Fix env vars (#130)

mar-be · web-flow · commit 46713f77ba22 · 2022-01-13T14:04:02.000+01:00
Signed-off-by: Marvin Bechtold &lt;marvin.bechtold.dev@gmail.com&gt;
diff --git a/.docker/config-init.sh b/.docker/config-init.sh
@@ -5,7 +5,7 @@ if [ ! -f "/opt/configComplete" ]; then
   for topic in $(jq -r 'keys[]' /opt/init-config.d/*.json); do
     for key in $(jq .$topic /opt/init-config.d/*.json | jq -r 'keys[]'); do
       myVal=$(jq -r [".$topic | .$key"] /opt/init-config.d/*.json | jq -r .[])
-      echo "saving: $topic/$key: $myVal"
+      # echo "saving: $topic/$key: $myVal"
       /usr/bin/wait-for-it $CONFIG_SERVER:$CONFIG_SERVER_PORT -s -t 10 -- curl http://$CONFIG_SERVER:$CONFIG_SERVER_PORT/v2/keys/$topic/$key -XPUT -d value="$myVal" > /dev/null 2>&1
       done
   done
diff --git a/src/app/core/service/discussion.service.ts b/src/app/core/service/discussion.service.ts
@@ -1,16 +1,16 @@
 import { Injectable } from '@angular/core';
-import { globals } from '../../globals';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { DiscussionTopic } from '../model/discussion-topic';
 import { DiscussionComment } from '../model/discussion-comment';
+import { environment } from '../../../environments/environment';
 
 @Injectable({
   providedIn: 'root'
 })
 export class DiscussionService {
 
-  private repoEndpoint = globals.repoEndpoint;
+  private repoEndpoint = environment.API_URL;
 
   constructor(private http: HttpClient) {
   }
diff --git a/src/app/core/service/image.service.ts b/src/app/core/service/image.service.ts
@@ -1,16 +1,16 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { globals } from '../../globals';
 import { Image } from '../model/image';
 import { ImageModel } from '../model/image-model';
+import { environment } from '../../../environments/environment';
 
 @Injectable({
   providedIn: 'root'
 })
 export class ImageService {
 
-  private repoEndpoint = globals.repoEndpoint;
+  private repoEndpoint = environment.API_URL;
 
   constructor(private http: HttpClient) {
   }
diff --git a/src/app/core/service/pattern-language.service.ts b/src/app/core/service/pattern-language.service.ts
@@ -15,7 +15,6 @@
 import { Injectable } from '@angular/core';
 import PatternLanguage from '../model/hal/pattern-language.model';
 import { HttpClient, HttpResponse } from '@angular/common/http';
-import { globals } from '../../globals';
 import { Observable, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 import PatternLanguages from '../model/hal/pattern-languages.model';
@@ -29,11 +28,12 @@ import { PatternContainer } from '../model/hal/pattern-container.model';
 import { PatternService } from './pattern.service';
 import { PatternContainerResponse } from '../model/hal/pattern-container-response.interface';
 import Pattern from '../model/hal/pattern.model';
+import { environment } from '../../../environments/environment';
 
 @Injectable()
 export class PatternLanguageService implements GraphDataService {
 
-  private repoEndpoint = globals.repoEndpoint;
+  private repoEndpoint = environment.API_URL;
 
   constructor(private http: HttpClient, private patternService: PatternService) {
   }
diff --git a/src/app/core/service/pattern-view.service.ts b/src/app/core/service/pattern-view.service.ts
@@ -14,7 +14,6 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse } from '@angular/common/http';
-import { globals } from '../../globals';
 import { EMPTY, forkJoin, Observable, of } from 'rxjs';
 import Pattern from '../model/hal/pattern.model';
 import { PatternContainer } from '../model/hal/pattern-container.model';
@@ -31,11 +30,12 @@ import { UndirectedEdgesResponse } from '../model/hal/undirected-edes-response.i
 import { DirectedEdesResponse } from '../model/hal/directed-edes-response.interface';
 import { GraphNode } from '../component/graph-display/graph-display.component';
 import { GraphDataService } from './graph-data/graph-data.service';
+import { environment } from '../../../environments/environment';
 
 @Injectable()
 export class PatternViewService implements GraphDataService {
 
-  private repoEndpoint = globals.repoEndpoint;
+  private repoEndpoint = environment.API_URL;
 
   constructor(private http: HttpClient) {
   }
@@ -90,11 +90,11 @@ export class PatternViewService implements GraphDataService {
   }
 
   getDirectedEdgeById(patternViewId, edgeId: string): Observable<DirectedEdgeModel> {
-    return this.http.get<DirectedEdgeModel>(this.repoEndpoint + /patternViews/ + patternViewId + /directedEdges/ + edgeId)
+    return this.http.get<DirectedEdgeModel>(this.repoEndpoint + /patternViews/ + patternViewId + /directedEdges/ + edgeId);
   }
 
   getUndirectedEdgeById(patternViewId, edgeId: string): Observable<UndirectedEdgeModel> {
-    return this.http.get<UndirectedEdgeModel>(this.repoEndpoint + /patternViews/ + patternViewId + /undirectedEdges/ + edgeId)
+    return this.http.get<UndirectedEdgeModel>(this.repoEndpoint + /patternViews/ + patternViewId + /undirectedEdges/ + edgeId);
   }
 
   deleteLink(patternLink: any): Observable<any> {
diff --git a/src/app/core/service/pattern.service.ts b/src/app/core/service/pattern.service.ts
@@ -14,18 +14,18 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { globals } from '../../globals';
 import { Observable } from 'rxjs';
 import Pattern from '../model/hal/pattern.model';
 import { map } from 'rxjs/operators';
 import { PatternResponse } from '../model/hal/pattern-response.interface';
 import PatternLanguage from '../model/hal/pattern-language.model';
 import { Edge } from '../model/hal/edge.model';
+import { environment } from '../../../environments/environment';
 
 @Injectable()
 export class PatternService {
 
-  private repoEndpoint = globals.repoEndpoint;
+  private repoEndpoint = environment.API_URL;
 
   constructor(private http: HttpClient) {
   }
diff --git a/src/app/design-model-module/service/concrete-solution.service.ts b/src/app/design-model-module/service/concrete-solution.service.ts
@@ -14,15 +14,15 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { globals } from '../../globals';
 import { map } from 'rxjs/operators';
 import { FileDTO } from '../model/file-dto';
 import { HalCollectionResponse } from '../model/hal/hal-collection-response';
+import { environment } from '../../../environments/environment';
 
 @Injectable()
 export class ConcreteSolutionService {
 
-  private readonly repoEndpoint = globals.repoEndpoint + '/design-models';
+  private readonly repoEndpoint = environment.API_URL + '/design-models';
 
   constructor(private httpClient: HttpClient) {
   }
diff --git a/src/app/design-model-module/service/design-model.service.ts b/src/app/design-model-module/service/design-model.service.ts
@@ -14,7 +14,6 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse } from '@angular/common/http';
-import { globals } from '../../globals';
 import { BehaviorSubject, EMPTY, forkJoin, Observable, of } from 'rxjs';
 import Pattern from '../../core/model/hal/pattern.model';
 import { PatternContainer } from '../../core/model/hal/pattern-container.model';
@@ -32,11 +31,12 @@ import { GraphDataSavePatternService } from '../../core/service/graph-data/graph
 import { TextComponent } from '@ustutt/grapheditor-webcomponent/lib/edge';
 import { HalCollectionResponse } from '../model/hal/hal-collection-response';
 import { HalEntityResponse } from '../model/hal/hal-entity-response';
+import { environment } from '../../../environments/environment';
 
 @Injectable()
 export class DesignModelService implements GraphDataService, GraphDataSavePatternService {
 
-  private readonly repoEndpoint = globals.repoEndpoint;
+  private readonly repoEndpoint = environment.API_URL;
   private readonly designModelsEndpoint = this.repoEndpoint + '/design-models';
   private designModelLinks;
   private edgeTypes = new BehaviorSubject<string[]>([]);
diff --git a/src/app/globals.ts b/src/app/globals.ts
@@ -17,7 +17,6 @@ export const globals = {
   iriPatternRepoInstance: 'https://purl.org/patternatlas#LinkedOpenPatterns',
   urlGithubAPI: 'https://api.github.com/repos/patternatlas/patternatlascontent/contents',
   loadOntologyLocally: true,
-  repoEndpoint: 'http://localhost:1977/patternatlas',
   pathConstants: {
     patternLanguages: 'pattern-languages',
     patternLanguageId: 'pattern-language-id',
diff --git a/src/assets/env.js b/src/assets/env.js
@@ -6,7 +6,9 @@
   window['env']['production'] = false;
   window['env']['CONFIG_SERVER_HOST_NAME'] = 'localhost';
   window['env']['LATEX_RENDERER_HOST_NAME'] = 'localhost';
-  window['env']['PATTERN_ATLAS_HOST_NAME'] = 'localhost';
+  window['env']['PATTERN_ATLAS_API_HOST_NAME'] = 'localhost';
   window['env']['CONFIG_SERVER_PORT'] = 2379;
   window['env']['LATEX_RENDERER_PORT'] = 5030;
+  window['env']['PATTERN_ATLAS_API_PORT'] = 1977;
+  window['env']['URL_SCHEME'] = 'http';
 })(this);
diff --git a/src/assets/env.js.template b/src/assets/env.js.template
@@ -5,10 +5,11 @@
   // Environment variables
   window['env']['CONFIG_SERVER_HOST_NAME'] = '${CONFIG_SERVER_HOST_NAME}';
   window['env']['LATEX_RENDERER_HOST_NAME'] = '${LATEX_RENDERER_HOST_NAME}';
-  window['env']['PATTERN_ATLAS_HOST_NAME'] = '${PATTERN_ATLAS_API_HOST_NAME}';
+  window['env']['PATTERN_ATLAS_API_HOST_NAME'] = '${PATTERN_ATLAS_API_HOST_NAME}';
   window['env']['CONFIG_SERVER_PORT'] = '${CONFIG_SERVER_PORT}';
   window['env']['LATEX_RENDERER_PORT'] = '${LATEX_RENDERER_PORT}';
-  window['env']['PATTERN_ATLAS_API_PORT'] = '${PATTERN_ATLAS_API_HOST_NAME}';
+  window['env']['PATTERN_ATLAS_API_PORT'] = '${PATTERN_ATLAS_API_PORT}';
+  window['env']['URL_SCHEME'] = '${URL_SCHEME}';
 })(this);
 
 
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -12,9 +12,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  */
 
+const urlScheme = `${window['env'] && window['env']['URL_SCHEME'] ? window['env']['URL_SCHEME'] : 'http'}`;
 export const environment = {
   PRODUCTION: true,
-  API_URL: 'http://localhost:1977',
+  API_URL: window['env'] && window['env']['PATTERN_ATLAS_API_HOST_NAME'] && window['env']['PATTERN_ATLAS_API_PORT']
+    ? `${urlScheme}://${window['env']['PATTERN_ATLAS_API_HOST_NAME']}:${window['env']['PATTERN_ATLAS_API_PORT']}/patternatlas`
+    : 'http://localhost:1977/patternatlas',
   authorizeUrl: 'http://localhost:8081/oauth/authorize?',
   tokenUrl: 'http://localhost:8081/oauth/token',
   tokenRevokeUrl: 'http://localhost:8081/oauth/revoke_token',
@@ -25,9 +28,12 @@ export const environment = {
   clientIdPublic: 'pattern-pedia-public',
   clientIdPKCE: 'pattern-pedia-pkce',
   CONFIG_SERVER_URL:
-    window['env'] && window['env']['CONFIG_SERVER_HOST_NAME'] &&
-    window['env']['CONFIG_SERVER_PORT']
-      ? `http://${window['env']['CONFIG_SERVER_HOST_NAME']}:${window['env']['CONFIG_SERVER_PORT']}/v2/keys`
+    window['env'] && window['env']['CONFIG_SERVER_HOST_NAME'] && window['env']['CONFIG_SERVER_PORT']
+      ? `${urlScheme}://${window['env']['CONFIG_SERVER_HOST_NAME']}:${window['env']['CONFIG_SERVER_PORT']}/v2/keys`
       : 'http://localhost:2379/v2/keys',
-  defaultFeatures: 'assets/settings_features/default_features.json'
+  defaultFeatures: 'assets/settings_features/default_features.json',
+  LATEX_RENDERER_API_URL:
+    window['env'] && window['env']['LATEX_RENDERER_HOST_NAME'] && window['env']['LATEX_RENDERER_PORT']
+      ? `${urlScheme}://${window['env']['LATEX_RENDERER_HOST_NAME']}:${window['env']['LATEX_RENDERER_PORT']}`
+      : 'http://localhost:5030'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -16,16 +16,16 @@
 // `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
+const urlScheme = `${window['env'] && window['env']['URL_SCHEME'] ? window['env']['URL_SCHEME'] : 'http'}`
 export const environment = {
   PRODUCTION: window['env'] && window['env']['production'] || false,
   API_URL:
     window['env'] && window['env']['PATTERN_ATLAS_API_HOST_NAME'] && window['env']['PATTERN_ATLAS_API_PORT']
-      ? `http://${window['env']['PATTERN_ATLAS_API_HOST_NAME']}:${window['env']['PATTERN_ATLAS_API_PORT']}/atlas`
+      ? `${urlScheme}://${window['env']['PATTERN_ATLAS_API_HOST_NAME']}:${window['env']['PATTERN_ATLAS_API_PORT']}/patternatlas`
       : 'http://localhost:1977/patternatlas',
   LATEX_RENDERER_API_URL:
-    window['env'] && window['env']['LATEX_RENDERER_HOST_NAME'] &&
-    window['env']['LATEX_RENDERER_PORT']
-      ? `http://${window['env']['LATEX_RENDERER_HOST_NAME']}:${window['env']['LATEX_RENDERER_PORT']}`
+    window['env'] && window['env']['LATEX_RENDERER_HOST_NAME'] && window['env']['LATEX_RENDERER_PORT']
+      ? `${urlScheme}://${window['env']['LATEX_RENDERER_HOST_NAME']}:${window['env']['LATEX_RENDERER_PORT']}`
       : 'http://localhost:5030',
   authorizeUrl: 'http://localhost:8081/oauth/authorize?',
   tokenUrl: 'http://localhost:8081/oauth/token',
@@ -37,9 +37,8 @@ export const environment = {
   clientIdPublic: 'pattern-pedia-public',
   clientIdPKCE: 'pattern-pedia-pkce',
   CONFIG_SERVER_URL:
-    window['env'] && window['env']['CONFIG_SERVER_HOST_NAME'] &&
-    window['env']['CONFIG_SERVER_PORT']
-      ? `http://${window['env']['CONFIG_SERVER_HOST_NAME']}:${window['env']['CONFIG_SERVER_PORT']}/v2/keys`
+    window['env'] && window['env']['CONFIG_SERVER_HOST_NAME'] && window['env']['CONFIG_SERVER_PORT']
+      ? `${urlScheme}://${window['env']['CONFIG_SERVER_HOST_NAME']}:${window['env']['CONFIG_SERVER_PORT']}/v2/keys`
       : 'http://localhost:2379/v2/keys',
   defaultFeatures: 'assets/settings_features/default_features.json'
 };
