Merge branch 'release/2024-11' of github.com:os2ulf/os2udoglaer-front…

…end into release/2024-11
os2ulf · Dec 3, 2024 · e261350 · e261350
2 parents d3b4a87 + b68a5e7
commit e261350
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/composables/useGetCurrentDomain.ts b/composables/useGetCurrentDomain.ts
@@ -3,17 +3,12 @@ export default function useGetCurrentDomain() {
 
   if (process.server) {
     const hostHeader = useRequestHeaders();
-    currentDomain = hostHeader['x-forwarded-host'] || hostHeader.host;
-
-    if (
-      !currentDomain.startsWith('http://') ||
-      !currentDomain.startsWith('https://')
-    ) {
-      currentDomain = 'https://' + currentDomain;
-    }
+    const rawDomain = hostHeader['x-forwarded-host'] || hostHeader.host || '';
+    currentDomain = `https://${rawDomain}`;
   } else if (process.client) {
-    currentDomain = window.location.protocol + '//' + window.location.hostname;
+    const rawDomain = window.location.hostname;
+    currentDomain = `https://${rawDomain}`;
   }
 
   return currentDomain;
-}
+}