refactors an exception case

supertokens · Aug 7, 2024 · d80ca83 · d80ca83
1 parent 2366db6
commit d80ca83
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/lib/build/recipe/accountlinking/index.js b/lib/build/recipe/accountlinking/index.js
@@ -129,6 +129,9 @@ class Wrapper {
     }
     static async isEmailChangeAllowed(recipeUserId, newEmail, isVerified, session, userContext) {
         const user = await __1.getUser(recipeUserId.getAsString(), userContext);
+        if (user === undefined) {
+            throw new Error("Passed in recipe user id does not exist");
+        }
         const res = await recipe_1.default.getInstance().isEmailChangeAllowed({
             user,
             newEmail,

diff --git a/lib/build/recipe/accountlinking/recipe.d.ts b/lib/build/recipe/accountlinking/recipe.d.ts
@@ -99,7 +99,7 @@ export default class Recipe extends RecipeModule {
         userContext: UserContext;
     }) => Promise<boolean>;
     isEmailChangeAllowed: (input: {
-        user?: User;
+        user: User;
         newEmail: string;
         isVerified: boolean;
         session: SessionContainerInterface | undefined;

diff --git a/lib/build/recipe/accountlinking/recipe.js b/lib/build/recipe/accountlinking/recipe.js
@@ -385,9 +385,6 @@ class Recipe extends recipeModule_1.default {
              * in account take over if this recipe user is malicious.
              */
             let inputUser = input.user;
-            if (inputUser === undefined) {
-                throw new Error("Passed in recipe user id does not exist");
-            }
             for (const tenantId of inputUser.tenantIds) {
                 let existingUsersWithNewEmail = await this.recipeInterfaceImpl.listUsersByAccountInfo({
                     tenantId,

diff --git a/lib/ts/recipe/accountlinking/index.ts b/lib/ts/recipe/accountlinking/index.ts
@@ -165,6 +165,10 @@ export default class Wrapper {
     ) {
         const user = await getUser(recipeUserId.getAsString(), userContext);
 
+        if (user === undefined) {
+            throw new Error("Passed in recipe user id does not exist");
+        }
+
         const res = await Recipe.getInstance().isEmailChangeAllowed({
             user,
             newEmail,

diff --git a/lib/ts/recipe/accountlinking/recipe.ts b/lib/ts/recipe/accountlinking/recipe.ts
@@ -523,7 +523,7 @@ export default class Recipe extends RecipeModule {
     };
 
     isEmailChangeAllowed = async (input: {
-        user?: User;
+        user: User;
         newEmail: string;
         isVerified: boolean;
         session: SessionContainerInterface | undefined;
@@ -546,10 +546,6 @@ export default class Recipe extends RecipeModule {
 
         let inputUser = input.user;
 
-        if (inputUser === undefined) {
-            throw new Error("Passed in recipe user id does not exist");
-        }
-
         for (const tenantId of inputUser.tenantIds) {
             let existingUsersWithNewEmail = await this.recipeInterfaceImpl.listUsersByAccountInfo({
                 tenantId,