MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2394 from Budibase/fix/check-for-couch-creds 

conditionally apply username and password to couchdb auth
This commit is contained in:
Martin McKeaveney 2021-08-17 16:57:04 +01:00 committed by GitHub
parent 1a9a61f92c 87bf640a5d
commit 7bca33e53d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/server/src/db/client.js
View File

@ -12,10 +12,13 @@ PouchDB.adapter("writableStream", replicationStream.adapters.writableStream)
let POUCH_DB_DEFAULTS = { let POUCH_DB_DEFAULTS = {
prefix: COUCH_DB_URL, prefix: COUCH_DB_URL,
auth: { }
if (env.COUCH_DB_USERNAME && env.COUCH_DB_PASSWORD) {
POUCH_DB_DEFAULTS.auth = {
username: env.COUCH_DB_USERNAME, username: env.COUCH_DB_USERNAME,
password: env.COUCH_DB_PASSWORD, password: env.COUCH_DB_PASSWORD,
}, }
} }
if (env.isTest()) { if (env.isTest()) {

7
packages/worker/src/db/index.js
View File

@ -7,10 +7,13 @@ const COUCH_DB_URL = env.COUCH_DB_URL || "http://localhost:10000/db/"
let POUCH_DB_DEFAULTS = { let POUCH_DB_DEFAULTS = {
prefix: COUCH_DB_URL, prefix: COUCH_DB_URL,
auth: { }
if (env.COUCH_DB_USERNAME && env.COUCH_DB_PASSWORD) {
POUCH_DB_DEFAULTS.auth = {
username: env.COUCH_DB_USERNAME, username: env.COUCH_DB_USERNAME,
password: env.COUCH_DB_PASSWORD, password: env.COUCH_DB_PASSWORD,
}, }
} }
if (env.isTest()) { if (env.isTest()) {