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

supertokens · Nov 21, 2023 · 8f35657 · 8f35657
2 parents b483c83 + da4ac03
commit 8f35657
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 82 deletions.
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/types.d.ts b/lib/build/recipe/multifactorauth/types.d.ts
diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorChooserFooter.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorChooserFooter.tsx
@@ -17,8 +17,8 @@ import { withOverride } from "../../../../../components/componentOverride/withOv
 import { useTranslation } from "../../../../../translation/translationContext";
 
 export const FactorChooserFooter = withOverride(
-    "MultiFactorAuthFactorChooserFooter",
-    function MultiFactorAuthFactorChooserFooter({ logout }: { logout: (() => void) | undefined }): JSX.Element {
+    "MFAFactorChooserFooter",
+    function MFAChooserFooter({ logout }: { logout: (() => void) | undefined }): JSX.Element {
         const t = useTranslation();
 
         return (

diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorChooserHeader.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorChooserHeader.tsx
@@ -17,11 +17,8 @@ import { useTranslation } from "../../../../../translation/translationContext";
 import BackButton from "../../../../emailpassword/components/library/backButton";
 
 export const FactorChooserHeader = withOverride(
-    "MultiFactorAuthFactorChooserHeader",
-    function MultiFactorAuthFactorChooserHeader(props: {
-        showBackButton: boolean;
-        onBackButtonClicked: () => void;
-    }): JSX.Element {
+    "MFAFactorChooserHeader",
+    function MFAFactorChooserHeader(props: { showBackButton: boolean; onBackButtonClicked: () => void }): JSX.Element {
         const t = useTranslation();
 
         return (

diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorList.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorList.tsx
@@ -21,8 +21,8 @@ import type { SecondaryFactorRedirectionInfo } from "../../../types";
 import type { MFAFactorInfo } from "supertokens-web-js/recipe/multifactorauth/types";
 
 export const FactorList = withOverride(
-    "MultiFactorAuthFactorList",
-    function MultiFactorAuthFactorList({
+    "MFAFactorList",
+    function MFAFactorList({
         availableFactors,
         navigateToFactor,
     }: {

diff --git a/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorOption.tsx b/lib/ts/recipe/multifactorauth/components/themes/factorChooser/factorOption.tsx
@@ -20,8 +20,8 @@ import { useTranslation } from "../../../../../translation/translationContext";
 import type { FC } from "react";
 
 export const FactorOption = withOverride(
-    "MultiFactorAuthFactorOption",
-    function MultiFactorAuthFactorOption({
+    "MFAFactorOption",
+    function MFAFactorOption({
         onClick,
         id,
         name,
@@ -42,9 +42,6 @@ export const FactorOption = withOverride(
                     <h6 data-supertokens="factorName">{t(name)}</h6>
                     <p data-supertokens="factorDescription">{t(description)}</p>
                 </div>
-                {/* <span data-supertokens="factorArrow">
-                    <ArrowRightIcon color="rgb(var(--palette-textPrimary))" />
-                </span> */}
             </a>
         );
     }

diff --git a/lib/ts/recipe/multifactorauth/types.ts b/lib/ts/recipe/multifactorauth/types.ts
@@ -13,6 +13,10 @@
  * under the License.
  */
 
+import type { FactorChooserFooter } from "./components/themes/factorChooser/factorChooserFooter";
+import type { FactorChooserHeader } from "./components/themes/factorChooser/factorChooserHeader";
+import type { FactorList } from "./components/themes/factorChooser/factorList";
+import type { FactorOption } from "./components/themes/factorChooser/factorOption";
 import type { ComponentOverride } from "../../components/componentOverride/componentOverride";
 import type { FeatureBaseConfig } from "../../types";
 import type {
@@ -26,7 +30,10 @@ import type { RecipeInterface } from "supertokens-web-js/recipe/multifactorauth"
 import type { MFAFactorInfo } from "supertokens-web-js/recipe/multifactorauth/types";
 
 export type ComponentOverrideMap = {
-    FactorChooser_Override?: ComponentOverride<any>; // TODO
+    MFAFactorChooserFooter_Override?: ComponentOverride<typeof FactorChooserFooter>;
+    MFAFactorChooserHeader_Override?: ComponentOverride<typeof FactorChooserHeader>;
+    MFAFactorList_Override?: ComponentOverride<typeof FactorList>;
+    MFAFactorOption_Override?: ComponentOverride<typeof FactorOption>;
 };
 
 // Config is what does in the constructor of the recipe.

diff --git a/lib/ts/recipe/recipeRouter/index.tsx b/lib/ts/recipe/recipeRouter/index.tsx
@@ -146,7 +146,7 @@ export abstract class RecipeRouter {
 
         // We may get here if the app is using an older BE that doesn't support MFA
         const enabledRecipeCount = Object.keys(dynamicLoginMethods).filter(
-            (key) => (dynamicLoginMethods as any)[key].enabled
+            (key) => (dynamicLoginMethods as any)[key]?.enabled === true
         ).length;
         // We first try to find an exact match
         for (const { rid, includes } of priorityOrder) {