Merge remote-tracking branch 'origin/0.35' into feat/account-linking

supertokens · Sep 19, 2023 · 676fc2c · 676fc2c
2 parents cabf84f + 5818082
commit 676fc2c
Show file tree

Hide file tree

Showing 45 changed files with 188 additions and 71 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,12 @@ EmailPassword.init({ // This looks the same for other recipes
 })
 ```
 
+## [0.34.2] - 2023-08-27
+
+### Fixes
+
+-   Fixed the SDK trying to merge the providers from the tenant config if the third party login method is disabled.
+
 ## [0.34.1] - 2023-07-31
 
 ### Changes

diff --git a/docs/classes/index.default.html b/docs/classes/index.default.html
diff --git a/docs/classes/recipe_authRecipe.default.html b/docs/classes/recipe_authRecipe.default.html
diff --git a/docs/classes/recipe_emailpassword.default.html b/docs/classes/recipe_emailpassword.default.html
diff --git a/docs/classes/recipe_emailverification.default.html b/docs/classes/recipe_emailverification.default.html
diff --git a/docs/classes/recipe_multitenancy.default.html b/docs/classes/recipe_multitenancy.default.html
diff --git a/docs/classes/recipe_passwordless.default.html b/docs/classes/recipe_passwordless.default.html
diff --git a/docs/classes/recipe_recipeModule.default.html b/docs/classes/recipe_recipeModule.default.html
diff --git a/docs/classes/recipe_session.BooleanClaim.html b/docs/classes/recipe_session.BooleanClaim.html
diff --git a/docs/classes/recipe_session.PrimitiveArrayClaim.html b/docs/classes/recipe_session.PrimitiveArrayClaim.html
diff --git a/docs/classes/recipe_session.PrimitiveClaim.html b/docs/classes/recipe_session.PrimitiveClaim.html
diff --git a/docs/classes/recipe_session.default.html b/docs/classes/recipe_session.default.html
diff --git a/docs/classes/recipe_thirdparty.ActiveDirectory.html b/docs/classes/recipe_thirdparty.ActiveDirectory.html
diff --git a/docs/classes/recipe_thirdparty.Apple.html b/docs/classes/recipe_thirdparty.Apple.html
diff --git a/docs/classes/recipe_thirdparty.Bitbucket.html b/docs/classes/recipe_thirdparty.Bitbucket.html
diff --git a/docs/classes/recipe_thirdparty.BoxySAML.html b/docs/classes/recipe_thirdparty.BoxySAML.html
diff --git a/docs/classes/recipe_thirdparty.Discord.html b/docs/classes/recipe_thirdparty.Discord.html
diff --git a/docs/classes/recipe_thirdparty.Facebook.html b/docs/classes/recipe_thirdparty.Facebook.html
diff --git a/docs/classes/recipe_thirdparty.Github.html b/docs/classes/recipe_thirdparty.Github.html
diff --git a/docs/classes/recipe_thirdparty.Gitlab.html b/docs/classes/recipe_thirdparty.Gitlab.html
diff --git a/docs/classes/recipe_thirdparty.Google.html b/docs/classes/recipe_thirdparty.Google.html
diff --git a/docs/classes/recipe_thirdparty.GoogleWorkspaces.html b/docs/classes/recipe_thirdparty.GoogleWorkspaces.html
diff --git a/docs/classes/recipe_thirdparty.LinkedIn.html b/docs/classes/recipe_thirdparty.LinkedIn.html
diff --git a/docs/classes/recipe_thirdparty.Okta.html b/docs/classes/recipe_thirdparty.Okta.html
diff --git a/docs/classes/recipe_thirdparty.Twitter.html b/docs/classes/recipe_thirdparty.Twitter.html
diff --git a/docs/classes/recipe_thirdparty.default.html b/docs/classes/recipe_thirdparty.default.html
diff --git a/docs/classes/recipe_thirdpartyemailpassword.default.html b/docs/classes/recipe_thirdpartyemailpassword.default.html
diff --git a/docs/classes/recipe_thirdpartypasswordless.default.html b/docs/classes/recipe_thirdpartypasswordless.default.html
diff --git a/docs/classes/recipe_userroles.default.html b/docs/classes/recipe_userroles.default.html
diff --git a/docs/modules/index.html b/docs/modules/index.html
diff --git a/docs/modules/recipe_emailpassword.html b/docs/modules/recipe_emailpassword.html
diff --git a/docs/modules/recipe_emailverification.html b/docs/modules/recipe_emailverification.html
diff --git a/docs/modules/recipe_multitenancy.html b/docs/modules/recipe_multitenancy.html
diff --git a/docs/modules/recipe_passwordless.html b/docs/modules/recipe_passwordless.html
diff --git a/docs/modules/recipe_session.html b/docs/modules/recipe_session.html
diff --git a/docs/modules/recipe_thirdparty.html b/docs/modules/recipe_thirdparty.html
diff --git a/docs/modules/recipe_thirdpartyemailpassword.html b/docs/modules/recipe_thirdpartyemailpassword.html
diff --git a/docs/modules/recipe_thirdpartypasswordless.html b/docs/modules/recipe_thirdpartypasswordless.html
diff --git a/lib/build/recipe/thirdpartyemailpassword/components/themes/translations.d.ts b/lib/build/recipe/thirdpartyemailpassword/components/themes/translations.d.ts
diff --git a/lib/build/thirdparty-shared.js b/lib/build/thirdparty-shared.js
diff --git a/lib/build/thirdparty-shared2.js b/lib/build/thirdparty-shared2.js
diff --git a/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx b/lib/ts/recipe/thirdparty/components/features/signInAndUp/index.tsx
@@ -92,7 +92,9 @@ export function useChildProps(recipe: Recipe | undefined): ThirdPartySignInUpChi
             if (dynamicLoginMethods.loaded === false) {
                 throw new Error("Component requiring dynamicLoginMethods rendered without FeatureWrapper.");
             } else {
-                tenantProviders = dynamicLoginMethods.loginMethods.thirdparty.providers;
+                tenantProviders = dynamicLoginMethods.loginMethods.thirdparty.enabled
+                    ? dynamicLoginMethods.loginMethods.thirdparty.providers
+                    : [];
             }
         }
 

diff --git a/lib/ts/recipe/thirdparty/utils.ts b/lib/ts/recipe/thirdparty/utils.ts
@@ -141,8 +141,9 @@ export async function redirectToThirdPartyLogin(input: {
     const loginMethods = await Multitenancy.getInstanceOrThrow().getCurrentDynamicLoginMethods({
         userContext: input.userContext,
     });
+    const tenantProviders = loginMethods?.thirdparty.enabled ? loginMethods.thirdparty.providers : [];
     const providers = mergeProviders({
-        tenantProviders: loginMethods?.thirdparty.providers,
+        tenantProviders,
         clientProviders: input.config.signInAndUpFeature.providers,
     });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/end-to-end/multitenancy.dynamic_login_methods.test.js b/test/end-to-end/multitenancy.dynamic_login_methods.test.js
@@ -478,7 +478,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
 
     // Examples from https://supertokens.com/docs/contribute/decisions/multitenancy/0006
 
-    it("should should show emailpassword if it's the only one added on both", async function () {
+    it("should show emailpassword if it's the only one added on both", async function () {
         await setEnabledRecipes(page, ["emailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -506,7 +506,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, ["email", "password"]);
     });
 
-    it("should should show thirdpartyemailpassword with emailpassword disabled if FE only has tpep but only thirdparty is enabled", async function () {
+    it("should show thirdpartyemailpassword with emailpassword disabled if FE only has tpep but only thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdpartyemailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: false },
@@ -534,7 +534,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, []);
     });
 
-    it("should should show thirdpartyemailpassword if FE has tpep and both emailpassword and thirdparty is enabled", async function () {
+    it("should show thirdpartyemailpassword if FE has tpep and both emailpassword and thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdpartyemailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -563,7 +563,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
     });
 
     // This is slightly different than the version in the ADR, since it hasn't been updated
-    it("should should show emailpassword if FE has tp and ep but (no tpep) and both emailpassword and thirdparty is enabled", async function () {
+    it("should show emailpassword if FE has tp and ep but (no tpep) and both emailpassword and thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdparty", "emailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -591,7 +591,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, ["email", "password"]);
     });
 
-    it("should should show thirdparty if FE has tp and pwless and both emailpassword and thirdparty is enabled", async function () {
+    it("should show thirdparty if FE has tp and pwless and both emailpassword and thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdparty", "passwordless"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -619,7 +619,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, []);
     });
 
-    it("should should show thirdpartyemailpassword if FE has tpep and ep and both emailpassword and thirdparty is enabled", async function () {
+    it("should show thirdpartyemailpassword if FE has tpep and ep and both emailpassword and thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdpartyemailpassword", "emailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -647,7 +647,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, ["email", "password"]);
     });
 
-    it("should should show thirdpartypasswordless if FE has tppwless and ep and both emailpassword and thirdparty is enabled", async function () {
+    it("should show thirdpartypasswordless if FE has tppwless and ep and both emailpassword and thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdpartypasswordless", "emailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -675,7 +675,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, []);
     });
 
-    it("should should show thirdpartyemailpassword if FE has tpep and tppwless and all 3 enabled in core", async function () {
+    it("should show thirdpartyemailpassword if FE has tpep and tppwless and all 3 enabled in core", async function () {
         await setEnabledRecipes(page, ["thirdpartypasswordless", "thirdpartyemailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -703,7 +703,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, ["email", "password"]);
     });
 
-    it("should should show thirdpartypwless if rid has FE has tpep and tppwless and all 3 enabled in core", async function () {
+    it("should show thirdpartypwless if rid has FE has tpep and tppwless and all 3 enabled in core", async function () {
         await setEnabledRecipes(page, ["thirdpartypasswordless", "thirdpartyemailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -731,7 +731,109 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, ["email", "password"]);
     });
 
-    it("should should show something went wrong if logging in with disabled method", async function () {
+    it("should show thirdpartyemailpassword if FE has only tpep and thirdparty is disbled in core", async function () {
+        await setEnabledRecipes(page, ["thirdpartyemailpassword"]);
+        await enableDynamicLoginMethods(page, {
+            emailPassword: { enabled: true },
+            passwordless: { enabled: true },
+            thirdParty: {
+                enabled: false,
+                providers: [],
+            },
+        });
+
+        await Promise.all([
+            page.goto(`${TEST_CLIENT_BASE_URL}${DEFAULT_WEBSITE_BASE_PATH}`),
+            page.waitForNavigation({ waitUntil: "networkidle0" }),
+        ]);
+
+        // Thirdparty
+        const providers = await getProvidersLabels(page);
+        assert.strictEqual(providers.length, 0);
+        assert.strictEqual(await getProviderLogoCount(page), 0);
+
+        // Emailpassword
+        const inputNames = await getInputNames(page);
+        assert.deepStrictEqual(inputNames, ["email", "password"]);
+    });
+
+    it("should show thirdpartyemailpassword if FE has only tpep and thirdparty is disbled in core", async function () {
+        await setEnabledRecipes(page, ["thirdpartyemailpassword"]);
+        await enableDynamicLoginMethods(page, {
+            emailPassword: { enabled: false },
+            passwordless: { enabled: false },
+            thirdParty: {
+                enabled: true,
+                providers: [],
+            },
+        });
+
+        await Promise.all([
+            page.goto(`${TEST_CLIENT_BASE_URL}${DEFAULT_WEBSITE_BASE_PATH}`),
+            page.waitForNavigation({ waitUntil: "networkidle0" }),
+        ]);
+
+        // Thirdparty
+        const providers = await getProvidersLabels(page);
+        assert.notStrictEqual(providers.length, 0);
+        assert.notStrictEqual(await getProviderLogoCount(page), 0);
+
+        // Emailpassword
+        const inputNames = await getInputNames(page);
+        assert.deepStrictEqual(inputNames, []);
+    });
+
+    it("should show thirdpartpasswordless if FE has only tppwless and thirdparty is disbled in core", async function () {
+        await setEnabledRecipes(page, ["thirdpartypasswordless"]);
+        await enableDynamicLoginMethods(page, {
+            emailPassword: { enabled: true },
+            passwordless: { enabled: true },
+            thirdParty: {
+                enabled: false,
+                providers: [],
+            },
+        });
+
+        await Promise.all([
+            page.goto(`${TEST_CLIENT_BASE_URL}${DEFAULT_WEBSITE_BASE_PATH}`),
+            page.waitForNavigation({ waitUntil: "networkidle0" }),
+        ]);
+
+        // Thirdparty
+        const providers = await getProvidersLabels(page);
+        assert.strictEqual(providers.length, 0);
+        assert.strictEqual(await getProviderLogoCount(page), 0);
+
+        // pwless
+        await waitForSTElement(page, "[data-supertokens~=input][name=emailOrPhone]");
+    });
+
+    it("should show thirdpartpasswordless if FE has only tppwless and passwordless is disbled in core", async function () {
+        await setEnabledRecipes(page, ["thirdpartypasswordless"]);
+        await enableDynamicLoginMethods(page, {
+            emailPassword: { enabled: false },
+            passwordless: { enabled: false },
+            thirdParty: {
+                enabled: true,
+                providers: [],
+            },
+        });
+
+        await Promise.all([
+            page.goto(`${TEST_CLIENT_BASE_URL}${DEFAULT_WEBSITE_BASE_PATH}`),
+            page.waitForNavigation({ waitUntil: "networkidle0" }),
+        ]);
+
+        // Thirdparty
+        const providers = await getProvidersLabels(page);
+        assert.notStrictEqual(providers.length, 0);
+        assert.notStrictEqual(await getProviderLogoCount(page), 0);
+
+        // pwless
+        await waitForSTElement(page, "[data-supertokens~=input][name=emailOrPhone]", true);
+    });
+
+    it("should show something went wrong if logging in with disabled method", async function () {
         await setEnabledRecipes(page, ["emailpassword"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: false },
@@ -769,7 +871,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.strictEqual(error, SOMETHING_WENT_WRONG_ERROR);
     });
 
-    it("should should show thirdparty if FE has tp and pwless and both emailpassword and thirdparty is enabled", async function () {
+    it("should show thirdparty if FE has tp and pwless and both emailpassword and thirdparty is enabled", async function () {
         await setEnabledRecipes(page, ["thirdparty", "passwordless"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: true },
@@ -797,7 +899,7 @@ describe("SuperTokens Multitenancy dynamic login methods", function () {
         assert.deepStrictEqual(inputNames, []);
     });
 
-    it("should should be able to log in with dynamically added tp providers", async function () {
+    it("should be able to log in with dynamically added tp providers", async function () {
         await setEnabledRecipes(page, ["thirdparty"]);
         await enableDynamicLoginMethods(page, {
             emailPassword: { enabled: false },