feat: remove EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT + update version n…

…umber
supertokens · Sep 7, 2023 · c58b6e3 · c58b6e3
1 parent ee794ff
commit c58b6e3
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,7 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   User type has changed across recipes and functions: recipe specific user types have been removed and replaced by a generic one that contains more information
 -   `createdNewUser` has been renamed to `createdNewRecipeUser`
 -   `createCode`, `consumeCode`, `createPasswordlessCode` and `consumePasswordlessCode` can now return status: `SIGN_IN_UP_NOT_ALLOWED`
--   `signInAndUp` and `thirdPartySignInAndUp` can now return new statuses: `EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT`, `SIGN_IN_UP_NOT_ALLOWED`
+-   `signInAndUp` and `thirdPartySignInAndUp` can now return new status: `SIGN_IN_UP_NOT_ALLOWED`
 -   `sendPasswordResetEmail` can now return `status: "PASSWORD_RESET_NOT_ALLOWED"`
 
 ## [0.34.1] - 2023-07-31

diff --git a/lib/build/recipe/thirdparty/index.d.ts b/lib/build/recipe/thirdparty/index.d.ts
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/recipe/thirdpartyemailpassword/index.d.ts b/lib/build/recipe/thirdpartyemailpassword/index.d.ts
diff --git a/lib/build/recipe/thirdpartypasswordless/components/themes/translations.d.ts b/lib/build/recipe/thirdpartypasswordless/components/themes/translations.d.ts
diff --git a/lib/build/recipe/thirdpartypasswordless/index.d.ts b/lib/build/recipe/thirdpartypasswordless/index.d.ts
diff --git a/lib/build/thirdparty-shared2.js b/lib/build/thirdparty-shared2.js
diff --git a/lib/build/version.d.ts b/lib/build/version.d.ts
diff --git a/lib/ts/recipe/thirdparty/components/features/signInAndUpCallback/index.tsx b/lib/ts/recipe/thirdparty/components/features/signInAndUpCallback/index.tsx
@@ -54,10 +54,7 @@ const SignInAndUpCallback: React.FC<PropType> = (props) => {
                 });
             }
 
-            if (
-                response.status === "EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT" ||
-                response.status === "SIGN_IN_UP_NOT_ALLOWED"
-            ) {
+            if (response.status === "SIGN_IN_UP_NOT_ALLOWED") {
                 return SuperTokens.getInstanceOrThrow().redirectToAuth({
                     history: props.history,
                     queryParams: {

diff --git a/lib/ts/recipe/thirdparty/index.ts b/lib/ts/recipe/thirdparty/index.ts
@@ -107,7 +107,7 @@ export default class Wrapper {
               fetchResponse: Response;
           }
         | {
-              status: "SIGN_IN_UP_NOT_ALLOWED" | "EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT";
+              status: "SIGN_IN_UP_NOT_ALLOWED";
               reason: string;
               fetchResponse: Response;
           }

diff --git a/lib/ts/recipe/thirdpartyemailpassword/index.ts b/lib/ts/recipe/thirdpartyemailpassword/index.ts
@@ -218,7 +218,7 @@ export default class Wrapper {
               fetchResponse: Response;
           }
         | {
-              status: "SIGN_IN_UP_NOT_ALLOWED" | "EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT";
+              status: "SIGN_IN_UP_NOT_ALLOWED";
               reason: string;
               fetchResponse: Response;
           }

diff --git a/lib/ts/recipe/thirdpartypasswordless/index.ts b/lib/ts/recipe/thirdpartypasswordless/index.ts
@@ -82,7 +82,7 @@ export default class Wrapper {
               fetchResponse: Response;
           }
         | {
-              status: "SIGN_IN_UP_NOT_ALLOWED" | "EMAIL_ALREADY_USED_IN_ANOTHER_ACCOUNT";
+              status: "SIGN_IN_UP_NOT_ALLOWED";
               reason: string;
               fetchResponse: Response;
           }

diff --git a/lib/ts/version.ts b/lib/ts/version.ts
@@ -12,4 +12,4 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-export const package_version = "0.34.1";
+export const package_version = "0.35.0";
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "supertokens-auth-react",
-    "version": "0.34.1",
+    "version": "0.35.0",
     "description": "ReactJS SDK that provides login functionality with SuperTokens.",
     "main": "./index.js",
     "engines": {

diff --git a/test/end-to-end/accountlinking.test.js b/test/end-to-end/accountlinking.test.js
@@ -428,36 +428,6 @@ describe("SuperTokens Account linking", function () {
                 assert.strictEqual(new URL(page.url()).pathname, "/auth/");
             });
 
-            it("should not allow sign in w/ passwordless if it conflicts with an unverified user", async function () {
-                const email = `test-user+${Date.now()}@supertokens.com`;
-
-                await setAccountLinkingConfig(true, false);
-                // 1. Sign up without account linking with an unverified tp user & log out
-                await tryEmailPasswordSignUp(page, email);
-                await logOut(page);
-
-                // 2. Sign up with passwordless
-                await tryPasswordlessSignInUp(page, email);
-                await logOut(page);
-
-                await setAccountLinkingConfig(true, true, true);
-                // 3. Sign in with passwordless
-                await page.evaluate(() => localStorage.removeItem("supertokens-passwordless-loginAttemptInfo"));
-                await Promise.all([
-                    page.goto(`${TEST_CLIENT_BASE_URL}/auth/?authRecipe=passwordless`),
-                    page.waitForNavigation({ waitUntil: "networkidle0" }),
-                ]);
-
-                await setInputValues(page, [{ name: "emailOrPhone", value: email }]);
-                await submitForm(page);
-
-                assert.strictEqual(
-                    await getGeneralError(page),
-                    "Cannot sign in / up due to security reasons. Please try a different login method or contact support. (ERR_CODE_003)"
-                );
-                assert.strictEqual(new URL(page.url()).pathname, "/auth/");
-            });
-
             it("should not allow sign up w/ passwordless if it conflicts with an unverified user", async function () {
                 const email = `test-user+${Date.now()}@supertokens.com`;
 

diff --git a/test/end-to-end/multitenancy.tenant_interactions.test.js b/test/end-to-end/multitenancy.tenant_interactions.test.js
@@ -454,6 +454,14 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
                     providers: [],
                 },
             });
+            await setupTenant("customer1", {
+                emailPassword: { enabled: true },
+                passwordless: { enabled: false },
+                thirdParty: {
+                    enabled: true,
+                    providers: [],
+                },
+            });
 
             await Promise.all([
                 page.goto(`${TEST_CLIENT_BASE_URL}${DEFAULT_WEBSITE_BASE_PATH}`),
@@ -463,7 +471,8 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
             const email = await epSignUp(page);
 
             const userId = await getUserIdWithFetch(page);
-            removeUserFromTenant("public", userId);
+            await addUserToTenant("customer1", userId);
+            await removeUserFromTenant("public", userId);
 
             await clearBrowserCookiesWithoutAffectingConsole(page, []);
 
@@ -501,7 +510,8 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
             const email = await epSignUp(page);
 
             const userId = await getUserIdWithFetch(page);
-            removeUserFromTenant("public", userId);
+            await addUserToTenant("customer1", userId);
+            await removeUserFromTenant("public", userId);
             await clearBrowserCookiesWithoutAffectingConsole(page, []);
 
             await Promise.all([
@@ -540,7 +550,8 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
             await epSignUp(page);
 
             const userId = await getUserIdWithFetch(page);
-            removeUserFromTenant("public", userId);
+            await addUserToTenant("customer1", userId);
+            await removeUserFromTenant("public", userId);
 
             await Promise.all([
                 page.goto(`${TEST_CLIENT_BASE_URL}/dashboard`),