fix: mfa cleanup (#164)

* fix: mfa cleanup

* fix: pr comments

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

@@ -48,8 +48,6 @@
 import io.supertokens.pluginInterface.jwt.JWTSigningKeyInfo;
 import io.supertokens.pluginInterface.jwt.exceptions.DuplicateKeyIdException;
 import io.supertokens.pluginInterface.jwt.sqlstorage.JWTRecipeSQLStorage;
-import io.supertokens.pluginInterface.mfa.MfaStorage;
-import io.supertokens.pluginInterface.mfa.sqlStorage.MfaSQLStorage;
 import io.supertokens.pluginInterface.multitenancy.*;
 import io.supertokens.pluginInterface.multitenancy.exceptions.DuplicateClientTypeException;
 import io.supertokens.pluginInterface.multitenancy.exceptions.DuplicateTenantException;
@@ -108,8 +106,8 @@
 public class Start
         implements SessionSQLStorage, EmailPasswordSQLStorage, EmailVerificationSQLStorage, ThirdPartySQLStorage,
         JWTRecipeSQLStorage, PasswordlessSQLStorage, UserMetadataSQLStorage, UserRolesSQLStorage, UserIdMappingStorage,
-        UserIdMappingSQLStorage, MultitenancyStorage, MultitenancySQLStorage, DashboardSQLStorage, TOTPSQLStorage, MfaStorage,
-        MfaSQLStorage, ActiveUsersStorage, ActiveUsersSQLStorage, AuthRecipeSQLStorage {
+        UserIdMappingSQLStorage, MultitenancyStorage, MultitenancySQLStorage, DashboardSQLStorage, TOTPSQLStorage,
+        ActiveUsersStorage, ActiveUsersSQLStorage, AuthRecipeSQLStorage {
 
     // these configs are protected from being modified / viewed by the dev using the SuperTokens
     // SaaS. If the core is not running in SuperTokens SaaS, this array has no effect.
@@ -760,13 +758,6 @@ 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");
         }
@@ -864,12 +855,6 @@ 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");
         }
@@ -2838,71 +2823,6 @@ public int removeExpiredCodes(TenantIdentifier tenantIdentifier, long expiredBef
         }
     }
 
-    // MFA recipe:
-    @Override
-    public boolean enableFactor(TenantIdentifier tenantIdentifier, String userId, String factor)
-            throws StorageQueryException {
-        try {
-            int insertedCount = MfaQueries.enableFactor(this, tenantIdentifier, userId, factor);
-            if (insertedCount == 0) {
-                return false;
-            }
-            return true;
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public String[] listFactors(TenantIdentifier tenantIdentifier, String userId)
-            throws StorageQueryException {
-        try {
-            return MfaQueries.listFactors(this, tenantIdentifier, userId);
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public boolean disableFactor(TenantIdentifier tenantIdentifier, String userId, String factor)
-            throws StorageQueryException {
-        try {
-            int deletedCount = MfaQueries.disableFactor(this, tenantIdentifier, userId, factor);
-            if (deletedCount == 0) {
-                return false;
-            }
-            return true;
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public boolean deleteMfaInfoForUser_Transaction(TransactionConnection con, AppIdentifier appIdentifier, String userId) throws StorageQueryException {
-        try {
-            int deletedCount = MfaQueries.deleteUser_Transaction(this, (Connection) con.getConnection(), appIdentifier, userId);
-            if (deletedCount == 0) {
-                return false;
-            }
-            return true;
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
-    @Override
-    public boolean deleteMfaInfoForUser(TenantIdentifier tenantIdentifier, String userId) throws StorageQueryException {
-        try {
-            int deletedCount = MfaQueries.deleteUser(this, tenantIdentifier, userId);
-            if (deletedCount == 0) {
-                return false;
-            }
-            return true;
-        } catch (SQLException e) {
-            throw new StorageQueryException(e);
-        }
-    }
-
     @Override
     public Set<String> getValidFieldsInConfig() {
         return PostgreSQLConfig.getValidFields();

src/main/java/io/supertokens/storage/postgresql/config/PostgreSQLConfig.java

@@ -302,10 +302,6 @@ public String getTotpUsedCodesTable() {
         return addSchemaAndPrefixToTableName("totp_used_codes");
     }
 
-    public String getMfaUserFactorsTable() {
-        return addSchemaAndPrefixToTableName("mfa_user_factors");
-    }
-
     private String addSchemaAndPrefixToTableName(String tableName) {
         return addSchemaToTableName(postgresql_table_names_prefix + tableName);
     }

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

@@ -106,35 +106,11 @@ 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";
-
-        return execute(start, QUERY, pst -> {
-            pst.setString(1, appIdentifier.getAppId());
-        }, result -> {
-            if (result.next()) {
-                return result.getInt("total");
-            }
-            return 0;
-        });
+        return 0; // TODO
     }
 
     public static int countUsersEnabledMfaAndActiveSince(Start start, AppIdentifier appIdentifier, long sinceTime) throws SQLException, StorageQueryException {
-        // Find unique users from mfa_user_factors table and join with user_last_active table
-        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 = ? "
-                + "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;
-        });
+        return 0; // TODO
     }
 
     public static int updateUserLastActive(Start start, AppIdentifier appIdentifier, String userId)

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

@@ -28,6 +28,7 @@
 import io.supertokens.storage.postgresql.ConnectionPool;
 import io.supertokens.storage.postgresql.Start;
 import io.supertokens.storage.postgresql.config.Config;
+import io.supertokens.storage.postgresql.queries.GeneralQueries.AccountLinkingInfo;
 import io.supertokens.storage.postgresql.utils.Utils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -516,11 +517,6 @@ public static void createTablesIfNotExists(Start start) throws SQLException, Sto
                     update(start, TOTPQueries.getQueryToCreateTenantIdIndexForUsedCodesTable(start), NO_OP_SETTER);
                 }
 
-                if (!doesTableExists(start, Config.getConfig(start).getMfaUserFactorsTable())) {
-                    getInstance(start).addState(CREATING_NEW_TABLE, null);
-                    update(start, MfaQueries.getQueryToCreateUserFactorsTable(start), NO_OP_SETTER);
-                }
-
             } catch (Exception e) {
                 if (e.getMessage().contains("schema") && e.getMessage().contains("does not exist")
                         && numberOfRetries < 1) {
@@ -589,8 +585,9 @@ public static void deleteAllTables(Start start) throws SQLException, StorageQuer
                     + getConfig(start).getUserRolesTable() + ","
                     + getConfig(start).getDashboardUsersTable() + ","
                     + getConfig(start).getDashboardSessionsTable() + ","
-                    + getConfig(start).getTotpUsedCodesTable() + "," + getConfig(start).getTotpUserDevicesTable() + ","
-                    + getConfig(start).getTotpUsersTable() + "," + getConfig(start).getMfaUserFactorsTable();
+                    + getConfig(start).getTotpUsedCodesTable() + "," 
+                    + getConfig(start).getTotpUserDevicesTable() + ","
+                    + getConfig(start).getTotpUsersTable();
             update(start, DROP_QUERY, NO_OP_SETTER);
         }
     }