refactor(dlcm-portal): refactor environment config

refactor environment config

src/environments/environment.defaults.ts

@@ -7,18 +7,18 @@ import {ThemeEnum} from "@app/shared/enums/theme.enum";
 export const defaultEnvironment = {
   appTitle: "DLCM - Portal",
   production: false,
+  theme: ThemeEnum.dlcm,
+  defaultLanguage: LanguagesEnum.en,
+  defaultPageSizeOption: 5,
+  pageSizeOptions: [5, 10, 25, 50, 100],
+
+  // Base URL For Module Applications
   ADMIN_APPLICATION: "https://to-set/administration",
   ACCESS_APPLICATION: "https://to-set/accession",
   INGEST_APPLICATION: "https://to-set/ingestion",
   PREINGEST_APPLICATION: "https://to-set/accession",
   STORAGION_APPLICATION: "https://to-set/storagion",
 
-  theme: ThemeEnum.dlcm,
-
-  defaultLanguage: LanguagesEnum.en,
-  pageSizeOptions: [5, 10, 25, 50, 100],
-  defaultPageSizeOption: 5,
-
   // OAuth2 properties
   oauthOidc: false,
   oauthRequestAccessToken: true,

src/environments/environment.prod.ts

 import {ThemeEnum} from "@app/shared/enums/theme.enum";
 import {defaultEnvironment} from "./environment.defaults";
 
-export const environment: typeof defaultEnvironment = {
+export const environment = {
   ...defaultEnvironment,
-  theme: ThemeEnum.yareta,
+
+  // Override OAuth2 properties
+  appTitle: "DLCM - Portal",
   production: true,
+  theme: ThemeEnum.yareta,
+
   ADMIN_APPLICATION: "https://test.dlcm.ch/administration",
   ACCESS_APPLICATION: "https://test.dlcm.ch/accession",
   INGEST_APPLICATION: "https://test.dlcm.ch/ingestion",
   PREINGEST_APPLICATION: "https://test.dlcm.ch/accession",
   STORAGION_APPLICATION: "https://test.dlcm.ch/storagion",
 
-  oauthTokenEndpoint: "https://test.dlcm.ch/authorization/oauth/token",
-  oauthDummyClientSecret: "123abc",
-  oauthClientId: "dlcm-test-angular",
-  oauthScope: "READ",
-  oauthRequireHttps: false,
-  oauthLoginUrl: "https://test.dlcm.ch/authorization/oauth/authorize",
-  oauthRedirectUrl: "https://test.dlcm.ch/portal/",
+
+  // OAuth2 properties
+  tokenEndpoint: "https://test.dlcm.ch/authorization/oauth/token",
+  dummyClientSecret: "123abc",
+  clientId: "dlcm-test-angular",
+  responseType: "token",
+  scope: "READ",
+  requireHttps: false,
+  loginUrl: "https://test.dlcm.ch/authorization/oauth/authorize",
+  redirectUrl: "https://test.dlcm.ch/portal/",
 };

src/environments/environment.ts

@@ -10,14 +10,19 @@ import {environmentLocal} from "./environment.local";
 export const environment: typeof defaultEnvironment = {
   ...defaultEnvironment,
   theme: ThemeEnum.dlcm,
-  oauthTokenEndpoint: "http://localhost/dlcm-authorization/oauth/token",
-  oauthDummyClientSecret: "123abc",
-  oauthClientId: "local-dev-angular",
-  oauthScope: "READ",
-  oauthRequireHttps: false,
-  oauthLoginUrl: "http://localhost/dlcm-authorization/oauth/authorize",
-  oauthRedirectUrl: window.location.origin,
-  ...environmentLocal,
+
+  // Override OAuth2 properties
+  tokenEndpoint: "https://localhost/authorization/oauth/token",
+  dummyClientSecret: "123abc",
+  clientId: "local-dev-angular",
+  responseType: "token",
+  scope: "READ",
+  requireHttps: false,
+  loginUrl: "https://localhost/authorization/oauth/authorize",
+  redirectUrl: window.location.origin,
+
+  //Override properties inside environment.local.ts
+  ...environmentLocal
 };
 
 /*