Merge branch 'master' into feat/mfa

supertokens · Jun 23, 2023 · 6e5f1ec · KShivendu · Jun 23, 2023 · KShivendu
2 parents 9f3b681 + c9bd517
commit 6e5f1ec
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-- Introduce MFA Recipe plugin interface
+## [3.0.0] - 2023-06-02
+
+- Adds support for multi-tenancy
 
 ## [2.23.0] - 2023-04-05
 
@@ -111,4 +113,4 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Added RowMapper interface for db queries
 - Email verification related changes
-- User pagination related queries
+- User pagination related queries
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "2.23.0"
+version = "3.0.0"
 
 repositories {
     mavenCentral()

diff --git a/jar/plugin-interface-2.22.0.jar b/jar/plugin-interface-2.22.0.jar
diff --git a/jar/plugin-interface-3.0.0.jar b/jar/plugin-interface-3.0.0.jar
diff --git a/src/main/java/io/supertokens/pluginInterface/Storage.java b/src/main/java/io/supertokens/pluginInterface/Storage.java
@@ -30,7 +30,7 @@
 public interface Storage {
 
     // if silent is true, do not log anything out on the console
-    void constructor(String processId, boolean silent);
+    void constructor(String processId, boolean silent, boolean isTesting);
 
     void loadConfig(JsonObject jsonConfig, Set<LOG_LEVEL> logLevels, TenantIdentifier tenantIdentifier) throws InvalidConfigException;
 
@@ -90,4 +90,8 @@ boolean isUserIdBeingUsedInNonAuthRecipe(AppIdentifier appIdentifier, String cla
     Set<String> getValidFieldsInConfig();
 
     void setLogLevels(Set<LOG_LEVEL> logLevels);
+
+    String[] getAllTablesInTheDatabase() throws StorageQueryException;
+
+    String[] getAllTablesInTheDatabaseThatHasDataForAppId(String appId) throws StorageQueryException;
 }
diff --git a/src/main/java/io/supertokens/pluginInterface/multitenancy/AppIdentifierWithStorage.java b/src/main/java/io/supertokens/pluginInterface/multitenancy/AppIdentifierWithStorage.java
@@ -23,11 +23,11 @@
 import io.supertokens.pluginInterface.dashboard.sqlStorage.DashboardSQLStorage;
 import io.supertokens.pluginInterface.emailpassword.sqlStorage.EmailPasswordSQLStorage;
 import io.supertokens.pluginInterface.emailverification.sqlStorage.EmailVerificationSQLStorage;
-import io.supertokens.pluginInterface.mfa.MfaStorage;
 import io.supertokens.pluginInterface.passwordless.sqlStorage.PasswordlessSQLStorage;
 import io.supertokens.pluginInterface.session.SessionStorage;
 import io.supertokens.pluginInterface.thirdparty.sqlStorage.ThirdPartySQLStorage;
 import io.supertokens.pluginInterface.totp.sqlStorage.TOTPSQLStorage;
+import io.supertokens.pluginInterface.mfa.MfaStorage;
 import io.supertokens.pluginInterface.useridmapping.UserIdMappingStorage;
 import io.supertokens.pluginInterface.usermetadata.sqlStorage.UserMetadataSQLStorage;
 import io.supertokens.pluginInterface.userroles.sqlStorage.UserRolesSQLStorage;

diff --git a/src/main/java/io/supertokens/pluginInterface/multitenancy/TenantIdentifierWithStorage.java b/src/main/java/io/supertokens/pluginInterface/multitenancy/TenantIdentifierWithStorage.java
@@ -21,11 +21,11 @@
 import io.supertokens.pluginInterface.authRecipe.AuthRecipeStorage;
 import io.supertokens.pluginInterface.emailpassword.sqlStorage.EmailPasswordSQLStorage;
 import io.supertokens.pluginInterface.emailverification.sqlStorage.EmailVerificationSQLStorage;
-import io.supertokens.pluginInterface.mfa.MfaStorage;
 import io.supertokens.pluginInterface.passwordless.sqlStorage.PasswordlessSQLStorage;
 import io.supertokens.pluginInterface.session.SessionStorage;
 import io.supertokens.pluginInterface.thirdparty.sqlStorage.ThirdPartySQLStorage;
 import io.supertokens.pluginInterface.totp.sqlStorage.TOTPSQLStorage;
+import io.supertokens.pluginInterface.mfa.MfaStorage;
 import io.supertokens.pluginInterface.useridmapping.UserIdMappingStorage;
 import io.supertokens.pluginInterface.userroles.sqlStorage.UserRolesSQLStorage;
 
@@ -123,7 +123,7 @@ public TOTPSQLStorage getTOTPStorage() {
         }
         return (TOTPSQLStorage) this.storage;
     }
-
+    
     public MfaStorage getMfaStorage() {
         if (this.storage.getType() != STORAGE_TYPE.SQL) {
             // we only support SQL for now