Merge pull request #798 from supertokens/al-ep-issue

fix: ep login issues
supertokens · Sep 11, 2023 · a2d8d61 · a2d8d61
2 parents 1a9ae87 + 18ca94c
commit a2d8d61
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/main/java/io/supertokens/emailpassword/EmailPassword.java b/src/main/java/io/supertokens/emailpassword/EmailPassword.java
@@ -177,7 +177,7 @@ public static ImportUserResponse importUserWithPasswordHash(TenantIdentifierWith
                 LoginMethod loginMethod = null;
                 for (AuthRecipeUserInfo currUser : allUsers) {
                     for (LoginMethod currLM : currUser.loginMethods) {
-                        if (currLM.email.equals(email) && currLM.recipeId == RECIPE_ID.EMAIL_PASSWORD) {
+                        if (currLM.email.equals(email) && currLM.recipeId == RECIPE_ID.EMAIL_PASSWORD && currLM.tenantIds.contains(tenantIdentifierWithStorage.getTenantId())) {
                             userInfoToBeUpdated = currUser;
                             loginMethod = currLM;
                             break;
@@ -246,7 +246,7 @@ public static AuthRecipeUserInfo signIn(TenantIdentifierWithStorage tenantIdenti
         LoginMethod lM = null;
         for (AuthRecipeUserInfo currUser : users) {
             for (LoginMethod currLM : currUser.loginMethods) {
-                if (currLM.recipeId == RECIPE_ID.EMAIL_PASSWORD && currLM.email.equals(email)) {
+                if (currLM.recipeId == RECIPE_ID.EMAIL_PASSWORD && currLM.email.equals(email) && currLM.tenantIds.contains(tenantIdentifierWithStorage.getTenantId())) {
                     user = currUser;
                     lM = currLM;
                 }

diff --git a/src/test/java/io/supertokens/test/accountlinking/MultitenantTest.java b/src/test/java/io/supertokens/test/accountlinking/MultitenantTest.java
@@ -23,6 +23,7 @@
 import io.supertokens.authRecipe.exception.AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException;
 import io.supertokens.emailpassword.EmailPassword;
 import io.supertokens.emailpassword.exceptions.EmailChangeNotAllowedException;
+import io.supertokens.emailpassword.exceptions.WrongCredentialsException;
 import io.supertokens.featureflag.EE_FEATURES;
 import io.supertokens.featureflag.FeatureFlagTestContent;
 import io.supertokens.featureflag.exceptions.FeatureNotEnabledException;
@@ -256,6 +257,13 @@ public void testVariousCases() throws Exception {
                         new AssociateUserToTenant(t2, 0),
                         new MakePrimaryUser(t1, 0),
                 }),
+                new TestCase(new TestCaseStep[]{
+                        new CreateEmailPasswordUser(t1, "[email protected]"),
+                        new CreatePlessUserWithEmail(t2, "[email protected]"),
+                        new MakePrimaryUser(t1, 0),
+                        new LinkAccounts(t1, 0, 1),
+                        new SignInEmailPasswordUser(t2, 0).expect(new WrongCredentialsException())
+                }),
 
                 new TestCase(new TestCaseStep[]{
                         new CreateEmailPasswordUser(t1, "[email protected]"),
@@ -830,4 +838,20 @@ public void execute(Main main) throws Exception {
             AuthRecipe.unlinkAccounts(main, tenantIdentifierWithStorage.toAppIdentifierWithStorage(), TestCase.users.get(userIndex).getSupertokensUserId());
         }
     }
+
+    private static class SignInEmailPasswordUser extends TestCaseStep {
+        TenantIdentifier tenantIdentifier;
+        int userIndex;
+
+            public SignInEmailPasswordUser(TenantIdentifier tenantIdentifier, int userIndex) {
+                this.tenantIdentifier = tenantIdentifier;
+                this.userIndex = userIndex;
+            }
+
+            @Override
+            public void execute(Main main) throws Exception {
+                TenantIdentifierWithStorage tenantIdentifierWithStorage = tenantIdentifier.withStorage(StorageLayer.getStorage(tenantIdentifier, main));
+                EmailPassword.signIn(tenantIdentifierWithStorage, main, TestCase.users.get(userIndex).loginMethods[0].email, "password");
+            }
+    }
 }