fix: Moved canonical construction to post-validation paths in account, license, and node pages

Author: wzrdx

app/account/[ownerEthAddr]/page.tsx

@@ -32,25 +32,29 @@ const getCachedNodeOperatorProfile = unstable_cache(
 
 export async function generateMetadata({ params }) {
     const { ownerEthAddr } = await params;
-    const canonical = `/account/${encodeURIComponent(ownerEthAddr)}`;
     const errorMetadata = {
         title: 'Error',
         openGraph: {
             title: 'Error',
         },
-        alternates: {
-            canonical,
-        },
     };
 
     if (!ownerEthAddr || !isAddress(ownerEthAddr) || isZeroAddress(ownerEthAddr)) {
         return errorMetadata;
     }
-
-    try {
-        const [ensName, publicProfile] = await Promise.all([
-            cachedGetENSName(ownerEthAddr),
-            getCachedNodeOperatorProfile(ownerEthAddr as types.EthAddress),
+
+    const canonical = `/account/${encodeURIComponent(ownerEthAddr)}`;
+    const errorMetadataWithCanonical = {
+        ...errorMetadata,
+        alternates: {
+            canonical,
+        },
+    };
+
+    try {
+        const [ensName, publicProfile] = await Promise.all([
+            cachedGetENSName(ownerEthAddr),
+            getCachedNodeOperatorProfile(ownerEthAddr as types.EthAddress),
         ]);
 
         const primaryName = publicProfile?.name || ensName || getShortAddress(ownerEthAddr, 4, true);
@@ -65,7 +69,7 @@ export async function generateMetadata({ params }) {
             },
         };
     } catch (error) {
-        return errorMetadata;
+        return errorMetadataWithCanonical;
     }
 }
 

app/license/[licenseType]/[licenseId]/page.tsx

@@ -12,33 +12,37 @@ import { cache, Suspense } from 'react';
 
 export async function generateMetadata({ params }) {
     const { licenseType, licenseId } = await params;
-    const canonical = `/license/${encodeURIComponent(licenseType)}/${encodeURIComponent(licenseId)}`;
     const errorMetadata = {
         title: 'Error',
         openGraph: {
             title: 'Error',
         },
-        alternates: {
-            canonical,
-        },
     };
-
-    if (!licenseType || !['ND', 'MND', 'GND'].includes(licenseType)) {
-        return errorMetadata;
-    }
+
+    if (!licenseType || !['ND', 'MND', 'GND'].includes(licenseType)) {
+        return errorMetadata;
+    }
 
     const licenseIdNum = parseInt(licenseId);
 
-    if (isNaN(licenseIdNum) || licenseIdNum < 0 || licenseIdNum > 10000) {
-        return errorMetadata;
-    }
-
-    try {
-        await fetchLicense(licenseType, licenseId, config.environment);
-    } catch (error) {
-        return errorMetadata;
-    }
-
+    if (isNaN(licenseIdNum) || licenseIdNum < 0 || licenseIdNum > 10000) {
+        return errorMetadata;
+    }
+
+    const canonical = `/license/${encodeURIComponent(licenseType)}/${encodeURIComponent(licenseId)}`;
+    const errorMetadataWithCanonical = {
+        ...errorMetadata,
+        alternates: {
+            canonical,
+        },
+    };
+
+    try {
+        await fetchLicense(licenseType, licenseId, config.environment);
+    } catch (error) {
+        return errorMetadataWithCanonical;
+    }
+
     return {
         title: `License #${licenseId}`,
         openGraph: {

app/node/[nodeAddr]/page.tsx

@@ -34,32 +34,36 @@ const resolveNodeEthAddress = (nodeAddress?: string): types.EthAddress | null =>
 
 export async function generateMetadata({ params }) {
     const { nodeAddr } = await params;
-    const canonical = `/node/${encodeURIComponent(nodeAddr)}`;
     const errorMetadata = {
         title: 'Error',
         openGraph: {
             title: 'Error',
         },
-        alternates: {
-            canonical,
-        },
     };
     const resolvedNodeEthAddr = resolveNodeEthAddress(nodeAddr);
 
     if (!resolvedNodeEthAddr) {
         console.log(`[Node Page] Invalid node address: ${nodeAddr}`);
-        return errorMetadata;
-    }
-
-    let nodeResponse: types.OraclesAvailabilityResult & types.OraclesDefaultResult;
-
-    try {
-        ({ nodeResponse } = await fetchLicenseDetailsAndNodeAvailability(resolvedNodeEthAddr, config.environment));
-    } catch (error) {
-        console.error(error);
-        return errorMetadata;
-    }
-
+        return errorMetadata;
+    }
+
+    const canonical = `/node/${encodeURIComponent(nodeAddr)}`;
+    const errorMetadataWithCanonical = {
+        ...errorMetadata,
+        alternates: {
+            canonical,
+        },
+    };
+
+    let nodeResponse: types.OraclesAvailabilityResult & types.OraclesDefaultResult;
+
+    try {
+        ({ nodeResponse } = await fetchLicenseDetailsAndNodeAvailability(resolvedNodeEthAddr, config.environment));
+    } catch (error) {
+        console.error(error);
+        return errorMetadataWithCanonical;
+    }
+
     return {
         title: `Node • ${nodeResponse.node_alias}`,
         openGraph: {