From 219ac00a8857336c8b7011dcf22af42a2a536364 Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <hr.softwarelab@t-online.de>
Date: Wed, 20 Nov 2024 00:52:13 +0100
Subject: [PATCH] use harmonized src/configs for admin and frontend

---
 admin/src/config/index.js    |  2 +-
 frontend/src/config/index.js | 35 ++++++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/admin/src/config/index.js b/admin/src/config/index.js
index 0c2005e0e..32abee87a 100644
--- a/admin/src/config/index.js
+++ b/admin/src/config/index.js
@@ -50,7 +50,7 @@ const COMMUNITY_URL = process.env.COMMUNITY_URL ?? ADMIN_MODULE_URL
 const WALLET_URL = process.env.WALLET_URL ?? COMMUNITY_URL ?? 'http://localhost'
 
 const endpoints = {
-  GRAPHQL_URI: process.env.GRAPHQL_URI ?? COMMUNITY_URL + (process.env.GRAPHQL_PATH ?? '/graphql'),
+  GRAPHQL_URI: process.env.GRAPHQL_URL ?? 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'),
 }
diff --git a/frontend/src/config/index.js b/frontend/src/config/index.js
index 5090f34af..8f0275aa3 100644
--- a/frontend/src/config/index.js
+++ b/frontend/src/config/index.js
@@ -8,18 +8,39 @@ const constants = {
   DECAY_START_TIME: new Date('2021-05-13 17:46:31-0000'), // GMT+0
   CONFIG_VERSION: {
     DEFAULT: 'DEFAULT',
-    EXPECTED: 'v6.2024-02-27',
+    EXPECTED: 'v7.2024-08-06',
     CURRENT: '',
   },
 }
 
 const version = {
+  FRONTEND_MODULE_PROTOCOL: process.env.FRONTEND_MODULE_PROTOCOL ?? 'http',
+  FRONTEND_MODULE_HOST: process.env.FRONTEND_MODULE_HOST ?? 'localhost',
+  FRONTEND_MODULE_PORT: process.env.FRONTEND_MODULE_PORT ?? '3000',
   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),
 }
 
+let FRONTEND_MODULE_URL
+// in case of hosting the frontend module with a nodejs-instance
+if (process.env.FRONTEND_HOSTING === 'nodejs') {
+  FRONTEND_MODULE_URL =
+    version.FRONTEND_MODULE_PROTOCOL +
+    '://' +
+    version.FRONTEND_MODULE_HOST +
+    ':' +
+    version.FRONTEND_MODULE_PORT
+} else {
+  // in case of hosting the frontend module with a nginx
+  FRONTEND_MODULE_URL = version.FRONTEND_MODULE_PROTOCOL + '://' + version.FRONTEND_MODULE_HOST
+}
+
+// const FRONTEND_MODULE_URI = version.FRONTEND_MODULE_PROTOCOL + '://' + version.FRONTEND_MODULE_HOST // +
+// ':' +
+// version.FRONTEND_MODULE_PORT
+
 const features = {
   GMS_ACTIVE: process.env.GMS_ACTIVE ?? false,
   HUMHUB_ACTIVE: process.env.HUMHUB_ACTIVE ?? false,
@@ -30,16 +51,16 @@ const environment = {
   DEBUG: process.env.NODE_ENV !== 'production' ?? false,
   PRODUCTION: process.env.NODE_ENV === 'production' ?? false,
   DEFAULT_PUBLISHER_ID: process.env.DEFAULT_PUBLISHER_ID ?? 2896,
-  PORT: process.env.PORT ?? 3000,
 }
 
-const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? 'localhost'
-const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
-const COMMUNITY_URL = process.env.COMMUNITY_URL ?? `${URL_PROTOCOL}://${COMMUNITY_HOST}`
+// const COMMUNITY_HOST = process.env.COMMUNITY_HOST ?? 'localhost'
+// const URL_PROTOCOL = process.env.URL_PROTOCOL ?? 'http'
+const COMMUNITY_URL = process.env.COMMUNITY_URL ?? FRONTEND_MODULE_URL
 
 const endpoints = {
-  GRAPHQL_URI: COMMUNITY_URL + (process.env.GRAPHQL_PATH ?? '/graphql'),
+  GRAPHQL_URI: process.env.GRAPHQL_URI ?? COMMUNITY_URL + (process.env.GRAPHQL_PATH ?? '/graphql'),
   ADMIN_AUTH_URL:
+    process.env.ADMIN_AUTH_URL ??
     COMMUNITY_URL + (process.env.ADMIN_AUTH_PATH ?? '/admin/authenticate?token={token}'),
 }
 
@@ -94,4 +115,4 @@ const CONFIG = {
   ...meta,
 }
 
-export default CONFIG
+module.exports = CONFIG