Merge branch 'feat/mfa/otp' into feat/mfa/totp

supertokens · Dec 6, 2023 · 82aaef8 · 82aaef8
2 parents 405c419 + c0d686f
commit 82aaef8
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 10 deletions.
diff --git a/lib/build/index2.js b/lib/build/index2.js
diff --git a/lib/ts/recipe/recipeRouter/index.tsx b/lib/ts/recipe/recipeRouter/index.tsx
@@ -36,28 +36,42 @@ const priorityOrder: {
 
 function chooseComponentBasedOnFirstFactors(
     firstFactors: string[],
-    routeComponents: ComponentWithRecipeAndMatchingMethod[]
+    routeComponents: ComponentWithRecipeAndMatchingMethod[],
+    allowSubRecipeComp: boolean
 ) {
     let fallbackRid;
     let fallbackComponent;
+    let subRecipeRid;
+    let subRecipeComponent;
     // We first try to find an exact match, and fall back on something that covers all factors (but maybe more)
     for (const { rid, factorsProvided } of priorityOrder) {
         if (firstFactors.every((factor) => factorsProvided.includes(factor))) {
             const matchingComp = routeComponents.find((comp) => comp.recipeID === rid);
             if (matchingComp) {
-                // This means that this gets overwritten by items lower in the prios list.
-                // This is intentional since this way we end up with the most specific recipe that covers all required factrors (pwless instead of tppwless)
                 fallbackRid = rid;
                 fallbackComponent = matchingComp;
                 if (firstFactors.length === factorsProvided.length) {
                     logDebugMessage(`Rendering ${rid} because it matches factors: ${firstFactors} exactly`);
                     return matchingComp;
                 }
             }
+        } else if (allowSubRecipeComp && factorsProvided.some((factor) => firstFactors.includes(factor))) {
+            const matchingComp = routeComponents.find((comp) => comp.recipeID === rid);
+            if (matchingComp) {
+                subRecipeRid = rid;
+                subRecipeComponent = matchingComp;
+            }
         }
     }
 
     if (fallbackComponent === undefined) {
+        if (subRecipeComponent) {
+            logDebugMessage(
+                `Rendering ${subRecipeRid} because it overlaps factors: ${firstFactors} and we are not rendering the auth page`
+            );
+            return subRecipeComponent;
+        }
+
         throw new Error("No enabled recipes overlap with the requested firstFactors: " + firstFactors);
     }
 
@@ -75,6 +89,7 @@ export abstract class RecipeRouter {
         dynamicLoginMethods?: GetLoginMethodsResponseNormalized
     ): ComponentWithRecipeAndMatchingMethod | undefined {
         const path = normalisedUrl.getAsStringDangerous();
+        const isNonAuthPage = path !== SuperTokens.getInstanceOrThrow().appInfo.websiteBasePath.getAsStringDangerous();
 
         const routeComponents = preBuiltUIList.reduce((components, c) => {
             const routes = c.getPathsToFeatureComponentWithRecipeIdMap();
@@ -119,7 +134,11 @@ export abstract class RecipeRouter {
             }
 
             if (mfaRecipe && mfaRecipe.config.firstFactors !== undefined) {
-                return chooseComponentBasedOnFirstFactors(mfaRecipe.config.firstFactors, routeComponents);
+                return chooseComponentBasedOnFirstFactors(
+                    mfaRecipe.config.firstFactors,
+                    routeComponents,
+                    isNonAuthPage
+                );
             } else {
                 return defaultComp;
             }
@@ -141,7 +160,7 @@ export abstract class RecipeRouter {
         }
 
         if (dynamicLoginMethods.firstFactors !== undefined) {
-            return chooseComponentBasedOnFirstFactors(dynamicLoginMethods.firstFactors, routeComponents);
+            return chooseComponentBasedOnFirstFactors(dynamicLoginMethods.firstFactors, routeComponents, isNonAuthPage);
         }
 
         // We may get here if the app is using an older BE that doesn't support MFA