Merge branch '8.1' into fix/test-speed

Author: Sattvik

CHANGELOG.md

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [8.1.1]
+
+- Adds more null and empty checks for bulk migration
+
 ## [8.1.0]
 
 - Adds support for webauthn (passkeys)

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "8.1.0"
+version = "8.1.1"
 
 repositories {
     mavenCentral()

jar/postgresql-plugin-8.1.0.jar jar/postgresql-plugin-8.1.1.jarjar/postgresql-plugin-8.1.0.jar renamed to jar/postgresql-plugin-8.1.1.jar

@@ -76,6 +76,9 @@ public static String getQueryToCreatePaginationIndex2(Start start) {
 
     public static void insertBulkImportUsers_Transaction(Start start, Connection connection, AppIdentifier appIdentifier, List<BulkImportUser> users)
             throws SQLException, StorageQueryException {
+        if(users == null || users.isEmpty()){
+            return;
+        }
         String queryBuilder = "INSERT INTO " + Config.getConfig(start).getBulkImportUsersTable() +
                 " (id, app_id, raw_data, created_at, updated_at) VALUES "
                 + " (?, ?, ?, ?, ?)";
@@ -118,6 +121,9 @@ public static void updateBulkImportUserStatus_Transaction(Start start, Connectio
     public static void updateMultipleBulkImportUsersStatusToError_Transaction(Start start, Connection con, AppIdentifier appIdentifier,
                                                                               @Nonnull Map<String,String> bulkImportUserIdToErrorMessage)
             throws SQLException, StorageQueryException {
+        if(bulkImportUserIdToErrorMessage == null || bulkImportUserIdToErrorMessage.isEmpty()){
+            return;
+        }
         BULK_IMPORT_USER_STATUS errorStatus = BULK_IMPORT_USER_STATUS.FAILED;
         String query = "UPDATE " + Config.getConfig(start).getBulkImportUsersTable()
                 + " SET status = ?, error_msg = ?, updated_at = ? WHERE app_id = ? and id = ?";

src/main/java/io/supertokens/storage/postgresql/queries/BulkImportQueries.java

@@ -1587,6 +1587,9 @@ public static AuthRecipeUserInfo[] listPrimaryUsersByMultipleEmailsOrPhonesOrThi
         //collect ids by thirdparty
         userIds.addAll(ThirdPartyQueries.listUserIdsByMultipleThirdPartyInfo_Transaction(start, sqlCon, appIdentifier, thirdpartyUserIdToThirdpartyId));
 
+        //collect ids by webauthn
+        userIds.addAll(WebAuthNQueries.getPrimaryUserIdsUsingEmails_Transaction(start, sqlCon, appIdentifier, emails));
+
         List<AuthRecipeUserInfo> result = getPrimaryUserInfoForUserIds_Transaction(start, sqlCon, appIdentifier,
                 new ArrayList<>(userIds));
 

src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java

@@ -427,6 +427,33 @@ public static String getPrimaryUserIdUsingEmail_Transaction(Start start, Connect
         });
     }
 
+    public static List<String> getPrimaryUserIdsUsingEmails_Transaction(Start start, Connection sqlConnection,
+                                                                        AppIdentifier appIdentifier, List<String> emails)
+            throws SQLException, StorageQueryException {
+        if(emails == null || emails.isEmpty()) {
+            return new ArrayList<>();
+        }
+        String QUERY = "SELECT DISTINCT all_users.primary_or_recipe_user_id AS user_id "
+                + "FROM " + getConfig(start).getWebAuthNUserToTenantTable() + " AS ep" +
+                " JOIN " + getConfig(start).getUsersTable() + " AS all_users" +
+                " ON ep.app_id = all_users.app_id AND ep.user_id = all_users.user_id" +
+                " WHERE ep.app_id = ? AND ep.email in (" + Utils.generateCommaSeperatedQuestionMarks(emails.size()) + ")";
+
+        return execute(sqlConnection, QUERY, pst -> {
+            pst.setString(1, appIdentifier.getAppId());
+            int i = 2;
+            for(String email : emails) {
+                pst.setString(i++, email);
+            }
+        }, result -> {
+            List<String> idResult = new ArrayList<>();
+            if (result.next()) {
+                idResult.add(result.getString("user_id"));
+            }
+            return idResult;
+        });
+    }
+
     public static Collection<? extends LoginMethod> getUsersInfoUsingIdList(Start start, Set<String> ids, AppIdentifier appIdentifier)
             throws StorageQueryException {
         try {