fix(oidc): allow paths in wellknown lookup

server/utils/oidc.ts

@@ -4,15 +4,13 @@ import * as yup from 'yup';
 
 /** Fetch the oidc configuration blob */
 export async function getOIDCWellknownConfiguration(domain: string) {
-  const wellKnownInfo: WellKnownConfiguration = await fetch(
+  // remove trailing slash from url if it exists and add /.well-known/openid-configuration path
-    new URL(
+  const wellKnownUrl = new URL(
-      '/.well-known/openid-configuration',
+    `https://${domain}`.replace(/\/$/, '') + '/.well-known/openid-configuration'
-      `https://${domain}`
+  ).toString();
-    ).toString(),
+  const wellKnownInfo: WellKnownConfiguration = await fetch(wellKnownUrl, {
-    {
+    headers: new Headers([['Content-Type', 'application/json']]),
-      headers: new Headers([['Content-Type', 'application/json']]),
+  }).then((r) => r.json());
-    }
-  ).then((r) => r.json());
 
   return wellKnownInfo;
 }

src/components/Login/OIDCLoginButton.tsx

@@ -26,8 +26,9 @@ function OIDCLoginButton({ revalidate, oidcName }: Props) {
     } catch (e) {
       setLoading(false);
       return;
+    } finally {
+      setLoading(false);
     }
-    setLoading(false);
   };
 
   return (