fix: firstFactors + test helpers

supertokens · Nov 6, 2023 · 3deb3cd · 3deb3cd
1 parent a9ce3b5
commit 3deb3cd
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 9 deletions.
diff --git a/lib/build/emailpassword-shared4.js b/lib/build/emailpassword-shared4.js
diff --git a/lib/build/emailpassword.js b/lib/build/emailpassword.js
diff --git a/lib/build/index2.js b/lib/build/index2.js
diff --git a/lib/build/multifactorauthprebuiltui.js b/lib/build/multifactorauthprebuiltui.js
diff --git a/lib/build/recipe/multifactorauth/components/themes/factorChooser/factorOption.d.ts b/lib/build/recipe/multifactorauth/components/themes/factorChooser/factorOption.d.ts
diff --git a/lib/build/thirdparty-shared.js b/lib/build/thirdparty-shared.js
diff --git a/lib/build/thirdparty.js b/lib/build/thirdparty.js
diff --git a/lib/build/thirdpartyemailpassword.js b/lib/build/thirdpartyemailpassword.js
diff --git a/lib/build/thirdpartypasswordless.js b/lib/build/thirdpartypasswordless.js
diff --git a/lib/ts/recipe/emailpassword/recipe.tsx b/lib/ts/recipe/emailpassword/recipe.tsx
@@ -19,10 +19,12 @@
 
 import EmailPasswordWebJS from "supertokens-web-js/recipe/emailpassword";
 import NormalisedURLPath from "supertokens-web-js/utils/normalisedURLPath";
+import { PostSuperTokensInitCallbacks } from "supertokens-web-js/utils/postSuperTokensInitCallbacks";
 
 import { SSR_ERROR } from "../../constants";
 import { isTest } from "../../utils";
 import AuthRecipe from "../authRecipe";
+import MultiFactorAuth from "../multifactorauth/recipe";
 
 import { DEFAULT_RESET_PASSWORD_PATH } from "./constants";
 import { getFunctionOverrides } from "./functionOverrides";
@@ -58,6 +60,13 @@ export default class EmailPassword extends AuthRecipe<
         public readonly webJSRecipe: WebJSRecipeInterface<typeof EmailPasswordWebJS> = EmailPasswordWebJS
     ) {
         super(config);
+
+        PostSuperTokensInitCallbacks.addPostInitCallback(() => {
+            const mfa = MultiFactorAuth.getInstance();
+            if (mfa !== undefined) {
+                mfa.addMFAFactors(["emailpassword"], []);
+            }
+        });
     }
 
     getDefaultRedirectionURL = async (context: GetRedirectionURLContext): Promise<string> => {

diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorList.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorList.tsx
@@ -35,6 +35,7 @@ export const FactorList = withOverride(
                 {availableFactors.map((factor) => (
                     <FactorOption
                         key={factor.id}
+                        id={factor.id}
                         name={factor.name}
                         description={factor.description}
                         logo={factor.logo}

diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorOption.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorOption.tsx
@@ -23,18 +23,20 @@ export const FactorOption = withOverride(
     "MultiFactorAuthFactorOption",
     function MultiFactorAuthFactorOption({
         onClick,
+        id,
         name,
         description,
         logo,
     }: {
         onClick: (() => void) | undefined;
+        id: string;
         name: string;
         description: string;
         logo: FC;
     }): JSX.Element {
         const t = useTranslation();
         return (
-            <a data-supertokens="factorChooserOption" onClick={onClick}>
+            <a data-supertokens={`factorChooserOption ${id}`} onClick={onClick}>
                 <div data-supertokens="factorLogo"> {logo({})}</div>
                 <div data-supertokens="factorOptionText">
                     <h6 data-supertokens="factorName">{t(name)}</h6>

diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/index.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/index.tsx
@@ -31,7 +31,7 @@ export function FactorChooserTheme(props: FactorChooserThemeProps): JSX.Element
     if (props.availableFactors.length === 0) {
         return (
             <AccessDeniedScreen
-                useShadowDom={props.config.useShadowDom}
+                useShadowDom={false}
                 error={props.showBackButton ? t("MFA_NO_AVAILABLE_OPTIONS") : t("MFA_NO_AVAILABLE_OPTIONS_LOGIN")}
             />
         );

diff --git a/lib/ts/recipe/recipeRouter/index.tsx b/lib/ts/recipe/recipeRouter/index.tsx
@@ -124,7 +124,8 @@ export abstract class RecipeRouter {
                 return componentMatchingRid;
             }
 
-            if (mfaRecipe) {
+            // TODO: check if we need this whole defaultFirstFactors thing.
+            if (mfaRecipe && mfaRecipe.config.firstFactors !== undefined) {
                 return chooseComponentBasedOnFirstFactors(mfaRecipe.getFirstFactors(), routeComponents);
             } else {
                 return defaultComp;

diff --git a/lib/ts/recipe/thirdparty/recipe.tsx b/lib/ts/recipe/thirdparty/recipe.tsx
@@ -18,11 +18,13 @@
  */
 
 import ThirdpartyWebJS from "supertokens-web-js/recipe/thirdparty";
+import { PostSuperTokensInitCallbacks } from "supertokens-web-js/utils/postSuperTokensInitCallbacks";
 
 import { SSR_ERROR } from "../../constants";
 import SuperTokens from "../../superTokens";
 import { isTest } from "../../utils";
 import AuthRecipe from "../authRecipe";
+import MultiFactorAuth from "../multifactorauth/recipe";
 
 import { getFunctionOverrides } from "./functionOverrides";
 import { normaliseThirdPartyConfig } from "./utils";
@@ -58,6 +60,14 @@ export default class ThirdParty extends AuthRecipe<
         if (SuperTokens.usesDynamicLoginMethods === false && config.signInAndUpFeature.providers.length === 0) {
             throw new Error("ThirdParty signInAndUpFeature providers array cannot be empty.");
         }
+
+        PostSuperTokensInitCallbacks.addPostInitCallback(() => {
+            const mfa = MultiFactorAuth.getInstance();
+            if (mfa !== undefined) {
+                mfa.addMFAFactors(["thirdparty"], []);
+            }
+        });
+
         super(config);
     }