@logto/next 3.1.2 → 3.2.1

package/lib/edge/index.d.ts

@@ -2,7 +2,7 @@ import { type GetContextParameters, type InteractionMode } from '@logto/node';
 import { type NextRequest } from 'next/server';
 import BaseClient from '../src/client';
 import type { LogtoNextConfig } from '../src/types.js';
-export type { LogtoContext, InteractionMode } from '@logto/node';
+export type { AccessTokenClaims, IdTokenClaims, LogtoContext, InteractionMode, LogtoErrorCode, } from '@logto/node';
 export default class LogtoClient extends BaseClient {
     constructor(config: LogtoNextConfig);
     handleSignIn: (redirectUri?: string, interactionMode?: InteractionMode) => (request: Request) => Promise<Response>;

package/lib/src/index.cjs

@@ -61,21 +61,37 @@ class LogtoClient extends client.default {
             }
             response.status(404).end();
         };
-        this.withLogtoApiRoute = (handler, config = {}) => async (request, response) => {
-            const nodeClient = await this.createNodeClientFromNextApi(request, response);
-            const user = await nodeClient.getContext(config);
-            await this.storage?.save();
-            // eslint-disable-next-line @silverhand/fp/no-mutating-methods
-            Object.defineProperty(request, 'user', { enumerable: true, get: () => user });
-            return handler(request, response);
+        this.withLogtoApiRoute = (handler, config = {}, onError) => async (request, response) => {
+            try {
+                const nodeClient = await this.createNodeClientFromNextApi(request, response);
+                const user = await nodeClient.getContext(config);
+                await this.storage?.save();
+                // eslint-disable-next-line @silverhand/fp/no-mutating-methods
+                Object.defineProperty(request, 'user', { enumerable: true, get: () => user });
+                return handler(request, response);
+            }
+            catch (error) {
+                if (onError) {
+                    return onError(request, response, error);
+                }
+                throw error;
+            }
         };
-        this.withLogtoSsr = (handler, configs = {}) => async (context) => {
-            const nodeClient = await this.createNodeClientFromNextApi(context.req, context.res);
-            const user = await nodeClient.getContext(configs);
-            await this.storage?.save();
-            // eslint-disable-next-line @silverhand/fp/no-mutating-methods
-            Object.defineProperty(context.req, 'user', { enumerable: true, get: () => user });
-            return handler(context);
+        this.withLogtoSsr = (handler, configs = {}, onError) => async (context) => {
+            try {
+                const nodeClient = await this.createNodeClientFromNextApi(context.req, context.res);
+                const user = await nodeClient.getContext(configs);
+                await this.storage?.save();
+                // 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;
+            }
         };
     }
     async createNodeClientFromNextApi(request, response) {

package/lib/src/index.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 import { type IncomingMessage, type ServerResponse } from 'node:http';
 import NodeClient, { type GetContextParameters, type InteractionMode } from '@logto/node';
-import { type GetServerSidePropsResult, type GetServerSidePropsContext, type NextApiHandler } from 'next';
+import { type GetServerSidePropsResult, type GetServerSidePropsContext, type NextApiHandler, type NextApiRequest, type NextApiResponse } from 'next';
 import { type NextApiRequestCookies } from 'next/dist/server/api-utils/index.js';
 import LogtoNextBaseClient from './client.js';
 import type { LogtoNextConfig } from './types.js';
 export { LogtoError, LogtoRequestError, LogtoClientError, OidcError, Prompt, ReservedScope, ReservedResource, UserScope, organizationUrnPrefix, buildOrganizationUrn, getOrganizationIdFromUrn, PersistKey, } from '@logto/node';
-export type { IdTokenClaims, LogtoContext, InteractionMode, LogtoErrorCode } from '@logto/node';
+export type { AccessTokenClaims, IdTokenClaims, LogtoContext, InteractionMode, LogtoErrorCode, } from '@logto/node';
 export default class LogtoClient extends LogtoNextBaseClient {
     constructor(config: LogtoNextConfig);
     handleSignIn: (redirectUri?: string, interactionMode?: InteractionMode) => NextApiHandler;
@@ -14,8 +14,8 @@ export default class LogtoClient extends LogtoNextBaseClient {
     handleSignOut: (redirectUri?: string) => NextApiHandler;
     handleUser: (configs?: GetContextParameters) => NextApiHandler;
     handleAuthRoutes: (configs?: GetContextParameters) => NextApiHandler;
-    withLogtoApiRoute: (handler: NextApiHandler, config?: GetContextParameters) => NextApiHandler;
-    withLogtoSsr: <P extends Record<string, unknown> = Record<string, unknown>>(handler: (context: GetServerSidePropsContext) => GetServerSidePropsResult<P> | Promise<GetServerSidePropsResult<P>>, configs?: GetContextParameters) => (context: GetServerSidePropsContext) => Promise<GetServerSidePropsResult<P>>;
+    withLogtoApiRoute: (handler: NextApiHandler, config?: GetContextParameters, onError?: ((request: NextApiRequest, response: NextApiResponse, error: unknown) => unknown) | undefined) => 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

@@ -54,21 +54,37 @@ class LogtoClient extends LogtoNextBaseClient {
             }
             response.status(404).end();
         };
-        this.withLogtoApiRoute = (handler, config = {}) => async (request, response) => {
-            const nodeClient = await this.createNodeClientFromNextApi(request, response);
-            const user = await nodeClient.getContext(config);
-            await this.storage?.save();
-            // eslint-disable-next-line @silverhand/fp/no-mutating-methods
-            Object.defineProperty(request, 'user', { enumerable: true, get: () => user });
-            return handler(request, response);
+        this.withLogtoApiRoute = (handler, config = {}, onError) => async (request, response) => {
+            try {
+                const nodeClient = await this.createNodeClientFromNextApi(request, response);
+                const user = await nodeClient.getContext(config);
+                await this.storage?.save();
+                // eslint-disable-next-line @silverhand/fp/no-mutating-methods
+                Object.defineProperty(request, 'user', { enumerable: true, get: () => user });
+                return handler(request, response);
+            }
+            catch (error) {
+                if (onError) {
+                    return onError(request, response, error);
+                }
+                throw error;
+            }
         };
-        this.withLogtoSsr = (handler, configs = {}) => async (context) => {
-            const nodeClient = await this.createNodeClientFromNextApi(context.req, context.res);
-            const user = await nodeClient.getContext(configs);
-            await this.storage?.save();
-            // eslint-disable-next-line @silverhand/fp/no-mutating-methods
-            Object.defineProperty(context.req, 'user', { enumerable: true, get: () => user });
-            return handler(context);
+        this.withLogtoSsr = (handler, configs = {}, onError) => async (context) => {
+            try {
+                const nodeClient = await this.createNodeClientFromNextApi(context.req, context.res);
+                const user = await nodeClient.getContext(configs);
+                await this.storage?.save();
+                // 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;
+            }
         };
     }
     async createNodeClientFromNextApi(request, response) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/next",
-  "version": "3.1.2",
+  "version": "3.2.1",
   "type": "module",
   "main": "./lib/src/index.cjs",
   "module": "./lib/src/index.js",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@edge-runtime/cookies": "^4.0.0",
-    "@logto/node": "^2.4.1"
+    "@logto/node": "^2.4.3"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "^5.0.0",
@@ -55,7 +55,7 @@
     "@swc/core": "^1.3.50",
     "@swc/jest": "^0.2.24",
     "@types/jest": "^29.5.0",
-    "eslint": "^8.44.0",
+    "eslint": "^8.57.0",
     "jest": "^29.5.0",
     "jest-location-mock": "^2.0.0",
     "jest-matcher-specific-error": "^1.0.0",