fix: pr comments

supertokens · Nov 1, 2023 · c122142 · c122142
1 parent 39ab158
commit c122142
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 39 deletions.
diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/ActiveUsersQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/ActiveUsersQueries.java
@@ -52,9 +52,10 @@ public static int countUsersActiveSince(Start start, AppIdentifier appIdentifier
 
     public static int countUsersActiveSinceAndHasMoreThanOneLoginMethod(Start start, AppIdentifier appIdentifier, long sinceTime)
             throws SQLException, StorageQueryException {
+        // TODO: Active users are present only on public tenant and MFA users may be present on different storages
         String QUERY = "SELECT count(1) as c FROM ("
                 + "  SELECT count(user_id) as num_login_methods, app_id, primary_or_recipe_user_id"
-                + "  FROM " + Config.getConfig(start).getUsersTable()
+                + "  FROM " + Config.getConfig(start).getAppIdToUserIdTable()
                 + "  WHERE primary_or_recipe_user_id IN ("
                 + "    SELECT user_id FROM " + Config.getConfig(start).getUserLastActiveTable()
                 + "    WHERE app_id = ? AND last_active_time >= ?"
@@ -72,40 +73,6 @@ public static int countUsersActiveSinceAndHasMoreThanOneLoginMethod(Start start,
         });
     }
 
-    public static int countUsersEnabledTotp(Start start, AppIdentifier appIdentifier)
-            throws SQLException, StorageQueryException {
-        String QUERY = "SELECT COUNT(*) as total FROM " + Config.getConfig(start).getTotpUsersTable()
-                + " WHERE app_id = ?";
-
-        return execute(start, QUERY, pst -> {
-            pst.setString(1, appIdentifier.getAppId());
-        }, result -> {
-            if (result.next()) {
-                return result.getInt("total");
-            }
-            return 0;
-        });
-    }
-
-    public static int countUsersEnabledTotpAndActiveSince(Start start, AppIdentifier appIdentifier, long sinceTime)
-            throws SQLException, StorageQueryException {
-        String QUERY =
-                "SELECT COUNT(*) as total FROM " + Config.getConfig(start).getTotpUsersTable() + " AS totp_users "
-                        + "INNER JOIN " + Config.getConfig(start).getUserLastActiveTable() + " AS user_last_active "
-                        + "ON totp_users.user_id = user_last_active.user_id "
-                        + "WHERE user_last_active.app_id = ? AND user_last_active.last_active_time >= ?";
-
-        return execute(start, QUERY, pst -> {
-            pst.setString(1, appIdentifier.getAppId());
-            pst.setLong(2, sinceTime);
-        }, result -> {
-            if (result.next()) {
-                return result.getInt("total");
-            }
-            return 0;
-        });
-    }
-
     public static int updateUserLastActive(Start start, AppIdentifier appIdentifier, String userId)
             throws SQLException, StorageQueryException {
         String QUERY = "INSERT INTO " + Config.getConfig(start).getUserLastActiveTable()
@@ -156,12 +123,13 @@ public static void deleteUserActive_Transaction(Connection con, Start start, App
 
     public static int countUsersThatHaveMoreThanOneLoginMethodOrTOTPEnabledAndActiveSince(Start start, AppIdentifier appIdentifier, long sinceTime)
             throws SQLException, StorageQueryException {
+        // TODO: Active users are present only on public tenant and MFA users may be present on different storages
         String QUERY =
-              "SELECT COUNT (user_id) as c FROM ("
+              "SELECT COUNT (DISTINCT user_id) as c FROM ("
             + "  (" // users with more than one login method
             + "    SELECT primary_or_recipe_user_id AS user_id FROM ("
             + "      SELECT COUNT(user_id) as num_login_methods, app_id, primary_or_recipe_user_id"
-            + "      FROM " + getConfig(start).getUsersTable()
+            + "      FROM " + getConfig(start).getAppIdToUserIdTable()
             + "      WHERE app_id = ? AND primary_or_recipe_user_id IN ("
             + "        SELECT user_id FROM " + getConfig(start).getUserLastActiveTable()
             + "        WHERE app_id = ? AND last_active_time >= ?"

diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java
@@ -1711,7 +1711,7 @@ public static int getUsersCountWithMoreThanOneLoginMethod(Start start, AppIdenti
             throws SQLException, StorageQueryException {
         String QUERY = "SELECT COUNT (1) as c FROM ("
                 + "  SELECT COUNT(user_id) as num_login_methods "
-                + "  FROM " + getConfig(start).getUsersTable()
+                + "  FROM " + getConfig(start).getAppIdToUserIdTable()
                 + "  WHERE app_id = ? "
                 + "  GROUP BY (app_id, primary_or_recipe_user_id) "
                 + ") as nloginmethods WHERE num_login_methods > 1";
@@ -1730,7 +1730,7 @@ public static int getUsersCountWithMoreThanOneLoginMethodOrTOTPEnabled(Start sta
                 + "  (" // Users with number of login methods > 1
                 + "    SELECT primary_or_recipe_user_id AS user_id FROM ("
                 + "      SELECT COUNT(user_id) as num_login_methods, app_id, primary_or_recipe_user_id"
-                + "      FROM " + getConfig(start).getUsersTable()
+                + "      FROM " + getConfig(start).getAppIdToUserIdTable()
                 + "      WHERE app_id = ? "
                 + "      GROUP BY (app_id, primary_or_recipe_user_id)"
                 + "    ) AS nloginmethods"