fix: queries

supertokens · Sep 29, 2023 · e547b94 · e547b94
1 parent 4cf61bb
commit e547b94
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/main/java/io/supertokens/storage/postgresql/Start.java b/src/main/java/io/supertokens/storage/postgresql/Start.java
@@ -758,6 +758,13 @@ public boolean isUserIdBeingUsedInNonAuthRecipe(AppIdentifier appIdentifier, Str
             return false;
         } else if (className.equals(ActiveUsersStorage.class.getName())) {
             return ActiveUsersQueries.getLastActiveByUserId(this, appIdentifier, userId) != null;
+        } else if (className.equals(MfaStorage.class.getName())) {
+            try {
+                MultitenancyQueries.getAllTenants(this);
+                return MfaQueries.listFactors(this, appIdentifier, userId).length > 0;
+            } catch (SQLException e) {
+                throw new StorageQueryException(e);
+            }
         } else {
             throw new IllegalStateException("ClassName: " + className + " is not part of NonAuthRecipeStorage");
         }
@@ -855,6 +862,12 @@ public void addInfoToNonAuthRecipesBasedOnUserId(TenantIdentifier tenantIdentifi
             } catch (SQLException e) {
                 throw new StorageQueryException(e);
             }
+        } else if (className.equals(MfaStorage.class.getName())) {
+            try {
+                MfaQueries.enableFactor(this, tenantIdentifier, userId, "emailpassword");
+            } catch (SQLException e) {
+                throw new StorageQueryException(e);
+            }
         } else {
             throw new IllegalStateException("ClassName: " + className + " is not part of NonAuthRecipeStorage");
         }

diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/ActiveUsersQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/ActiveUsersQueries.java
@@ -106,7 +106,7 @@ public static int countUsersEnabledTotpAndActiveSince(Start start, AppIdentifier
     }
 
     public static int countUsersEnabledMfa(Start start, AppIdentifier appIdentifier) throws SQLException, StorageQueryException {
-        String QUERY = "SELECT COUNT(*) as total FROM (SELECT DISTINCT user_id FROM " + Config.getConfig(start).getMfaUserFactorsTable() + "WHERE app_id = ?) AS app_mfa_users";
+        String QUERY = "SELECT COUNT(*) as total FROM (SELECT DISTINCT user_id FROM " + Config.getConfig(start).getMfaUserFactorsTable() + " WHERE app_id = ?) AS app_mfa_users";
 
         return execute(start, QUERY, pst -> {
             pst.setString(1, appIdentifier.getAppId());
@@ -123,7 +123,7 @@ public static int countUsersEnabledMfaAndActiveSince(Start start, AppIdentifier
         String QUERY = "SELECT COUNT(*) as total FROM (SELECT DISTINCT user_id FROM " + Config.getConfig(start).getMfaUserFactorsTable() + ") AS mfa_users "
                 + "INNER JOIN " + Config.getConfig(start).getUserLastActiveTable() + " AS user_last_active "
                 + "ON mfa_users.user_id = user_last_active.user_id "
-                + "WHERE user_last_active.app_id = ?"
+                + "WHERE user_last_active.app_id = ? "
                 + "AND user_last_active.last_active_time >= ?";
 
         return execute(start, QUERY, pst -> {

diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/MfaQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/MfaQueries.java
@@ -72,6 +72,23 @@ public static String[] listFactors(Start start, TenantIdentifier tenantIdentifie
         });
     }
 
+    public static String[] listFactors(Start start, AppIdentifier appIdentifier, String userId)
+            throws StorageQueryException, SQLException {
+        String QUERY = "SELECT factor_id FROM " + Config.getConfig(start).getMfaUserFactorsTable() + " WHERE app_id = ? AND user_id = ?";
+
+        return execute(start, QUERY, pst -> {
+            pst.setString(1, appIdentifier.getAppId());
+            pst.setString(2, userId);
+        }, result -> {
+            List<String> factors = new ArrayList<>();
+            while (result.next()) {
+                factors.add(result.getString("factor_id"));
+            }
+
+            return factors.toArray(String[]::new);
+        });
+    }
+
     public static int disableFactor(Start start, TenantIdentifier tenantIdentifier, String userId, String factorId)
             throws StorageQueryException, SQLException {
         String QUERY = "DELETE FROM " + Config.getConfig(start).getMfaUserFactorsTable() + " WHERE app_id = ? AND tenant_id = ? AND user_id = ? AND factor_id = ?";