@logto/next 3.2.6 → 3.3.0

package/lib/server-actions/index.cjs

@@ -18,16 +18,17 @@ const signIn = async (config, redirectUri, interactionMode) => {
     navigation.redirect(url);
 };
 /**
- * Handle sign in callback from search params, save tokens to session
+ * Handle sign in callback from search params or full redirect URL, save tokens to session
  */
-const handleSignIn = async (config, searchParams) => {
-    const search = searchParams.toString();
+async function handleSignIn(config, searchParamsOrUrl) {
     const client$1 = new client.default(config);
-    const newCookie = await client$1.handleSignInCallback(await cookie.getCookies(config), `${config.baseUrl}/callback?${search}`);
+    const newCookie = await client$1.handleSignInCallback(await cookie.getCookies(config), searchParamsOrUrl instanceof URL
+        ? searchParamsOrUrl.toString()
+        : `${config.baseUrl}/callback?${searchParamsOrUrl.toString()}`);
     if (newCookie) {
         await cookie.setCookies(newCookie, config);
     }
-};
+}
 /**
  * Init sign out process, clear session, and redirect to the Logto sign-out page
  */

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

@@ -5,10 +5,8 @@ export type { LogtoContext, InteractionMode } from '@logto/node';
  * Init sign in process and redirect to the Logto sign-in page
  */
 export declare const signIn: (config: LogtoNextConfig, redirectUri?: string, interactionMode?: InteractionMode) => Promise<void>;
-/**
- * Handle sign in callback from search params, save tokens to session
- */
-export declare const handleSignIn: (config: LogtoNextConfig, searchParams: URLSearchParams) => Promise<void>;
+export declare function handleSignIn(config: LogtoNextConfig, searchParams: URLSearchParams): Promise<void>;
+export declare function handleSignIn(config: LogtoNextConfig, url: URL): Promise<void>;
 /**
  * Init sign out process, clear session, and redirect to the Logto sign-out page
  */

package/lib/server-actions/index.js

@@ -14,16 +14,17 @@ const signIn = async (config, redirectUri, interactionMode) => {
     redirect(url);
 };
 /**
- * Handle sign in callback from search params, save tokens to session
+ * Handle sign in callback from search params or full redirect URL, save tokens to session
  */
-const handleSignIn = async (config, searchParams) => {
-    const search = searchParams.toString();
+async function handleSignIn(config, searchParamsOrUrl) {
     const client = new LogtoClient(config);
-    const newCookie = await client.handleSignInCallback(await getCookies(config), `${config.baseUrl}/callback?${search}`);
+    const newCookie = await client.handleSignInCallback(await getCookies(config), searchParamsOrUrl instanceof URL
+        ? searchParamsOrUrl.toString()
+        : `${config.baseUrl}/callback?${searchParamsOrUrl.toString()}`);
     if (newCookie) {
         await setCookies(newCookie, config);
     }
-};
+}
 /**
  * Init sign out process, clear session, and redirect to the Logto sign-out page
  */

package/lib/src/index.cjs

@@ -42,24 +42,32 @@ class LogtoClient extends client.default {
         this.handleUser = (configs) => this.withLogtoApiRoute((request, response) => {
             response.json(request.user);
         }, configs);
-        this.handleAuthRoutes = (configs) => (request, response) => {
-            const { action } = request.query;
-            if (action === 'sign-in') {
-                return this.handleSignIn()(request, response);
-            }
-            if (action === 'sign-up') {
-                return this.handleSignIn(undefined, 'signUp')(request, response);
-            }
-            if (action === 'sign-in-callback') {
-                return this.handleSignInCallback()(request, response);
-            }
-            if (action === 'sign-out') {
-                return this.handleSignOut()(request, response);
+        this.handleAuthRoutes = (configs, onError) => (request, response) => {
+            try {
+                const { action } = request.query;
+                if (action === 'sign-in') {
+                    return this.handleSignIn()(request, response);
+                }
+                if (action === 'sign-up') {
+                    return this.handleSignIn(undefined, 'signUp')(request, response);
+                }
+                if (action === 'sign-in-callback') {
+                    return this.handleSignInCallback()(request, response);
+                }
+                if (action === 'sign-out') {
+                    return this.handleSignOut()(request, response);
+                }
+                if (action === 'user') {
+                    return this.handleUser(configs)(request, response);
+                }
+                response.status(404).end();
             }
-            if (action === 'user') {
-                return this.handleUser(configs)(request, response);
+            catch (error) {
+                if (onError) {
+                    return onError(request, response, error);
+                }
+                throw error;
             }
-            response.status(404).end();
         };
         this.withLogtoApiRoute = (handler, config = {}, onError) => async (request, response) => {
             try {

package/lib/src/index.d.ts

@@ -14,7 +14,7 @@ export default class LogtoClient extends LogtoNextBaseClient {
     handleSignInCallback: (redirectTo?: string) => NextApiHandler;
     handleSignOut: (redirectUri?: string) => NextApiHandler;
     handleUser: (configs?: GetContextParameters) => NextApiHandler;
-    handleAuthRoutes: (configs?: GetContextParameters) => NextApiHandler;
+    handleAuthRoutes: (configs?: GetContextParameters, onError?: ((request: NextApiRequest, response: NextApiResponse, error: unknown) => unknown) | undefined) => NextApiHandler;
     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 & {

package/lib/src/index.js

@@ -35,24 +35,32 @@ class LogtoClient extends LogtoNextBaseClient {
         this.handleUser = (configs) => this.withLogtoApiRoute((request, response) => {
             response.json(request.user);
         }, configs);
-        this.handleAuthRoutes = (configs) => (request, response) => {
-            const { action } = request.query;
-            if (action === 'sign-in') {
-                return this.handleSignIn()(request, response);
-            }
-            if (action === 'sign-up') {
-                return this.handleSignIn(undefined, 'signUp')(request, response);
-            }
-            if (action === 'sign-in-callback') {
-                return this.handleSignInCallback()(request, response);
-            }
-            if (action === 'sign-out') {
-                return this.handleSignOut()(request, response);
+        this.handleAuthRoutes = (configs, onError) => (request, response) => {
+            try {
+                const { action } = request.query;
+                if (action === 'sign-in') {
+                    return this.handleSignIn()(request, response);
+                }
+                if (action === 'sign-up') {
+                    return this.handleSignIn(undefined, 'signUp')(request, response);
+                }
+                if (action === 'sign-in-callback') {
+                    return this.handleSignInCallback()(request, response);
+                }
+                if (action === 'sign-out') {
+                    return this.handleSignOut()(request, response);
+                }
+                if (action === 'user') {
+                    return this.handleUser(configs)(request, response);
+                }
+                response.status(404).end();
             }
-            if (action === 'user') {
-                return this.handleUser(configs)(request, response);
+            catch (error) {
+                if (onError) {
+                    return onError(request, response, error);
+                }
+                throw error;
             }
-            response.status(404).end();
         };
         this.withLogtoApiRoute = (handler, config = {}, onError) => async (request, response) => {
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/next",
-  "version": "3.2.6",
+  "version": "3.3.0",
   "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.5.0"
+    "@logto/node": "^2.5.1"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "^6.0.1",
@@ -55,7 +55,7 @@
     "@vitest/coverage-v8": "^1.4.0",
     "eslint": "^8.57.0",
     "lint-staged": "^15.0.0",
-    "next": "^14.0.0",
+    "next": "^14.1.1",
     "next-test-api-route-handler": "^4.0.0",
     "prettier": "^3.0.0",
     "react": "^18.2.0",