From fc3ad168fa9dcb252eac1a34b0cf5283a7116b4f Mon Sep 17 00:00:00 2001
From: Knee Cola <kneecola@duck.com>
Date: Tue, 25 Nov 2025 19:50:55 +0100
Subject: [PATCH 1/2] Add debug logging for JWT and session handling in
 authConfig

---
 app/lib/auth.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/lib/auth.ts b/app/lib/auth.ts
index 63e1fd2..479da30 100644
--- a/app/lib/auth.ts
+++ b/app/lib/auth.ts
@@ -35,6 +35,8 @@ export const authConfig: NextAuthConfig = {
       // see: https://stackoverflow.com/questions/70409219/get-user-id-from-session-in-next-auth-client
       jwt({ token, account, user }) {
          if (account) {
+            console.log("(jwt) account:", account);
+            console.log("(jwt) user:", user);
            token.accessToken = account.access_token
            token.id = user?.id
          }
@@ -46,6 +48,7 @@ export const authConfig: NextAuthConfig = {
       async session({ session, token }:{ session:Session, token:any }) {
          if(session.user && token) {
             session.user.id = token.id;
+            console.log("(jwt) token:", token);
          }
          return session;
        },

From 3bac2306f83e4d3cc882c829500be4238cf48f9d Mon Sep 17 00:00:00 2001
From: Knee Cola <kneecola@duck.com>
Date: Tue, 25 Nov 2025 20:05:44 +0100
Subject: [PATCH 2/2] BugFix: after an dependency update the authentication no
 longer used proper ID for the user

---
 app/lib/auth.ts | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/lib/auth.ts b/app/lib/auth.ts
index 479da30..5c09a61 100644
--- a/app/lib/auth.ts
+++ b/app/lib/auth.ts
@@ -35,10 +35,12 @@ export const authConfig: NextAuthConfig = {
       // see: https://stackoverflow.com/questions/70409219/get-user-id-from-session-in-next-auth-client
       jwt({ token, account, user }) {
          if (account) {
-            console.log("(jwt) account:", account);
-            console.log("(jwt) user:", user);
-           token.accessToken = account.access_token
-           token.id = user?.id
+            // console.log("(jwt) account:", account);
+            // console.log("(jwt) user:", user);
+           token.accessToken = account.access_token;
+           // attach Google account ID to the token
+           token.piggyback_providerAccountId = account.providerAccountId;
+           
          }
          return token
       },
@@ -47,8 +49,9 @@ export const authConfig: NextAuthConfig = {
       // see: https://stackoverflow.com/questions/70409219/get-user-id-from-session-in-next-auth-client
       async session({ session, token }:{ session:Session, token:any }) {
          if(session.user && token) {
-            session.user.id = token.id;
-            console.log("(jwt) token:", token);
+            // assign Google account ID from the token to the Session user ID
+            session.user.id = token.piggyback_providerAccountId;
+            // console.log("(jwt) token:", token);
          }
          return session;
        },