From 4fa52c15e0d1f197459dd1bfb5d94125b15402d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mih=C3=A1ly=20Lengyel?= <mihaly@lengyel.tech>
Date: Thu, 8 Aug 2024 12:42:44 +0200
Subject: [PATCH] fix: make shouldDoAutomaticAccountLinking properly get the
 primary user when linking to oldest user (#907)

---
 CHANGELOG.md                              | 4 ++++
 lib/build/recipe/accountlinking/recipe.js | 2 +-
 lib/build/version.d.ts                    | 2 +-
 lib/build/version.js                      | 2 +-
 lib/ts/recipe/accountlinking/recipe.ts    | 2 +-
 lib/ts/version.ts                         | 2 +-
 package-lock.json                         | 4 ++--
 package.json                              | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 54b5c239f..aa88e14c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [20.0.2] - 2024-08-08
+
+-   Fixes an issue where `shouldDoAutomaticAccountLinking` was called without a primary user when linking in some cases.
+
 ## [20.0.1] - 2024-08-05
 
 -   Fixes an issue with `removeFromPayloadByMerge_internal` for `MultiFactorAuthClaim` where it was not retaining other claims while removing the claim from the payload.
diff --git a/lib/build/recipe/accountlinking/recipe.js b/lib/build/recipe/accountlinking/recipe.js
index 47f375b1d..e9eeeb363 100644
--- a/lib/build/recipe/accountlinking/recipe.js
+++ b/lib/build/recipe/accountlinking/recipe.js
@@ -797,7 +797,7 @@ class Recipe extends recipeModule_1.default {
                     // we can use the 0 index cause targetUser is not a primary user.
                     let shouldDoAccountLinking = await this.config.shouldDoAutomaticAccountLinking(
                         inputUser.loginMethods[0],
-                        primaryUserThatCanBeLinkedToTheInputUser,
+                        createPrimaryUserResult.user,
                         session,
                         tenantId,
                         userContext
diff --git a/lib/build/version.d.ts b/lib/build/version.d.ts
index 4ffb12d1e..ba4e3898a 100644
--- a/lib/build/version.d.ts
+++ b/lib/build/version.d.ts
@@ -1,4 +1,4 @@
 // @ts-nocheck
-export declare const version = "20.0.1";
+export declare const version = "20.0.2";
 export declare const cdiSupported: string[];
 export declare const dashboardVersion = "0.13";
diff --git a/lib/build/version.js b/lib/build/version.js
index 6515caf8f..0d9902d49 100644
--- a/lib/build/version.js
+++ b/lib/build/version.js
@@ -15,7 +15,7 @@ exports.dashboardVersion = exports.cdiSupported = exports.version = void 0;
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-exports.version = "20.0.1";
+exports.version = "20.0.2";
 exports.cdiSupported = ["5.1"];
 // Note: The actual script import for dashboard uses v{DASHBOARD_VERSION}
 exports.dashboardVersion = "0.13";
diff --git a/lib/ts/recipe/accountlinking/recipe.ts b/lib/ts/recipe/accountlinking/recipe.ts
index 8bfe1a8b1..b57b9329a 100644
--- a/lib/ts/recipe/accountlinking/recipe.ts
+++ b/lib/ts/recipe/accountlinking/recipe.ts
@@ -925,7 +925,7 @@ export default class Recipe extends RecipeModule {
                     // we can use the 0 index cause targetUser is not a primary user.
                     let shouldDoAccountLinking = await this.config.shouldDoAutomaticAccountLinking(
                         inputUser.loginMethods[0],
-                        primaryUserThatCanBeLinkedToTheInputUser,
+                        createPrimaryUserResult.user,
                         session,
                         tenantId,
                         userContext
diff --git a/lib/ts/version.ts b/lib/ts/version.ts
index 583444944..22817ea60 100644
--- a/lib/ts/version.ts
+++ b/lib/ts/version.ts
@@ -12,7 +12,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-export const version = "20.0.1";
+export const version = "20.0.2";
 
 export const cdiSupported = ["5.1"];
 
diff --git a/package-lock.json b/package-lock.json
index ebdbc0bfc..862f3f36a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "supertokens-node",
-    "version": "20.0.1",
+    "version": "20.0.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "supertokens-node",
-            "version": "20.0.1",
+            "version": "20.0.2",
             "license": "Apache-2.0",
             "dependencies": {
                 "content-type": "^1.0.5",
diff --git a/package.json b/package.json
index 4b20c99a1..033c9d389 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "supertokens-node",
-    "version": "20.0.1",
+    "version": "20.0.2",
     "description": "NodeJS driver for SuperTokens core",
     "main": "index.js",
     "scripts": {