Relative DB URLs

build/default.conf

@@ -48,6 +48,7 @@ server {
         root   /usr/share/nginx/html;
     }
 
+    # The proxy path should be the same as in AppConfig.DB_PROXY_PREFIX
     location /db {
         rewrite /db/(.*) /$1 break;
         proxy_pass ${COUCHDB_URL};

src/app/app.component.spec.ts

@@ -48,7 +48,7 @@ describe("AppComponent", () => {
   let entityUpdates: Subject<UpdatedEntity<Config>>;
 
   const mockAppSettings: IAppConfig = {
-    database: { name: "", remote_url: "" },
+    database: { name: "" },
     session_type: SessionType.local,
     demo_mode: false,
     site_name: "",

src/app/core/admin/admin/admin.component.spec.ts

@@ -58,10 +58,7 @@ describe("AdminComponent", () => {
       AppConfig.settings = {
         site_name: "",
         session_type: SessionType.mock,
-        database: {
-          name: "unit-tests",
-          remote_url: "",
-        },
+        database: { name: "unit-tests" },
       };
 
       TestBed.configureTestingModule({

src/app/core/app-config/app-config.model.ts

@@ -43,13 +43,6 @@ export interface IAppConfig {
   database: {
     /** name of the database - both remote and local */
     name: string;
-
-    /**
-     * URL to the database server to be synced with
-     *
-     * Beware of CORS issues if this is on a different domain than the app is served from.
-     */
-    remote_url: string;
   };
 
   /**

src/app/core/app-config/app-config.ts

@@ -34,6 +34,8 @@ import { IAppConfig } from "./app-config.model";
  * // no need for dependency injection here
  */
 export class AppConfig {
+  /** Path for the reverse proxy that forwards to the database - configured in `proxy.conf.json` and `default.conf` */
+  static DB_PROXY_PREFIX = "/db";
   /** settings for the app */
   static settings: IAppConfig;
 

src/app/core/session/session-service/local-session.spec.ts

@@ -33,10 +33,7 @@ describe("LocalSessionService", () => {
     AppConfig.settings = {
       site_name: "Aam Digital - DEV",
       session_type: SessionType.mock,
-      database: {
-        name: "test-db-name",
-        remote_url: "https://demo.aam-digital.com/db/",
-      },
+      database: { name: "test-db-name" },
     };
     database = jasmine.createSpyObj([
       "initInMemoryDB",

src/app/core/session/session-service/remote-session.spec.ts

@@ -19,10 +19,7 @@ describe("RemoteSessionService", () => {
     AppConfig.settings = {
       site_name: "test",
       session_type: SessionType.mock,
-      database: {
-        name: "database",
-        remote_url: "database_url",
-      },
+      database: { name: "database" },
     };
     mockHttpClient = jasmine.createSpyObj(["post", "delete"]);
     mockHttpClient.delete.and.returnValue(of());

src/app/core/session/session-service/remote-session.ts

@@ -22,6 +22,7 @@ import { SessionService } from "./session.service";
 import { LoginState } from "../session-states/login-state.enum";
 import { PouchDatabase } from "../../database/pouch-database";
 import { LoggingService } from "../../logging/logging.service";
+import PouchDB from "pouchdb-browser";
 
 /**
  * Responsibilities:
@@ -47,9 +48,19 @@ export class RemoteSession extends SessionService {
   ) {
     super();
     this.database = new PouchDatabase(this.loggingService).initIndexedDB(
-      AppConfig.settings.database.remote_url + AppConfig.settings.database.name,
+      `${AppConfig.DB_PROXY_PREFIX}/${AppConfig.settings.database.name}`,
       {
+        adapter: "http",
         skip_setup: true,
+        fetch: (url, opts) => {
+          if (typeof url === "string") {
+            return PouchDB.fetch(
+              AppConfig.DB_PROXY_PREFIX +
+                url.split(AppConfig.DB_PROXY_PREFIX)[1],
+              opts
+            );
+          }
+        },
       }
     );
   }
@@ -63,7 +74,7 @@ export class RemoteSession extends SessionService {
     try {
       const response = await this.httpClient
         .post<DatabaseUser>(
-          `${AppConfig.settings.database.remote_url}_session`,
+          `${AppConfig.DB_PROXY_PREFIX}/_session`,
           { name: username, password: password },
           { withCredentials: true }
         )
@@ -103,7 +114,7 @@ export class RemoteSession extends SessionService {
    */
   public async logout(): Promise<void> {
     await this.httpClient
-      .delete(`${AppConfig.settings.database.remote_url}_session`, {
+      .delete(`${AppConfig.DB_PROXY_PREFIX}/_session`, {
         withCredentials: true,
       })
       .toPromise()

src/app/core/session/session-service/synced-session.service.spec.ts

@@ -65,10 +65,7 @@ describe("SyncedSessionService", () => {
     AppConfig.settings = {
       site_name: "Aam Digital - DEV",
       session_type: SessionType.mock,
-      database: {
-        name: "integration_tests",
-        remote_url: "https://demo.aam-digital.com/db/",
-      },
+      database: { name: "integration_tests" },
       webdav: { remote_url: "" },
     };
     sessionService = TestBed.inject(SyncedSessionService);

src/app/core/session/session-service/synced-session.service.ts

@@ -75,7 +75,7 @@ export class SyncedSessionService extends SessionService {
    */
   checkForValidSession() {
     this.httpClient
-      .get(`${AppConfig.settings.database.remote_url}_session`, {
+      .get(`${AppConfig.DB_PROXY_PREFIX}/_session`, {
         withCredentials: true,
       })
       .subscribe((res: any) => {

src/app/core/webdav/cloud-file-service.service.spec.ts

@@ -26,10 +26,7 @@ describe("CloudFileService", () => {
     AppConfig.settings = {
       site_name: "",
       session_type: SessionType.mock,
-      database: {
-        name: "unit-tests",
-        remote_url: "",
-      },
+      database: { name: "unit-tests" },
       webdav: { remote_url: "test-url" },
     };
 

src/app/utils/mocked-testing.module.ts

@@ -90,10 +90,7 @@ export class MockedTestingModule {
     AppConfig.settings = {
       site_name: "Aam Digital - DEV",
       session_type: SessionType.mock,
-      database: {
-        name: "test-db-name",
-        remote_url: "https://demo.aam-digital.com/db/",
-      },
+      database: { name: "test-db-name" },
     };
     const mockedEntityMapper = mockEntityMapper([new User(TEST_USER), ...data]);
     const session = createLocalSession(loginState === LoginState.LOGGED_IN);

src/app/utils/performance-tests.spec.ts

@@ -14,10 +14,7 @@ xdescribe("Performance Tests", () => {
     AppConfig.settings = {
       site_name: "Aam Digital - DEV",
       session_type: SessionType.mock, // change to SessionType.local to run performance tests with the InBrowser database
-      database: {
-        name: "test-db-name",
-        remote_url: "https://demo.aam-digital.com/db/",
-      },
+      database: { name: "test-db-name" },
     };
 
     await TestBed.configureTestingModule({