fix(perf): optimized runRoutes

Author: ljosberinn

src/runRoutes.tsx

@@ -7,78 +7,76 @@ import { TokenParam, defaultParam } from './token';
  * as dictated by netlify identity's communication with us via hashes
  */
 
-const routes = /(confirmation|invite|recovery|email_change)_token=([^&]+)/;
+const routes = /(confirmation|invite|recovery|email_change|access)_token=([^&]+)/;
 const errorRoute = /error=access_denied&error_description=403/;
-const accessTokenRoute = /access_token=/;
-const confirmationRoute = /confirmation_token=/;
+
+const reduceHashToKeyValue = (hash: string): { [key: string]: string } =>
+  hash.split('&').reduce((carry, pair) => {
+    const [key, value] = pair.split('=');
+
+    return { ...carry, [key]: value };
+  }, {});
+
+const hashReplace = /^#\/?/;
 
 export function runRoutes(
   gotrue: GoTrue,
   setUser: (value: User) => User | undefined,
   remember = true
 ): TokenParam {
   // early terminate if no hash
+  // also accounts for document.cookie further down
   if (!document?.location?.hash) {
     return defaultParam;
   }
 
-  const hash = document.location.hash.replace(/^#\/?/, '');
+  const hash = document.location.hash.replace(hashReplace, '');
 
-  const m = hash.match(routes);
-  if (m) {
-    // store.verifyToken(m[1], m[2]);
-    document.location.hash = '';
-  }
+  // todo: maybe replace with history.replaceState to completely clear the url?
+  // currently keeps #
+  document.location.hash = '';
 
-  const em = hash.match(errorRoute);
-  if (em) {
-    // store.openModal("signup");
-    document.location.hash = '';
+  // earliest possible bail on any match
+  if (hash.match(errorRoute)) {
+    return {
+      ...defaultParam,
+      error: 'access_denied',
+      status: 403,
+    };
   }
-  const params = {} as { [key: string]: string };
-  hash.split('&').forEach(pair => {
-    const [key, value] = pair.split('=');
-    params[key] = value;
-  });
 
-  const am = hash.match(accessTokenRoute);
-  if (am) {
-    if (!!document && params.access_token) {
-      document.cookie = `nf_jwt=${params.access_token}`;
+  const matchesActionHashes = hash.match(routes);
+
+  if (matchesActionHashes) {
+    const params = reduceHashToKeyValue(hash);
+
+    if (params.confirmation_token) {
+      gotrue
+        .confirm(params.confirmation_token)
+        .then(setUser)
+        .catch(console.error);
+
+      // dont notify dev as this package does not export its own method for this
+      return defaultParam;
     }
-    document.location.hash = '';
-    // store.openModal("login");
-    // store.completeExternalLogin(params);
-    gotrue
-      .createUser(params, remember)
-      .then(setUser)
-      .catch(console.error);
-  }
 
-  const cm = hash.match(confirmationRoute);
-  if (cm) {
-    document.location.hash = '';
-    // store.openModal("login");
-    // store.completeExternalLogin(params);
-    gotrue
-      .confirm(params.confirmation_token)
-      .then(setUser)
-      .catch(console.error);
-  }
+    if (params.access_token) {
+      document.cookie = `nf_jwt=${params.access_token}`;
 
-  if (m) {
-    return {
-      ...defaultParam,
-      type: m[1] as TokenParam['type'],
-      token: m[2],
-    };
-  }
+      gotrue
+        .createUser(params, remember)
+        .then(setUser)
+        .catch(console.error);
+
+      // also dont notify dev here for the same reasons as above
+      return defaultParam;
+    }
 
-  if (em) {
+    // pass responsibility to dev in all other cases
     return {
       ...defaultParam,
-      error: 'access_denied',
-      status: 403,
+      type: matchesActionHashes[1] as TokenParam['type'],
+      token: matchesActionHashes[2],
     };
   }
 

src/token.ts

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