Fix Missing idToken during Session Migration from v3 to v4 #2116

Author: KentoMoriwaki

src/server/session/normalize-session.ts

@@ -123,6 +123,7 @@ function convertFromLegacy(
   return {
     user: userClaims,
     tokenSet: {
+      idToken: (session.idToken as string) ?? undefined,
       accessToken: (session.accessToken as string) ?? undefined,
       scope: session.accessTokenScope as string | undefined,
       refreshToken: session.refreshToken as string | undefined,

src/server/session/stateless-session-store.test.ts

@@ -67,6 +67,7 @@ describe("Stateless Session Store", async () => {
             sub: "user_123",
             sid: "auth0-sid"
           },
+          idToken: "idt_123",
           accessToken: "at_123",
           accessTokenScope: "openid profile email",
           refreshToken: "rt_123",
@@ -97,6 +98,7 @@ describe("Stateless Session Store", async () => {
         expect(await sessionStore.get(requestCookies)).toEqual({
           user: { sub: "user_123", sid: "auth0-sid" },
           tokenSet: {
+            idToken: "idt_123",
             accessToken: "at_123",
             refreshToken: "rt_123",
             expiresAt: 123456,
@@ -161,6 +163,7 @@ describe("Stateless Session Store", async () => {
             sub: "user_123",
             sid: "auth0-sid"
           },
+          idToken: "idt_123",
           accessToken: "at_123",
           accessTokenScope: "openid profile email",
           refreshToken: "rt_123",
@@ -194,6 +197,7 @@ describe("Stateless Session Store", async () => {
         expect(await sessionStore.get(requestCookies)).toEqual({
           user: { sub: "user_123", sid: "auth0-sid" },
           tokenSet: {
+            idToken: "idt_123",
             accessToken: "at_123",
             refreshToken: "rt_123",
             expiresAt: 123456,