root loader error check refinement (#2664)

proofzero · Sep 7, 2023 · 85f2e49 · 85f2e49
1 parent 1f6840e
commit 85f2e49
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/apps/passport/app/root.tsx b/apps/passport/app/root.tsx
@@ -102,15 +102,20 @@ export const loader: LoaderFunction = getRollupReqFunctionErrorWrapper(
           websiteURL: 'https://rollup.id',
         }
       } else {
-        if (['console', 'passport'].includes(params.clientId!)) {
+        if (
+          ['console', 'passport'].includes(params.clientId!) ||
+          (clientId && ['console', 'passport'].includes(clientId))
+        ) {
+          const effectiveClientId = params.clientId! ?? clientId
           const name =
-            params.clientId!.charAt(0).toUpperCase() + params.clientId!.slice(1)
+            effectiveClientId.charAt(0).toUpperCase() +
+            effectiveClientId.slice(1)
           appProps = {
             name: `Rollup - ${name}`,
             iconURL: LogoIndigo,
             termsURL: 'https://rollup.id/tos',
             privacyURL: 'https://rollup.id/privacy-policy',
-            redirectURI: `https://${params.clientId}.rollup.id`,
+            redirectURI: `https://${effectiveClientId}.rollup.id`,
             websiteURL: 'https://rollup.id',
           }
         } else {