Merge branch '5.0' into feat/mfa

supertokens · Nov 6, 2023 · aba26d2 · aba26d2
2 parents a8f9f79 + 9a0141a
commit aba26d2
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,15 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [5.0.2] - 2023-11-01
+
+- Fixes `verified` in `loginMethods` for users with userId mapping
+
+## [5.0.1] - 2023-10-12
+
+- Fixes user info from primary user id query
+- Fixes `deviceIdHash` issue
+
 ## [5.0.0] - 2023-09-19
 
 ### Changes

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "5.0.0"
+version = "5.0.2"
 
 repositories {
     mavenCentral()

diff --git a/jar/mysql-plugin-5.0.0.jar → jar/mysql-plugin-5.0.2.jar b/jar/mysql-plugin-5.0.0.jar → jar/mysql-plugin-5.0.2.jar
diff --git a/src/main/java/io/supertokens/storage/mysql/queries/EmailVerificationQueries.java b/src/main/java/io/supertokens/storage/mysql/queries/EmailVerificationQueries.java
@@ -238,26 +238,50 @@ public static List<String> isEmailVerified_transaction(Start start, Connection s
             return new ArrayList<>();
         }
         List<String> emails = new ArrayList<>();
-        List<String> userIds = new ArrayList<>();
-        Map<String, String> userIdToEmailMap = new HashMap<>();
+        List<String> supertokensUserIds = new ArrayList<>();
         for (UserIdAndEmail ue : userIdAndEmail) {
             emails.add(ue.email);
-            userIds.add(ue.userId);
+            supertokensUserIds.add(ue.userId);
         }
+
+        // We have external user id stored in the email verification table, so we need to fetch the mapped userids for
+        // calculating the verified emails
+
+        HashMap<String, String> supertokensUserIdToExternalUserIdMap = UserIdMappingQueries.getUserIdMappingWithUserIds_Transaction(start,
+                sqlCon, supertokensUserIds);
+        HashMap<String, String> externalUserIdToSupertokensUserIdMap = new HashMap<>();
+
+        List<String> supertokensOrExternalUserIdsToQuery = new ArrayList<>();
+        for (String userId : supertokensUserIds) {
+            if (supertokensUserIdToExternalUserIdMap.containsKey(userId)) {
+                supertokensOrExternalUserIdsToQuery.add(supertokensUserIdToExternalUserIdMap.get(userId));
+                externalUserIdToSupertokensUserIdMap.put(supertokensUserIdToExternalUserIdMap.get(userId), userId);
+            } else {
+                supertokensOrExternalUserIdsToQuery.add(userId);
+                externalUserIdToSupertokensUserIdMap.put(userId, userId);
+            }
+        }
+
+        Map<String, String> supertokensOrExternalUserIdToEmailMap = new HashMap<>();
         for (UserIdAndEmail ue : userIdAndEmail) {
-            if (userIdToEmailMap.containsKey(ue.userId)) {
+            String supertokensOrExternalUserId = ue.userId;
+            if (supertokensUserIdToExternalUserIdMap.containsKey(supertokensOrExternalUserId)) {
+                supertokensOrExternalUserId = supertokensUserIdToExternalUserIdMap.get(supertokensOrExternalUserId);
+            }
+            if (supertokensOrExternalUserIdToEmailMap.containsKey(supertokensOrExternalUserId)) {
                 throw new RuntimeException("Found a bug!");
             }
-            userIdToEmailMap.put(ue.userId, ue.email);
+            supertokensOrExternalUserIdToEmailMap.put(supertokensOrExternalUserId, ue.email);
         }
+
         String QUERY = "SELECT * FROM " + getConfig(start).getEmailVerificationTable()
-                + " WHERE app_id = ? AND user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
+                + " WHERE app_id = ? AND user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(supertokensOrExternalUserIdsToQuery.size()) +
                 ") AND email IN (" + Utils.generateCommaSeperatedQuestionMarks(emails.size()) + ")";
 
         return execute(sqlCon, QUERY, pst -> {
             pst.setString(1, appIdentifier.getAppId());
             int index = 2;
-            for (String userId : userIds) {
+            for (String userId : supertokensOrExternalUserIdsToQuery) {
                 pst.setString(index++, userId);
             }
             for (String email : emails) {
@@ -266,10 +290,10 @@ public static List<String> isEmailVerified_transaction(Start start, Connection s
         }, result -> {
             List<String> res = new ArrayList<>();
             while (result.next()) {
-                String userId = result.getString("user_id");
+                String supertokensOrExternalUserId = result.getString("user_id");
                 String email = result.getString("email");
-                if (Objects.equals(userIdToEmailMap.get(userId), email)) {
-                    res.add(userId);
+                if (Objects.equals(supertokensOrExternalUserIdToEmailMap.get(supertokensOrExternalUserId), email)) {
+                    res.add(externalUserIdToSupertokensUserIdMap.get(supertokensOrExternalUserId));
                 }
             }
             return res;
@@ -283,26 +307,46 @@ public static List<String> isEmailVerified(Start start, AppIdentifier appIdentif
             return new ArrayList<>();
         }
         List<String> emails = new ArrayList<>();
-        List<String> userIds = new ArrayList<>();
-        Map<String, String> userIdToEmailMap = new HashMap<>();
+        List<String> supertokensUserIds = new ArrayList<>();
+
         for (UserIdAndEmail ue : userIdAndEmail) {
             emails.add(ue.email);
-            userIds.add(ue.userId);
+            supertokensUserIds.add(ue.userId);
+        }
+        // We have external user id stored in the email verification table, so we need to fetch the mapped userids for
+        // calculating the verified emails
+        HashMap<String, String> supertokensUserIdToExternalUserIdMap = UserIdMappingQueries.getUserIdMappingWithUserIds(start,
+                supertokensUserIds);
+        HashMap<String, String> externalUserIdToSupertokensUserIdMap = new HashMap<>();
+        List<String> supertokensOrExternalUserIdsToQuery = new ArrayList<>();
+        for (String userId : supertokensUserIds) {
+            if (supertokensUserIdToExternalUserIdMap.containsKey(userId)) {
+                supertokensOrExternalUserIdsToQuery.add(supertokensUserIdToExternalUserIdMap.get(userId));
+                externalUserIdToSupertokensUserIdMap.put(supertokensUserIdToExternalUserIdMap.get(userId), userId);
+            } else {
+                supertokensOrExternalUserIdsToQuery.add(userId);
+                externalUserIdToSupertokensUserIdMap.put(userId, userId);
+            }
         }
+
+        Map<String, String> supertokensOrExternalUserIdToEmailMap = new HashMap<>();
         for (UserIdAndEmail ue : userIdAndEmail) {
-            if (userIdToEmailMap.containsKey(ue.userId)) {
+            String supertokensOrExternalUserId = ue.userId;
+            if (supertokensUserIdToExternalUserIdMap.containsKey(supertokensOrExternalUserId)) {
+                supertokensOrExternalUserId = supertokensUserIdToExternalUserIdMap.get(supertokensOrExternalUserId);
+            }
+            if (supertokensOrExternalUserIdToEmailMap.containsKey(supertokensOrExternalUserId)) {
                 throw new RuntimeException("Found a bug!");
             }
-            userIdToEmailMap.put(ue.userId, ue.email);
+            supertokensOrExternalUserIdToEmailMap.put(supertokensOrExternalUserId, ue.email);
         }
         String QUERY = "SELECT * FROM " + getConfig(start).getEmailVerificationTable()
-                + " WHERE app_id = ? AND user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
+                + " WHERE app_id = ? AND user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(supertokensOrExternalUserIdsToQuery.size()) +
                 ") AND email IN (" + Utils.generateCommaSeperatedQuestionMarks(emails.size()) + ")";
-
         return execute(start, QUERY, pst -> {
             pst.setString(1, appIdentifier.getAppId());
             int index = 2;
-            for (String userId : userIds) {
+            for (String userId : supertokensOrExternalUserIdsToQuery) {
                 pst.setString(index++, userId);
             }
             for (String email : emails) {
@@ -311,10 +355,10 @@ public static List<String> isEmailVerified(Start start, AppIdentifier appIdentif
         }, result -> {
             List<String> res = new ArrayList<>();
             while (result.next()) {
-                String userId = result.getString("user_id");
+                String supertokensOrExternalUserId = result.getString("user_id");
                 String email = result.getString("email");
-                if (Objects.equals(userIdToEmailMap.get(userId), email)) {
-                    res.add(userId);
+                if (Objects.equals(supertokensOrExternalUserIdToEmailMap.get(supertokensOrExternalUserId), email)) {
+                    res.add(externalUserIdToSupertokensUserIdMap.get(supertokensOrExternalUserId));
                 }
             }
             return res;

diff --git a/src/main/java/io/supertokens/storage/mysql/queries/GeneralQueries.java b/src/main/java/io/supertokens/storage/mysql/queries/GeneralQueries.java
@@ -1198,7 +1198,7 @@ private static List<AuthRecipeUserInfo> getPrimaryUserInfoForUserIds(Start start
                 " WHERE au.primary_or_recipe_user_id IN (SELECT primary_or_recipe_user_id FROM " +
                 Config.getConfig(start).getAppIdToUserIdTable() + " WHERE (user_id IN ("
                 + Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
-                ") OR au.primary_or_recipe_user_id IN (" +
+                ") OR primary_or_recipe_user_id IN (" +
                 Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
                 ")) AND app_id = ?) AND au.app_id = ?";
 
@@ -1290,7 +1290,7 @@ private static List<AuthRecipeUserInfo> getPrimaryUserInfoForUserIds_Transaction
                 " WHERE au.primary_or_recipe_user_id IN (SELECT primary_or_recipe_user_id FROM " +
                 Config.getConfig(start).getAppIdToUserIdTable() + " WHERE (user_id IN ("
                 + Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
-                ") OR au.primary_or_recipe_user_id IN (" +
+                ") OR primary_or_recipe_user_id IN (" +
                 Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
                 ")) AND app_id = ?) AND au.app_id = ?";
 

diff --git a/src/main/java/io/supertokens/storage/mysql/queries/PasswordlessQueries.java b/src/main/java/io/supertokens/storage/mysql/queries/PasswordlessQueries.java
@@ -1115,7 +1115,7 @@ private static PasswordlessDeviceRowMapper getInstance() {
 
         @Override
         public PasswordlessDevice map(ResultSet result) throws Exception {
-            return new PasswordlessDevice(result.getString("device_id_hash"), result.getString("email"),
+            return new PasswordlessDevice(result.getString("device_id_hash").trim(), result.getString("email"),
                     result.getString("phone_number"), result.getString("link_code_salt"),
                     result.getInt("failed_attempts"));
         }
@@ -1133,7 +1133,7 @@ private static PasswordlessCodeRowMapper getInstance() {
 
         @Override
         public PasswordlessCode map(ResultSet result) throws Exception {
-            return new PasswordlessCode(result.getString("code_id"), result.getString("device_id_hash"),
+            return new PasswordlessCode(result.getString("code_id"), result.getString("device_id_hash").trim(),
                     result.getString("link_code_hash"), result.getLong("created_at"));
         }
     }

diff --git a/src/main/java/io/supertokens/storage/mysql/queries/UserIdMappingQueries.java b/src/main/java/io/supertokens/storage/mysql/queries/UserIdMappingQueries.java
@@ -29,6 +29,7 @@
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 import static io.supertokens.storage.mysql.QueryExecutorTemplate.execute;
 import static io.supertokens.storage.mysql.QueryExecutorTemplate.update;
@@ -116,7 +117,7 @@ public static UserIdMapping[] getUserIdMappingWithEitherSuperTokensUserIdOrExter
 
     }
 
-    public static HashMap<String, String> getUserIdMappingWithUserIds(Start start, ArrayList<String> userIds)
+    public static HashMap<String, String> getUserIdMappingWithUserIds(Start start, List<String> userIds)
             throws SQLException, StorageQueryException {
 
         if (userIds.size() == 0) {
@@ -149,6 +150,39 @@ public static HashMap<String, String> getUserIdMappingWithUserIds(Start start, A
         });
     }
 
+    public static HashMap<String, String> getUserIdMappingWithUserIds_Transaction(Start start, Connection sqlCon, List<String> userIds)
+            throws SQLException, StorageQueryException {
+
+        if (userIds.size() == 0) {
+            return new HashMap<>();
+        }
+
+        // No need to filter based on tenantId because the id list is already filtered for a tenant
+        StringBuilder QUERY = new StringBuilder(
+                "SELECT * FROM " + Config.getConfig(start).getUserIdMappingTable() + " WHERE supertokens_user_id IN (");
+        for (int i = 0; i < userIds.size(); i++) {
+            QUERY.append("?");
+            if (i != userIds.size() - 1) {
+                // not the last element
+                QUERY.append(",");
+            }
+        }
+        QUERY.append(")");
+        return execute(sqlCon, QUERY.toString(), pst -> {
+            for (int i = 0; i < userIds.size(); i++) {
+                // i+1 cause this starts with 1 and not 0
+                pst.setString(i + 1, userIds.get(i));
+            }
+        }, result -> {
+            HashMap<String, String> userIdMappings = new HashMap<>();
+            while (result.next()) {
+                UserIdMapping temp = UserIdMappingRowMapper.getInstance().mapOrThrow(result);
+                userIdMappings.put(temp.superTokensUserId, temp.externalUserId);
+            }
+            return userIdMappings;
+        });
+    }
+
     public static boolean deleteUserIdMappingWithSuperTokensUserId(Start start, AppIdentifier appIdentifier, String userId)
             throws SQLException, StorageQueryException {
         String QUERY = "DELETE FROM " + Config.getConfig(start).getUserIdMappingTable()