Mfa multitenancy (#841)

* fix: multitenancy changes * fix: mfa cleanup * fix: mfa cleanup * fix: test * fix: api * fix: mfa multitenancy updates * fix: tests * fix: mfa * fix: tests * fix: tests * fix: pr comments * fix: pr comments * fix: pr comments * fix: tests * fix: tests * fix: pr comments
supertokens · Oct 27, 2023 · da5dfa2 · da5dfa2
1 parent e7725f5
commit da5dfa2
Show file tree

Hide file tree

Showing 55 changed files with 1,842 additions and 260 deletions.
diff --git a/coreDriverInterfaceSupported.json b/coreDriverInterfaceSupported.json
@@ -17,6 +17,7 @@
     "2.20",
     "2.21",
     "3.0",
-    "4.0"
+    "4.0",
+    "4.1"
   ]
 }
diff --git a/ee/src/test/java/io/supertokens/ee/test/TestMultitenancyStats.java b/ee/src/test/java/io/supertokens/ee/test/TestMultitenancyStats.java
@@ -78,6 +78,7 @@ public void testPaidStatsIsSentForAllAppsInMultitenancy() throws Exception {
                     new EmailPasswordConfig(true),
                     new ThirdPartyConfig(true, null),
                     new PasswordlessConfig(true),
+                    new TotpConfig(false), null, null,
                     config
             ), false);
 
@@ -86,6 +87,7 @@ public void testPaidStatsIsSentForAllAppsInMultitenancy() throws Exception {
                     new EmailPasswordConfig(true),
                     new ThirdPartyConfig(true, null),
                     new PasswordlessConfig(true),
+                    new TotpConfig(false), null, null,
                     config
             ), false);
 
@@ -94,6 +96,7 @@ public void testPaidStatsIsSentForAllAppsInMultitenancy() throws Exception {
                     new EmailPasswordConfig(true),
                     new ThirdPartyConfig(true, null),
                     new PasswordlessConfig(true),
+                    new TotpConfig(false), null, null,
                     config
             ), false);
         }

diff --git a/src/main/java/io/supertokens/inmemorydb/queries/multitenancy/TenantConfigSQLHelper.java b/src/main/java/io/supertokens/inmemorydb/queries/multitenancy/TenantConfigSQLHelper.java
@@ -53,7 +53,9 @@ public TenantConfig map(ResultSet result) throws StorageQueryException {
                         new EmailPasswordConfig(result.getBoolean("email_password_enabled")),
                         new ThirdPartyConfig(result.getBoolean("third_party_enabled"), this.providers),
                         new PasswordlessConfig(result.getBoolean("passwordless_enabled")),
-                        JsonUtils.stringToJsonObject(result.getString("core_config"))
+                        new TotpConfig(false), // TODO
+                        null, null, JsonUtils.stringToJsonObject(result.getString("core_config"))
+                        // TODO
                 );
             } catch (Exception e) {
                 throw new StorageQueryException(e);

diff --git a/src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java b/src/main/java/io/supertokens/multitenancy/MultitenancyHelper.java
@@ -75,7 +75,8 @@ public static void init(Main main) throws StorageQueryException, IOException {
                         new TenantConfig(
                                 new TenantIdentifier(null, null, null),
                                 new EmailPasswordConfig(true), new ThirdPartyConfig(true, null),
-                                new PasswordlessConfig(true), new JsonObject()), false, false, false);
+                                new PasswordlessConfig(true), new TotpConfig(true),
+                                null, null, new JsonObject()), false, false, false);
                 // Not force reloading all resources here (the last boolean in the function above)
                 // because the ucl for the FeatureFlag is not yet loaded and results in an empty
                 // instance of eeFeatureFlag. This is applicable only when the core is starting on
@@ -95,7 +96,8 @@ private TenantConfig[] getAllTenantsFromDb() throws StorageQueryException {
                             new EmailPasswordConfig(true),
                             new ThirdPartyConfig(true, null),
                             new PasswordlessConfig(true),
-                            new JsonObject()
+                            new TotpConfig(true),
+                            null, null, new JsonObject()
                     )
             };
         }

diff --git a/src/main/java/io/supertokens/utils/SemVer.java b/src/main/java/io/supertokens/utils/SemVer.java
@@ -34,6 +34,7 @@ public class SemVer implements Comparable<SemVer> {
     public static final SemVer v2_21 = new SemVer("2.21");
     public static final SemVer v3_0 = new SemVer("3.0");
     public static final SemVer v4_0 = new SemVer("4.0");
+    public static final SemVer v4_1 = new SemVer("4.1");
 
     final private String version;
 

diff --git a/src/main/java/io/supertokens/webserver/WebserverAPI.java b/src/main/java/io/supertokens/webserver/WebserverAPI.java
@@ -76,10 +76,11 @@ public abstract class WebserverAPI extends HttpServlet {
         supportedVersions.add(SemVer.v2_21);
         supportedVersions.add(SemVer.v3_0);
         supportedVersions.add(SemVer.v4_0);
+        supportedVersions.add(SemVer.v4_1);
     }
 
     public static SemVer getLatestCDIVersion() {
-        return SemVer.v4_0;
+        return SemVer.v4_1;
     }
 
     public SemVer getLatestCDIVersionForRequest(HttpServletRequest req)

diff --git a/src/main/java/io/supertokens/webserver/api/multitenancy/BaseCreateOrUpdate.java b/src/main/java/io/supertokens/webserver/api/multitenancy/BaseCreateOrUpdate.java
@@ -45,8 +45,10 @@ public BaseCreateOrUpdate(Main main) {
 
     protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdentifier,
                           TenantIdentifier targetTenantIdentifier, Boolean emailPasswordEnabled,
-                          Boolean thirdPartyEnabled, Boolean passwordlessEnabled, JsonObject coreConfig,
-                          HttpServletResponse resp)
+                          Boolean thirdPartyEnabled, Boolean passwordlessEnabled, Boolean totpEnabled,
+                          boolean hasFirstFactors, String[] firstFactors,
+                          boolean hasDefaultRequiredFactorIds, String[] defaultRequiredFactorIds,
+                          JsonObject coreConfig, HttpServletResponse resp)
             throws ServletException, IOException {
 
         TenantConfig tenantConfig = Multitenancy.getTenantInfo(main,
@@ -63,7 +65,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
                         new EmailPasswordConfig(true),
                         new ThirdPartyConfig(true, null),
                         new PasswordlessConfig(true),
-                        new JsonObject()
+                        new TotpConfig(true),
+                        null, null, new JsonObject()
                 );
             } else {
                 // We disable all recipes by default while creating tenant
@@ -72,7 +75,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
                         new EmailPasswordConfig(false),
                         new ThirdPartyConfig(false, null),
                         new PasswordlessConfig(false),
-                        new JsonObject()
+                        new TotpConfig(false),
+                        null, null, new JsonObject()
                 );
             }
             createdNew = true;
@@ -84,7 +88,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
                     new EmailPasswordConfig(emailPasswordEnabled),
                     tenantConfig.thirdPartyConfig,
                     tenantConfig.passwordlessConfig,
-                    tenantConfig.coreConfig
+                    tenantConfig.totpConfig,
+                    tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
             );
         }
 
@@ -94,7 +99,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
                     tenantConfig.emailPasswordConfig,
                     new ThirdPartyConfig(thirdPartyEnabled, tenantConfig.thirdPartyConfig.providers),
                     tenantConfig.passwordlessConfig,
-                    tenantConfig.coreConfig
+                    tenantConfig.totpConfig,
+                    tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
             );
         }
 
@@ -104,7 +110,41 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
                     tenantConfig.emailPasswordConfig,
                     tenantConfig.thirdPartyConfig,
                     new PasswordlessConfig(passwordlessEnabled),
-                    tenantConfig.coreConfig
+                    tenantConfig.totpConfig,
+                    tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
+            );
+        }
+
+        if (totpEnabled != null) {
+            tenantConfig = new TenantConfig(
+                    tenantConfig.tenantIdentifier,
+                    tenantConfig.emailPasswordConfig,
+                    tenantConfig.thirdPartyConfig,
+                    tenantConfig.passwordlessConfig,
+                    new TotpConfig(totpEnabled),
+                    tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
+            );
+        }
+
+        if (hasFirstFactors) {
+            tenantConfig = new TenantConfig(
+                    tenantConfig.tenantIdentifier,
+                    tenantConfig.emailPasswordConfig,
+                    tenantConfig.thirdPartyConfig,
+                    tenantConfig.passwordlessConfig,
+                    tenantConfig.totpConfig,
+                    firstFactors, tenantConfig.defaultRequiredFactorIds, tenantConfig.coreConfig
+            );
+        }
+
+        if (hasDefaultRequiredFactorIds) {
+            tenantConfig = new TenantConfig(
+                    tenantConfig.tenantIdentifier,
+                    tenantConfig.emailPasswordConfig,
+                    tenantConfig.thirdPartyConfig,
+                    tenantConfig.passwordlessConfig,
+                    tenantConfig.totpConfig,
+                    tenantConfig.firstFactors, defaultRequiredFactorIds, tenantConfig.coreConfig
             );
         }
 
@@ -115,7 +155,8 @@ protected void handle(HttpServletRequest req, TenantIdentifier sourceTenantIdent
                     tenantConfig.emailPasswordConfig,
                     tenantConfig.thirdPartyConfig,
                     tenantConfig.passwordlessConfig,
-                    coreConfig
+                    tenantConfig.totpConfig,
+                    tenantConfig.firstFactors, tenantConfig.defaultRequiredFactorIds, coreConfig
             );
         }
 

diff --git a/src/main/java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateAppAPI.java b/src/main/java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateAppAPI.java
@@ -16,19 +16,22 @@
 
 package io.supertokens.webserver.api.multitenancy;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import io.supertokens.Main;
-import io.supertokens.multitenancy.exception.BadPermissionException;
 import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.utils.SemVer;
 import io.supertokens.webserver.InputParser;
 import io.supertokens.webserver.Utils;
-import io.supertokens.webserver.api.multitenancy.BaseCreateOrUpdate;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 public class CreateOrUpdateAppAPI extends BaseCreateOrUpdate {
 
@@ -56,6 +59,38 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
         Boolean passwordlessEnabled = InputParser.parseBooleanOrThrowError(input, "passwordlessEnabled", true);
         JsonObject coreConfig = InputParser.parseJsonObjectOrThrowError(input, "coreConfig", true);
 
+        Boolean totpEnabled = null;
+        String[] firstFactors = null;
+        boolean hasFirstFactors = false;
+        String[] defaultRequiredFactorIds = null;
+        boolean hasDefaultRequiredFactorIds = false;
+
+        if (getVersionFromRequest(req).greaterThanOrEqualTo(SemVer.v4_1)) {
+            totpEnabled = InputParser.parseBooleanOrThrowError(input, "totpEnabled", true);
+            hasFirstFactors = input.has("firstFactors");
+            if (hasFirstFactors && !input.get("firstFactors").isJsonNull()) {
+                JsonArray firstFactorsArr = InputParser.parseArrayOrThrowError(input, "firstFactors", true);
+                firstFactors = new String[firstFactorsArr.size()];
+                for (int i = 0; i < firstFactors.length; i++) {
+                    firstFactors[i] = InputParser.parseStringFromElementOrThrowError(firstFactorsArr.get(i), "firstFactors", false);
+                }
+                if (firstFactors.length != new HashSet<>(Arrays.asList(firstFactors)).size()) {
+                    throw new ServletException(new BadRequestException("firstFactors input should not contain duplicate values"));
+                }
+            }
+            hasDefaultRequiredFactorIds = input.has("defaultRequiredFactorIds");
+            if (hasDefaultRequiredFactorIds && !input.get("defaultRequiredFactorIds").isJsonNull()) {
+                JsonArray defaultRequiredFactorIdsArr = InputParser.parseArrayOrThrowError(input, "defaultRequiredFactorIds", true);
+                defaultRequiredFactorIds = new String[defaultRequiredFactorIdsArr.size()];
+                for (int i = 0; i < defaultRequiredFactorIds.length; i++) {
+                    defaultRequiredFactorIds[i] = InputParser.parseStringFromElementOrThrowError(defaultRequiredFactorIdsArr.get(i), "defaultRequiredFactorIds", false);
+                }
+                if (defaultRequiredFactorIds.length != new HashSet<>(Arrays.asList(defaultRequiredFactorIds)).size()) {
+                    throw new ServletException(new BadRequestException("defaultRequiredFactorIds input should not contain duplicate values"));
+                }
+            }
+        }
+
         TenantIdentifier sourceTenantIdentifier;
         try {
             sourceTenantIdentifier = this.getTenantIdentifierWithStorageFromRequest(req);
@@ -66,7 +101,9 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
         super.handle(
                 req, sourceTenantIdentifier,
                 new TenantIdentifier(sourceTenantIdentifier.getConnectionUriDomain(), appId, null),
-                emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled, coreConfig, resp);
+                emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled,
+                totpEnabled, hasFirstFactors, firstFactors, hasDefaultRequiredFactorIds, defaultRequiredFactorIds,
+                coreConfig, resp);
 
     }
 }
diff --git a/.../java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateConnectionUriDomainAPI.java b/.../java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateConnectionUriDomainAPI.java
@@ -16,17 +16,22 @@
 
 package io.supertokens.webserver.api.multitenancy;
 
+import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import io.supertokens.Main;
 import io.supertokens.pluginInterface.multitenancy.TenantIdentifier;
 import io.supertokens.pluginInterface.multitenancy.exceptions.TenantOrAppNotFoundException;
+import io.supertokens.utils.SemVer;
 import io.supertokens.webserver.InputParser;
 import io.supertokens.webserver.Utils;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 public class CreateOrUpdateConnectionUriDomainAPI extends BaseCreateOrUpdate {
 
@@ -54,6 +59,38 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
         Boolean passwordlessEnabled = InputParser.parseBooleanOrThrowError(input, "passwordlessEnabled", true);
         JsonObject coreConfig = InputParser.parseJsonObjectOrThrowError(input, "coreConfig", true);
 
+        Boolean totpEnabled = null;
+        String[] firstFactors = null;
+        boolean hasFirstFactors = false;
+        String[] defaultRequiredFactorIds = null;
+        boolean hasDefaultRequiredFactorIds = false;
+
+        if (getVersionFromRequest(req).greaterThanOrEqualTo(SemVer.v4_1)) {
+            totpEnabled = InputParser.parseBooleanOrThrowError(input, "totpEnabled", true);
+            hasFirstFactors = input.has("firstFactors");
+            if (hasFirstFactors && !input.get("firstFactors").isJsonNull()) {
+                JsonArray firstFactorsArr = InputParser.parseArrayOrThrowError(input, "firstFactors", true);
+                firstFactors = new String[firstFactorsArr.size()];
+                for (int i = 0; i < firstFactors.length; i++) {
+                    firstFactors[i] = InputParser.parseStringFromElementOrThrowError(firstFactorsArr.get(i), "firstFactors", false);
+                }
+                if (firstFactors.length != new HashSet<>(Arrays.asList(firstFactors)).size()) {
+                    throw new ServletException(new BadRequestException("firstFactors input should not contain duplicate values"));
+                }
+            }
+            hasDefaultRequiredFactorIds = input.has("defaultRequiredFactorIds");
+            if (hasDefaultRequiredFactorIds && !input.get("defaultRequiredFactorIds").isJsonNull()) {
+                JsonArray defaultRequiredFactorIdsArr = InputParser.parseArrayOrThrowError(input, "defaultRequiredFactorIds", true);
+                defaultRequiredFactorIds = new String[defaultRequiredFactorIdsArr.size()];
+                for (int i = 0; i < defaultRequiredFactorIds.length; i++) {
+                    defaultRequiredFactorIds[i] = InputParser.parseStringFromElementOrThrowError(defaultRequiredFactorIdsArr.get(i), "defaultRequiredFactorIds", false);
+                }
+                if (defaultRequiredFactorIds.length != new HashSet<>(Arrays.asList(defaultRequiredFactorIds)).size()) {
+                    throw new ServletException(new BadRequestException("defaultRequiredFactorIds input should not contain duplicate values"));
+                }
+            }
+        }
+
         TenantIdentifier sourceTenantIdentifier;
         try {
             sourceTenantIdentifier = this.getTenantIdentifierWithStorageFromRequest(req);
@@ -64,7 +101,9 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
         super.handle(
                 req, sourceTenantIdentifier,
                 new TenantIdentifier(connectionUriDomain, null, null),
-                emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled, coreConfig, resp);
+                emailPasswordEnabled, thirdPartyEnabled, passwordlessEnabled,
+                totpEnabled, hasFirstFactors, firstFactors, hasDefaultRequiredFactorIds, defaultRequiredFactorIds,
+                coreConfig, resp);
 
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ @@
         "2.20",
         "2.21",
         "3.0",
-        "4.0"
+        "4.0",
+        "4.1"
       ]
     }