From cd578e89ff4cc26f2fd570c34858e44bb0143e10 Mon Sep 17 00:00:00 2001
From: Stevche Radevski <sradevski@live.com>
Date: Thu, 7 Nov 2024 09:24:14 +0100
Subject: [PATCH] fix: Use sub instead of email for google entity ID (#9949)

---
 .changeset/beige-dots-divide.md                           | 5 +++++
 .../integration-tests/__tests__/services.spec.ts          | 8 ++++----
 .../modules/providers/auth-google/src/services/google.ts  | 3 +--
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/beige-dots-divide.md

diff --git a/.changeset/beige-dots-divide.md b/.changeset/beige-dots-divide.md
new file mode 100644
index 0000000000..4752eec6d0
--- /dev/null
+++ b/.changeset/beige-dots-divide.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/auth-google": patch
+---
+
+fix: Use sub instead of email for google entity ID
diff --git a/packages/modules/providers/auth-google/integration-tests/__tests__/services.spec.ts b/packages/modules/providers/auth-google/integration-tests/__tests__/services.spec.ts
index 693d0474a2..de641ab8a7 100644
--- a/packages/modules/providers/auth-google/integration-tests/__tests__/services.spec.ts
+++ b/packages/modules/providers/auth-google/integration-tests/__tests__/services.spec.ts
@@ -155,7 +155,7 @@ describe("Google auth provider", () => {
         return {
           provider_identities: [
             {
-              entity_id: "test@admin.com",
+              entity_id: "113664482950786663866",
               provider: "google",
             },
           ],
@@ -180,7 +180,7 @@ describe("Google auth provider", () => {
       authIdentity: {
         provider_identities: [
           {
-            entity_id: "test@admin.com",
+            entity_id: "113664482950786663866",
             provider: "google",
           },
         ],
@@ -194,7 +194,7 @@ describe("Google auth provider", () => {
         return {
           provider_identities: [
             {
-              entity_id: "test@admin.com",
+              entity_id: "113664482950786663866",
               provider: "google",
             },
           ],
@@ -222,7 +222,7 @@ describe("Google auth provider", () => {
       authIdentity: {
         provider_identities: [
           {
-            entity_id: "test@admin.com",
+            entity_id: "113664482950786663866",
             provider: "google",
           },
         ],
diff --git a/packages/modules/providers/auth-google/src/services/google.ts b/packages/modules/providers/auth-google/src/services/google.ts
index 562f6e8912..1a2a323913 100644
--- a/packages/modules/providers/auth-google/src/services/google.ts
+++ b/packages/modules/providers/auth-google/src/services/google.ts
@@ -142,8 +142,7 @@ export class GoogleAuthService extends AbstractAuthModuleProvider {
       )
     }
 
-    // TODO: We should probably use something else than email here, like the `sub` field (which is more constant than the email)
-    const entity_id = payload.email
+    const entity_id = payload.sub
     const userMetadata = {
       name: payload.name,
       picture: payload.picture,