fix: fixing table locked issue with in-memory db

Author: tamassoltesz

src/main/java/io/supertokens/storage/postgresql/Start.java

@@ -1692,6 +1692,19 @@ public AuthRecipeUserInfo getPrimaryUserByWebauthNCredentialId(TenantIdentifier
         }
     }
 
+    @Override
+    public AuthRecipeUserInfo getPrimaryUserByWebauthNCredentialId_Transaction(TenantIdentifier tenantIdentifier,
+                                                                               TransactionConnection con,
+                                                                               String credentialId)
+            throws StorageQueryException {
+        try {
+            Connection sqlCon = (Connection) con.getConnection();
+            return GeneralQueries.getPrimaryUserByWebauthNCredentialId_Transaction(this, sqlCon, tenantIdentifier, credentialId);
+        } catch (SQLException | StorageTransactionLogicException e) {
+            throw new StorageQueryException(e);
+        }
+    }
+
     @Override
     public AuthRecipeUserInfo getPrimaryUserByThirdPartyInfo(TenantIdentifier tenantIdentifier, String thirdPartyId,
                                                              String thirdPartyUserId) throws StorageQueryException {
@@ -4062,6 +4075,8 @@ public AuthRecipeUserInfo signUpWithCredentialsRegister_Transaction(TenantIdenti
                 PostgreSQLConfig config = Config.getConfig(this);
 
                 if (isUniqueConstraintError(errorMessage, config.getWebAuthNUserToTenantTable(),"email")) {
+                    Logging.error(this, errorMessage.getMessage(), true);
+                    Logging.error(this, email, true);
                     throw new DuplicateUserEmailException();
                 } else if (isPrimaryKeyError(errorMessage, config.getWebAuthNUsersTable())
                         || isPrimaryKeyError(errorMessage, config.getUsersTable())

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

@@ -649,6 +649,9 @@ public static void createTablesIfNotExists(Start start, Connection con) throws S
                 if(!doesTableExists(start, con, Config.getConfig(start).getWebAuthNCredentialsTable())){
                     getInstance(start).addState(CREATING_NEW_TABLE, null);
                     update(con, WebAuthNQueries.getQueryToCreateWebAuthNCredentialsTable(start), NO_OP_SETTER);
+
+                    //index
+                    //TODO
                 }
 
                 if(!doesTableExists(start, con, Config.getConfig(start).getWebAuthNAccountRecoveryTokenTable())){
@@ -1654,11 +1657,10 @@ public static AuthRecipeUserInfo getPrimaryUserByWebauthNCredentialId(Start star
                                                                           TenantIdentifier tenantIdentifier,
                                                                           String credentialId)
             throws StorageQueryException, SQLException, StorageTransactionLogicException {
-        // TODO: revisit this. Seems like we are loading the same data multiple times
         AuthRecipeUserInfo webauthnUser = start.startTransaction(con -> {
             try {
                 Connection sqlCon = (Connection) con.getConnection();
-                return WebAuthNQueries.getUserInfoByCredentialId_Transaction(start, sqlCon, tenantIdentifier,
+                return getPrimaryUserByWebauthNCredentialId_Transaction(start, sqlCon, tenantIdentifier,
                         credentialId);
             } catch (SQLException e) {
                 throw new StorageQueryException(e);
@@ -1667,6 +1669,16 @@ public static AuthRecipeUserInfo getPrimaryUserByWebauthNCredentialId(Start star
         return getPrimaryUserInfoForUserId(start, tenantIdentifier.toAppIdentifier(), webauthnUser.getSupertokensUserId());
     }
 
+    public static AuthRecipeUserInfo getPrimaryUserByWebauthNCredentialId_Transaction(Start start,
+                                                                          Connection connection,
+                                                                          TenantIdentifier tenantIdentifier,
+                                                                          String credentialId)
+            throws StorageQueryException, SQLException, StorageTransactionLogicException {
+        AuthRecipeUserInfo webauthnUser = WebAuthNQueries.getUserInfoByCredentialId_Transaction(start, connection, tenantIdentifier,
+                        credentialId);
+        return getPrimaryUserInfoForUserId(start, tenantIdentifier.toAppIdentifier(), webauthnUser.getSupertokensUserId());
+    }
+
     public static String getPrimaryUserIdStrForUserId(Start start, AppIdentifier appIdentifier, String id)
             throws SQLException, StorageQueryException {
         String QUERY = "SELECT primary_or_recipe_user_id FROM " + getConfig(start).getUsersTable() +

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

@@ -129,6 +129,12 @@ static String getQueryToCreateWebAuthNCredentialsTable(Start start){
                 ");";
     }
 
+    static String getQueryToCreateWebAuthNCredentialsUserIdIndex(Start start) {
+        return  "CREATE INDEX webauthn_credentials_user_id_index ON " +
+                getConfig(start).getWebAuthNCredentialsTable() +
+                " (user_id);";
+    }
+
     public static String getQueryToCreateWebAuthNAccountRecoveryTokenTable(Start start) {
         return "CREATE TABLE IF NOT EXISTS " + getConfig(start).getWebAuthNAccountRecoveryTokenTable() + "(" +
                 " app_id VARCHAR(64) DEFAULT 'public' NOT NULL," +
@@ -399,10 +405,10 @@ public static String getPrimaryUserIdUsingEmail(Start start, AppIdentifier appId
     public static String getPrimaryUserIdUsingEmail_Transaction(Start start, Connection sqlConnection, AppIdentifier appIdentifier, String email)
             throws SQLException, StorageQueryException {
         String QUERY = "SELECT DISTINCT all_users.primary_or_recipe_user_id AS user_id "
-                + "FROM " + getConfig(start).getWebAuthNUserToTenantTable() + " AS ep" +
+                + "FROM " + getConfig(start).getWebAuthNUserToTenantTable() + " AS webauthn" +
                 " JOIN " + getConfig(start).getUsersTable() + " AS all_users" +
-                " ON ep.app_id = all_users.app_id AND ep.user_id = all_users.user_id" +
-                " WHERE ep.app_id = ? AND ep.email = ?";
+                " ON webauthn.app_id = all_users.app_id AND webauthn.user_id = all_users.user_id" +
+                " WHERE webauthn.app_id = ? AND webauthn.email = ?";
 
         return execute(sqlConnection, QUERY, pst -> {
             pst.setString(1, appIdentifier.getAppId());
@@ -448,7 +454,8 @@ public static Collection<? extends LoginMethod> getUsersInfoUsingIdList_Transact
                     "JOIN " + usersTable + " as all_users ON webauthn.app_id = all_users.app_id AND webauthn.user_id = all_users.user_id " +
                     "LEFT JOIN " + credentialTable + " as credentials ON webauthn.user_id = credentials.user_id " +
                     "LEFT JOIN " + userIdMappingTable + " as user_id_mapping ON webauthn.user_id = user_id_mapping.supertokens_user_id " +
-                    "LEFT JOIN " + emailVerificationTable + " as email_verification ON webauthn.app_id = email_verification.app_id AND user_id_mapping.external_user_id = email_verification.user_id OR user_id_mapping.supertokens_user_id = email_verification.user_id " +
+                    "LEFT JOIN " + emailVerificationTable + " as email_verification ON webauthn.app_id = " +
+                    "email_verification.app_id AND user_id_mapping.external_user_id = email_verification.user_id OR user_id_mapping.supertokens_user_id = email_verification.user_id  OR webauthn.user_id = email_verification.user_id " +
                     "WHERE webauthn.app_id = ? AND webauthn.user_id IN (" + Utils.generateCommaSeperatedQuestionMarks(ids.size()) + ")";
 
             return execute(connection, queryAll, pst -> {
@@ -495,7 +502,8 @@ public static AuthRecipeUserInfo getUserInfoByCredentialId_Transaction(Start sta
                 "JOIN " + getConfig(start).getUsersTable() + " as all_users ON webauthn.app_id = all_users.app_id AND webauthn.user_id = all_users.user_id " +
                 "LEFT JOIN " + getConfig(start).getWebAuthNCredentialsTable() + " as credentials ON webauthn.user_id = credentials.user_id " +
                 "LEFT JOIN " + getConfig(start).getUserIdMappingTable() + " as user_id_mapping ON webauthn.user_id = user_id_mapping.supertokens_user_id " +
-                "LEFT JOIN " + getConfig(start).getEmailVerificationTable() + " as email_verification ON webauthn.app_id = email_verification.app_id AND user_id_mapping.external_user_id = email_verification.user_id OR user_id_mapping.supertokens_user_id = email_verification.user_id " +
+                "LEFT JOIN " + getConfig(start).getEmailVerificationTable() + " as email_verification ON webauthn" +
+                ".app_id = email_verification.app_id AND user_id_mapping.external_user_id = email_verification.user_id OR user_id_mapping.supertokens_user_id = email_verification.user_id  OR webauthn.user_id = email_verification.user_id " +
                 "WHERE webauthn.app_id = ? AND credentials.id = ?";
 
         return execute(sqlCon, QUERY, pst -> {