Merge pull request #215 from os2ulf/feature/canonical-fix

Feature/canonical fix
os2ulf · Dec 3, 2024 · 3d2f0cc · 3d2f0cc
2 parents 892a0ca + 2307ac9
commit 3d2f0cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 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;
-}
+}
diff --git a/utils/seoCanonicalUrlHandler.ts b/utils/seoCanonicalUrlHandler.ts
@@ -6,7 +6,8 @@ export const seoCanonicalUrlHandler = (url: string, isFrontPage: boolean) => {
   }
 
   const currentDomain = useGetCurrentDomain();
-  console.log('currentDomain from the composable', currentDomain);
+  console.log('seoCanonicalUrlHandler from the composable:', currentDomain);
+
 
   if (isFrontPage) {
     return currentDomain;