From 2cd295e783ccbcd5479b83a0106375d413b010c1 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sun, 25 May 2025 19:05:12 +0200
Subject: [PATCH] make meta data configurable

---
 backend/src/config/index.ts                          |  8 ++++++--
 backend/src/config/metadata.ts                       | 10 ----------
 backend/src/constants/categories.ts                  |  2 +-
 backend/src/emails/sendEmail.ts                      |  3 +--
 backend/tools/replace-constants.sh                   |  1 -
 webapp/components/LoginForm/LoginForm.vue            |  6 ++++--
 webapp/components/Logo/Logo.vue                      |  6 ++++--
 .../components/Registration/RegistrationSlider.vue   | 11 ++++++++---
 webapp/config/index.js                               | 12 +++++++++++-
 webapp/constants/categories.js                       |  2 +-
 webapp/constants/dateTime.js                         |  2 +-
 webapp/constants/manifest.js                         | 11 +++++------
 webapp/constants/metadata.js                         | 10 ----------
 webapp/maintenance/source/pages/index.vue            |  8 ++++----
 webapp/nuxt.config.js                                |  3 +--
 webapp/pages/password-reset.vue                      |  6 ++++--
 webapp/plugins/apollo-config.js                      |  3 +--
 webapp/store/auth.js                                 |  4 ++--
 18 files changed, 54 insertions(+), 54 deletions(-)
 delete mode 100644 backend/src/config/metadata.ts
 delete mode 100644 webapp/constants/metadata.js

diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 1aa7991eb..44db57919 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -7,7 +7,6 @@ import { config } from 'dotenv'
 import * as SMTPTransport from 'nodemailer/lib/smtp-pool'
 
 import emails from './emails'
-import metadata from './metadata'
 
 // Load env file
 config()
@@ -110,11 +109,15 @@ const s3 = {
     env.AWS_BUCKET,
 }
 
+const meta = {
+  APPLICATION_NAME: process.env.APPLICATION_NAME ?? 'ocelot.social',
+  ORGANIZATION_NAME: process.env.ORGANIZATION_NAME ?? 'ocelot.social Community',
+}
+
 const options = {
   EMAIL_DEFAULT_SENDER: env.EMAIL_DEFAULT_SENDER,
   SUPPORT_EMAIL: env.SUPPORT_EMAIL,
   SUPPORT_URL: emails.SUPPORT_LINK,
-  APPLICATION_NAME: metadata.APPLICATION_NAME,
   ORGANIZATION_URL: emails.ORGANIZATION_LINK,
   PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true' || false,
   INVITE_REGISTRATION: env.INVITE_REGISTRATION !== 'false', // default = true
@@ -147,6 +150,7 @@ export default {
   ...s3,
   ...options,
   ...language,
+  ...meta,
 }
 
 export { nodemailerTransportOptions }
diff --git a/backend/src/config/metadata.ts b/backend/src/config/metadata.ts
deleted file mode 100644
index 9c87818ae..000000000
--- a/backend/src/config/metadata.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// this file is duplicated in `backend/src/config/metadata` and `webapp/constants/metadata.js` and replaced on rebranding
-export default {
-  APPLICATION_NAME: 'ocelot.social',
-  APPLICATION_SHORT_NAME: 'ocelot.social',
-  APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
-  COOKIE_NAME: 'ocelot-social-token',
-  ORGANIZATION_NAME: 'ocelot.social Community',
-  ORGANIZATION_JURISDICTION: 'City of Angels',
-  THEME_COLOR: 'rgb(23, 181, 63)', // $color-primary – as the main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case
-}
diff --git a/backend/src/constants/categories.ts b/backend/src/constants/categories.ts
index b6fce03ca..db458857c 100644
--- a/backend/src/constants/categories.ts
+++ b/backend/src/constants/categories.ts
@@ -1,4 +1,4 @@
-// this file is duplicated in `backend/src/constants/metadata` and `webapp/constants/metadata.js`
+// this file is duplicated in `backend/src/constants/categories` and `webapp/constants/categories.js`
 export const CATEGORIES_MIN = 1
 export const CATEGORIES_MAX = 3
 
diff --git a/backend/src/emails/sendEmail.ts b/backend/src/emails/sendEmail.ts
index 61a5ba951..98a32b30d 100644
--- a/backend/src/emails/sendEmail.ts
+++ b/backend/src/emails/sendEmail.ts
@@ -12,7 +12,6 @@ import { createTransport } from 'nodemailer'
 
 import CONFIG, { nodemailerTransportOptions } from '@config/index'
 import logosWebapp from '@config/logosBranded'
-import metadata from '@config/metadata'
 import { UserDbProperties } from '@db/types/User'
 
 const welcomeImageUrl = new URL(logosWebapp.LOGO_WELCOME_PATH, CONFIG.CLIENT_URI)
@@ -21,7 +20,7 @@ const settingsUrl = new URL('/settings/notifications', CONFIG.CLIENT_URI)
 export const defaultParams = {
   welcomeImageUrl,
   APPLICATION_NAME: CONFIG.APPLICATION_NAME,
-  ORGANIZATION_NAME: metadata.ORGANIZATION_NAME,
+  ORGANIZATION_NAME: CONFIG.ORGANIZATION_NAME,
   ORGANIZATION_URL: CONFIG.ORGANIZATION_URL,
   SUPPORT_EMAIL: CONFIG.SUPPORT_EMAIL,
   supportUrl: CONFIG.SUPPORT_URL,
diff --git a/backend/tools/replace-constants.sh b/backend/tools/replace-constants.sh
index 5454d3ae8..6a62b2325 100755
--- a/backend/tools/replace-constants.sh
+++ b/backend/tools/replace-constants.sh
@@ -3,6 +3,5 @@
 # TODO: this is a hack, we should find a better way to share files between backend and webapp
 [ -f src/config/tmp/emails.js ] && mv src/config/tmp/emails.js src/config/emails.ts
 [ -f src/config/tmp/logos.js ] && mv src/config/tmp/logos.js src/config/logos.ts
-[ -f src/config/tmp/metadata.js ] && mv src/config/tmp/metadata.js src/config/metadata.ts
 [ -f src/constants/categories.js ] && mv src/constants/categories.js src/constants/categories.ts
 exit 0
diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index ab64c5a3b..39d293cb2 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -53,7 +53,7 @@
 
 <script>
 import links from '~/constants/links.js'
-import metadata from '~/constants/metadata.js'
+import CONFIG from '~/config'
 import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
@@ -70,7 +70,9 @@ export default {
   },
   data() {
     return {
-      metadata,
+      metadata: {
+        APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+      },
       links,
       form: {
         email: '',
diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue
index b49bfebfb..b2a8aa7c8 100644
--- a/webapp/components/Logo/Logo.vue
+++ b/webapp/components/Logo/Logo.vue
@@ -20,7 +20,7 @@
 
 <script>
 import logos from '~/constants/logosBranded.js'
-import metadata from '~/constants/metadata.js'
+import CONFIG from '~/config'
 
 /**
  * This component displays the brand's logo.
@@ -90,7 +90,9 @@ export default {
     }
     return {
       logo: logosObject[this.logoType],
-      metadata,
+      metadata: {
+        APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+      },
     }
   },
   computed: {
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 25cbe648a..d3c7b23f7 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -44,7 +44,6 @@
 
 <script>
 import links from '~/constants/links.js'
-import metadata from '~/constants/metadata.js'
 import ComponentSlider from '~/components/ComponentSlider/ComponentSlider'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
@@ -54,6 +53,7 @@ import RegistrationSlideEmail from './RegistrationSlideEmail'
 import RegistrationSlideInvite from './RegistrationSlideInvite'
 import RegistrationSlideNonce from './RegistrationSlideNonce'
 import RegistrationSlideNoPublic from './RegistrationSlideNoPublic'
+import CONFIG from '~/config'
 
 export default {
   name: 'RegistrationSlider',
@@ -89,7 +89,10 @@ export default {
       },
       enterInvite: {
         name: 'enter-invite',
-        titleIdent: { id: 'components.registration.signup.title', data: metadata },
+        titleIdent: {
+          id: 'components.registration.signup.title',
+          data: { APPLICATION_NAME: CONFIG.APPLICATION_NAME },
+        },
         validated: false,
         data: { request: null, response: { isValidInviteCode: false } },
         button: {
@@ -168,7 +171,9 @@ export default {
         query: this.$route.query,
       },
       links,
-      metadata,
+      metadata: {
+        APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+      },
       sliderData: {
         collectedInputData: {
           inviteCode: null,
diff --git a/webapp/config/index.js b/webapp/config/index.js
index 2981c9329..4fb984e0c 100644
--- a/webapp/config/index.js
+++ b/webapp/config/index.js
@@ -37,7 +37,16 @@ const options = {
   CATEGORIES_ACTIVE: process.env.CATEGORIES_ACTIVE === 'true' || false,
   BADGES_ENABLED: process.env.BADGES_ENABLED === 'true' || false,
   INVITE_LINK_LIMIT: process.env.INVITE_LINK_LIMIT || 7,
-  NETWORK_NAME: process.env.NETWORK_NAME || 'Ocelot.social',
+}
+
+const meta = {
+  APPLICATION_NAME: process.env.APPLICATION_NAME ?? 'ocelot.social',
+  APPLICATION_SHORT_NAME: process.env.APPLICATION_SHORT_NAME ?? 'ocelot.social',
+  APPLICATION_DESCRIPTION: process.env.APPLICATION_DESCRIPTION ?? 'ocelot.social Community Network',
+  COOKIE_NAME: process.env.COOKIE_NAME ?? 'ocelot-social-token',
+  ORGANIZATION_NAME: process.env.ORGANIZATION_NAME ?? 'ocelot.social Community',
+  ORGANIZATION_JURISDICTION: process.env.ORGANIZATION_JURISDICTION ?? 'City of Angels',
+  THEME_COLOR: process.env.THEME_COLOR ?? 'rgb(23, 181, 63)', // $color-primary – as the main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case
 }
 
 const language = {
@@ -51,6 +60,7 @@ const CONFIG = {
   ...sentry,
   ...options,
   ...language,
+  ...meta,
 }
 
 // override process.env with the values here since they contain default values
diff --git a/webapp/constants/categories.js b/webapp/constants/categories.js
index 64ceb9021..b01dd19a1 100644
--- a/webapp/constants/categories.js
+++ b/webapp/constants/categories.js
@@ -1,3 +1,3 @@
-// this file is duplicated in `backend/src/constants/metadata.js` and `webapp/constants/metadata.js`
+// this file is duplicated in `backend/src/constants/categories.js` and `webapp/constants/categories.js`
 export const CATEGORIES_MIN = 1
 export const CATEGORIES_MAX = 3
diff --git a/webapp/constants/dateTime.js b/webapp/constants/dateTime.js
index 25294c172..490157660 100644
--- a/webapp/constants/dateTime.js
+++ b/webapp/constants/dateTime.js
@@ -1,4 +1,4 @@
-// this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js`
+// this file is duplicated in `backend/src/config/dataTime.js` and `webapp/constants/dataTime.js`
 export default {
   RELATIVE_DATETIME: true,
   ABSOLUT_DATETIME_FORMAT: 'P',
diff --git a/webapp/constants/manifest.js b/webapp/constants/manifest.js
index 653f9f6fc..d0ece8e0a 100644
--- a/webapp/constants/manifest.js
+++ b/webapp/constants/manifest.js
@@ -1,10 +1,9 @@
-import metadata from './metadata.js'
-const { APPLICATION_NAME, APPLICATION_SHORT_NAME, APPLICATION_DESCRIPTION, THEME_COLOR } = metadata
+import CONFIG from '~/config'
 
 export default {
-  name: APPLICATION_NAME,
-  short_name: APPLICATION_SHORT_NAME,
-  description: APPLICATION_DESCRIPTION,
-  theme_color: THEME_COLOR,
+  name: CONFIG.APPLICATION_NAME,
+  short_name: CONFIG.APPLICATION_SHORT_NAME,
+  description: CONFIG.APPLICATION_DESCRIPTION,
+  theme_color: CONFIG.THEME_COLOR,
   lang: 'en',
 }
diff --git a/webapp/constants/metadata.js b/webapp/constants/metadata.js
deleted file mode 100644
index 9a2cbf5c9..000000000
--- a/webapp/constants/metadata.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// this file is duplicated in `backend/src/config/metadata.js` and `webapp/constants/metadata.js` and replaced on rebranding
-export default {
-  APPLICATION_NAME: 'ocelot.social',
-  APPLICATION_SHORT_NAME: 'ocelot.social',
-  APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
-  COOKIE_NAME: 'ocelot-social-token',
-  ORGANIZATION_NAME: 'ocelot.social Community',
-  ORGANIZATION_JURISDICTION: 'City of Angels',
-  THEME_COLOR: 'rgb(23, 181, 63)', // $color-primary – as the main color in general. e.g. the color in the background of the app that is visible behind the transparent iPhone status bar to name one use case, or the current color of SVGs to name another use case
-}
diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index c38041ca7..1107ba679 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -45,10 +45,8 @@
 
 <script>
 import emails from '~/constants/emails.js'
-// import links from '~/constants/links.js'
-import metadata from '~/constants/metadata.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
-// import Logo from '~/components/Logo/Logo'
+import CONFIG from '~/config'
 
 export default {
   layout: 'blank',
@@ -58,7 +56,9 @@ export default {
   },
   data() {
     // return { links, metadata, supportEmail: emails.SUPPORT_EMAIL }
-    return { metadata, supportEmail: emails.SUPPORT_EMAIL }
+    return { metadata: {
+      APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+    }, supportEmail: emails.SUPPORT_EMAIL }
   },
 }
 </script>
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index 263c3f149..e4e25041a 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -1,6 +1,5 @@
 import path from 'path'
 import manifest from './constants/manifest.js'
-import metadata from './constants/metadata.js'
 
 const CONFIG = require('./config').default // we need to use require since this is only evaluated at compile time.
 
@@ -211,7 +210,7 @@ export default {
 
   // Give apollo module options
   apollo: {
-    tokenName: metadata.COOKIE_NAME, // optional, default: apollo-token
+    tokenName: CONFIG.COOKIE_NAME, // optional, default: apollo-token
     cookieAttributes: {
       expires: CONFIG.COOKIE_EXPIRE_TIME, // optional, default: 7 (days)
       /** * Define the path where the cookie is available. Defaults to '/' */
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index fa3223f6d..c918e6834 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -16,11 +16,11 @@
 
 <script>
 import links from '~/constants/links.js'
-import metadata from '~/constants/metadata.js'
 import loginConstants from '~/constants/loginBranded.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
 import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
+import CONFIG from '~/config'
 
 export default {
   components: {
@@ -31,7 +31,9 @@ export default {
   layout: loginConstants.LAYOUT,
   data() {
     return {
-      metadata,
+      metadata: {
+        APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+      },
       links,
     }
   },
diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js
index 51dac51c5..d2152087e 100644
--- a/webapp/plugins/apollo-config.js
+++ b/webapp/plugins/apollo-config.js
@@ -1,6 +1,5 @@
 import { InMemoryCache, IntrospectionFragmentMatcher } from 'apollo-cache-inmemory'
 import introspectionQueryResultData from './apollo-config/fragmentTypes.json'
-import metadata from '~/constants/metadata'
 
 const fragmentMatcher = new IntrospectionFragmentMatcher({
   introspectionQueryResultData,
@@ -17,7 +16,7 @@ export default ({ req, nuxtState }) => {
       credentials: 'same-origin',
     },
     credentials: true,
-    tokenName: metadata.COOKIE_NAME,
+    tokenName: env.COOKIE_NAME,
     persisting: false,
     websocketsOnly: false,
     cache: new InMemoryCache({ fragmentMatcher }),
diff --git a/webapp/store/auth.js b/webapp/store/auth.js
index 0633c6e1e..00d0a72b5 100644
--- a/webapp/store/auth.js
+++ b/webapp/store/auth.js
@@ -2,7 +2,7 @@ import gql from 'graphql-tag'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { currentUserQuery } from '~/graphql/User'
 import Cookie from 'universal-cookie'
-import metadata from '~/constants/metadata'
+import CONFIG from '~/config'
 
 const cookies = new Cookie()
 
@@ -106,7 +106,7 @@ export const actions = {
       await this.app.$apolloHelpers.onLogin(login)
       commit('SET_TOKEN', login)
       await dispatch('fetchCurrentUser')
-      if (cookies.get(metadata.COOKIE_NAME) === undefined) {
+      if (cookies.get(CONFIG.COOKIE_NAME) === undefined) {
         throw new Error('no-cookie')
       }
     } catch (err) {