Skip to content
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

fix: remove con reuse #810

Merged
merged 1 commit into from
Sep 14, 2023
Merged

fix: remove con reuse #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 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 @@ -2815,10 +2815,15 @@ public AuthRecipeUserInfo[] listPrimaryUsersByPhoneNumber_Transaction(AppIdentif

@Override
public AuthRecipeUserInfo[] listPrimaryUsersByThirdPartyInfo(AppIdentifier appIdentifier,
String thirdPartyId,
String thirdPartyUserId)
String thirdPartyId,
String thirdPartyUserId)
throws StorageQueryException {
return null; // TODO
try {
return GeneralQueries.listPrimaryUsersByThirdPartyInfo(this, appIdentifier,
thirdPartyId, thirdPartyUserId);
} catch (SQLException e) {
throw new StorageQueryException(e);
}
}

@Override
Expand All @@ -2829,7 +2834,7 @@ public AuthRecipeUserInfo[] listPrimaryUsersByThirdPartyInfo_Transaction(AppIden
throws StorageQueryException {
try {
Connection sqlCon = (Connection) con.getConnection();
return GeneralQueries.getPrimaryUsersByThirdPartyInfo_Transaction(this, sqlCon, appIdentifier,
return GeneralQueries.listPrimaryUsersByThirdPartyInfo_Transaction(this, sqlCon, appIdentifier,
thirdPartyId, thirdPartyUserId);
} catch (SQLException e) {
throw new StorageQueryException(e);
Expand Down
116 changes: 95 additions & 21 deletions src/main/java/io/supertokens/inmemorydb/queries/EmailPasswordQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ public static void deleteAllPasswordResetTokensForUser_Transaction(Start start,
public static PasswordResetTokenInfo[] getAllPasswordResetTokenInfoForUser(Start start, AppIdentifier appIdentifier,
String userId)
throws StorageQueryException, SQLException {
String QUERY = "SELECT user_id, token, token_expiry FROM " + getConfig(start).getPasswordResetTokensTable()
String QUERY =
"SELECT user_id, token, token_expiry, email FROM " + getConfig(start).getPasswordResetTokensTable()
+ " WHERE app_id = ? AND user_id = ?";

return execute(start, QUERY, pst -> {
Expand Down Expand Up @@ -201,7 +202,8 @@ public static PasswordResetTokenInfo[] getAllPasswordResetTokenInfoForUser_Trans
public static PasswordResetTokenInfo getPasswordResetTokenInfo(Start start, AppIdentifier appIdentifier,
String token)
throws SQLException, StorageQueryException {
String QUERY = "SELECT user_id, token, token_expiry FROM " + getConfig(start).getPasswordResetTokensTable()
String QUERY =
"SELECT user_id, token, token_expiry, email FROM " + getConfig(start).getPasswordResetTokensTable()
+ " WHERE app_id = ? AND token = ?";
return execute(start, QUERY, pst -> {
pst.setString(1, appIdentifier.getAppId());
Expand Down Expand Up @@ -308,7 +310,8 @@ public static AuthRecipeUserInfo signUp(Start start, TenantIdentifier tenantIden
});
}

public static void deleteUser_Transaction(Connection sqlCon, Start start, AppIdentifier appIdentifier, String userId, boolean deleteUserIdMappingToo)
public static void deleteUser_Transaction(Connection sqlCon, Start start, AppIdentifier appIdentifier,
String userId, boolean deleteUserIdMappingToo)
throws StorageQueryException, SQLException {
if (deleteUserIdMappingToo) {
String QUERY = "DELETE FROM " + getConfig(start).getAppIdToUserIdTable()
Expand Down Expand Up @@ -348,10 +351,10 @@ public static void deleteUser_Transaction(Connection sqlCon, Start start, AppIde
}
}

public static UserInfoPartial getUserInfoUsingId(Start start, Connection sqlCon, AppIdentifier appIdentifier,
private static UserInfoPartial getUserInfoUsingId_Transaction(Start start, Connection sqlCon, AppIdentifier appIdentifier,
String id) throws SQLException, StorageQueryException {
// we don't need a LOCK here because this is already part of a transaction, and locked on app_id_to_user_id
// table
// we don't need a FOR UPDATE here because this is already part of a transaction, and locked on
// app_id_to_user_id table
String QUERY = "SELECT user_id, email, password_hash, time_joined FROM "
+ getConfig(start).getEmailPasswordUsersTable() + " WHERE app_id = ? AND user_id = ?";

Expand All @@ -366,14 +369,47 @@ public static UserInfoPartial getUserInfoUsingId(Start start, Connection sqlCon,
});
}

public static List<LoginMethod> getUsersInfoUsingIdList(Start start, Connection con, Set<String> ids,
public static List<LoginMethod> getUsersInfoUsingIdList(Start start, Set<String> ids,
AppIdentifier appIdentifier)
throws SQLException, StorageQueryException {
if (ids.size() > 0) {
// No need to filter based on tenantId because the id list is already filtered for a tenant
String QUERY = "SELECT user_id, email, password_hash, time_joined "
+ "FROM " + getConfig(start).getEmailPasswordUsersTable() + " WHERE user_id IN (" +
Utils.generateCommaSeperatedQuestionMarks(ids.size()) + ") AND app_id = ?";
+ "FROM " + getConfig(start).getEmailPasswordUsersTable()
+ " WHERE user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(ids.size()) +
" ) AND app_id = ?";

List<UserInfoPartial> userInfos = execute(start, QUERY, pst -> {
int index = 1;
for (String id : ids) {
pst.setString(index, id);
index++;
}
pst.setString(index, appIdentifier.getAppId());
}, result -> {
List<UserInfoPartial> finalResult = new ArrayList<>();
while (result.next()) {
finalResult.add(UserInfoRowMapper.getInstance().mapOrThrow(result));
}
return finalResult;
});
fillUserInfoWithTenantIds(start, appIdentifier, userInfos);
fillUserInfoWithVerified(start, appIdentifier, userInfos);
return userInfos.stream().map(UserInfoPartial::toLoginMethod)
.collect(Collectors.toList());
}
return Collections.emptyList();
}

public static List<LoginMethod> getUsersInfoUsingIdList_Transaction(Start start, Connection con, Set<String> ids,
AppIdentifier appIdentifier)
throws SQLException, StorageQueryException {
if (ids.size() > 0) {
// No need to filter based on tenantId because the id list is already filtered for a tenant
String QUERY = "SELECT user_id, email, password_hash, time_joined "
+ "FROM " + getConfig(start).getEmailPasswordUsersTable()
+ " WHERE user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(ids.size()) +
" ) AND app_id = ?";

List<UserInfoPartial> userInfos = execute(con, QUERY, pst -> {
int index = 1;
Expand All @@ -396,14 +432,10 @@ public static List<LoginMethod> getUsersInfoUsingIdList(Start start, Connection
}
return Collections.emptyList();
}

public static String lockEmail_Transaction(Start start, Connection con, AppIdentifier appIdentifier,
String email) throws SQLException, StorageQueryException {
// normally the query below will use a for update, but sqlite doesn't support it.
((ConnectionWithLocks) con).lock(
appIdentifier.getAppId() + "~" + email +
Config.getConfig(start).getEmailPasswordUsersTable());

public static String lockEmail_Transaction(Start start, Connection con,
AppIdentifier appIdentifier,
String email)
throws StorageQueryException, SQLException {
String QUERY = "SELECT user_id FROM " + getConfig(start).getEmailPasswordUsersTable() +
" WHERE app_id = ? AND email = ?";
return execute(con, QUERY, pst -> {
Expand All @@ -417,7 +449,7 @@ public static String lockEmail_Transaction(Start start, Connection con, AppIdent
});
}

public static String getPrimaryUserIdUsingEmail(Start start, Connection con, TenantIdentifier tenantIdentifier,
public static String getPrimaryUserIdUsingEmail(Start start, TenantIdentifier tenantIdentifier,
String email)
throws StorageQueryException, SQLException {
String QUERY = "SELECT DISTINCT all_users.primary_or_recipe_user_id AS user_id "
Expand All @@ -426,7 +458,7 @@ public static String getPrimaryUserIdUsingEmail(Start start, Connection con, Ten
" ON ep.app_id = all_users.app_id AND ep.user_id = all_users.user_id" +
" WHERE ep.app_id = ? AND ep.tenant_id = ? AND ep.email = ?";

return execute(con, QUERY, pst -> {
return execute(start, QUERY, pst -> {
pst.setString(1, tenantIdentifier.getAppId());
pst.setString(2, tenantIdentifier.getTenantId());
pst.setString(3, email);
Expand All @@ -438,7 +470,7 @@ public static String getPrimaryUserIdUsingEmail(Start start, Connection con, Ten
});
}

public static List<String> getPrimaryUserIdsUsingEmail(Start start, Connection con, AppIdentifier appIdentifier,
public static List<String> getPrimaryUserIdsUsingEmail_Transaction(Start start, Connection con, AppIdentifier appIdentifier,
String email)
throws StorageQueryException, SQLException {
String QUERY = "SELECT DISTINCT all_users.primary_or_recipe_user_id AS user_id "
Expand All @@ -462,7 +494,7 @@ public static List<String> getPrimaryUserIdsUsingEmail(Start start, Connection c
public static boolean addUserIdToTenant_Transaction(Start start, Connection sqlCon,
TenantIdentifier tenantIdentifier, String userId)
throws SQLException, StorageQueryException {
UserInfoPartial userInfo = EmailPasswordQueries.getUserInfoUsingId(start, sqlCon,
UserInfoPartial userInfo = EmailPasswordQueries.getUserInfoUsingId_Transaction(start, sqlCon,
tenantIdentifier.toAppIdentifier(), userId);

{ // all_auth_recipe_users
Expand Down Expand Up @@ -543,6 +575,28 @@ private static List<UserInfoPartial> fillUserInfoWithVerified_transaction(Start
return userInfos;
}

private static List<UserInfoPartial> fillUserInfoWithVerified(Start start,
AppIdentifier appIdentifier,
List<UserInfoPartial> userInfos)
throws SQLException, StorageQueryException {
List<EmailVerificationQueries.UserIdAndEmail> userIdsAndEmails = new ArrayList<>();
for (UserInfoPartial userInfo : userInfos) {
userIdsAndEmails.add(new EmailVerificationQueries.UserIdAndEmail(userInfo.id, userInfo.email));
}
List<String> userIdsThatAreVerified = EmailVerificationQueries.isEmailVerified(start,
appIdentifier,
userIdsAndEmails);
Set<String> verifiedUserIdsSet = new HashSet<>(userIdsThatAreVerified);
for (UserInfoPartial userInfo : userInfos) {
if (verifiedUserIdsSet.contains(userInfo.id)) {
userInfo.verified = true;
} else {
userInfo.verified = false;
}
}
return userInfos;
}

private static UserInfoPartial fillUserInfoWithTenantIds_transaction(Start start, Connection sqlCon,
AppIdentifier appIdentifier,
UserInfoPartial userInfo)
Expand All @@ -567,6 +621,26 @@ private static List<UserInfoPartial> fillUserInfoWithTenantIds_transaction(Start
for (UserInfoPartial userInfo : userInfos) {
userInfo.tenantIds = tenantIdsForUserIds.get(userInfo.id).toArray(new String[0]);
}

return userInfos;
}

private static List<UserInfoPartial> fillUserInfoWithTenantIds(Start start,
AppIdentifier appIdentifier,
List<UserInfoPartial> userInfos)
throws SQLException, StorageQueryException {
String[] userIds = new String[userInfos.size()];
for (int i = 0; i < userInfos.size(); i++) {
userIds[i] = userInfos.get(i).id;
}

Map<String, List<String>> tenantIdsForUserIds = GeneralQueries.getTenantIdsForUserIds(start,
appIdentifier,
userIds);
for (UserInfoPartial userInfo : userInfos) {
userInfo.tenantIds = tenantIdsForUserIds.get(userInfo.id).toArray(new String[0]);
}

return userInfos;
}

Expand Down
45 changes: 45 additions & 0 deletions src/main/java/io/supertokens/inmemorydb/queries/EmailVerificationQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,51 @@ public static List<String> isEmailVerified_transaction(Start start, Connection s
});
}

public static List<String> isEmailVerified(Start start, AppIdentifier appIdentifier,
List<UserIdAndEmail> userIdAndEmail)
throws SQLException, StorageQueryException {
if (userIdAndEmail.isEmpty()) {
return new ArrayList<>();
}
List<String> emails = new ArrayList<>();
List<String> userIds = new ArrayList<>();
Map<String, String> userIdToEmailMap = new HashMap<>();
for (UserIdAndEmail ue : userIdAndEmail) {
emails.add(ue.email);
userIds.add(ue.userId);
}
for (UserIdAndEmail ue : userIdAndEmail) {
if (userIdToEmailMap.containsKey(ue.userId)) {
throw new RuntimeException("Found a bug!");
}
userIdToEmailMap.put(ue.userId, ue.email);
}
String QUERY = "SELECT * FROM " + getConfig(start).getEmailVerificationTable()
+ " WHERE app_id = ? AND user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(userIds.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) {
pst.setString(index++, userId);
}
for (String email : emails) {
pst.setString(index++, email);
}
}, result -> {
List<String> res = new ArrayList<>();
while (result.next()) {
String userId = result.getString("user_id");
String email = result.getString("email");
if (Objects.equals(userIdToEmailMap.get(userId), email)) {
res.add(userId);
}
}
return res;
});
}

public static void deleteUserInfo_Transaction(Connection sqlCon, Start start, AppIdentifier appIdentifier, String userId)
throws StorageQueryException, SQLException {
{
Expand Down
Loading