fix: mfa stats

supertokens · Oct 31, 2023 · 39ab158 · 39ab158
1 parent 6ebaa47
commit 39ab158
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 46 deletions.
diff --git a/src/main/java/io/supertokens/storage/postgresql/Start.java b/src/main/java/io/supertokens/storage/postgresql/Start.java
@@ -1319,44 +1319,6 @@ public int countUsersActiveSince(AppIdentifier appIdentifier, long time) throws
         }
     }
 
-    @Override
-    public int countUsersEnabledTotp(AppIdentifier appIdentifier) throws StorageQueryException {
-        try {
-            return ActiveUsersQueries.countUsersEnabledTotp(this, appIdentifier);
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public int countUsersEnabledTotpAndActiveSince(AppIdentifier appIdentifier, long time)
-            throws StorageQueryException {
-        try {
-            return ActiveUsersQueries.countUsersEnabledTotpAndActiveSince(this, appIdentifier, time);
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public int countUsersEnabledMfa(AppIdentifier appIdentifier) throws StorageQueryException {
-        try {
-            return ActiveUsersQueries.countUsersEnabledMfa(this, appIdentifier);
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public int countUsersEnabledMfaAndActiveSince(AppIdentifier appIdentifier, long time)
-            throws StorageQueryException {
-        try {
-            return ActiveUsersQueries.countUsersEnabledMfaAndActiveSince(this, appIdentifier, time);
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
     @Override
     public void deleteUserActive_Transaction(TransactionConnection con, AppIdentifier appIdentifier, String userId)
             throws StorageQueryException {
@@ -3037,4 +2999,22 @@ public UserIdMapping[] getUserIdMapping_Transaction(TransactionConnection con, A
             throw new StorageQueryException(e);
         }
     }
+
+    @Override
+    public int getUsersCountWithMoreThanOneLoginMethodOrTOTPEnabled(AppIdentifier appIdentifier) throws StorageQueryException {
+        try {
+            return GeneralQueries.getUsersCountWithMoreThanOneLoginMethodOrTOTPEnabled(this, appIdentifier);
+        } catch (SQLException e) {
+            throw new StorageQueryException(e);
+        }
+    }
+
+    @Override
+    public int countUsersThatHaveMoreThanOneLoginMethodOrTOTPEnabledAndActiveSince(AppIdentifier appIdentifier, long sinceTime) throws StorageQueryException {
+        try {
+            return ActiveUsersQueries.countUsersThatHaveMoreThanOneLoginMethodOrTOTPEnabledAndActiveSince(this, appIdentifier, sinceTime);
+        } catch (SQLException e) {
+            throw new StorageQueryException(e);
+        }
+    }
 }
diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/ActiveUsersQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/ActiveUsersQueries.java
@@ -11,6 +11,7 @@
 
 import static io.supertokens.storage.postgresql.QueryExecutorTemplate.execute;
 import static io.supertokens.storage.postgresql.QueryExecutorTemplate.update;
+import static io.supertokens.storage.postgresql.config.Config.getConfig;
 
 public class ActiveUsersQueries {
     static String getQueryToCreateUserLastActiveTable(Start start) {
@@ -104,14 +105,6 @@ public static int countUsersEnabledTotpAndActiveSince(Start start, AppIdentifier
             return 0;
         });
     }
-
-    public static int countUsersEnabledMfa(Start start, AppIdentifier appIdentifier) throws SQLException, StorageQueryException {
-        return 0; // TODO
-    }
-
-    public static int countUsersEnabledMfaAndActiveSince(Start start, AppIdentifier appIdentifier, long sinceTime) throws SQLException, StorageQueryException {
-        return 0; // TODO
-    }
 
     public static int updateUserLastActive(Start start, AppIdentifier appIdentifier, String userId)
             throws SQLException, StorageQueryException {
@@ -160,4 +153,40 @@ public static void deleteUserActive_Transaction(Connection con, Start start, App
             pst.setString(2, userId);
         });
     }
+
+    public static int countUsersThatHaveMoreThanOneLoginMethodOrTOTPEnabledAndActiveSince(Start start, AppIdentifier appIdentifier, long sinceTime)
+            throws SQLException, StorageQueryException {
+        String QUERY =
+              "SELECT COUNT (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()
+            + "      WHERE app_id = ? AND primary_or_recipe_user_id IN ("
+            + "        SELECT user_id FROM " + getConfig(start).getUserLastActiveTable()
+            + "        WHERE app_id = ? AND last_active_time >= ?"
+            + "      )"
+            + "      GROUP BY (app_id, primary_or_recipe_user_id)"
+            + "    ) AS nloginmethods"
+            + "    WHERE num_login_methods > 1"
+            + "  ) UNION (" // TOTP users
+            + "    SELECT user_id FROM " + getConfig(start).getTotpUsersTable()
+            + "    WHERE app_id = ? AND user_id IN ("
+            + "      SELECT user_id FROM " + getConfig(start).getUserLastActiveTable()
+            + "      WHERE app_id = ? AND last_active_time >= ?"
+            + "    )"
+            + "  )"
+            + ") AS all_users";
+
+        return execute(start, QUERY, pst -> {
+            pst.setString(1, appIdentifier.getAppId());
+            pst.setString(2, appIdentifier.getAppId());
+            pst.setLong(3, sinceTime);
+            pst.setString(4, appIdentifier.getAppId());
+            pst.setString(5, appIdentifier.getAppId());
+            pst.setLong(6, sinceTime);
+        }, result -> {
+            return result.next() ? result.getInt("c") : 0;
+        });
+    }
 }
diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java
@@ -1723,6 +1723,32 @@ public static int getUsersCountWithMoreThanOneLoginMethod(Start start, AppIdenti
         });
     }
 
+    public static int getUsersCountWithMoreThanOneLoginMethodOrTOTPEnabled(Start start, AppIdentifier appIdentifier)
+            throws SQLException, StorageQueryException {
+        String QUERY =
+                  "SELECT COUNT (DISTINCT user_id) as c FROM ("
+                + "  (" // 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()
+                + "      WHERE app_id = ? "
+                + "      GROUP BY (app_id, primary_or_recipe_user_id)"
+                + "    ) AS nloginmethods"
+                + "    WHERE num_login_methods > 1"
+                + "  ) UNION (" // TOTP users
+                + "    SELECT user_id FROM " + getConfig(start).getTotpUsersTable()
+                + "    WHERE app_id = ?"
+                + "  )"
+                + ") AS all_users";
+
+        return execute(start, QUERY, pst -> {
+            pst.setString(1, appIdentifier.getAppId());
+            pst.setString(2, appIdentifier.getAppId());
+        }, result -> {
+            return result.next() ? result.getInt("c") : 0;
+        });
+    }
+
     public static boolean checkIfUsesAccountLinking(Start start, AppIdentifier appIdentifier)
             throws SQLException, StorageQueryException {
         String QUERY = "SELECT 1 FROM "