From 7b5cdbb285062afaa6ffe96b5421ee551a5dccac Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Sat, 26 Jul 2025 20:30:29 +0200
Subject: [PATCH] Fixed various issues with dynamic redirect uris and custom
 theme loading

---
 frontend/public/config.json                   |  2 +-
 frontend/src/App.vue                          | 42 +------------------
 .../src/layouts/connected/ConnectedLayout.vue | 38 +++++++++++++++++
 frontend/src/stores/auth.store.js             |  4 +-
 modoboa/core/api/v2/serializers.py            |  2 +-
 5 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/frontend/public/config.json b/frontend/public/config.json
index 5de521980..4738ed2e7 100644
--- a/frontend/public/config.json
+++ b/frontend/public/config.json
@@ -4,5 +4,5 @@
   "OAUTH_AUTHORITY_URL": "https://localhost:8000/api/o",
   "OAUTH_CLIENT_ID": "LVQbfIIX3khWR3nDvix1u9yEGHZUxcx53bhJ7FlD",
   "OAUTH_REDIRECT_URI": "/login/logged",
-  "OAUTH_POST_REDIRECT_URI": "https://localhost:3000/"
+  "OAUTH_POST_REDIRECT_URI": "/"
 }
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 8d13ca90b..84c12b591 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -4,44 +4,4 @@
   </Suspense>
 </template>
 
-<script setup>
-import { useTheme } from 'vuetify'
-import themeApi from '@/api/theme'
-
-const theme = useTheme()
-
-themeApi.getTheme().then((response) => {
-  if (
-    response.data.theme_primary_color !==
-    theme.themes.value.light.colors.primary
-  ) {
-    theme.themes.value.light.colors.primary = response.data.theme_primary_color
-  }
-  if (
-    response.data.theme_primary_color_light !==
-    theme.themes.value.light.colors['primary-lighten-1']
-  ) {
-    theme.themes.value.light.colors['primary-lighten-1'] =
-      response.data.theme_primary_color_light
-  }
-  if (
-    response.data.theme_primary_color_dark !==
-    theme.themes.value.light.colors['primary-darken-1']
-  ) {
-    theme.themes.value.light.colors['primary-darken-1'] =
-      response.data.theme_primary_color_dark
-  }
-  if (
-    response.data.theme_secondary_color !==
-    theme.themes.value.light.colors.secondary
-  ) {
-    theme.themes.value.light.colors.secondary =
-      response.data.theme_secondary_color
-  }
-  if (
-    response.data.theme_label_color !== theme.themes.value.light.colors.label
-  ) {
-    theme.themes.value.light.colors.label = response.data.theme_label_color
-  }
-})
-</script>
+<script setup></script>
diff --git a/frontend/src/layouts/connected/ConnectedLayout.vue b/frontend/src/layouts/connected/ConnectedLayout.vue
index 2f9a0b60c..18a32ab24 100644
--- a/frontend/src/layouts/connected/ConnectedLayout.vue
+++ b/frontend/src/layouts/connected/ConnectedLayout.vue
@@ -24,14 +24,17 @@
 <script setup>
 import { ref, computed } from 'vue'
 import { useGettext } from 'vue3-gettext'
+import { useTheme } from 'vuetify'
 import { useAuthStore, useBusStore } from '@/stores'
 import ConnectedView from './ConnectedView.vue'
 import NavBar from '@/components/shared/NavBar.vue'
 import TopMenu from '@/components/shared/TopMenu.vue'
+import themeApi from '@/api/theme'
 
 const authStore = useAuthStore()
 const busStore = useBusStore()
 const { $gettext } = useGettext()
+const theme = useTheme()
 
 const props = defineProps({
   color: {
@@ -58,6 +61,41 @@ busStore.$onAction(({ name, after }) => {
     })
   }
 }, true)
+
+themeApi.getTheme().then((response) => {
+  if (
+    response.data.theme_primary_color !==
+    theme.themes.value.light.colors.primary
+  ) {
+    theme.themes.value.light.colors.primary = response.data.theme_primary_color
+  }
+  if (
+    response.data.theme_primary_color_light !==
+    theme.themes.value.light.colors['primary-lighten-1']
+  ) {
+    theme.themes.value.light.colors['primary-lighten-1'] =
+      response.data.theme_primary_color_light
+  }
+  if (
+    response.data.theme_primary_color_dark !==
+    theme.themes.value.light.colors['primary-darken-1']
+  ) {
+    theme.themes.value.light.colors['primary-darken-1'] =
+      response.data.theme_primary_color_dark
+  }
+  if (
+    response.data.theme_secondary_color !==
+    theme.themes.value.light.colors.secondary
+  ) {
+    theme.themes.value.light.colors.secondary =
+      response.data.theme_secondary_color
+  }
+  if (
+    response.data.theme_label_color !== theme.themes.value.light.colors.label
+  ) {
+    theme.themes.value.light.colors.label = response.data.theme_label_color
+  }
+})
 </script>
 
 <style>
diff --git a/frontend/src/stores/auth.store.js b/frontend/src/stores/auth.store.js
index ce72012f3..9ee9cdbba 100644
--- a/frontend/src/stores/auth.store.js
+++ b/frontend/src/stores/auth.store.js
@@ -21,10 +21,10 @@ export const useAuthStore = defineStore('auth', () => {
   let postLogoutRedirectUri = config.OAUTH_POST_REDIRECT_URI
 
   if (!redirectUri.startsWith('http')) {
-    redirectUri = `${location.protocol}//${location.host}${redirectUri}`
+    redirectUri = `${location.protocol}//${location.host}${config.OAUTH_REDIRECT_URI}`
   }
   if (!postLogoutRedirectUri.startsWith('http')) {
-    postLogoutRedirectUri = `${location.protocol}//${location.host}${postLogouRedirectUri}`
+    postLogoutRedirectUri = `${location.protocol}//${location.host}${config.OAUTH_POST_REDIRECT_URI}`
   }
   const manager = new UserManager({
     authority: config.OAUTH_AUTHORITY_URL,
diff --git a/modoboa/core/api/v2/serializers.py b/modoboa/core/api/v2/serializers.py
index 543e4ad30..1bded346d 100644
--- a/modoboa/core/api/v2/serializers.py
+++ b/modoboa/core/api/v2/serializers.py
@@ -141,7 +141,7 @@ class CoreGlobalParametersSerializer(serializers.Serializer):
     )
 
     # Dashboard settings
-    custom_welcome_message = serializers.CharField(required=False)
+    custom_welcome_message = serializers.CharField(required=False, allow_blank=True)
     rss_feed_url = serializers.URLField(
         allow_blank=True, required=False, allow_null=True
     )