Browse Source
Merge pull request #2394 from Budibase/fix/check-for-couch-creds
conditionally apply username and password to couchdb auth
gh-pages
Martin McKeaveney
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
10 additions and
4 deletions
-
packages/server/src/db/client.js
-
packages/worker/src/db/index.js
|
|
|
@ -12,10 +12,13 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream) |
|
|
|
|
|
|
|
let POUCH_DB_DEFAULTS = { |
|
|
|
prefix: COUCH_DB_URL, |
|
|
|
auth: { |
|
|
|
} |
|
|
|
|
|
|
|
if (env.COUCH_DB_USERNAME && env.COUCH_DB_PASSWORD) { |
|
|
|
POUCH_DB_DEFAULTS.auth = { |
|
|
|
username: env.COUCH_DB_USERNAME, |
|
|
|
password: env.COUCH_DB_PASSWORD, |
|
|
|
}, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (env.isTest()) { |
|
|
|
|
|
|
|
@ -7,10 +7,13 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/" |
|
|
|
|
|
|
|
let POUCH_DB_DEFAULTS = { |
|
|
|
prefix: COUCH_DB_URL, |
|
|
|
auth: { |
|
|
|
} |
|
|
|
|
|
|
|
if (env.COUCH_DB_USERNAME && env.COUCH_DB_PASSWORD) { |
|
|
|
POUCH_DB_DEFAULTS.auth = { |
|
|
|
username: env.COUCH_DB_USERNAME, |
|
|
|
password: env.COUCH_DB_PASSWORD, |
|
|
|
}, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (env.isTest()) { |
|
|
|
|
