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/GeneralQueries.java

@@ -724,6 +724,32 @@ public static void createTablesIfNotExists(Start start, Connection con) throws S
                     update(con, SAMLQueries.getQueryToCreateSAMLClaimsExpiresAtIndex(start), NO_OP_SETTER);
                 }
 
+                if (!doesTableExists(start, con, Config.getConfig(start).getRecipeUserAccountInfosTable())) {
+                    getInstance(start).addState(CREATING_NEW_TABLE, null);
+                    update(con, AccountInfoQueries.getQueryToCreateRecipeUserAccountInfosTable(start), NO_OP_SETTER);
+
+                    // indexes
+                    // TODO
+                }
+
+                if (!doesTableExists(start, con, Config.getConfig(start).getRecipeUserTenantsTable())) {
+                    getInstance(start).addState(CREATING_NEW_TABLE, null);
+                    update(con, AccountInfoQueries.getQueryToCreateRecipeUserTenantsTable(start), NO_OP_SETTER);
+
+                    // indexes
+                    update(con, AccountInfoQueries.getQueryToCreateTenantIndexForRecipeUserTenantsTable(start), NO_OP_SETTER);
+                    update(con, AccountInfoQueries.getQueryToCreateRecipeUserIdIndexForRecipeUserTenantsTable(start), NO_OP_SETTER);
+                    update(con, AccountInfoQueries.getQueryToCreateAccountInfoIndexForRecipeUserTenantsTable(start), NO_OP_SETTER);
+                }
+
+                if (!doesTableExists(start, con, Config.getConfig(start).getPrimaryUserTenantsTable())) {
+                    getInstance(start).addState(CREATING_NEW_TABLE, null);
+                    update(con, AccountInfoQueries.getQueryToCreatePrimaryUserTenantsTable(start), NO_OP_SETTER);
+
+                    // indexes
+                    update(con, AccountInfoQueries.getQueryToCreatePrimaryUserIndexForPrimaryUserTenantsTable(start), NO_OP_SETTER);
+                }
+
             } catch (Exception e) {
                 if (e.getMessage().contains("schema") && e.getMessage().contains("does not exist")
                         && numberOfRetries < 1) {
@@ -779,7 +805,10 @@ public static void deleteAllTables(Start start) throws SQLException, StorageQuer
                     + getConfig(start).getKeyValueTable() + ","
                     + getConfig(start).getAppIdToUserIdTable() + ","
                     + getConfig(start).getUserIdMappingTable() + ","
+                    + getConfig(start).getRecipeUserTenantsTable() + ","
+                    + getConfig(start).getRecipeUserAccountInfosTable() + ","
                     + getConfig(start).getUsersTable() + ","
+                    + getConfig(start).getPrimaryUserTenantsTable() + ","
                     + getConfig(start).getAccessTokenSigningKeysTable() + ","
                     + getConfig(start).getTenantFirstFactorsTable() + ","
                     + getConfig(start).getTenantRequiredSecondaryFactorsTable() + ","
@@ -875,8 +904,12 @@ public static KeyValueInfo getKeyValue(Start start, TenantIdentifier tenantIdent
     public static KeyValueInfo getKeyValue_Transaction(Start start, Connection con, TenantIdentifier tenantIdentifier,
                                                        String key)
             throws SQLException, StorageQueryException {
+
+        io.supertokens.storage.postgresql.queries.Utils.takeAdvisoryLock(
+                con, tenantIdentifier.getAppId() + "~" + tenantIdentifier.getTenantId() + "~" + key);
+
         String QUERY = "SELECT value, created_at_time FROM " + getConfig(start).getKeyValueTable()
-                + " WHERE app_id = ? AND tenant_id = ? AND name = ? FOR UPDATE";
+                + " WHERE app_id = ? AND tenant_id = ? AND name = ?";
 
         return execute(con, QUERY, pst -> {
             pst.setString(1, tenantIdentifier.getAppId());
@@ -1398,27 +1431,33 @@ public static void linkAccounts_Transaction(Start start, Connection sqlCon, AppI
             throws SQLException, StorageQueryException {
         {
             String QUERY = "UPDATE " + getConfig(start).getUsersTable() +
-                    " SET is_linked_or_is_a_primary_user = true, primary_or_recipe_user_id = ? WHERE app_id = ? AND " +
-                    "user_id = ?";
+                    " SET is_linked_or_is_a_primary_user = true, primary_or_recipe_user_id = (" +
+                    "   SELECT primary_user_id FROM " + getConfig(start).getRecipeUserAccountInfosTable() +
+                    "   WHERE app_id = ? AND recipe_user_id = ? LIMIT 1" +
+                    ") WHERE app_id = ? AND user_id = ?";
 
             update(sqlCon, QUERY, pst -> {
-                pst.setString(1, primaryUserId);
-                pst.setString(2, appIdentifier.getAppId());
-                pst.setString(3, recipeUserId);
+                pst.setString(1, appIdentifier.getAppId());
+                pst.setString(2, primaryUserId);
+                pst.setString(3, appIdentifier.getAppId());
+                pst.setString(4, recipeUserId);
             });
         }
 
         updateTimeJoinedForPrimaryUser_Transaction(start, sqlCon, appIdentifier, primaryUserId);
 
         {
             String QUERY = "UPDATE " + getConfig(start).getAppIdToUserIdTable() +
-                    " SET is_linked_or_is_a_primary_user = true, primary_or_recipe_user_id = ? WHERE app_id = ? AND " +
-                    "user_id = ?";
+                    " SET is_linked_or_is_a_primary_user = true, primary_or_recipe_user_id = (" +
+                    "   SELECT primary_user_id FROM " + getConfig(start).getRecipeUserAccountInfosTable() +
+                    "   WHERE app_id = ? AND recipe_user_id = ? LIMIT 1" +
+                    ") WHERE app_id = ? AND user_id = ?";
 
             update(sqlCon, QUERY, pst -> {
-                pst.setString(1, primaryUserId);
-                pst.setString(2, appIdentifier.getAppId());
-                pst.setString(3, recipeUserId);
+                pst.setString(1, appIdentifier.getAppId());
+                pst.setString(2, primaryUserId);
+                pst.setString(3, appIdentifier.getAppId());
+                pst.setString(4, recipeUserId);
             });
         }
     }
@@ -1515,29 +1554,6 @@ public static void unlinkAccounts_Transaction(Start start, Connection sqlCon, Ap
         }
     }
 
-    public static AuthRecipeUserInfo[] listPrimaryUsersByPhoneNumber_Transaction(Start start, Connection sqlCon,
-                                                                                 AppIdentifier appIdentifier,
-                                                                                 String phoneNumber)
-            throws SQLException, StorageQueryException {
-        // we first lock on the table based on phoneNumber and tenant - this will ensure that any other
-        // query happening related to the account linking on this phone number / tenant will wait for this to finish,
-        // and vice versa.
-
-        PasswordlessQueries.lockPhoneAndTenant_Transaction(start, sqlCon, appIdentifier, phoneNumber);
-
-        // now that we have locks on all the relevant tables, we can read from them safely
-        List<String> userIds = PasswordlessQueries.listUserIdsByPhoneNumber_Transaction(start, sqlCon, appIdentifier,
-                phoneNumber);
-
-        List<AuthRecipeUserInfo> result = getPrimaryUserInfoForUserIds_Transaction(start, sqlCon, appIdentifier,
-                userIds);
-
-        // this is going to order them based on oldest that joined to newest that joined.
-        result.sort(Comparator.comparingLong(o -> o.timeJoined));
-
-        return result.toArray(new AuthRecipeUserInfo[0]);
-    }
-
     public static AuthRecipeUserInfo[] listPrimaryUsersByThirdPartyInfo(Start start,
                                                                         AppIdentifier appIdentifier,
                                                                         String thirdPartyId,
@@ -1578,78 +1594,6 @@ public static AuthRecipeUserInfo[] listPrimaryUsersByThirdPartyInfo_Transaction(
         return result.toArray(new AuthRecipeUserInfo[0]);
     }
 
-    public static AuthRecipeUserInfo[] listPrimaryUsersByEmail_Transaction(Start start, Connection sqlCon,
-                                                                           AppIdentifier appIdentifier,
-                                                                           String email)
-            throws SQLException, StorageQueryException {
-        // we first lock on the three tables based on email and tenant - this will ensure that any other
-        // query happening related to the account linking on this email / tenant will wait for this to finish,
-        // and vice versa.
-
-        EmailPasswordQueries.lockEmail_Transaction(start, sqlCon, appIdentifier, email);
-
-        ThirdPartyQueries.lockEmail_Transaction(start, sqlCon, appIdentifier, email);
-
-        PasswordlessQueries.lockEmail_Transaction(start, sqlCon, appIdentifier, email);
-
-        // now that we have locks on all the relevant tables, we can read from them safely
-        List<String> userIds = new ArrayList<>();
-        userIds.addAll(EmailPasswordQueries.getPrimaryUserIdsUsingEmail_Transaction(start, sqlCon, appIdentifier,
-                email));
-
-        userIds.addAll(PasswordlessQueries.getPrimaryUserIdsUsingEmail_Transaction(start, sqlCon, appIdentifier,
-                email));
-
-        userIds.addAll(ThirdPartyQueries.getPrimaryUserIdUsingEmail_Transaction(start, sqlCon, appIdentifier, email));
-
-        String webauthnUserId = WebAuthNQueries.getPrimaryUserIdForAppUsingEmail_Transaction(start, sqlCon,
-                appIdentifier, email);
-        if(webauthnUserId != null) {
-            userIds.add(webauthnUserId);
-        }
-
-        // remove duplicates from userIds
-        Set<String> userIdsSet = new HashSet<>(userIds);
-        userIds = new ArrayList<>(userIdsSet);
-
-        List<AuthRecipeUserInfo> result = getPrimaryUserInfoForUserIds_Transaction(start, sqlCon, appIdentifier,
-                userIds);
-
-        // this is going to order them based on oldest that joined to newest that joined.
-        result.sort(Comparator.comparingLong(o -> o.timeJoined));
-
-        return result.toArray(new AuthRecipeUserInfo[0]);
-    }
-
-    public static AuthRecipeUserInfo[] listPrimaryUsersByMultipleEmailsOrPhonesOrThirdParty_Transaction(Start start, Connection sqlCon,
-                                                                                                        AppIdentifier appIdentifier,
-                                                                                                        List<String> emails, List<String> phones,
-                                                                                                        Map<String, String> thirdpartyUserIdToThirdpartyId)
-            throws SQLException, StorageQueryException {
-        Set<String> userIds = new HashSet<>();
-
-        //collect ids by email
-        userIds.addAll(EmailPasswordQueries.getPrimaryUserIdsUsingMultipleEmails_Transaction(start, sqlCon, appIdentifier,
-                emails));
-        userIds.addAll(PasswordlessQueries.getPrimaryUserIdsUsingMultipleEmails_Transaction(start, sqlCon, appIdentifier,
-                emails));
-        userIds.addAll(ThirdPartyQueries.getPrimaryUserIdsUsingMultipleEmails_Transaction(start, sqlCon, appIdentifier, emails));
-
-        //collect ids by phone
-        userIds.addAll(PasswordlessQueries.listUserIdsByMultiplePhoneNumber_Transaction(start, sqlCon, appIdentifier, phones));
-
-        //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));
-
-        return result.toArray(new AuthRecipeUserInfo[0]);
-    }
-
     public static AuthRecipeUserInfo[] listPrimaryUsersByEmail(Start start, TenantIdentifier tenantIdentifier,
                                                                String email)
             throws StorageQueryException, SQLException {
@@ -1781,17 +1725,6 @@ public static AuthRecipeUserInfo getPrimaryUserInfoForUserId_Transaction(Start s
         return result.get(0);
     }
 
-    public static List<AuthRecipeUserInfo> getPrimaryUserInfosForUserIds_Transaction(Start start, Connection con,
-                                                                             AppIdentifier appIdentifier, List<String> ids)
-            throws SQLException, StorageQueryException {
-
-        List<AuthRecipeUserInfo> result = getPrimaryUserInfoForUserIds_Transaction(start, con, appIdentifier, ids);
-        if (result.isEmpty()) {
-            return null;
-        }
-        return result;
-    }
-
     private static List<AuthRecipeUserInfo> getPrimaryUserInfoForUserIds(Start start,
                                                                          AppIdentifier appIdentifier,
                                                                          List<String> userIds)
@@ -1929,7 +1862,6 @@ private static List<AuthRecipeUserInfo> getPrimaryUserInfoForUserIds_Transaction
             // for app_id
             pst.setString(index, appIdentifier.getAppId());
             pst.setString(index+1, appIdentifier.getAppId());
-//            System.out.println(pst);
         }, result -> {
             List<AllAuthRecipeUsersResultHolder> parsedResult = new ArrayList<>();
             while (result.next()) {

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

@@ -243,6 +243,10 @@ public static void overwriteTenantConfig(Start start, TenantConfig tenantConfig)
             Connection sqlCon = (Connection) con.getConnection();
             {
                 try {
+                    {
+                        io.supertokens.storage.postgresql.queries.Utils.takeAdvisoryLock(
+                                sqlCon, tenantConfig.tenantIdentifier.getConnectionUriDomain() + "~" + tenantConfig.tenantIdentifier.getAppId() + "~" + tenantConfig.tenantIdentifier.getTenantId());
+                    }
                     {
                         String QUERY = "DELETE FROM " + getConfig(start).getTenantConfigsTable()
                                 + " WHERE connection_uri_domain = ? AND app_id = ? AND tenant_id = ?;";