fix: isolation level and primary user reservation

build.gradle

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

pluginInterfaceSupported.json

@@ -1,6 +1,6 @@
 {
   "_comment": "contains a list of plugin interfaces branch names that this core supports",
   "versions": [
-    "8.3"
+    "8.4"
   ]
 }

src/main/java/io/supertokens/storage/postgresql/LockFailure.java

@@ -0,0 +1,27 @@
+/*
+ *    Copyright (c) 2020, VRAI Labs and/or its affiliates. All rights reserved.
+ *
+ *    This software is licensed under the Apache License, Version 2.0 (the
+ *    "License") as published by the Apache Software Foundation.
+ *
+ *    You may not use this file except in compliance with the License. You may
+ *    obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *    License for the specific language governing permissions and limitations
+ *    under the License.
+ */
+
+package io.supertokens.storage.postgresql;
+
+public class LockFailure extends Exception {
+    public LockFailure() {
+        super("Failed to acquire advisory lock");
+    }
+
+    public LockFailure(String message) {
+        super(message);
+    }
+}

src/main/java/io/supertokens/storage/postgresql/config/PostgreSQLConfig.java

@@ -506,6 +506,17 @@ public String getBulkImportUsersTable() {
         return addSchemaAndPrefixToTableName("bulk_import_users");
     }
 
+    public String getRecipeUserAccountInfosTable() {
+        return addSchemaAndPrefixToTableName("recipe_user_account_infos");
+    }
+
+    public String getRecipeUserTenantsTable() {
+        return addSchemaAndPrefixToTableName("recipe_user_tenants");
+    }
+
+    public String getPrimaryUserTenantsTable() {
+        return addSchemaAndPrefixToTableName("primary_user_tenants");
+    }
 
     private String addSchemaAndPrefixToTableName(String tableName) {
         return addSchemaToTableName(postgresql_table_names_prefix + tableName);

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

@@ -16,31 +16,39 @@
 
 package io.supertokens.storage.postgresql.queries;
 
+import static java.lang.System.currentTimeMillis;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import static io.supertokens.pluginInterface.RECIPE_ID.EMAIL_PASSWORD;
 import io.supertokens.pluginInterface.RowMapper;
+import io.supertokens.pluginInterface.authRecipe.ACCOUNT_INFO_TYPE;
 import io.supertokens.pluginInterface.authRecipe.AuthRecipeUserInfo;
 import io.supertokens.pluginInterface.authRecipe.LoginMethod;
+import io.supertokens.pluginInterface.authRecipe.exceptions.UnknownUserIdException;
 import io.supertokens.pluginInterface.emailpassword.EmailPasswordImportUser;
 import io.supertokens.pluginInterface.emailpassword.PasswordResetTokenInfo;
-import io.supertokens.pluginInterface.emailpassword.exceptions.UnknownUserIdException;
 import io.supertokens.pluginInterface.exceptions.StorageQueryException;
 import io.supertokens.pluginInterface.exceptions.StorageTransactionLogicException;
 import io.supertokens.pluginInterface.multitenancy.AppIdentifier;
 import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
 import io.supertokens.storage.postgresql.PreparedStatementValueSetter;
+import static io.supertokens.storage.postgresql.QueryExecutorTemplate.execute;
+import static io.supertokens.storage.postgresql.QueryExecutorTemplate.executeBatch;
+import static io.supertokens.storage.postgresql.QueryExecutorTemplate.update;
 import io.supertokens.storage.postgresql.Start;
 import io.supertokens.storage.postgresql.config.Config;
-import io.supertokens.storage.postgresql.utils.Utils;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static io.supertokens.pluginInterface.RECIPE_ID.EMAIL_PASSWORD;
-import static io.supertokens.storage.postgresql.QueryExecutorTemplate.*;
 import static io.supertokens.storage.postgresql.config.Config.getConfig;
-import static java.lang.System.currentTimeMillis;
+import io.supertokens.storage.postgresql.utils.Utils;
 
 public class EmailPasswordQueries {
     static String getQueryToCreateUsersTable(Start start) {
@@ -309,6 +317,11 @@ public static AuthRecipeUserInfo signUp(Start start, TenantIdentifier tenantIden
                     });
                 }
 
+                { // recipe_user_tenants
+                    AccountInfoQueries.addRecipeUserAccountInfo_Transaction(start, sqlCon, tenantIdentifier, userId,
+                            EMAIL_PASSWORD.toString(), ACCOUNT_INFO_TYPE.EMAIL, "", "", email);
+                }
+
                 { // emailpassword_users
                     String QUERY = "INSERT INTO " + getConfig(start).getEmailPasswordUsersTable()
                             + "(app_id, user_id, email, password_hash, time_joined)" + " VALUES(?, ?, ?, ?, ?)";
@@ -345,16 +358,16 @@ public static AuthRecipeUserInfo signUp(Start start, TenantIdentifier tenantIden
         });
     }
 
-    public static void signUpMultipleForBulkImport_Transaction(Start start, Connection sqlCon, List<EmailPasswordImportUser> usersToSignUp)
+    public static void importUsers_Transaction(Start start, Connection sqlCon, List<EmailPasswordImportUser> usersToSignUp)
             throws StorageQueryException, StorageTransactionLogicException {
         try {
             String app_id_to_user_id_QUERY = "INSERT INTO " + getConfig(start).getAppIdToUserIdTable()
-                    + "(app_id, user_id, primary_or_recipe_user_id, recipe_id)" + " VALUES(?, ?, ?, ?)";
+                    + "(app_id, user_id, primary_or_recipe_user_id, is_linked_or_is_a_primary_user, recipe_id)" + " VALUES(?, ?, ?, ?, ?)";
 
             String all_auth_recipe_users_QUERY = "INSERT INTO " + getConfig(start).getUsersTable() +
-                    "(app_id, tenant_id, user_id, primary_or_recipe_user_id, recipe_id, time_joined, " +
+                    "(app_id, tenant_id, user_id, primary_or_recipe_user_id, is_linked_or_is_a_primary_user, recipe_id, time_joined, " +
                     "primary_or_recipe_user_time_joined)" +
-                    " VALUES(?, ?, ?, ?, ?, ?, ?)";
+                    " VALUES(?, ?, ?, ?, ?, ?, ?, ?)";
 
             String emailpassword_users_QUERY = "INSERT INTO " + getConfig(start).getEmailPasswordUsersTable()
                     + "(app_id, user_id, email, password_hash, time_joined)" + " VALUES(?, ?, ?, ?, ?)";
@@ -363,48 +376,68 @@ public static void signUpMultipleForBulkImport_Transaction(Start start, Connecti
                     "INSERT INTO " + getConfig(start).getEmailPasswordUserToTenantTable()
                             + "(app_id, tenant_id, user_id, email)" + " VALUES(?, ?, ?, ?)";
 
+            List<PreparedStatementValueSetter> recipeUserAccountInfoBatch = new ArrayList<>();
+            List<PreparedStatementValueSetter> recipeUserTenantsBatch = new ArrayList<>();
+
             List<PreparedStatementValueSetter> appIdToUserIdSetters = new ArrayList<>();
             List<PreparedStatementValueSetter> allAuthRecipeUsersSetters = new ArrayList<>();
             List<PreparedStatementValueSetter> emailPasswordUsersSetters = new ArrayList<>();
             List<PreparedStatementValueSetter> emailPasswordUsersToTenantSetters = new ArrayList<>();
 
             for (EmailPasswordImportUser user : usersToSignUp) {
                 String userId = user.userId;
-                TenantIdentifier tenantIdentifier = user.tenantIdentifier;
+                String appId = user.appIdentifier.getAppId();
+                String primaryOrRecipeUserId = user.primaryUserId != null ? user.primaryUserId : user.userId;
+                boolean isLinkedOrIsPrimaryUser = user.primaryUserId != null;
+
+                // Recipe Account Info
+                AccountInfoQueries.addRecipeUserAccountInfoToBatch(recipeUserAccountInfoBatch, user.appIdentifier, user.userId, EMAIL_PASSWORD.toString(), ACCOUNT_INFO_TYPE.EMAIL, "", "", user.email, isLinkedOrIsPrimaryUser ? primaryOrRecipeUserId : null);
+
+                // Recipe User Tenants
+                AccountInfoQueries.addRecipeUserTenantsToBatch(recipeUserTenantsBatch, user.appIdentifier, user.userId, EMAIL_PASSWORD.toString(), ACCOUNT_INFO_TYPE.EMAIL, "", "", user.email, user.recipeUserTenantIds);
+
 
                 appIdToUserIdSetters.add(pst -> {
-                    pst.setString(1, tenantIdentifier.getAppId());
+                    pst.setString(1, appId);
                     pst.setString(2, userId);
-                    pst.setString(3, userId);
-                    pst.setString(4, EMAIL_PASSWORD.toString());
-                });
-
-                allAuthRecipeUsersSetters.add(pst -> {
-                    pst.setString(1, tenantIdentifier.getAppId());
-                    pst.setString(2, tenantIdentifier.getTenantId());
-                    pst.setString(3, userId);
-                    pst.setString(4, userId);
+                    pst.setString(3, primaryOrRecipeUserId);
+                    pst.setBoolean(4, isLinkedOrIsPrimaryUser);
                     pst.setString(5, EMAIL_PASSWORD.toString());
-                    pst.setLong(6, user.timeJoinedMSSinceEpoch);
-                    pst.setLong(7, user.timeJoinedMSSinceEpoch);
                 });
 
                 emailPasswordUsersSetters.add(pst -> {
-                    pst.setString(1, tenantIdentifier.getAppId());
+                    pst.setString(1, appId);
                     pst.setString(2, userId);
                     pst.setString(3, user.email);
                     pst.setString(4, user.passwordHash);
                     pst.setLong(5, user.timeJoinedMSSinceEpoch);
                 });
 
-                emailPasswordUsersToTenantSetters.add(pst -> {
-                    pst.setString(1, tenantIdentifier.getAppId());
-                    pst.setString(2, tenantIdentifier.getTenantId());
-                    pst.setString(3, userId);
-                    pst.setString(4, user.email);
-                });
+                // Generate entries for all recipe user tenant IDs
+                for (String tenantId : user.recipeUserTenantIds) {
+                    allAuthRecipeUsersSetters.add(pst -> {
+                        pst.setString(1, appId);
+                        pst.setString(2, tenantId);
+                        pst.setString(3, userId);
+                        pst.setString(4, primaryOrRecipeUserId);
+                        pst.setBoolean(5, isLinkedOrIsPrimaryUser);
+                        pst.setString(6, EMAIL_PASSWORD.toString());
+                        pst.setLong(7, user.timeJoinedMSSinceEpoch);
+                        pst.setLong(8, user.timeJoinedMSSinceEpoch);
+                    });
+
+                    emailPasswordUsersToTenantSetters.add(pst -> {
+                        pst.setString(1, appId);
+                        pst.setString(2, tenantId);
+                        pst.setString(3, userId);
+                        pst.setString(4, user.email);
+                    });
+                }
             }
 
+            executeBatch(sqlCon, AccountInfoQueries.getRecipeUserAccountInfoBatchQuery(start), recipeUserAccountInfoBatch);
+            executeBatch(sqlCon, AccountInfoQueries.getRecipeUserTenantBatchQuery(start), recipeUserTenantsBatch);
+
             executeBatch(sqlCon, app_id_to_user_id_QUERY, appIdToUserIdSetters);
             executeBatch(sqlCon, all_auth_recipe_users_QUERY, allAuthRecipeUsersSetters);
             executeBatch(sqlCon, emailpassword_users_QUERY, emailPasswordUsersSetters);