feat(TokenParam): progress on TokenParam

Author: ljosberinn

src/index.tsx

@@ -15,6 +15,7 @@ import GoTrue, {
   Settings as GoTrueSettings,
 } from 'gotrue-js';
 import { runRoutes } from './runRoutes';
+import { TokenParam, defaultParam } from './token';
 
 type authChangeParam = (user?: User) => string | void;
 
@@ -70,6 +71,7 @@ export type ReactNetlifyIdentityAPI = {
   loginProvider: (provider: Provider) => void;
   acceptInviteExternalUrl: (provider: Provider, token: string) => string;
   settings: Settings;
+  param: TokenParam;
 };
 
 const [_useIdentityContext, _IdentityCtxProvider] = createCtx<
@@ -126,9 +128,15 @@ export function useNetlifyIdentity(
     return _user; // so that we can continue chaining
   };
 
+  const [param, setParam] = useState<TokenParam>(defaultParam);
+
   useEffect(() => {
     if (enableRunRoutes) {
-      runRoutes(goTrueInstance, _setUser);
+      const param = runRoutes(goTrueInstance, _setUser);
+
+      if (param.token || param.error) {
+        setParam(param);
+      }
     }
   }, []);
 
@@ -224,6 +232,7 @@ export function useNetlifyIdentity(
     loginProvider,
     acceptInviteExternalUrl,
     settings,
+    param,
   };
 }
 

src/runRoutes.tsx

@@ -1,4 +1,5 @@
 import GoTrue, { User } from 'gotrue-js';
+import { TokenParam, defaultParam } from './token';
 
 /**
  * This code runs on every rerender so keep it light
@@ -15,9 +16,13 @@ export function runRoutes(
   gotrue: GoTrue,
   setUser: (value: User) => User | undefined,
   remember = true
-) {
-  const hash = (document.location.hash || '').replace(/^#\/?/, '');
-  if (!hash) return; // early terminate if no hash
+): TokenParam {
+  // early terminate if no hash
+  if (!document?.location?.hash) {
+    return defaultParam;
+  }
+
+  const hash = document.location.hash.replace(/^#\/?/, '');
 
   const m = hash.match(routes);
   if (m) {
@@ -38,8 +43,8 @@ export function runRoutes(
 
   const am = hash.match(accessTokenRoute);
   if (am) {
-    if (!!document && params['access_token']) {
-      document.cookie = `nf_jwt=${params['access_token']}`;
+    if (!!document && params.access_token) {
+      document.cookie = `nf_jwt=${params.access_token}`;
     }
     document.location.hash = '';
     // store.openModal("login");
@@ -56,8 +61,26 @@ export function runRoutes(
     // store.openModal("login");
     // store.completeExternalLogin(params);
     gotrue
-      .confirm(params['confirmation_token'])
+      .confirm(params.confirmation_token)
       .then(setUser)
       .catch(console.error);
   }
+
+  if (m) {
+    return {
+      ...defaultParam,
+      type: m[1] as TokenParam['type'],
+      token: m[2],
+    };
+  }
+
+  if (em) {
+    return {
+      ...defaultParam,
+      error: 'access_denied',
+      status: 403,
+    };
+  }
+
+  return defaultParam;
 }

src/token.ts

@@ -0,0 +1,18 @@
+export type TokenParam = {
+  token: string | undefined;
+  type:
+    | 'confirmation'
+    | 'invite'
+    | 'recovery'
+    | 'email_change'
+    | 'access'
+    | 'confirmation'
+    | undefined;
+  error?: 'access_denied';
+  status?: 403;
+};
+
+export const defaultParam: TokenParam = {
+  token: undefined,
+  type: undefined,
+};