@logto/next 4.2.5 → 4.2.7

package/lib/server-actions/client.d.ts

@@ -36,8 +36,9 @@ export default class LogtoClient extends BaseClient {
      * Handle sign-in callback from Logto.
      *
      * @param callbackUrl the uri (callbackUri) to redirect to after sign in, should match the one used in handleSignIn
+     * @returns the postRedirectUri if configured, otherwise undefined
      */
-    handleSignInCallback(callbackUrl: string): Promise<void>;
+    handleSignInCallback(callbackUrl: string): Promise<string | undefined>;
     /**
      * Get Logto context from cookies.
      *

package/lib/server-actions/client.js

@@ -42,10 +42,12 @@ class LogtoClient extends LogtoNextBaseClient {
      * Handle sign-in callback from Logto.
      *
      * @param callbackUrl the uri (callbackUri) to redirect to after sign in, should match the one used in handleSignIn
+     * @returns the postRedirectUri if configured, otherwise undefined
      */
     async handleSignInCallback(callbackUrl) {
         const nodeClient = await this.createNodeClient();
         await nodeClient.handleSignInCallback(callbackUrl);
+        return this.navigateUrl;
     }
     /**
      * Get Logto context from cookies.

package/lib/server-actions/index.js

@@ -10,15 +10,19 @@ async function signIn(config, options, interactionMode) {
     redirect(url);
 }
 /**
- * Handle sign in callback from search params or full redirect URL, save tokens to session
+ * Handle sign in callback from search params or full redirect URL, save tokens to session,
+ * and redirect to postRedirectUri if configured
  * @param config The Logto configuration object
  * @param searchParamsOrUrl Either URLSearchParams from the callback URL or the complete URL object
  */
 async function handleSignIn(config, searchParamsOrUrl) {
     const client = new LogtoClient(config);
-    await client.handleSignInCallback(searchParamsOrUrl instanceof URL
+    const postRedirectUri = await client.handleSignInCallback(searchParamsOrUrl instanceof URL
         ? searchParamsOrUrl.toString()
         : `${config.baseUrl}/callback?${searchParamsOrUrl.toString()}`);
+    if (postRedirectUri) {
+        redirect(postRedirectUri);
+    }
 }
 /**
  * Init sign out process, clear session, and redirect to the Logto sign-out page

package/lib/src/index.d.ts

@@ -20,7 +20,7 @@ export default class LogtoClient extends LogtoNextBaseClient {
     getAccessToken: (request: NextApiRequest, response: NextApiResponse, resource: string) => Promise<string>;
     getOrganizationToken: (request: NextApiRequest, response: NextApiResponse, organizationId: string) => Promise<string>;
     withLogtoApiRoute: (handler: NextApiHandler, config?: GetContextParameters, onError?: ErrorHandler) => NextApiHandler;
-    withLogtoSsr: <P extends Record<string, unknown> = Record<string, unknown>>(handler: (context: GetServerSidePropsContext) => GetServerSidePropsResult<P> | Promise<GetServerSidePropsResult<P>>, configs?: GetContextParameters, onError?: ((error: unknown) => unknown) | undefined) => (context: GetServerSidePropsContext) => Promise<NextApiHandler>;
+    withLogtoSsr: <P extends Record<string, unknown> = Record<string, unknown>>(handler: (context: GetServerSidePropsContext) => GetServerSidePropsResult<P> | Promise<GetServerSidePropsResult<P>>, configs?: GetContextParameters, onError?: ((error: unknown) => unknown) | undefined) => (context: GetServerSidePropsContext) => Promise<unknown>;
     createNodeClientFromNextApi(request: IncomingMessage & {
         cookies: NextApiRequestCookies;
     }, response: ServerResponse): Promise<NodeClient>;

package/lib/src/index.js

@@ -24,7 +24,13 @@ class LogtoClient extends LogtoNextBaseClient {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             if (request.url) {
                 await nodeClient.handleSignInCallback(`${this.config.baseUrl}${request.url}`);
-                response.redirect(redirectTo);
+                // Check if there's a stored navigation URL (from postRedirectUri) first
+                if (this.navigateUrl) {
+                    response.redirect(this.navigateUrl);
+                }
+                else {
+                    response.redirect(redirectTo);
+                }
             }
         }, onError);
         this.handleSignOut = (redirectUri = this.config.baseUrl, onError) => buildHandler(async (request, response) => {
@@ -73,9 +79,19 @@ class LogtoClient extends LogtoNextBaseClient {
             return handler(request, response);
         }, onError);
         this.withLogtoSsr = (handler, configs = {}, onError) => async (context) => {
-            return this.withLogtoApiRoute(async () => {
-                return handler(context);
-            }, configs, onError);
+            try {
+                const nodeClient = await this.createNodeClientFromNextApi(context.req, context.res);
+                const user = await nodeClient.getContext(configs);
+                // eslint-disable-next-line @silverhand/fp/no-mutating-methods
+                Object.defineProperty(context.req, 'user', { enumerable: true, get: () => user });
+                return await handler(context);
+            }
+            catch (error) {
+                if (onError) {
+                    return onError(error);
+                }
+                throw error;
+            }
         };
         this.handleSignInImplementation = (options) => buildHandler(async (request, response) => {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/next",
-  "version": "4.2.5",
+  "version": "4.2.7",
   "type": "module",
   "module": "./lib/src/index.js",
   "types": "./lib/src/index.d.ts",
@@ -43,7 +43,7 @@
   "dependencies": {
     "@edge-runtime/cookies": "^5.0.0",
     "cookie": "^1.0.0",
-    "@logto/node": "^3.1.6"
+    "@logto/node": "^3.1.7"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "^6.0.1",
@@ -53,11 +53,11 @@
     "@vitest/coverage-v8": "^2.1.9",
     "eslint": "^8.57.0",
     "lint-staged": "^15.0.0",
-    "next": "^15.2.4",
+    "next": "^15.5.9",
     "next-test-api-route-handler": "^4.0.14",
     "prettier": "^3.0.0",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
+    "react": "19.2.3",
+    "react-dom": "19.2.3",
     "typescript": "^5.3.3",
     "vitest": "^2.1.9"
   },