From bcbd40764fc9da27819bf9aa96b8bfed028b2d46 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Tue, 17 Aug 2021 16:48:02 +0100 Subject: [PATCH] conditionally apply username and password to couchdb auth --- packages/server/src/db/client.js | 7 +++++-- packages/worker/src/db/index.js | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/packages/server/src/db/client.js b/packages/server/src/db/client.js index 9a244fee17..dde857c462 100644 --- a/packages/server/src/db/client.js +++ b/packages/server/src/db/client.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()) { diff --git a/packages/worker/src/db/index.js b/packages/worker/src/db/index.js index c0676634f7..b9e05a0e0e 100644 --- a/packages/worker/src/db/index.js +++ b/packages/worker/src/db/index.js @@ -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()) {