From c93e6f228f507bff4596870d1ed3bd15f6a24c84 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Thu, 12 Oct 2023 19:19:06 +0530 Subject: [PATCH 1/2] fix: query fix --- CHANGELOG.md | 4 ++++ build.gradle | 2 +- .../storage/postgresql/queries/GeneralQueries.java | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 496fcff2..69ef7e9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [5.0.1] - 2023-10-12 + +- Fixes user info from primary user id query + ## [5.0.0] - 2023-09-19 ### Changes diff --git a/build.gradle b/build.gradle index a3e8c53f..736fe41b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java-library' } -version = "5.0.0" +version = "5.0.1" repositories { mavenCentral() diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java index 81583518..976c3337 100644 --- a/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java +++ b/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java @@ -1368,7 +1368,7 @@ private static List 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 = ?"; @@ -1460,7 +1460,7 @@ private static List 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 = ?"; From 3c4c3061d4dfc1cd2e537bf9c1abd83b570de76a Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Thu, 12 Oct 2023 19:38:40 +0530 Subject: [PATCH 2/2] fix: passwordless --- CHANGELOG.md | 1 + .../storage/postgresql/queries/PasswordlessQueries.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69ef7e9d..a01447b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [5.0.1] - 2023-10-12 - Fixes user info from primary user id query +- Fixes `deviceIdHash` issue ## [5.0.0] - 2023-09-19 diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/PasswordlessQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/PasswordlessQueries.java index 31858944..8f8df3d6 100644 --- a/src/main/java/io/supertokens/storage/postgresql/queries/PasswordlessQueries.java +++ b/src/main/java/io/supertokens/storage/postgresql/queries/PasswordlessQueries.java @@ -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")); } @@ -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")); } }