feat: update to match BE changes

supertokens · Jan 2, 2024 · ef449b7 · ef449b7
1 parent 8bdfd64
commit ef449b7
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 67 deletions.
diff --git a/bundle/multifactorauth.js b/bundle/multifactorauth.js
diff --git a/lib/build/recipe/multifactorauth/index.d.ts b/lib/build/recipe/multifactorauth/index.d.ts
diff --git a/lib/build/recipe/multifactorauth/index.js b/lib/build/recipe/multifactorauth/index.js
diff --git a/lib/build/recipe/multifactorauth/multiFactorAuthClaim.d.ts b/lib/build/recipe/multifactorauth/multiFactorAuthClaim.d.ts
diff --git a/lib/build/recipe/multifactorauth/multiFactorAuthClaim.js b/lib/build/recipe/multifactorauth/multiFactorAuthClaim.js
diff --git a/lib/build/recipe/multifactorauth/recipeImplementation.js b/lib/build/recipe/multifactorauth/recipeImplementation.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/index.ts b/lib/ts/recipe/multifactorauth/index.ts
@@ -17,6 +17,7 @@ import { MultiFactorAuthClaimClass } from "./multiFactorAuthClaim";
 import Recipe from "./recipe";
 import { PreAndPostAPIHookAction, PreAPIHookContext, PostAPIHookContext, RecipeInterface, UserInput } from "./types";
 import { RecipeFunctionOptions } from "../recipeModule/types";
+import { getNormalisedUserContext } from "../../utils";
 
 export default class RecipeWrapper {
     static init(config?: UserInput) {
@@ -32,23 +33,23 @@ export default class RecipeWrapper {
      *
      * @returns `{ status: "OK", ...}` if successful
      */
-    static getMFAInfo(input: { options?: RecipeFunctionOptions; userContext?: any }) {
-        return Recipe.getInstanceOrThrow().recipeImplementation.getMFAInfo({
-            options: input.options,
-            userContext: input.userContext ?? {},
+    static resyncSessionAndFetchMFAInfo(input?: { options?: RecipeFunctionOptions; userContext?: any }) {
+        return Recipe.getInstanceOrThrow().recipeImplementation.resyncSessionAndFetchMFAInfo({
+            options: input?.options ?? {},
+            userContext: getNormalisedUserContext(input?.userContext),
         });
     }
 
     static MultiFactorAuthClaim = Recipe.MultiFactorAuthClaim;
 }
 
 const init = RecipeWrapper.init;
-const getMFAInfo = RecipeWrapper.getMFAInfo;
+const resyncSessionAndFetchMFAInfo = RecipeWrapper.resyncSessionAndFetchMFAInfo;
 const MultiFactorAuthClaim = RecipeWrapper.MultiFactorAuthClaim;
 
 export {
     init,
-    getMFAInfo,
+    resyncSessionAndFetchMFAInfo,
     RecipeInterface,
     PreAPIHookContext,
     PostAPIHookContext,

diff --git a/lib/ts/recipe/multifactorauth/multiFactorAuthClaim.ts b/lib/ts/recipe/multifactorauth/multiFactorAuthClaim.ts
@@ -31,7 +31,8 @@ export class MultiFactorAuthClaimClass implements SessionClaim<MFAClaimValue> {
                             },
                         };
                     }
-                    if (val.n.length === 0) {
+
+                    if (val.v) {
                         return {
                             isValid: true,
                         };
@@ -41,7 +42,6 @@ export class MultiFactorAuthClaimClass implements SessionClaim<MFAClaimValue> {
                         isValid: false,
                         reason: {
                             message: "not all required factors have been completed",
-                            nextFactorOptions: val?.n,
                         },
                     };
                 },
@@ -81,16 +81,16 @@ export class MultiFactorAuthClaimClass implements SessionClaim<MFAClaimValue> {
                                     },
                                 };
                             }
-                        } else if (typeof req === "object" && "allOf" in req) {
-                            const res = req.allOf
+                        } else if (typeof req === "object" && "allOfInAnyOrder" in req) {
+                            const res = req.allOfInAnyOrder
                                 .map((r) => checkFactorRequirement(r, completedFactors))
                                 .filter((v) => v.isValid === false);
                             if (res.length !== 0) {
                                 return {
                                     isValid: false,
                                     reason: {
                                         message: "Some factor checkers failed in the list",
-                                        allOf: req.allOf,
+                                        allOfInAnyOrder: req.allOfInAnyOrder,
                                         failures: res,
                                     },
                                 };
@@ -118,17 +118,17 @@ export class MultiFactorAuthClaimClass implements SessionClaim<MFAClaimValue> {
     }
 
     async refresh(userContext: any): Promise<void> {
-        await this.getRecipeImpl().getMFAInfo(userContext);
+        await this.getRecipeImpl().resyncSessionAndFetchMFAInfo(userContext);
     }
 
-    getValueFromPayload(payload: any, _userContext?: any): { c: Record<string, number>; n: string[] } | undefined {
+    getValueFromPayload(payload: any, _userContext?: any): { c: Record<string, number>; v: boolean } | undefined {
         if (payload[this.id] === undefined) {
             return undefined;
         }
 
         return {
             c: payload[this.id].c,
-            n: payload[this.id].n,
+            v: payload[this.id].v,
         };
     }
 

diff --git a/lib/ts/recipe/multifactorauth/recipeImplementation.ts b/lib/ts/recipe/multifactorauth/recipeImplementation.ts
@@ -14,7 +14,7 @@
  */
 
 import Querier from "../../querier";
-import { MFAFactorInfo, RecipeInterface } from "./types";
+import { RecipeInterface } from "./types";
 import { RecipeImplementationInput } from "../recipeModule/types";
 import { PreAndPostAPIHookAction } from "./types";
 
@@ -24,17 +24,16 @@ export default function getRecipeImplementation(
     const querier = new Querier(recipeImplInput.recipeId, recipeImplInput.appInfo);
 
     return {
-        getMFAInfo: async function ({ options, userContext }) {
-            const { jsonBody, fetchResponse } = await querier.get<{
+        resyncSessionAndFetchMFAInfo: async function ({ options, userContext }) {
+            const { jsonBody, fetchResponse } = await querier.put<{
                 status: "OK";
-                factors: MFAFactorInfo;
-                email?: string;
-                phoneNumber?: string;
+                nextFactors: string[];
+                emails: Record<string, string[] | undefined>;
+                phoneNumbers: Record<string, string[] | undefined>;
             }>(
                 undefined,
                 "/mfa/info",
                 {},
-                undefined,
                 Querier.preparePreAPIHook({
                     recipePreAPIHook: recipeImplInput.preAPIHook,
                     action: "GET_MFA_INFO",

diff --git a/lib/ts/recipe/multifactorauth/types.ts b/lib/ts/recipe/multifactorauth/types.ts
@@ -49,17 +49,12 @@ export type NormalisedInputType = AuthRecipeNormalisedInputType<PreAndPostAPIHoo
     };
 };
 
-export type MFAFactorInfo = {
-    isAlreadySetup: string[];
-    isAllowedToSetup: string[];
-};
-
 export type RecipeInterface = {
-    getMFAInfo: (input: { options?: RecipeFunctionOptions; userContext: any }) => Promise<{
+    resyncSessionAndFetchMFAInfo: (input: { options?: RecipeFunctionOptions; userContext: any }) => Promise<{
         status: "OK";
-        factors: MFAFactorInfo;
-        email?: string;
-        phoneNumber?: string;
+        nextFactors: string[];
+        emails: Record<string, string[] | undefined>;
+        phoneNumbers: Record<string, string[] | undefined>;
         fetchResponse: Response;
     }>;
 };
@@ -71,12 +66,12 @@ export type MFARequirementList = (
           oneOf: MFARequirement[];
       }
     | {
-          allOf: MFARequirement[];
+          allOfInAnyOrder: MFARequirement[];
       }
     | MFARequirement
 )[];
 
 export type MFAClaimValue = {
     c: Record<string, number>;
-    n: string[];
+    v: boolean;
 };