From 884b36730b2b5f19b4d24d13c89b0323a6e19b8b Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Mon, 16 Aug 2021 16:38:00 +0100
Subject: [PATCH] utility helper for determining correct couchDB URL

---
 packages/auth/src/db/utils.js                 | 21 ++++++++++++-------
 packages/auth/src/environment.js              |  2 ++
 .../src/api/controllers/row/internalSearch.js |  3 ++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/auth/src/db/utils.js b/packages/auth/src/db/utils.js
index e3a86f8ae8..7c44664a68 100644
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@@ -159,6 +159,17 @@ exports.getDeployedAppID = appId => {
   return appId
 }
 
+exports.getCouchUrl = () => {
+  // username and password already exist in URL
+  if (env.COUCH_DB_URL.includes("@")) {
+    return env.COUCH_DB_URL
+  }
+
+  const [protocol, ...rest] = env.COUCH_DB_URL.split("://")
+
+  return `${protocol}://${env.COUCH_DB_USERNAME}:${env.COUCH_DB_PASSWORD}@${rest}`
+}
+
 /**
  * if in production this will use the CouchDB _all_dbs call to retrieve a list of databases. If testing
  * when using Pouch it will use the pouchdb-all-dbs package.
@@ -168,13 +179,7 @@ exports.getAllDbs = async () => {
   if (env.isTest()) {
     return getCouch().allDbs()
   }
-  const response = await fetch(`${env.COUCH_DB_URL}/_all_dbs`, {
-    method: "POST",
-    body: JSON.stringify({
-      name: env.COUCH_DB_USERNAME, 
-      password: env.COUCH_DB_PASSWORD, 
-    }),
-  })
+  const response = await fetch(`${exports.getCouchUrl()}/_all_dbs`)
   if (response.status === 200) {
     return response.json()
   } else {
@@ -309,4 +314,4 @@ exports.Replication = Replication
 exports.getScopedConfig = getScopedConfig
 exports.generateConfigID = generateConfigID
 exports.getConfigParams = getConfigParams
-exports.getScopedFullConfig = getScopedFullConfig
+exports.getScopedFullConfig = getScopedFullConfig
\ No newline at end of file
diff --git a/packages/auth/src/environment.js b/packages/auth/src/environment.js
index 355843d02d..e64a1c75f0 100644
--- a/packages/auth/src/environment.js
+++ b/packages/auth/src/environment.js
@@ -9,6 +9,8 @@ function isTest() {
 module.exports = {
   JWT_SECRET: process.env.JWT_SECRET,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
+  COUCH_DB_USERNAME: process.env.COUCH_DB_USER,
+  COUCH_DB_PASSWORD: process.env.COUCH_DB_PASSWORD,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
diff --git a/packages/server/src/api/controllers/row/internalSearch.js b/packages/server/src/api/controllers/row/internalSearch.js
index c13091d6e8..20147a7857 100644
--- a/packages/server/src/api/controllers/row/internalSearch.js
+++ b/packages/server/src/api/controllers/row/internalSearch.js
@@ -1,6 +1,7 @@
 const { SearchIndexes } = require("../../../db/utils")
 const env = require("../../../environment")
 const fetch = require("node-fetch")
+const { getCouchUrl } = require("@budibase/auth/db")
 
 /**
  * Class to build lucene query URLs.
@@ -233,7 +234,7 @@ class QueryBuilder {
   }
 
   async run() {
-    const url = `${env.COUCH_DB_URL}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`
+    const url = `${getCouchUrl()}/${this.appId}/_design/database/_search/${SearchIndexes.ROWS}`
     const body = this.buildSearchBody()
     return await runQuery(url, body)
   }