From a29f55656bba57f7bbde938809b794c3838856ba Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <hr.softwarelab@t-online.de>
Date: Thu, 14 Nov 2024 00:02:46 +0100
Subject: [PATCH] use admin specific configs

---
 admin/run/server.js       |  9 +++++----
 admin/src/config/index.js | 41 ++++++++++++++++++++++++++-------------
 admin/vue.config.js       |  2 +-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/admin/run/server.js b/admin/run/server.js
index 730fa03b5..cc0ea018b 100644
--- a/admin/run/server.js
+++ b/admin/run/server.js
@@ -1,11 +1,12 @@
 // Imports
+import CONFIG from '../src/config'
+
 const express = require('express')
 const path = require('path')
 
 // Host & Port
-const hostname = '127.0.0.1'
-const port = import.meta.env.PORT || 8080
-
+const hostname = CONFIG.ADMIN_MODULE_HOST // '127.0.0.1'
+const port = CONFIG.ADMIN_MODULE_PORT // process.env.PORT || 8080
 // Express Server
 const app = express()
 // Serve files
@@ -18,4 +19,4 @@ app.get('*', (req, res) => {
 app.listen(port, hostname, () => {
   // eslint-disable-next-line no-console
   console.log('Listening at http://%s:%s/', hostname, port)
-})
+})
\ No newline at end of file
diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 5c1e5b34f..0c2005e0e 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -7,35 +7,50 @@ const pkg = require('../../package')
 const constants = {
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v2.2024-01-04',
+    EXPECTED: 'v3.2024-08-06',
     CURRENT: '',
   },
 }
 
 const version = {
+  ADMIN_MODULE_PROTOCOL: process.env.ADMIN_MODULE_PROTOCOL ?? 'http',
+  ADMIN_MODULE_HOST: process.env.ADMIN_MODULE_HOST ?? 'localhost',
+  ADMIN_MODULE_PORT: process.env.ADMIN_MODULE_PORT ?? '8080',
   APP_VERSION: pkg.version,
   BUILD_COMMIT: process.env.BUILD_COMMIT ?? null,
   // self reference of `version.BUILD_COMMIT` is not possible at this point, hence the duplicate code
   BUILD_COMMIT_SHORT: (process.env.BUILD_COMMIT ?? '0000000').slice(0, 7),
-  PORT: process.env.PORT ?? 8080,
+}
+
+let ADMIN_MODULE_URL
+// in case of hosting the admin module with a nodejs-instance
+if (process.env.ADMIN_HOSTING === 'nodejs') {
+  ADMIN_MODULE_URL =
+    version.ADMIN_MODULE_PROTOCOL +
+    '://' +
+    version.ADMIN_MODULE_HOST +
+    ':' +
+    version.ADMIN_MODULE_PORT
+} else {
+  // in case of hosting the admin module with a nginx
+  ADMIN_MODULE_URL = version.ADMIN_MODULE_PROTOCOL + '://' + version.ADMIN_MODULE_HOST
 }
 
 const environment = {
-  NODE_ENV: import.meta.env.NODE_ENV,
-  DEBUG: import.meta.env.NODE_ENV !== 'production' ?? false,
-  PRODUCTION: import.meta.env.NODE_ENV === 'production' ?? false,
+  NODE_ENV: process.env.NODE_ENV,
+  DEBUG: process.env.NODE_ENV !== 'production' ?? false,
+  PRODUCTION: process.env.NODE_ENV === 'production' ?? false,
 }
 
-const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? undefined
-const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
-const COMMUNITY_URL =
-  COMMUNITY_HOST && URL_PROTOCOL ? URL_PROTOCOL + '://' + COMMUNITY_HOST : undefined
+// const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? undefined
+// const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
+// const COMMUNITY_URL =
+//   COMMUNITY_HOST && URL_PROTOCOL ? URL_PROTOCOL + '://' + COMMUNITY_HOST : undefined
+const COMMUNITY_URL = process.env.COMMUNITY_URL ?? ADMIN_MODULE_URL
 const WALLET_URL = process.env.WALLET_URL ?? COMMUNITY_URL ?? 'http://localhost'
 
 const endpoints = {
-  GRAPHQL_URL:
-    (process.env.GRAPHQL_URL ?? COMMUNITY_URL ?? 'http://localhost:4000') +
-      process.env.GRAPHQL_PATH ?? '/graphql',
+  GRAPHQL_URI: process.env.GRAPHQL_URI ?? COMMUNITY_URL + (process.env.GRAPHQL_PATH ?? '/graphql'),
   WALLET_AUTH_URL: WALLET_URL + (process.env.WALLET_AUTH_PATH ?? '/authenticate?token={token}'),
   WALLET_LOGIN_URL: WALLET_URL + (process.env.WALLET_LOGIN_PATH ?? '/login'),
 }
@@ -64,4 +79,4 @@ const CONFIG = {
   ...debug,
 }
 
-export default CONFIG
+module.exports = CONFIG
diff --git a/admin/vue.config.js b/admin/vue.config.js
index f90510099..81b7dd71b 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -7,7 +7,7 @@ const CONFIG = require('./src/config')
 // vue.config.js
 module.exports = {
   devServer: {
-    port: CONFIG.PORT,
+    port: CONFIG.ADMIN_MODULE_PORT,
   },
   pluginOptions: {
     i18n: {