Relative DB URLs

build/Dockerfile

@@ -1,9 +1,8 @@
 # This docker image can be used to run the application locally.
 # To use it only Docker needs to be installed locally
 # Run the following commands from the root folder to build, run and kill the application
-# >> docker build -f build/Dockerfile -t aam/digital:latest .
-# >> docker run -p=80:80 aam/digital:latest
-# >> docker kill aam-digital
+# >> docker build -f build/Dockerfile -t aam-digital .
+# >> docker run -p=80:80 aam-digital
 FROM node:16.14.2-alpine3.15 as builder
 WORKDIR /app
 
@@ -71,6 +70,8 @@ ENV PORT=80
 ENV WEBDAV_URL="http://localhost"
 # The url to the CouchDB database
 ENV COUCHDB_URL="http://localhost"
+# Whether the app should be started in demo mode. Everything else then "true" is considered as "false".
+ENV DEMO="true"
 # variables are inserted into the nginx config
-CMD envsubst '$$PORT $$WEBDAV_URL $$COUCHDB_URL' < /etc/nginx/templates/default.conf > /etc/nginx/conf.d/default.conf &&\
+CMD envsubst '$$PORT $$WEBDAV_URL $$COUCHDB_URL $$DEMO' < /etc/nginx/templates/default.conf > /etc/nginx/conf.d/default.conf &&\
     nginx -g 'daemon off;'

build/default.conf

@@ -13,7 +13,22 @@ server {
         try_files $uri =404;
     }
 
+    # Files should be directly accessed
+    location ~* \.[a-zA-Z]+$ {
+        try_files $uri =404;
+    }
+
     location / {
+        # Demo mode params are added to URL when not yet present and DEMO is set to true
+        if ($arg_demo != "true") {
+            set $demo "${DEMO}true";
+        }
+        if ($demo = "truetrue") {
+            # This first part is required because Heroku does some internal redirects which break the rewrite otherwise
+            # This does not work in localhost as it enforces HTTPS
+            rewrite ^ https://$http_host$uri?demo=true&session=mock permanent;
+        }
+
         index index.html index.htm;
         try_files $uri $uri/ /index.html =404;
     }
@@ -27,6 +42,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

@@ -21,13 +21,11 @@ import {
   fakeAsync,
   flush,
   TestBed,
-  tick,
   waitForAsync,
 } from "@angular/core/testing";
 import { AppComponent } from "./app.component";
 import { AppModule } from "./app.module";
 import { AppConfig } from "./core/app-config/app-config";
-import { IAppConfig } from "./core/app-config/app-config.model";
 import { Config } from "./core/config/config";
 import { USAGE_ANALYTICS_CONFIG_ID } from "./core/analytics/usage-analytics-config";
 import { environment } from "../environments/environment";
@@ -47,28 +45,19 @@ describe("AppComponent", () => {
   let fixture: ComponentFixture<AppComponent>;
   let entityUpdates: Subject<UpdatedEntity<Config>>;
 
-  const mockAppSettings: IAppConfig = {
-    database: { name: "", remote_url: "" },
-    session_type: SessionType.local,
-    demo_mode: false,
-    site_name: "",
-  };
+  beforeEach(waitForAsync(() => {
+    AppConfig.SESSION_TYPE = SessionType.mock;
+    const entityMapper = mockEntityMapper();
+    entityUpdates = new Subject();
+    spyOn(entityMapper, "receiveUpdates").and.returnValue(entityUpdates);
 
-  beforeEach(
-    waitForAsync(() => {
-      AppConfig.settings = mockAppSettings;
-      const entityMapper = mockEntityMapper();
-      entityUpdates = new Subject();
-      spyOn(entityMapper, "receiveUpdates").and.returnValue(entityUpdates);
+    TestBed.configureTestingModule({
+      imports: [AppModule, HttpClientTestingModule],
+      providers: [{ provide: EntityMapperService, useValue: entityMapper }],
+    }).compileComponents();
 
-      TestBed.configureTestingModule({
-        imports: [AppModule, HttpClientTestingModule],
-        providers: [{ provide: EntityMapperService, useValue: entityMapper }],
-      }).compileComponents();
-
-      spyOn(TestBed.inject(EntityRegistry), "add"); // Prevent error with duplicate registration
-    })
-  );
+    spyOn(TestBed.inject(EntityRegistry), "add"); // Prevent error with duplicate registration
+  }));
 
   function createComponent() {
     fixture = TestBed.createComponent(AppComponent);
@@ -101,7 +90,7 @@ describe("AppComponent", () => {
     window["_paq"] = [];
 
     createComponent();
-    tick();
+    flush();
 
     expect(startTrackingSpy).toHaveBeenCalledTimes(1);
     expect(window["_paq"]).toContain([
@@ -115,13 +104,13 @@ describe("AppComponent", () => {
   it("published the demo data", fakeAsync(() => {
     const demoDataService = TestBed.inject(DemoDataService);
     spyOn(demoDataService, "publishDemoData").and.callThrough();
-    AppConfig.settings.demo_mode = true;
+    AppConfig.DEMO_MODE = true;
 
     createComponent();
     flush();
     discardPeriodicTasks();
 
     expect(demoDataService.publishDemoData).toHaveBeenCalled();
-    AppConfig.settings.demo_mode = false;
+    AppConfig.DEMO_MODE = false;
   }));
 });

src/app/app.component.ts

@@ -90,7 +90,7 @@ export class AppComponent {
       this.analyticsService.init();
     }
 
-    if (AppConfig.settings.demo_mode) {
+    if (AppConfig.DEMO_MODE) {
       await this.demoDataInitializer.run();
     }
   }

src/app/app.module.ts

@@ -84,6 +84,7 @@ import {
   DEFAULT_LANGUAGE,
   LANGUAGE_LOCAL_STORAGE_KEY,
 } from "./core/language/language-statics";
+import { AppConfig } from "./core/app-config/app-config";
 
 /**
  * Main entry point of the application.
@@ -177,6 +178,7 @@ import {
 })
 export class AppModule {
   constructor(icons: FaIconLibrary) {
+    AppConfig.initSettings();
     icons.addIconPacks(fas, far);
   }
 }

src/app/core/admin/admin/admin.component.html

@@ -5,8 +5,8 @@ <h1>Administration & Configuration</h1>
   you know what you are doing.
 </p>
 
-<br />
-<hr />
+<br/>
+<hr/>
 <h2>Utility Functions</h2>
 <p fxLayoutGap="12px">
   <button
@@ -17,8 +17,8 @@ <h2>Utility Functions</h2>
   </button>
 </p>
 
-<br />
-<hr />
+<br/>
+<hr/>
 <h2>Backup</h2>
 <p>
   <button
@@ -42,8 +42,8 @@ <h2>Backup</h2>
   />
 </p>
 
-<br />
-<hr />
+<br/>
+<hr/>
 <h2>Export</h2>
 <p>
   <button
@@ -54,8 +54,8 @@ <h2>Export</h2>
   </button>
   &nbsp;
 </p>
-<br />
-<hr />
+<br/>
+<hr/>
 <h2>Application Configuration</h2>
 <p>
   <button
@@ -79,13 +79,8 @@ <h2>Application Configuration</h2>
   />
 </p>
 
-<br />
-<hr />
-<h2>AppConfig</h2>
-<p>{{ appConfig | json }}</p>
-
-<br />
-<hr />
+<br/>
+<hr/>
 <h2>Debug the PouchDB</h2>
 <p>
   <button (click)="debugDatabase()" mat-stroked-button>
@@ -101,8 +96,8 @@ <h2>Debug the PouchDB</h2>
   </button>
 </p>
 
-<br />
-<hr />
+<br/>
+<hr/>
 <h2>Alert Log</h2>
 <table aria-label="Table showing alerts">
   <tr *ngFor="let alert of alerts.reverse()">

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

@@ -55,14 +55,7 @@ describe("AdminComponent", () => {
 
   beforeEach(
     waitForAsync(() => {
-      AppConfig.settings = {
-        site_name: "",
-        session_type: SessionType.mock,
-        database: {
-          name: "unit-tests",
-          remote_url: "",
-        },
-      };
+      AppConfig.SESSION_TYPE = SessionType.mock;
 
       TestBed.configureTestingModule({
         imports: [AdminModule, MockedTestingModule.withState()],

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

@@ -1,5 +1,4 @@
 import { Component, OnInit } from "@angular/core";
-import { AppConfig } from "../../app-config/app-config";
 import { AlertService } from "../../alerts/alert.service";
 import { Alert } from "../../alerts/alert";
 import { BackupService } from "../services/backup.service";
@@ -23,9 +22,6 @@ import { Database } from "../../database/database";
   styleUrls: ["./admin.component.scss"],
 })
 export class AdminComponent implements OnInit {
-  /** app-wide configuration */
-  appConfig = AppConfig.settings;
-
   /** all alerts */
   alerts: Alert[];
 

src/app/core/analytics/analytics.service.spec.ts

@@ -5,8 +5,6 @@ import { Angulartics2Matomo, Angulartics2Module } from "angulartics2";
 import { RouterTestingModule } from "@angular/router/testing";
 import { ConfigService } from "../config/config.service";
 import { UsageAnalyticsConfig } from "./usage-analytics-config";
-import { AppConfig } from "../app-config/app-config";
-import { IAppConfig } from "../app-config/app-config.model";
 import { Subject } from "rxjs";
 import { Config } from "../config/config";
 
@@ -18,7 +16,6 @@ describe("AnalyticsService", () => {
   let mockMatomo: jasmine.SpyObj<Angulartics2Matomo>;
 
   beforeEach(() => {
-    AppConfig.settings = { site_name: "unit-testing" } as IAppConfig;
     mockConfigService = jasmine.createSpyObj(
       "mockConfigService",
       ["getConfig"],

src/app/core/analytics/analytics.service.ts

@@ -1,13 +1,13 @@
 import { Injectable } from "@angular/core";
 import { environment } from "../../../environments/environment";
-import { AppConfig } from "../app-config/app-config";
 import { ConfigService } from "../config/config.service";
 import {
   USAGE_ANALYTICS_CONFIG_ID,
   UsageAnalyticsConfig,
 } from "./usage-analytics-config";
 import { Angulartics2, Angulartics2Matomo } from "angulartics2";
 import md5 from "md5";
+import { UiConfig } from "../ui/ui-config";
 
 /**
  * Track usage analytics data and report it to a backend server like Matomo.
@@ -18,10 +18,6 @@ import md5 from "md5";
   providedIn: "root",
 })
 export class AnalyticsService {
-  private static getUserHash(username: string): string {
-    return md5(AppConfig.settings?.site_name + username);
-  }
-
   private isInitialized = false;
 
   constructor(
@@ -30,10 +26,14 @@ export class AnalyticsService {
     private configService: ConfigService
   ) {}
 
+  /**
+   * Sets a unique user hash which is always for the same user but does not expose the username.
+   * This improves the logging behavior.
+   * @param username actual username
+   */
   public setUser(username: string): void {
-    this.angulartics2Matomo.setUsername(
-      AnalyticsService.getUserHash(username ?? "")
-    );
+    const baseUrl = location.host;
+    this.angulartics2Matomo.setUsername(md5(`${baseUrl}${username ?? ""}`));
   }
 
   /**
@@ -48,7 +48,6 @@ export class AnalyticsService {
     window["_paq"].push(["trackPageView"]);
     window["_paq"].push(["enableLinkTracking"]);
     this.setVersion();
-    this.setOrganization(AppConfig.settings.site_name);
     this.setUser(undefined);
     this.configService.configUpdates.subscribe(() => this.setConfigValues());
   }
@@ -101,6 +100,11 @@ export class AnalyticsService {
     if (site_id) {
       window["_paq"].push(["setSiteId", site_id]);
     }
+    const { site_name } =
+      this.configService.getConfig<UiConfig>("appConfig") || {};
+    if (site_name) {
+      this.setOrganization(site_name);
+    }
   }
 
   /**