From 834856402cdaa7667797a56d5a3333b2fa682ff9 Mon Sep 17 00:00:00 2001
From: r4id4h <h.mourtada@live.de>
Date: Sun, 10 Aug 2025 16:04:41 +0200
Subject: [PATCH] feat(login) Redirect after login

---
 src/runtime/server/handler/callback.ts  | 11 +++++++++--
 src/runtime/server/handler/login.get.ts | 19 ++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/runtime/server/handler/callback.ts b/src/runtime/server/handler/callback.ts
index 963476c..6adc675 100644
--- a/src/runtime/server/handler/callback.ts
+++ b/src/runtime/server/handler/callback.ts
@@ -30,6 +30,12 @@ function callbackEventHandler({ onSuccess }: OAuthConfig<UserSession>) {
     const session = await useAuthSession(event, config.sessionConfiguration?.maxAuthSessionAge)
 
     const { code, state, id_token, admin_consent, error, error_description }: { code: string; state: string; id_token: string; admin_consent: string; error: string; error_description: string } = event.method === 'POST' ? await readBody(event) : getQuery(event)
+    let stateObj: { token: string; additionalClientAuthParameters: Record<string, string> } | null = null;
+    try {
+      stateObj = typeof state === "string" ? JSON.parse(state) : state;
+    } catch {
+      stateObj = null;
+    }
 
     // Check for admin consent callback
     if (admin_consent) {
@@ -57,7 +63,7 @@ function callbackEventHandler({ onSuccess }: OAuthConfig<UserSession>) {
     }
 
     // Check for valid state
-    if (config.state && (state !== session.data.state)) {
+    if (config.state && (stateObj?.token! !== session.data.state.token!)) {
       oidcErrorHandler(event, 'State mismatch')
     }
 
@@ -215,7 +221,8 @@ function callbackEventHandler({ onSuccess }: OAuthConfig<UserSession>) {
     deleteCookie(event, 'oidc')
     return onSuccess(event, {
       user,
-      callbackRedirectUrl: config.callbackRedirectUrl as string,
+      callbackRedirectUrl: (stateObj?.additionalClientAuthParameters?.redirectUriOverride ??
+        (config.callbackRedirectUrl as string)),
     })
   })
 }
diff --git a/src/runtime/server/handler/login.get.ts b/src/runtime/server/handler/login.get.ts
index 9b72b0b..ac88d9b 100644
--- a/src/runtime/server/handler/login.get.ts
+++ b/src/runtime/server/handler/login.get.ts
@@ -25,13 +25,6 @@ function loginEventHandler() {
     // Initialize auth session
     const session = await useAuthSession(event, config.sessionConfiguration?.maxAuthSessionAge)
     await session.clear()
-    await session.update({
-      state: generateRandomUrlSafeString(),
-      codeVerifier: generatePkceVerifier(),
-      referer: getRequestHeader(event, 'referer'),
-      nonce: undefined,
-    })
-
     // Get client side query parameters
     const additionalClientAuthParameters: Record<string, string> = {}
     if (config.allowedClientAuthParameters?.length) {
@@ -43,6 +36,18 @@ function loginEventHandler() {
       })
     }
 
+    const state = {
+      token: generateRandomUrlSafeString(),
+      additionalClientAuthParameters: additionalClientAuthParameters
+    }
+
+    await session.update({
+      state,
+      codeVerifier: generatePkceVerifier(),
+      referer: getRequestHeader(event, 'referer'),
+      nonce: undefined,
+    })
+
     let clientRedirectUri: string | undefined
     if (config.allowedCallbackRedirectUrls?.length) {
       const clientQueryParams = getQuery(event)