From d22ea29744fc6ee631f51da01a009fc1ebaf3d08 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Tue, 16 Jul 2024 12:03:35 +0530 Subject: [PATCH 1/3] fix: e2e with 0.41 --- CHANGELOG.md | 3 ++- test/end-to-end/accountlinking.test.js | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccee05a4e..3affa7dd3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] -## [0.41.2] - UNRELEASED +## [0.41.2] - 2024-07-16 ### Test changes - Backported some test stability fixes +- Fixes e2e test ## [0.41.1] - 2024-05-13 diff --git a/test/end-to-end/accountlinking.test.js b/test/end-to-end/accountlinking.test.js index af4aaf2a4..419a7a57b 100644 --- a/test/end-to-end/accountlinking.test.js +++ b/test/end-to-end/accountlinking.test.js @@ -373,10 +373,18 @@ describe("SuperTokens Account linking", function () { await tryThirdPartySignInUp(page, email, false, email2); assert.strictEqual(new URL(page.url()).pathname, "/auth/"); - assert.strictEqual( - await getGeneralError(page), - "Cannot sign in / up because new email cannot be applied to existing account. Please contact support. (ERR_CODE_005)" - ); + const features = await getFeatureFlags(); + if (features.includes("accountlinking-fixes")) { + assert.strictEqual( + await getGeneralError(page), + "Cannot sign in / up due to security reasons. Please try a different login method or contact support. (ERR_CODE_004)" + ); + } else { + assert.strictEqual( + await getGeneralError(page), + "Cannot sign in / up because new email cannot be applied to existing account. Please contact support. (ERR_CODE_005)" + ); + } }); it("should not allow sign in w/ an unverified thirdparty user in case of conflict", async function () { From 6784c371d583820645730735589ad3a5be0e2821 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Tue, 16 Jul 2024 12:18:37 +0530 Subject: [PATCH 2/3] fix: e2e --- CHANGELOG.md | 7 +++++-- lib/build/genericComponentOverrideContext.js | 2 +- lib/build/version.d.ts | 2 +- lib/ts/version.ts | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3affa7dd3..8e93e8f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] -## [0.41.2] - 2024-07-16 +## [0.41.3] - 2024-07-16 + +- Fixes e2e test + +## [0.41.2] ### Test changes - Backported some test stability fixes -- Fixes e2e test ## [0.41.1] - 2024-05-13 diff --git a/lib/build/genericComponentOverrideContext.js b/lib/build/genericComponentOverrideContext.js index de010bfb3..c85a9c7cd 100644 --- a/lib/build/genericComponentOverrideContext.js +++ b/lib/build/genericComponentOverrideContext.js @@ -265,7 +265,7 @@ var SSR_ERROR = * License for the specific language governing permissions and limitations * under the License. */ -var package_version = "0.41.2"; +var package_version = "0.41.3"; /* Copyright (c) 2021, VRAI Labs and/or its affiliates. All rights reserved. * diff --git a/lib/build/version.d.ts b/lib/build/version.d.ts index ecc265044..e9b6e1d79 100644 --- a/lib/build/version.d.ts +++ b/lib/build/version.d.ts @@ -1 +1 @@ -export declare const package_version = "0.41.2"; +export declare const package_version = "0.41.3"; diff --git a/lib/ts/version.ts b/lib/ts/version.ts index 8c7017580..f01104a71 100644 --- 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.41.2"; +export const package_version = "0.41.3"; diff --git a/package-lock.json b/package-lock.json index 9a623cfb2..c4346f972 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "supertokens-auth-react", - "version": "0.41.2", + "version": "0.41.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "supertokens-auth-react", - "version": "0.41.2", + "version": "0.41.3", "license": "Apache-2.0", "dependencies": { "intl-tel-input": "^17.0.19", diff --git a/package.json b/package.json index 1c09871c2..e73a4a97a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "supertokens-auth-react", - "version": "0.41.2", + "version": "0.41.3", "description": "ReactJS SDK that provides login functionality with SuperTokens.", "main": "./index.js", "engines": { From 31c034acaa2f8f4afd39483e3aece32fa8ed0a97 Mon Sep 17 00:00:00 2001 From: Sattvik Chakravarthy Date: Tue, 16 Jul 2024 12:23:19 +0530 Subject: [PATCH 3/3] fix: add dev tag --- addDevTag | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addDevTag b/addDevTag index 49f2f2d90..ecaeffc6a 100755 --- a/addDevTag +++ b/addDevTag @@ -1,9 +1,3 @@ -# check if we need to merge master into this branch------------ -if [[ $(git log origin/master ^HEAD) ]]; then - echo "You need to merge master into this branch. Exiting" - exit 1 -fi - # get version------------ version=`cat package.json | grep -e '"version":'`