Added: Config Loader

djuarezgf · djuarezgf · commit 20bab42f4b3c · 2024-10-18T17:48:12.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,5 @@
 .github
 .idea
 .gitignore
+dist
+node_modules
diff --git a/.env b/.env
@@ -1,7 +1 @@
 STANDALONE_SINGLE_SPA=false
-VUE_APP_KEYCLOAK_URL=https://login.verbis.dkfz.de/
-VUE_APP_KEYCLOAK_REALM=test-realm-01
-VUE_APP_KEYCLOAK_CLIENT_ID=bridgehead-test
-VUE_APP_KEYCLOAK_REFRESH_TOKEN_TIME_IN_MINUTES=5
-VUE_APP_PROJECT_MANAGER_BACKEND_URL=http://localhost:8097
-VUE_APP_PUBLIC_PATH=/
diff --git a/.env.standalone b/.env.standalone
@@ -1,7 +1 @@
 STANDALONE_SINGLE_SPA=true
-VUE_APP_KEYCLOAK_URL=https://login.verbis.dkfz.de/
-VUE_APP_KEYCLOAK_REALM=test-realm-01
-VUE_APP_KEYCLOAK_CLIENT_ID=bridgehead-test
-VUE_APP_KEYCLOAK_REFRESH_TOKEN_TIME_IN_MINUTES=5
-VUE_APP_PROJECT_MANAGER_BACKEND_URL=http://localhost:8097
-VUE_APP_PUBLIC_PATH=/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,3 +64,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Github CI
 - VUE_APP_PUBLIC_PATH
 - Nginx conf
+- Config Loader
diff --git a/Dockerfile b/Dockerfile
@@ -9,21 +9,31 @@ RUN npm install
 
 # Copy the rest of your application code
 COPY . .
+COPY docker/.env.template                   ./.env
+COPY docker/.env.standalone.template        ./.env.standalone
 
 # Build the Vue application
 RUN npm run build:standalone
 
 # Stage 2: Serve the application with Nginx
 FROM nginx:alpine
 
+WORKDIR /usr/share/nginx/html
+
 # Copy the built Vue application from the previous stage
-COPY --from=build /app/dist /usr/share/nginx/html
+COPY --from=build /app/dist .
 
 # Copy custom Nginx configuration if needed
-COPY nginx.conf /etc/nginx/conf.d/default.conf
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
 
 # Expose port 80 for the Nginx server
 EXPOSE 80
 
-# Nginx will run automatically
-CMD ["nginx", "-g", "daemon off;"]
+ADD docker/start.sh                 /samply/
+RUN chmod +x                        /samply/start.sh
+
+COPY docker/keycloak.json .
+COPY docker/config.json .
+
+
+CMD ["/samply/start.sh"]
diff --git a/docker/.env.standalone.template b/docker/.env.standalone.template
@@ -0,0 +1 @@
+STANDALONE_SINGLE_SPA=true
diff --git a/docker/.env.template b/docker/.env.template
@@ -0,0 +1 @@
+STANDALONE_SINGLE_SPA=false
diff --git a/docker/config.json b/docker/config.json
@@ -0,0 +1,3 @@
+{
+  "VUE_APP_PROJECT_MANAGER_BACKEND_URL" : "${VUE_APP_PROJECT_MANAGER_BACKEND_URL}"
+}
diff --git a/docker/keycloak.json b/docker/keycloak.json
@@ -0,0 +1,8 @@
+{
+  "realm": "${VUE_APP_KEYCLOAK_REALM}",
+  "auth-server-url": "${VUE_APP_KEYCLOAK_URL}",
+  "ssl-required": "external",
+  "resource": "${VUE_APP_KEYCLOAK_CLIENT_ID}",
+  "public-client": true,
+  "confidential-port": 0
+}
diff --git a/docker/nginx.conf b/docker/nginx.conf
diff --git a/docker/start.sh b/docker/start.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+envsubst < /usr/share/nginx/html/keycloak.json > /usr/share/nginx/html/keycloak.temp.json
+mv /usr/share/nginx/html/keycloak.temp.json /usr/share/nginx/html/keycloak.json
+
+envsubst < /usr/share/nginx/html/config.json > /usr/share/nginx/html/config.temp.json
+mv /usr/share/nginx/html/config.temp.json /usr/share/nginx/html/config.json
+
+#envsubst '${TEILER_DASHBOARD_SERVER_NAME} ${TEILER_ORCHESTRATOR_URL}'< /etc/nginx/nginx.template.conf > /etc/nginx/nginx.conf
+
+echo 'Start Teiler Dashboard in NGINX in foreground (non-daemon-mode)'
+exec nginx -g 'daemon off;'
diff --git a/public/config.json b/public/config.json
@@ -0,0 +1,3 @@
+{
+  "VUE_APP_PROJECT_MANAGER_BACKEND_URL" : "http://localhost:8097"
+}
diff --git a/public/projects.json b/public/projects.json
diff --git a/src/services/configLoader.ts b/src/services/configLoader.ts
@@ -0,0 +1,30 @@
+// configLoader.ts
+let config: any = null;
+let isLoading = false; // Track whether the config is being loaded
+
+const loadConfig = async () => {
+    if (!isLoading) {
+        isLoading = true; // Prevent multiple concurrent loads
+        try {
+            const response = await fetch('/config.json');
+            config = await response.json();
+        } catch (error) {
+            console.error('Failed to load config.json:', error);
+            throw new Error('Configuration loading failed');
+        } finally {
+            isLoading = false; // Reset loading state
+        }
+    }
+
+    // Wait until config is loaded
+    while (config === null) {
+        await new Promise(resolve => setTimeout(resolve, 100)); // Polling
+    }
+};
+
+export const getConfig = async () => {
+    if (config === null) {
+        await loadConfig(); // Load the config if it's not already loaded
+    }
+    return config;
+};
diff --git a/src/services/keycloak.ts b/src/services/keycloak.ts
@@ -44,7 +44,7 @@ const refreshToken = () => {
 };
 
 // Set up timer to refresh token periodically
-const tokenRefreshInterval = setInterval(refreshToken, process.env.VUE_APP_KEYCLOAK_REFRESH_TOKEN_TIME_IN_MINUTES * 60 * 1000); // Refresh token every 5 minutes
+const tokenRefreshInterval = setInterval(refreshToken, 5 * 60 * 1000); // Refresh token every 5 minutes
 
 const KeyCloakService = {
     getToken: () => keycloakInstance.token,
diff --git a/src/services/projetManagerBackendService.ts b/src/services/projetManagerBackendService.ts
@@ -1,10 +1,11 @@
-// projetManagerBackendService.ts
+//projectManagerBackendService.ts
 import axios, {AxiosRequestConfig, AxiosResponse} from 'axios';
 import axiosRetry from "axios-retry";
 import KeyCloakService from "@/services/keycloak";
+import {getConfig} from "@/services/configLoader";
 
 
-const baseURL = process.env.VUE_APP_PROJECT_MANAGER_BACKEND_URL
+const baseURL = (await getConfig()).VUE_APP_PROJECT_MANAGER_BACKEND_URL;
 
 const bridgeheadParam = 'bridgehead'
 const projectCodeParam = 'project-code'
diff --git a/vue.config.js b/vue.config.js
@@ -1,7 +1,7 @@
 const dotenv = require('dotenv').config();
 
 module.exports = {
-    publicPath: process.env.VUE_APP_PUBLIC_PATH || './', // Fallback to './' if not set
+//    publicPath: process.env.VUE_APP_PUBLIC_PATH || './', // Fallback to './' if not set
     configureWebpack: {
         output: {
             libraryTarget: "system",

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 .github
 .idea
 .gitignore
 +dist
 +node_modules
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "VUE_APP_PROJECT_MANAGER_BACKEND_URL" : "${VUE_APP_PROJECT_MANAGER_BACKEND_URL}"`
	`3`	`+}`