Merge pull request #18 from hashtopolis/bug/no-backend-url

Setting backendurl even if config.json returns error

Author: s3inlc

src/app/app.component.ts

@@ -114,6 +114,7 @@ export class AppComponent implements OnInit {
   isLogged: boolean;
 
   ngOnInit(): void {
+    this.configService.refreshEndpoint();
     this.authService.autoLogin();
     this.authService.isLogged.subscribe(logged => {
       this.isLogged = logged;

src/app/auth/auth.component.ts

@@ -33,7 +33,6 @@ export class AuthComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.configService.getEndpoint();
   }
 
   onSubmit(form: NgForm){

src/app/core/_services/shared/config.service.ts

@@ -8,32 +8,46 @@ import { environment } from 'src/environments/environment';
 })
 export class ConfigService {
   private configUrl = 'assets/config.json';
-
   constructor(private http: HttpClient) { }
 
   private getConfigOnce(): Observable<any> {
     return this.http.get(this.configUrl);
   }
 
+  public refreshEndpoint(){
+    let ApiEndPoint = "";
+    this.getConfigOnce().subscribe(config => {
+      // Assuming the JSON contains a property named 'backendUrl'
+      if (config && config.hashtopolis_backend_url) {
+        // If we get a config from the backend, we set the config property
+        ApiEndPoint = config.hashtopolis_backend_url;
+        // Remove trailing slash, because this causing invalid URLs
+        if (ApiEndPoint.endsWith('/')) {
+          ApiEndPoint = ApiEndPoint.slice(0, -1);
+        }
+        localStorage.setItem('prodApiEndpoint', ApiEndPoint);
+      } else if (config && !config.hashtopolis_backend_url) {
+        console.error('Invalid configuration file. Please check your config.json. Using defaults.');
+        ApiEndPoint = environment.config.prodApiEndpoint;
+        localStorage.setItem('prodApiEndpoint', ApiEndPoint);
+      } else {
+        ApiEndPoint = environment.config.prodApiEndpoint;
+        localStorage.setItem('prodApiEndpoint', ApiEndPoint);
+      }
+    },
+    error => {
+      ApiEndPoint = environment.config.prodApiEndpoint;
+      localStorage.setItem('prodApiEndpoint', ApiEndPoint);
+    }
+    );
+  }
+
   public getEndpoint(){
     let ApiEndPoint = localStorage.getItem('prodApiEndpoint');
     if (!ApiEndPoint) {
-      this.getConfigOnce().subscribe(config => {
-        // Assuming the JSON contains a property named 'backendUrl'
-        if (config && config.hashtopolis_backend_url) {
-          // If we get a config from the backend, we set the config property
-          ApiEndPoint = config.hashtopolis_backend_url;
-          localStorage.setItem('prodApiEndpoint', ApiEndPoint);
-        } else if (config && !config.hashtopolis_backend_url) {
-          console.error('Invalid configuration file. Please check your config.json. Using defaults.');
-          ApiEndPoint = environment.config.prodApiEndpoint;
-          localStorage.setItem('prodApiEndpoint', ApiEndPoint);
-        } else {
-          ApiEndPoint = environment.config.prodApiEndpoint;
-          localStorage.setItem('prodApiEndpoint', ApiEndPoint);
-        }
-      });
+      this.refreshEndpoint();
     }
+    ApiEndPoint = localStorage.getItem('prodApiEndpoint');
     return ApiEndPoint;
   }
 }