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

Merge latest #168

Merged
merged 5 commits into from
Oct 20, 2023
Merged

Merge latest #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab0db7d
fix: query fix (#165)
sattvikc Oct 12, 2023
f8ba21c
adding dev-v5.0.1 tag to this commit to ensure building
rishabhpoddar Oct 12, 2023
9435be3
Query fix (#166)
sattvikc Oct 12, 2023
45f662c
adding dev-v5.0.1 tag to this commit to ensure building
rishabhpoddar Oct 12, 2023
b6ae4e6
Merge branch '5.0' into merge-latest
sattvikc Oct 20, 2023
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- Replace `TotpNotEnabledError` with `UnknownUserIdTotpError`.
- Support for MFA recipe

## [5.0.1] - 2023-10-12

- Fixes user info from primary user id query
- Fixes `deviceIdHash` issue

## [5.0.0] - 2023-09-19

### Changes
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'java-library'
}

version = "5.0.0"
version = "5.0.1"

repositories {
mavenCentral()
Expand Down
Binary file renamed jar/postgresql-plugin-5.0.0.jar → jar/postgresql-plugin-5.0.1.jar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ private static List<AuthRecipeUserInfo> getPrimaryUserInfoForUserIds(Start start
" WHERE au.primary_or_recipe_user_id IN (SELECT primary_or_recipe_user_id FROM " +
getConfig(start).getAppIdToUserIdTable() + " WHERE (user_id IN ("
+ Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
") OR au.primary_or_recipe_user_id IN (" +
") OR primary_or_recipe_user_id IN (" +
Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
")) AND app_id = ?) AND au.app_id = ?";

Expand Down Expand Up @@ -1462,7 +1462,7 @@ private static List<AuthRecipeUserInfo> getPrimaryUserInfoForUserIds_Transaction
" WHERE au.primary_or_recipe_user_id IN (SELECT primary_or_recipe_user_id FROM " +
getConfig(start).getAppIdToUserIdTable() + " WHERE (user_id IN ("
+ Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
") OR au.primary_or_recipe_user_id IN (" +
") OR primary_or_recipe_user_id IN (" +
Utils.generateCommaSeperatedQuestionMarks(userIds.size()) +
")) AND app_id = ?) AND au.app_id = ?";

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/supertokens/storage/postgresql/queries/PasswordlessQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1112,7 +1112,7 @@ private static PasswordlessDeviceRowMapper getInstance() {

@Override
public PasswordlessDevice map(ResultSet result) throws Exception {
return new PasswordlessDevice(result.getString("device_id_hash"), result.getString("email"),
return new PasswordlessDevice(result.getString("device_id_hash").trim(), result.getString("email"),
result.getString("phone_number"), result.getString("link_code_salt"),
result.getInt("failed_attempts"));
}
Expand All @@ -1130,7 +1130,7 @@ private static PasswordlessCodeRowMapper getInstance() {

@Override
public PasswordlessCode map(ResultSet result) throws Exception {
return new PasswordlessCode(result.getString("code_id"), result.getString("device_id_hash"),
return new PasswordlessCode(result.getString("code_id"), result.getString("device_id_hash").trim(),
result.getString("link_code_hash"), result.getLong("created_at"));
}
}
Expand Down
Loading