Revize 4ccb6b62

re #33: load frontend app configuration from config.json file

webapp/src/app/app.module.ts

@@ -1 +1 @@
 import {BrowserModule} from '@angular/platform-browser';
-import {NgModule} from '@angular/core';
+import {NgModule, APP_INITIALIZER} from '@angular/core';
 
 import {AppRoutingModule} from './app-routing.module';
 import {AppComponent} from './app.component';
@@ -18 +18 @@
 import {BasicAuthInterceptor} from "./auth/basic-auth.interceptor";
 import {LoginComponent} from "./login/login.component";
 
+import {loadConfig} from './loadConfig';
+import {Config} from './services/util/config.service';
+
 @NgModule({
   declarations: [
     AppComponent,
@@ -45 +48 @@
     CommonModule
   ],
   providers: [
-    {provide: HTTP_INTERCEPTORS, useClass: BasicAuthInterceptor, multi: true}
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: BasicAuthInterceptor,
+      multi: true,
+    },
+    {
+      provide: APP_INITIALIZER,
+      useFactory: loadConfig,
+      deps: [
+        HttpClient,
+        Config,
+      ],
+      multi: true
+    },
   ],
   bootstrap: [AppComponent]
 })

webapp/src/app/loadConfig.ts

@@ +1 @@
+import { HttpClient } from '@angular/common/http';
+import { Config } from './services/util/config.service';
+
+export function loadConfig(http: HttpClient, config: Config) {
+  return (): Promise<void> => {
+    const configFile = 'assets/config/config.json';
+
+    return new Promise<void>((resolve, reject) => {
+      http.get(configFile).toPromise().then((response: any) => {
+        config.baseUrl = response.baseUrl;
+        config.redirectUrl = response.redirectUrl;
+        resolve();
+      });
+    });
+  };
+}

webapp/src/app/login/login.component.html

@@ -3 +3 @@
     <h1>Sign-in</h1>
 
     <p>Please sign-in using one of the following methods: </p>
-    <a href="http://localhost:9080/api/signin/google?target=http://localhost">Login with Google</a>
+    <a href="{{loginUrl}}">Login with Google</a>
   </div>
 </div>
 

webapp/src/app/login/login.component.ts

@@ -1 +1 @@
 import {Component, OnInit} from '@angular/core';
+import { Config } from '../services/util/config.service';
 
 @Component({
   selector: 'app-page-not-found',
@@ -6 +7 @@
   styleUrls: ['./login.component.sass']
 })
 export class LoginComponent implements OnInit {
+  loginUrl: string;
 
-  constructor() {
+  constructor(private config: Config) {
+    this.loginUrl = config.loginUrl;
   }
 
   ngOnInit() {

webapp/src/app/services/api/basic.service.ts

@@ -1 +1 @@
 import {Injectable} from '@angular/core';
 import {HttpClient, HttpErrorResponse, HttpParams} from '@angular/common/http';
 import {throwError} from 'rxjs';
-import {environment} from '../../../environments/environment';
 import {MatSnackBar} from '@angular/material';
 import {TranslateService} from '@ngx-translate/core';
+import { Config } from '../util/config.service';
+
 @Injectable({
   providedIn: 'root'
 })
 export class BasicService {
-  protected baseUrl = environment.apiUrl;
+  protected baseUrl: string;
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) { }
+  constructor(protected config: Config, protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
+    this.baseUrl = config.baseUrl;
+  }
 
   protected handleError(error: HttpErrorResponse) {
     let errMsg;

webapp/src/app/services/api/file.service.ts

@@ -5 +5 @@
 import {Languages} from '../../enums/common.enum';
 import {MatSnackBar} from '@angular/material';
 import {TranslateService} from '@ngx-translate/core';
+import { Config } from '../util/config.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class FileService extends BasicService {
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
-    super(http, snackBar, translateService);
+  constructor(protected config: Config, protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
+    super(config, http, snackBar, translateService);
   }
 
   /**

webapp/src/app/services/api/settings.service.ts

@@ -7 +7 @@
 import {Languages} from '../../enums/common.enum';
 import {MatSnackBar} from '@angular/material';
 import {TranslateService} from '@ngx-translate/core';
+import { Config } from '../util/config.service';
 
 @Injectable({
   providedIn: 'root'
@@ -14 +15 @@
 export class SettingsService extends BasicService {
   defaultSettingsUrl = this.baseUrl + '/api/settings';
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
-    super(http, snackBar, translateService);
+  constructor(protected config: Config, protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
+    super(config, http, snackBar, translateService);
   }
 
   /**

webapp/src/app/services/api/user.service.ts

@@ -11 +11 @@
 import {DateFormatterService} from '../util/date-formatter.service';
 import {TranslateService} from '@ngx-translate/core';
 import {ProfileService} from "../util/profile.service";
+import { Config } from '../util/config.service';
 
 @Injectable({
   providedIn: 'root'
@@ -18 +19 @@
 export class UserService extends BasicService { // dost podobny k usersService, mozna zmenit v rest api
   private _userUrl = this.baseUrl + '/api/user/';
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService, protected profileService: ProfileService, private dateFormater: DateFormatterService) {
-    super(http, snackBar, translateService);
+  constructor(protected config: Config, protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService, protected profileService: ProfileService, private dateFormater: DateFormatterService) {
+    super(config, http, snackBar, translateService);
   }
 
   /**

webapp/src/app/services/api/users.service.ts

@@ -9 +9 @@
 import {UserBasicInformation, UserProfile} from '../../models/user.model';
 import {MatSnackBar} from '@angular/material';
 import {TranslateService} from '@ngx-translate/core';
+import { Config } from '../util/config.service';
 
 @Injectable({
   providedIn: 'root'
@@ -16 +17 @@
 export class UsersService extends BasicService {
   private _usersUrl = this.baseUrl + '/api/users';
 
-  constructor(protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
-    super(http, snackBar, translateService);
+  constructor(protected config: Config, protected http: HttpClient, protected snackBar: MatSnackBar, protected translateService: TranslateService) {
+    super(config, http, snackBar, translateService);
   }
 
   /**

webapp/src/app/services/util/config.service.ts

@@ +1 @@
+import {Injectable} from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class Config {
+  baseUrl: string;
+  redirectUrl: string;
+
+  get loginUrl(): string {
+    return this.baseUrl + '/api/login/google?target=' + this.redirectUrl;
+  }
+}

webapp/src/assets/config/config.json

@@ +1 @@
+{
+	"baseUrl": "http://localhost:9080",
+	"redirectUrl": "http://localhost"
+}

webapp/src/environments/environment.prod.ts

@@ -1 +1 @@
 export const environment = {
   production: true,
-  apiUrl: 'http://localhost:9080/' // TODO Change to production url
 };

webapp/src/environments/environment.ts

@@ -1 +1 @@
 export const environment = {
   production: false,
-  apiUrl: 'http://localhost:9080'
 };