Support Internal CouchDB URL different than external (ingress usage)

davideshay · Apr 1, 2023 · e3f41fa · e3f41fa
1 parent e37fd8f
commit e3f41fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/server/src/apicalls.ts b/server/src/apicalls.ts
@@ -1,4 +1,5 @@
 export const couchdbUrl = (process.env.COUCHDB_URL == undefined) ? "" : process.env.COUCHDB_URL.endsWith("/") ? process.env.COUCHDB_URL.slice(0,-1): process.env.COUCHDB_URL;
+export const couchdbInternalUrl = (process.env.COUCHDB_INTERNAL_URL == undefined) ? couchdbUrl : process.env.COUCHDB_INTERAL_URL?.endsWith("/") ? process.env.COUCHDB_INTERNAL_URL.slice(0,-1): process.env.COUCHDB_INTERNAL_URL;
 export const couchDatabase = (process.env.COUCHDB_DATABASE == undefined) ? "" : process.env.COUCHDB_DATABASE;
 export const couchKey = process.env.COUCHDB_HMAC_KEY;
 export const couchAdminUser = process.env.COUCHDB_ADMIN_USER;
@@ -30,7 +31,7 @@ const smtpOptions: SMTPTransport.Options= {
 import nodemailer from 'nodemailer';
 import nanoAdmin, { DocumentListResponse,  MangoResponse, MaybeDocument } from 'nano';
 const nanoAdminOpts = {
-    url: couchdbUrl,
+    url: couchdbInternalUrl,
     requestDefaults: {
         headers: { Authorization: "Basic "+ Buffer.from(couchAdminUser+":"+couchAdminPassword).toString('base64') }
     }
@@ -102,8 +103,8 @@ export async function issueToken(req: Request, res: Response) {
         loginRoles: [],
         refreshJWT: "",
         accessJWT: "",
-        couchdbUrl: process.env.COUCHDB_URL,
-        couchdbDatabase: process.env.COUCHDB_DATABASE
+        couchdbUrl: couchdbUrl,
+        couchdbDatabase: couchDatabase
     }
     let loginResponse = await couchLogin(username,password);
     if (!loginResponse.loginSuccessful) {
@@ -199,8 +200,8 @@ export async function registerNewUser(req: CustomRequest<NewUserReqBody>, res: R
         idCreated: "",
         refreshJWT: "",
         accessJWT: "",
-        couchdbUrl: process.env.COUCHDB_URL,
-        couchdbDatabase: process.env.COUCHDB_DATABASE,
+        couchdbUrl: couchdbUrl,
+        couchdbDatabase: couchDatabase,
         email: email,
         fullname: fullname
     }

diff --git a/server/src/dbstartup.ts b/server/src/dbstartup.ts
@@ -1,4 +1,4 @@
-import { todosNanoAsAdmin, usersNanoAsAdmin, couchDatabase, couchAdminPassword, couchAdminUser, couchdbUrl, couchStandardRole,
+import { todosNanoAsAdmin, usersNanoAsAdmin, couchDatabase, couchAdminPassword, couchAdminUser, couchdbUrl, couchdbInternalUrl, couchStandardRole,
 couchAdminRole, conflictsViewID, conflictsViewName, utilitiesViewID, refreshTokenExpires, accessTokenExpires,
 enableScheduling, resolveConflictsFrequencyMinutes,expireJWTFrequencyMinutes } from "./apicalls";
 import { resolveConflicts } from "./apicalls";
@@ -31,7 +31,7 @@ export async function couchLogin(username: string, password: string) {
     }
     const config: AxiosRequestConfig = {
         method: 'get',
-        url: couchdbUrl+"/_session",
+        url: couchdbInternalUrl+"/_session",
         auth: { username: username, password: password},
         responseType: 'json'
     }
@@ -91,7 +91,7 @@ async function setDBSecurity() {
     let errorSettingSecurity = false;
     let config: AxiosRequestConfig = {
         method: 'get',
-        url: couchdbUrl+"/"+couchDatabase+"/_security",
+        url: couchdbInternalUrl+"/"+couchDatabase+"/_security",
         auth: {username: String(couchAdminUser), password: String(couchAdminPassword)},
         responseType: 'json'
     }
@@ -125,7 +125,7 @@ async function setDBSecurity() {
     }
     let configSec: any = {
         method: 'put',
-        url: couchdbUrl+"/"+couchDatabase+"/_security",
+        url: couchdbInternalUrl+"/"+couchDatabase+"/_security",
         auth: {username: couchAdminUser, password: couchAdminPassword},
         responseType: 'json',
         data: newSecurity
@@ -531,7 +531,9 @@ export async function dbStartup() {
     console.log("STATUS: App Version: ",appVersion);
     console.log("STATUS: Database Schema Version:",maxAppSupportedSchemaVersion);
     if (couchdbUrl == "") {console.log("ERROR: No environment variable for CouchDB URL"); return false;}
+    if (couchdbInternalUrl == "") {console.log("ERROR: No environment variable for internal CouchDB URL"); return false;}
     console.log("STATUS: Database URL: ",couchdbUrl);
+    console.log("STATUS: Internal Database URL: ",couchdbInternalUrl);
     if (couchDatabase == "") { console.log("ERROR: No CouchDatabase environment variable."); return false;}
     console.log("STATUS: Using database: ",couchDatabase);
     console.log("STATUS: Refresh token expires in ",refreshTokenExpires);