Skip to content

fix: Isolation level and reservation table #1201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sattvikc wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: Isolation level and reservation table #1201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fa7b07
fix: tests
sattvikc Nov 27, 2025
04805a3
fix: concurrent test
sattvikc Nov 27, 2025
30e06e2
fix: can and create primary
sattvikc Dec 11, 2025
201a2ec
fix: link accounts
sattvikc Dec 12, 2025
6302155
fix: associate tenant
sattvikc Dec 12, 2025
504092e
fix: delete user and bug fixes
sattvikc Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions downloader/implementationDependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"_comment": "Contains list of implementation dependencies URL for this project. This is a generated file, don't modify the contents by hand.",
"list": [
]
}
25 changes: 25 additions & 0 deletions ee/implementationDependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
Copy link
Collaborator

@porcellus porcellus Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these being added now?

"_comment": "Contains list of implementation dependencies URL for this project. This is a generated file, don't modify the contents by hand.",
"list": [
{
"jar":"https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.13.1/gson-2.13.1.jar",
"name":"gson 2.13.1",
"src":"https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.13.1/gson-2.13.1-sources.jar"
},
{
"jar":"https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.38.0/error_prone_annotations-2.38.0.jar",
"name":"error_prone_annotations 2.38.0",
"src":"https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.38.0/error_prone_annotations-2.38.0-sources.jar"
},
{
"jar":"https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.jar",
"name":"annotations 13.0",
"src":"https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0-sources.jar"
},
{
"jar":"https://repo.maven.apache.org/maven2/com/auth0/java-jwt/4.0.0/java-jwt-4.0.0.jar",
"name":"java-jwt 4.0.0",
"src":"https://repo.maven.apache.org/maven2/com/auth0/java-jwt/4.0.0/java-jwt-4.0.0-sources.jar"
}
]
}
88 changes: 30 additions & 58 deletions src/main/java/io/supertokens/authRecipe/AuthRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.supertokens.pluginInterface.StorageUtils;
import io.supertokens.pluginInterface.authRecipe.AuthRecipeUserInfo;
import io.supertokens.pluginInterface.authRecipe.LoginMethod;
import io.supertokens.pluginInterface.authRecipe.exceptions.AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException;
import io.supertokens.pluginInterface.authRecipe.sqlStorage.AuthRecipeSQLStorage;
import io.supertokens.pluginInterface.bulkimport.BulkImportUser;
import io.supertokens.pluginInterface.bulkimport.exceptions.BulkImportBatchInsertException;
Expand Down Expand Up @@ -286,12 +287,34 @@ private static CanLinkAccountsResult canLinkAccountsHelper(TransactionConnection
tenantIds.addAll(recipeUser.tenantIds);
tenantIds.addAll(primaryUser.tenantIds);

checkIfLoginMethodCanBeLinkedOnTenant(con, appIdentifier, authRecipeStorage, tenantIds, recipeUser.loginMethods[0], primaryUser);
Set<String> emails = new HashSet<>();
Copy link
Collaborator

@porcellus porcellus Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have a for update lock on both the primary and recipe user at this point, right?

Set<String> phoneNumbers = new HashSet<>();
Set<LoginMethod.ThirdParty> thirdParties = new HashSet<>();

for (LoginMethod currLoginMethod : primaryUser.loginMethods) {
checkIfLoginMethodCanBeLinkedOnTenant(con, appIdentifier, authRecipeStorage, tenantIds, currLoginMethod, primaryUser);
Copy link
Collaborator

@porcellus porcellus Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove the util function we used to use?

for (var lm : primaryUser.loginMethods) {
if (lm.email != null) {
emails.add(lm.email);
}
if (lm.phoneNumber != null) {
phoneNumbers.add(lm.phoneNumber);
}
if (lm.thirdParty != null) {
thirdParties.add(lm.thirdParty);
}
}
for (var lm : recipeUser.loginMethods) {
if (lm.email != null) {
emails.add(lm.email);
}
if (lm.phoneNumber != null) {
phoneNumbers.add(lm.phoneNumber);
}
if (lm.thirdParty != null) {
thirdParties.add(lm.thirdParty);
}
}

authRecipeStorage.checkIfLoginMethodsCanBeLinked_Transaction(con, appIdentifier, tenantIds, emails, phoneNumbers, thirdParties, primaryUser.getSupertokensUserId());
return new CanLinkAccountsResult(recipeUser.getSupertokensUserId(), primaryUser.getSupertokensUserId(), false);
}

Expand Down Expand Up @@ -707,61 +730,8 @@ private static CreatePrimaryUserResult canCreatePrimaryUserHelper(TransactionCon
// this means that the user has only one login method since it's not a primary user
// nor is it linked to a primary user
assert (targetUser.loginMethods.length == 1);
LoginMethod loginMethod = targetUser.loginMethods[0];

for (String tenantId : targetUser.tenantIds) {
if (loginMethod.email != null) {
AuthRecipeUserInfo[] usersWithSameEmail = authRecipeStorage
.listPrimaryUsersByEmail_Transaction(appIdentifier, con,
loginMethod.email);
for (AuthRecipeUserInfo user : usersWithSameEmail) {
if (!user.tenantIds.contains(tenantId)) {
continue;
}
if (user.isPrimaryUser) {
throw new AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException(
user.getSupertokensUserId(),
"This user's email is already associated with another user ID");
}
}
}

if (loginMethod.phoneNumber != null) {
AuthRecipeUserInfo[] usersWithSamePhoneNumber = authRecipeStorage
.listPrimaryUsersByPhoneNumber_Transaction(appIdentifier, con,
loginMethod.phoneNumber);
for (AuthRecipeUserInfo user : usersWithSamePhoneNumber) {
if (!user.tenantIds.contains(tenantId)) {
continue;
}
if (user.isPrimaryUser) {
throw new AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException(
user.getSupertokensUserId(),
"This user's phone number is already associated with another user" +
" ID");
}
}
}

if (loginMethod.thirdParty != null) {
AuthRecipeUserInfo[] usersWithSameThirdParty = authRecipeStorage
.listPrimaryUsersByThirdPartyInfo_Transaction(appIdentifier, con,
loginMethod.thirdParty.id, loginMethod.thirdParty.userId);
for (AuthRecipeUserInfo userWithSameThirdParty : usersWithSameThirdParty) {
if (!userWithSameThirdParty.tenantIds.contains(tenantId)) {
continue;
}
if (userWithSameThirdParty.isPrimaryUser) {
throw new AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException(
userWithSameThirdParty.getSupertokensUserId(),
"This user's third party login is already associated with another" +
" user ID");
}
}
}
}


authRecipeStorage.checkIfLoginMethodCanBecomePrimary_Transaction(appIdentifier, con, targetUser.loginMethods[0]);

return new CreatePrimaryUserResult(targetUser, false);
}
Expand Down Expand Up @@ -945,7 +915,7 @@ public static CreatePrimaryUserResult createPrimaryUser(Main main,
return authRecipeStorage.startTransaction(con -> {

try {
CreatePrimaryUserResult result = canCreatePrimaryUserHelper(con, appIdentifier, authRecipeStorage,
CreatePrimaryUserResult result = canCreatePrimaryUserHelper(con, appIdentifier, authRecipeStorage,
recipeUserId);
if (result.wasAlreadyAPrimaryUser) {
return result;
Expand Down Expand Up @@ -1447,6 +1417,8 @@ private static void deleteAuthRecipeUser(TransactionConnection con,
.deleteThirdPartyUser_Transaction(con, appIdentifier, userId, deleteFromUserIdToAppIdTableToo);
StorageUtils.getPasswordlessStorage(storage)
.deletePasswordlessUser_Transaction(con, appIdentifier, userId, deleteFromUserIdToAppIdTableToo);
StorageUtils.getAuthRecipeStorage(storage)
.deleteAccountInfoReservations_Transaction(con, appIdentifier, userId);
}

public static boolean deleteNonAuthRecipeUser(TenantIdentifier tenantIdentifier, Storage storage, String userId)
Expand Down
26 changes: 0 additions & 26 deletions ...s/authRecipe/exception/AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException.java
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/main/java/io/supertokens/bulkimport/BulkImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import io.supertokens.Main;
import io.supertokens.ResourceDistributor;
import io.supertokens.authRecipe.AuthRecipe;
import io.supertokens.authRecipe.exception.AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException;
import io.supertokens.pluginInterface.authRecipe.exceptions.AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException;
import io.supertokens.authRecipe.exception.InputUserIdIsNotAPrimaryUserException;
import io.supertokens.authRecipe.exception.RecipeUserIdAlreadyLinkedWithAnotherPrimaryUserIdException;
import io.supertokens.authRecipe.exception.RecipeUserIdAlreadyLinkedWithPrimaryUserIdException;
Expand All @@ -29,9 +29,9 @@
import io.supertokens.emailpassword.PasswordHashing;
import io.supertokens.featureflag.exceptions.FeatureNotEnabledException;
import io.supertokens.multitenancy.Multitenancy;
import io.supertokens.multitenancy.exception.AnotherPrimaryUserWithEmailAlreadyExistsException;
import io.supertokens.multitenancy.exception.AnotherPrimaryUserWithPhoneNumberAlreadyExistsException;
import io.supertokens.multitenancy.exception.AnotherPrimaryUserWithThirdPartyInfoAlreadyExistsException;
import io.supertokens.pluginInterface.authRecipe.exceptions.AnotherPrimaryUserWithEmailAlreadyExistsException;
import io.supertokens.pluginInterface.authRecipe.exceptions.AnotherPrimaryUserWithPhoneNumberAlreadyExistsException;
import io.supertokens.pluginInterface.authRecipe.exceptions.AnotherPrimaryUserWithThirdPartyInfoAlreadyExistsException;
import io.supertokens.output.Logging;
import io.supertokens.passwordless.Passwordless;
import io.supertokens.pluginInterface.Storage;
Expand Down
30 changes: 30 additions & 0 deletions src/main/java/io/supertokens/inmemorydb/Start.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.supertokens.pluginInterface.*;
import io.supertokens.pluginInterface.authRecipe.AuthRecipeUserInfo;
import io.supertokens.pluginInterface.authRecipe.LoginMethod;
import io.supertokens.pluginInterface.authRecipe.exceptions.AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException;
import io.supertokens.pluginInterface.authRecipe.sqlStorage.AuthRecipeSQLStorage;
import io.supertokens.pluginInterface.bulkimport.BulkImportStorage;
import io.supertokens.pluginInterface.dashboard.DashboardSearchTags;
Expand Down Expand Up @@ -1328,6 +1329,35 @@ public boolean doesUserIdExist_Transaction(TransactionConnection con, AppIdentif
}
}

@Override
public void checkIfLoginMethodCanBecomePrimary_Transaction(AppIdentifier appIdentifier, TransactionConnection con,
LoginMethod loginMethod) throws
AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException, StorageQueryException {
// TODO
}

@Override
public void checkIfLoginMethodsCanBeLinked_Transaction(TransactionConnection con, AppIdentifier appIdentifier,
Set<String> tenantIds, Set<String> emails,
Set<String> phoneNumbers,
Set<LoginMethod.ThirdParty> thirdParties,
String primaryUserId)
throws AccountInfoAlreadyAssociatedWithAnotherPrimaryUserIdException, StorageQueryException {
// TODO
}

@Override
public void addTenantIdToPrimaryUser_Transaction(TenantIdentifier tenantIdentifier, TransactionConnection con,
String supertokensUserId) {
// TODO
}

@Override
public void deleteAccountInfoReservations_Transaction(TransactionConnection con, AppIdentifier appIdentifier,
String userId) throws StorageQueryException {
// TODO
}

@Override
public void updateLastActive(AppIdentifier appIdentifier, String userId) throws StorageQueryException {
try {
Expand Down
Loading
Loading