@logto/next 3.5.0 → 3.6.1

package/lib/edge/index.cjs

@@ -19,7 +19,6 @@ class LogtoClient extends client.default {
         this.handleSignIn = (redirectUri = `${this.config.baseUrl}/api/logto/sign-in-callback`, interactionMode) => async (request) => {
             const { nodeClient, headers } = await this.createNodeClientFromEdgeRequest(request);
             await nodeClient.signIn(redirectUri, interactionMode);
-            await this.storage?.save();
             const response = new Response(null, {
                 headers,
                 status: 307,
@@ -33,7 +32,6 @@ class LogtoClient extends client.default {
             const { nodeClient, headers } = await this.createNodeClientFromEdgeRequest(request);
             await nodeClient.signOut(redirectUri);
             await this.storage?.destroy();
-            await this.storage?.save();
             const response = new Response(null, {
                 headers,
                 status: 307,
@@ -51,7 +49,6 @@ class LogtoClient extends client.default {
                 const requestUrl = new URL(request.url);
                 const callbackUrl = new URL(`${requestUrl.pathname}${requestUrl.search}${requestUrl.hash}`, this.config.baseUrl);
                 await nodeClient.handleSignInCallback(callbackUrl.toString());
-                await this.storage?.save();
             }
             const response = new Response(null, {
                 status: 307,
@@ -72,25 +69,31 @@ class LogtoClient extends client.default {
         this.getLogtoContext = async (request, config = {}) => {
             const { nodeClient } = await this.createNodeClientFromEdgeRequest(request);
             const context = await nodeClient.getContext(config);
-            await this.storage?.save();
             return context;
         };
     }
     async createNodeClientFromEdgeRequest(request) {
-        const cookieName = `logto:${this.config.appId}`;
         const cookies$1 = new cookies.RequestCookies(request.headers);
         const headers = new Headers();
         const responseCookies = new cookies.ResponseCookies(headers);
-        const nodeClient = super.createNodeClient(await NodeClient$1.createSession({
-            secret: this.config.cookieSecret,
-            crypto,
-        }, cookies$1.get(cookieName)?.value ?? '', (value) => {
-            responseCookies.set(cookieName, value, {
-                maxAge: 14 * 3600 * 24,
-                secure: this.config.cookieSecure,
-                sameSite: this.config.cookieSecure ? 'lax' : undefined,
-            });
-        }));
+        this.storage = new NodeClient$1.CookieStorage({
+            encryptionKey: this.config.cookieSecret,
+            cookieKey: `logto:${this.config.appId}`,
+            isSecure: this.config.cookieSecure,
+            getCookie: (name) => {
+                return cookies$1.get(name)?.value ?? '';
+            },
+            setCookie: (name, value, options) => {
+                responseCookies.set(name, value, options);
+            },
+        });
+        await this.storage.init();
+        const nodeClient = new this.adapters.NodeClient(this.config, {
+            storage: this.storage,
+            navigate: (url) => {
+                this.navigateUrl = url;
+            },
+        });
         return { nodeClient, headers };
     }
 }

package/lib/edge/index.js

@@ -1,5 +1,5 @@
 import { RequestCookies, ResponseCookies } from '@edge-runtime/cookies';
-import { createSession } from '@logto/node';
+import { CookieStorage } from '@logto/node';
 import NodeClient from '@logto/node/edge';
 import LogtoNextBaseClient from '../src/client.js';
 
@@ -11,7 +11,6 @@ class LogtoClient extends LogtoNextBaseClient {
         this.handleSignIn = (redirectUri = `${this.config.baseUrl}/api/logto/sign-in-callback`, interactionMode) => async (request) => {
             const { nodeClient, headers } = await this.createNodeClientFromEdgeRequest(request);
             await nodeClient.signIn(redirectUri, interactionMode);
-            await this.storage?.save();
             const response = new Response(null, {
                 headers,
                 status: 307,
@@ -25,7 +24,6 @@ class LogtoClient extends LogtoNextBaseClient {
             const { nodeClient, headers } = await this.createNodeClientFromEdgeRequest(request);
             await nodeClient.signOut(redirectUri);
             await this.storage?.destroy();
-            await this.storage?.save();
             const response = new Response(null, {
                 headers,
                 status: 307,
@@ -43,7 +41,6 @@ class LogtoClient extends LogtoNextBaseClient {
                 const requestUrl = new URL(request.url);
                 const callbackUrl = new URL(`${requestUrl.pathname}${requestUrl.search}${requestUrl.hash}`, this.config.baseUrl);
                 await nodeClient.handleSignInCallback(callbackUrl.toString());
-                await this.storage?.save();
             }
             const response = new Response(null, {
                 status: 307,
@@ -64,25 +61,31 @@ class LogtoClient extends LogtoNextBaseClient {
         this.getLogtoContext = async (request, config = {}) => {
             const { nodeClient } = await this.createNodeClientFromEdgeRequest(request);
             const context = await nodeClient.getContext(config);
-            await this.storage?.save();
             return context;
         };
     }
     async createNodeClientFromEdgeRequest(request) {
-        const cookieName = `logto:${this.config.appId}`;
         const cookies = new RequestCookies(request.headers);
         const headers = new Headers();
         const responseCookies = new ResponseCookies(headers);
-        const nodeClient = super.createNodeClient(await createSession({
-            secret: this.config.cookieSecret,
-            crypto,
-        }, cookies.get(cookieName)?.value ?? '', (value) => {
-            responseCookies.set(cookieName, value, {
-                maxAge: 14 * 3600 * 24,
-                secure: this.config.cookieSecure,
-                sameSite: this.config.cookieSecure ? 'lax' : undefined,
-            });
-        }));
+        this.storage = new CookieStorage({
+            encryptionKey: this.config.cookieSecret,
+            cookieKey: `logto:${this.config.appId}`,
+            isSecure: this.config.cookieSecure,
+            getCookie: (name) => {
+                return cookies.get(name)?.value ?? '';
+            },
+            setCookie: (name, value, options) => {
+                responseCookies.set(name, value, options);
+            },
+        });
+        await this.storage.init();
+        const nodeClient = new this.adapters.NodeClient(this.config, {
+            storage: this.storage,
+            navigate: (url) => {
+                this.navigateUrl = url;
+            },
+        });
         return { nodeClient, headers };
     }
 }

package/lib/server-actions/client.cjs

@@ -19,13 +19,12 @@ class LogtoClient extends client.default {
     /**
      * Init sign-in and return the url to redirect to Logto.
      *
-     * @param cookie the raw cookie string
      * @param redirectUri the uri (callbackUri) to redirect to after sign in
      * @param interactionMode OIDC interaction mode
-     * @returns the url to redirect to and new cookie if any
+     * @returns the url to redirect
      */
-    async handleSignIn(cookie, redirectUri, interactionMode) {
-        const { nodeClient, session } = await this.createNodeClientFromHeaders(cookie);
+    async handleSignIn(redirectUri, interactionMode) {
+        const nodeClient = await this.createNodeClient();
         await nodeClient.signIn(redirectUri, interactionMode);
         if (!this.navigateUrl) {
             // Not expected to happen
@@ -33,19 +32,18 @@ class LogtoClient extends client.default {
         }
         return {
             url: this.navigateUrl,
-            newCookie: await session.getValues?.(),
         };
     }
     /**
      * Init sign-out and return the url to redirect to Logto.
      *
-     * @param cookie the raw cookie string
      * @param redirectUri the uri (postSignOutUri) to redirect to after sign out
      * @returns the url to redirect to
      */
-    async handleSignOut(cookie, redirectUri = this.config.baseUrl) {
-        const { nodeClient } = await this.createNodeClientFromHeaders(cookie);
+    async handleSignOut(redirectUri = this.config.baseUrl) {
+        const nodeClient = await this.createNodeClient();
         await nodeClient.signOut(redirectUri);
+        await this.storage?.destroy();
         if (!this.navigateUrl) {
             // Not expected to happen
             throw new Error('navigateUrl is not set');
@@ -55,34 +53,46 @@ class LogtoClient extends client.default {
     /**
      * Handle sign-in callback from Logto.
      *
-     * @param cookie the raw cookie string
      * @param callbackUrl the uri (callbackUri) to redirect to after sign in, should match the one used in handleSignIn
-     * @returns new cookie if any
      */
-    async handleSignInCallback(cookie, callbackUrl) {
-        const { nodeClient, session } = await this.createNodeClientFromHeaders(cookie);
+    async handleSignInCallback(callbackUrl) {
+        const nodeClient = await this.createNodeClient();
         await nodeClient.handleSignInCallback(callbackUrl);
-        return session.getValues?.();
     }
     /**
      * Get Logto context from cookies.
      *
-     * @param cookie the raw cookie string
      * @param config additional configs of GetContextParameters
      * @returns LogtoContext
      */
-    async getLogtoContext(cookie, config = {}) {
-        const { nodeClient } = await this.createNodeClientFromHeaders(cookie);
+    async getLogtoContext(config = {}) {
+        const nodeClient = await this.createNodeClient({ ignoreCookieChange: true });
         const context = await nodeClient.getContext(config);
         return context;
     }
-    async createNodeClientFromHeaders(cookie) {
-        const session = await NodeClient$1.createSession({
-            secret: this.config.cookieSecret,
-            crypto,
-        }, cookie);
-        const nodeClient = super.createNodeClient(session);
-        return { nodeClient, session };
+    async createNodeClient({ ignoreCookieChange } = {}) {
+        const { cookies } = await import('next/headers');
+        this.storage = new NodeClient$1.CookieStorage({
+            encryptionKey: this.config.cookieSecret,
+            cookieKey: `logto:${this.config.appId}`,
+            isSecure: this.config.cookieSecure,
+            getCookie: (...args) => {
+                return cookies().get(...args)?.value ?? '';
+            },
+            setCookie: (...args) => {
+                // In server component (RSC), it is not allowed to modify cookies, see https://nextjs.org/docs/app/api-reference/functions/cookies#cookiessetname-value-options.
+                if (!ignoreCookieChange) {
+                    cookies().set(...args);
+                }
+            },
+        });
+        await this.storage.init();
+        return new this.adapters.NodeClient(this.config, {
+            storage: this.storage,
+            navigate: (url) => {
+                this.navigateUrl = url;
+            },
+        });
     }
 }
 

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

@@ -7,41 +7,35 @@ export default class LogtoClient extends BaseClient {
     /**
      * Init sign-in and return the url to redirect to Logto.
      *
-     * @param cookie the raw cookie string
      * @param redirectUri the uri (callbackUri) to redirect to after sign in
      * @param interactionMode OIDC interaction mode
-     * @returns the url to redirect to and new cookie if any
+     * @returns the url to redirect
      */
-    handleSignIn(cookie: string, redirectUri: string, interactionMode?: InteractionMode): Promise<{
+    handleSignIn(redirectUri: string, interactionMode?: InteractionMode): Promise<{
         url: string;
         newCookie?: string;
     }>;
     /**
      * Init sign-out and return the url to redirect to Logto.
      *
-     * @param cookie the raw cookie string
      * @param redirectUri the uri (postSignOutUri) to redirect to after sign out
      * @returns the url to redirect to
      */
-    handleSignOut(cookie: string, redirectUri?: string): Promise<string>;
+    handleSignOut(redirectUri?: string): Promise<string>;
     /**
      * Handle sign-in callback from Logto.
      *
-     * @param cookie the raw cookie string
      * @param callbackUrl the uri (callbackUri) to redirect to after sign in, should match the one used in handleSignIn
-     * @returns new cookie if any
      */
-    handleSignInCallback(cookie: string, callbackUrl: string): Promise<string | undefined>;
+    handleSignInCallback(callbackUrl: string): Promise<void>;
     /**
      * Get Logto context from cookies.
      *
-     * @param cookie the raw cookie string
      * @param config additional configs of GetContextParameters
      * @returns LogtoContext
      */
-    getLogtoContext(cookie: string, config?: GetContextParameters): Promise<import("@logto/node").LogtoContext>;
-    createNodeClientFromHeaders(cookie: string): Promise<{
-        nodeClient: import("@logto/node").default;
-        session: import("@logto/node").Session;
-    }>;
+    getLogtoContext(config?: GetContextParameters): Promise<import("@logto/node").LogtoContext>;
+    createNodeClient({ ignoreCookieChange }?: {
+        ignoreCookieChange?: boolean;
+    }): Promise<import("@logto/node").default>;
 }

package/lib/server-actions/client.js

@@ -1,4 +1,4 @@
-import { createSession } from '@logto/node';
+import { CookieStorage } from '@logto/node';
 import NodeClient from '@logto/node/edge';
 import LogtoNextBaseClient from '../src/client.js';
 
@@ -11,13 +11,12 @@ class LogtoClient extends LogtoNextBaseClient {
     /**
      * Init sign-in and return the url to redirect to Logto.
      *
-     * @param cookie the raw cookie string
      * @param redirectUri the uri (callbackUri) to redirect to after sign in
      * @param interactionMode OIDC interaction mode
-     * @returns the url to redirect to and new cookie if any
+     * @returns the url to redirect
      */
-    async handleSignIn(cookie, redirectUri, interactionMode) {
-        const { nodeClient, session } = await this.createNodeClientFromHeaders(cookie);
+    async handleSignIn(redirectUri, interactionMode) {
+        const nodeClient = await this.createNodeClient();
         await nodeClient.signIn(redirectUri, interactionMode);
         if (!this.navigateUrl) {
             // Not expected to happen
@@ -25,19 +24,18 @@ class LogtoClient extends LogtoNextBaseClient {
         }
         return {
             url: this.navigateUrl,
-            newCookie: await session.getValues?.(),
         };
     }
     /**
      * Init sign-out and return the url to redirect to Logto.
      *
-     * @param cookie the raw cookie string
      * @param redirectUri the uri (postSignOutUri) to redirect to after sign out
      * @returns the url to redirect to
      */
-    async handleSignOut(cookie, redirectUri = this.config.baseUrl) {
-        const { nodeClient } = await this.createNodeClientFromHeaders(cookie);
+    async handleSignOut(redirectUri = this.config.baseUrl) {
+        const nodeClient = await this.createNodeClient();
         await nodeClient.signOut(redirectUri);
+        await this.storage?.destroy();
         if (!this.navigateUrl) {
             // Not expected to happen
             throw new Error('navigateUrl is not set');
@@ -47,34 +45,46 @@ class LogtoClient extends LogtoNextBaseClient {
     /**
      * Handle sign-in callback from Logto.
      *
-     * @param cookie the raw cookie string
      * @param callbackUrl the uri (callbackUri) to redirect to after sign in, should match the one used in handleSignIn
-     * @returns new cookie if any
      */
-    async handleSignInCallback(cookie, callbackUrl) {
-        const { nodeClient, session } = await this.createNodeClientFromHeaders(cookie);
+    async handleSignInCallback(callbackUrl) {
+        const nodeClient = await this.createNodeClient();
         await nodeClient.handleSignInCallback(callbackUrl);
-        return session.getValues?.();
     }
     /**
      * Get Logto context from cookies.
      *
-     * @param cookie the raw cookie string
      * @param config additional configs of GetContextParameters
      * @returns LogtoContext
      */
-    async getLogtoContext(cookie, config = {}) {
-        const { nodeClient } = await this.createNodeClientFromHeaders(cookie);
+    async getLogtoContext(config = {}) {
+        const nodeClient = await this.createNodeClient({ ignoreCookieChange: true });
         const context = await nodeClient.getContext(config);
         return context;
     }
-    async createNodeClientFromHeaders(cookie) {
-        const session = await createSession({
-            secret: this.config.cookieSecret,
-            crypto,
-        }, cookie);
-        const nodeClient = super.createNodeClient(session);
-        return { nodeClient, session };
+    async createNodeClient({ ignoreCookieChange } = {}) {
+        const { cookies } = await import('next/headers');
+        this.storage = new CookieStorage({
+            encryptionKey: this.config.cookieSecret,
+            cookieKey: `logto:${this.config.appId}`,
+            isSecure: this.config.cookieSecure,
+            getCookie: (...args) => {
+                return cookies().get(...args)?.value ?? '';
+            },
+            setCookie: (...args) => {
+                // In server component (RSC), it is not allowed to modify cookies, see https://nextjs.org/docs/app/api-reference/functions/cookies#cookiessetname-value-options.
+                if (!ignoreCookieChange) {
+                    cookies().set(...args);
+                }
+            },
+        });
+        await this.storage.init();
+        return new this.adapters.NodeClient(this.config, {
+            storage: this.storage,
+            navigate: (url) => {
+                this.navigateUrl = url;
+            },
+        });
     }
 }
 

package/lib/server-actions/index.cjs

@@ -4,17 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var navigation = require('next/navigation');
 var client = require('./client.cjs');
-var cookie = require('./cookie.cjs');
 
 /**
  * Init sign in process and redirect to the Logto sign-in page
  */
 const signIn = async (config, redirectUri, interactionMode) => {
     const client$1 = new client.default(config);
-    const { url, newCookie } = await client$1.handleSignIn(await cookie.getCookies(config), redirectUri ?? `${config.baseUrl}/callback`, interactionMode);
-    if (newCookie) {
-        await cookie.setCookies(newCookie, config);
-    }
+    const { url } = await client$1.handleSignIn(redirectUri ?? `${config.baseUrl}/callback`, interactionMode);
     navigation.redirect(url);
 };
 /**
@@ -22,20 +18,16 @@ const signIn = async (config, redirectUri, interactionMode) => {
  */
 async function handleSignIn(config, searchParamsOrUrl) {
     const client$1 = new client.default(config);
-    const newCookie = await client$1.handleSignInCallback(await cookie.getCookies(config), searchParamsOrUrl instanceof URL
+    await client$1.handleSignInCallback(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
  */
 const signOut = async (config, redirectUri) => {
     const client$1 = new client.default(config);
-    const url = await client$1.handleSignOut(await cookie.getCookies(config), redirectUri);
-    await cookie.setCookies('', config);
+    const url = await client$1.handleSignOut(redirectUri);
     navigation.redirect(url);
 };
 /**
@@ -43,7 +35,7 @@ const signOut = async (config, redirectUri) => {
  */
 const getLogtoContext = async (config, getContextParameters) => {
     const client$1 = new client.default(config);
-    return client$1.getLogtoContext(await cookie.getCookies(config), getContextParameters);
+    return client$1.getLogtoContext(getContextParameters);
 };
 /**
  * Get organization tokens from session
@@ -56,7 +48,7 @@ const getOrganizationTokens = async (config) => {
         return [];
     }
     const client$1 = new client.default(config);
-    const { nodeClient } = await client$1.createNodeClientFromHeaders(await cookie.getCookies(config));
+    const nodeClient = await client$1.createNodeClient();
     const { organizations = [] } = await nodeClient.getIdTokenClaims();
     return Promise.all(organizations.map(async (organizationId) => ({
         id: organizationId,
@@ -69,13 +61,8 @@ const getOrganizationTokens = async (config) => {
  */
 const getAccessToken = async (config, resource, organizationId) => {
     const client$1 = new client.default(config);
-    const { nodeClient, session } = await client$1.createNodeClientFromHeaders(await cookie.getCookies(config));
+    const nodeClient = await client$1.createNodeClient();
     const accessToken = await nodeClient.getAccessToken(resource, organizationId);
-    // Update access token cache
-    const newCookie = await session.getValues?.();
-    if (newCookie) {
-        await cookie.setCookies(newCookie, config);
-    }
     return accessToken;
 };
 /**
@@ -93,7 +80,7 @@ const getOrganizationToken = async (config, organizationId) => {
  */
 const getAccessTokenRSC = async (config, resource, organizationId) => {
     const client$1 = new client.default(config);
-    const { nodeClient } = await client$1.createNodeClientFromHeaders(await cookie.getCookies(config));
+    const nodeClient = await client$1.createNodeClient({ ignoreCookieChange: true });
     return nodeClient.getAccessToken(resource, organizationId);
 };
 /**

package/lib/server-actions/index.js

@@ -1,16 +1,12 @@
 import { redirect } from 'next/navigation';
 import LogtoClient from './client.js';
-import { getCookies, setCookies } from './cookie.js';
 
 /**
  * Init sign in process and redirect to the Logto sign-in page
  */
 const signIn = async (config, redirectUri, interactionMode) => {
     const client = new LogtoClient(config);
-    const { url, newCookie } = await client.handleSignIn(await getCookies(config), redirectUri ?? `${config.baseUrl}/callback`, interactionMode);
-    if (newCookie) {
-        await setCookies(newCookie, config);
-    }
+    const { url } = await client.handleSignIn(redirectUri ?? `${config.baseUrl}/callback`, interactionMode);
     redirect(url);
 };
 /**
@@ -18,20 +14,16 @@ const signIn = async (config, redirectUri, interactionMode) => {
  */
 async function handleSignIn(config, searchParamsOrUrl) {
     const client = new LogtoClient(config);
-    const newCookie = await client.handleSignInCallback(await getCookies(config), searchParamsOrUrl instanceof URL
+    await client.handleSignInCallback(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
  */
 const signOut = async (config, redirectUri) => {
     const client = new LogtoClient(config);
-    const url = await client.handleSignOut(await getCookies(config), redirectUri);
-    await setCookies('', config);
+    const url = await client.handleSignOut(redirectUri);
     redirect(url);
 };
 /**
@@ -39,7 +31,7 @@ const signOut = async (config, redirectUri) => {
  */
 const getLogtoContext = async (config, getContextParameters) => {
     const client = new LogtoClient(config);
-    return client.getLogtoContext(await getCookies(config), getContextParameters);
+    return client.getLogtoContext(getContextParameters);
 };
 /**
  * Get organization tokens from session
@@ -52,7 +44,7 @@ const getOrganizationTokens = async (config) => {
         return [];
     }
     const client = new LogtoClient(config);
-    const { nodeClient } = await client.createNodeClientFromHeaders(await getCookies(config));
+    const nodeClient = await client.createNodeClient();
     const { organizations = [] } = await nodeClient.getIdTokenClaims();
     return Promise.all(organizations.map(async (organizationId) => ({
         id: organizationId,
@@ -65,13 +57,8 @@ const getOrganizationTokens = async (config) => {
  */
 const getAccessToken = async (config, resource, organizationId) => {
     const client = new LogtoClient(config);
-    const { nodeClient, session } = await client.createNodeClientFromHeaders(await getCookies(config));
+    const nodeClient = await client.createNodeClient();
     const accessToken = await nodeClient.getAccessToken(resource, organizationId);
-    // Update access token cache
-    const newCookie = await session.getValues?.();
-    if (newCookie) {
-        await setCookies(newCookie, config);
-    }
     return accessToken;
 };
 /**
@@ -89,7 +76,7 @@ const getOrganizationToken = async (config, organizationId) => {
  */
 const getAccessTokenRSC = async (config, resource, organizationId) => {
     const client = new LogtoClient(config);
-    const { nodeClient } = await client.createNodeClientFromHeaders(await getCookies(config));
+    const nodeClient = await client.createNodeClient({ ignoreCookieChange: true });
     return nodeClient.getAccessToken(resource, organizationId);
 };
 /**

package/lib/src/client.cjs

@@ -2,22 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var storage = require('./storage.cjs');
-
 class LogtoNextBaseClient {
     constructor(config, adapters) {
         this.config = config;
         this.adapters = adapters;
     }
-    createNodeClient(session) {
-        this.storage = new storage.default(session);
-        return new this.adapters.NodeClient(this.config, {
-            storage: this.storage,
-            navigate: (url) => {
-                this.navigateUrl = url;
-            },
-        });
-    }
 }
 
 exports.default = LogtoNextBaseClient;

package/lib/src/client.d.ts

@@ -1,11 +1,9 @@
-import { type Session } from '@logto/node';
-import NextStorage from './storage';
+import { type CookieStorage } from '@logto/node';
 import type { Adapters, LogtoNextConfig } from './types';
 export default class LogtoNextBaseClient {
     protected readonly config: LogtoNextConfig;
     protected readonly adapters: Adapters;
     protected navigateUrl?: string;
-    protected storage?: NextStorage;
+    protected storage?: CookieStorage;
     constructor(config: LogtoNextConfig, adapters: Adapters);
-    protected createNodeClient(session: Session): import("@logto/node").default;
 }

package/lib/src/client.js

@@ -1,19 +1,8 @@
-import NextStorage from './storage.js';
-
 class LogtoNextBaseClient {
     constructor(config, adapters) {
         this.config = config;
         this.adapters = adapters;
     }
-    createNodeClient(session) {
-        this.storage = new NextStorage(session);
-        return new this.adapters.NodeClient(this.config, {
-            storage: this.storage,
-            navigate: (url) => {
-                this.navigateUrl = url;
-            },
-        });
-    }
 }
 
 export { LogtoNextBaseClient as default };

package/lib/src/index.cjs

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var NodeClient = require('@logto/node');
+var cookie = require('cookie');
 var client = require('./client.cjs');
 var utils = require('./utils.cjs');
 
@@ -18,7 +19,6 @@ class LogtoClient extends client.default {
         this.handleSignIn = (redirectUri = `${this.config.baseUrl}/api/logto/sign-in-callback`, interactionMode, onError) => utils.buildHandler(async (request, response) => {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             await nodeClient.signIn(redirectUri, interactionMode);
-            await this.storage?.save();
             if (this.navigateUrl) {
                 response.redirect(this.navigateUrl);
             }
@@ -27,7 +27,6 @@ class LogtoClient extends client.default {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             if (request.url) {
                 await nodeClient.handleSignInCallback(`${this.config.baseUrl}${request.url}`);
-                await this.storage?.save();
                 response.redirect(redirectTo);
             }
         }, onError);
@@ -35,7 +34,6 @@ class LogtoClient extends client.default {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             await nodeClient.signOut(redirectUri);
             await this.storage?.destroy();
-            await this.storage?.save();
             if (this.navigateUrl) {
                 response.redirect(this.navigateUrl);
             }
@@ -62,10 +60,17 @@ class LogtoClient extends client.default {
             }
             response.status(404).end();
         };
+        this.getAccessToken = async (request, response, resource) => {
+            const nodeClient = await this.createNodeClientFromNextApi(request, response);
+            return nodeClient.getAccessToken(resource);
+        };
+        this.getOrganizationToken = async (request, response, organizationId) => {
+            const nodeClient = await this.createNodeClientFromNextApi(request, response);
+            return nodeClient.getOrganizationToken(organizationId);
+        };
         this.withLogtoApiRoute = (handler, config = {}, onError) => utils.buildHandler(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);
@@ -77,15 +82,24 @@ class LogtoClient extends client.default {
         };
     }
     async createNodeClientFromNextApi(request, response) {
-        const cookieName = `logto:${this.config.appId}`;
-        return super.createNodeClient(await NodeClient.createSession({
-            secret: this.config.cookieSecret,
-            crypto,
-        }, request.cookies[cookieName] ?? '', (value) => {
-            const secure = this.config.cookieSecure;
-            const maxAge = 14 * 3600 * 24;
-            response.setHeader('Set-Cookie', `${cookieName}=${value}; Path=/; Max-Age=${maxAge}; ${secure ? 'Secure; SameSite=Lax' : ''}`);
-        }));
+        this.storage = new NodeClient.CookieStorage({
+            encryptionKey: this.config.cookieSecret,
+            cookieKey: `logto:${this.config.appId}`,
+            isSecure: this.config.cookieSecure,
+            getCookie: (name) => {
+                return request.cookies[name] ?? '';
+            },
+            setCookie: (name, value, options) => {
+                response.setHeader('Set-Cookie', cookie.serialize(name, value, options));
+            },
+        });
+        await this.storage.init();
+        return new this.adapters.NodeClient(this.config, {
+            storage: this.storage,
+            navigate: (url) => {
+                this.navigateUrl = url;
+            },
+        });
     }
 }
 

package/lib/src/index.d.ts

@@ -1,7 +1,7 @@
 /// <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 { ErrorHandler, LogtoNextConfig } from './types.js';
@@ -15,6 +15,8 @@ export default class LogtoClient extends LogtoNextBaseClient {
     handleSignOut: (redirectUri?: string, onError?: ErrorHandler) => NextApiHandler;
     handleUser: (configs?: GetContextParameters, onError?: ErrorHandler) => NextApiHandler;
     handleAuthRoutes: (configs?: GetContextParameters, onError?: ErrorHandler) => NextApiHandler;
+    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>;
     createNodeClientFromNextApi(request: IncomingMessage & {

package/lib/src/index.js

@@ -1,5 +1,6 @@
-import NodeClient, { createSession } from '@logto/node';
+import NodeClient, { CookieStorage } from '@logto/node';
 export { LogtoClientError, LogtoError, LogtoRequestError, OidcError, PersistKey, Prompt, ReservedResource, ReservedScope, UserScope, buildOrganizationUrn, getOrganizationIdFromUrn, organizationUrnPrefix } from '@logto/node';
+import { serialize } from 'cookie';
 import LogtoNextBaseClient from './client.js';
 import { buildHandler } from './utils.js';
 
@@ -11,7 +12,6 @@ class LogtoClient extends LogtoNextBaseClient {
         this.handleSignIn = (redirectUri = `${this.config.baseUrl}/api/logto/sign-in-callback`, interactionMode, onError) => buildHandler(async (request, response) => {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             await nodeClient.signIn(redirectUri, interactionMode);
-            await this.storage?.save();
             if (this.navigateUrl) {
                 response.redirect(this.navigateUrl);
             }
@@ -20,7 +20,6 @@ class LogtoClient extends LogtoNextBaseClient {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             if (request.url) {
                 await nodeClient.handleSignInCallback(`${this.config.baseUrl}${request.url}`);
-                await this.storage?.save();
                 response.redirect(redirectTo);
             }
         }, onError);
@@ -28,7 +27,6 @@ class LogtoClient extends LogtoNextBaseClient {
             const nodeClient = await this.createNodeClientFromNextApi(request, response);
             await nodeClient.signOut(redirectUri);
             await this.storage?.destroy();
-            await this.storage?.save();
             if (this.navigateUrl) {
                 response.redirect(this.navigateUrl);
             }
@@ -55,10 +53,17 @@ class LogtoClient extends LogtoNextBaseClient {
             }
             response.status(404).end();
         };
+        this.getAccessToken = async (request, response, resource) => {
+            const nodeClient = await this.createNodeClientFromNextApi(request, response);
+            return nodeClient.getAccessToken(resource);
+        };
+        this.getOrganizationToken = async (request, response, organizationId) => {
+            const nodeClient = await this.createNodeClientFromNextApi(request, response);
+            return nodeClient.getOrganizationToken(organizationId);
+        };
         this.withLogtoApiRoute = (handler, config = {}, onError) => buildHandler(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);
@@ -70,15 +75,24 @@ class LogtoClient extends LogtoNextBaseClient {
         };
     }
     async createNodeClientFromNextApi(request, response) {
-        const cookieName = `logto:${this.config.appId}`;
-        return super.createNodeClient(await createSession({
-            secret: this.config.cookieSecret,
-            crypto,
-        }, request.cookies[cookieName] ?? '', (value) => {
-            const secure = this.config.cookieSecure;
-            const maxAge = 14 * 3600 * 24;
-            response.setHeader('Set-Cookie', `${cookieName}=${value}; Path=/; Max-Age=${maxAge}; ${secure ? 'Secure; SameSite=Lax' : ''}`);
-        }));
+        this.storage = new CookieStorage({
+            encryptionKey: this.config.cookieSecret,
+            cookieKey: `logto:${this.config.appId}`,
+            isSecure: this.config.cookieSecure,
+            getCookie: (name) => {
+                return request.cookies[name] ?? '';
+            },
+            setCookie: (name, value, options) => {
+                response.setHeader('Set-Cookie', serialize(name, value, options));
+            },
+        });
+        await this.storage.init();
+        return new this.adapters.NodeClient(this.config, {
+            storage: this.storage,
+            navigate: (url) => {
+                this.navigateUrl = url;
+            },
+        });
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/next",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "type": "module",
   "main": "./lib/src/index.cjs",
   "module": "./lib/src/index.js",
@@ -46,12 +46,14 @@
   },
   "dependencies": {
     "@edge-runtime/cookies": "^4.0.0",
-    "@logto/node": "^2.5.5"
+    "cookie": "^0.6.0",
+    "@logto/node": "^2.5.7"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "^6.0.1",
     "@silverhand/ts-config": "^6.0.0",
     "@silverhand/ts-config-react": "^6.0.0",
+    "@types/cookie": "^0.6.0",
     "@vitest/coverage-v8": "^1.6.0",
     "eslint": "^8.57.0",
     "lint-staged": "^15.0.0",

package/lib/server-actions/cookie.cjs

@@ -1,17 +0,0 @@
-'use strict';
-
-const getCookies = async (config) => {
-    const { cookies } = await import('next/headers');
-    return cookies().get(`logto:${config.appId}`)?.value ?? '';
-};
-const setCookies = async (newCookie, config) => {
-    const { cookies } = await import('next/headers');
-    cookies().set(`logto:${config.appId}`, newCookie, {
-        maxAge: 14 * 3600 * 24,
-        secure: config.cookieSecure,
-        sameSite: config.cookieSecure ? 'lax' : undefined,
-    });
-};
-
-exports.getCookies = getCookies;
-exports.setCookies = setCookies;

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

@@ -1,3 +0,0 @@
-import { type LogtoNextConfig } from '../src/types';
-export declare const getCookies: (config: LogtoNextConfig) => Promise<string>;
-export declare const setCookies: (newCookie: string, config: LogtoNextConfig) => Promise<void>;

package/lib/server-actions/cookie.js

@@ -1,14 +0,0 @@
-const getCookies = async (config) => {
-    const { cookies } = await import('next/headers');
-    return cookies().get(`logto:${config.appId}`)?.value ?? '';
-};
-const setCookies = async (newCookie, config) => {
-    const { cookies } = await import('next/headers');
-    cookies().set(`logto:${config.appId}`, newCookie, {
-        maxAge: 14 * 3600 * 24,
-        secure: config.cookieSecure,
-        sameSite: config.cookieSecure ? 'lax' : undefined,
-    });
-};
-
-export { getCookies, setCookies };

package/lib/src/storage.cjs

@@ -1,43 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var NodeClient = require('@logto/node/edge');
-
-class NextStorage {
-    constructor(session) {
-        this.session = session;
-        this.sessionChanged = false;
-    }
-    async setItem(key, value) {
-        this.session[key] = value;
-        this.sessionChanged = true;
-    }
-    async getItem(key) {
-        const value = this.session[key];
-        if (value === undefined) {
-            return null;
-        }
-        return String(value);
-    }
-    async removeItem(key) {
-        this.session[key] = undefined;
-        this.sessionChanged = true;
-    }
-    async destroy() {
-        this.session[NodeClient.PersistKey.AccessToken] = undefined;
-        this.session[NodeClient.PersistKey.IdToken] = undefined;
-        this.session[NodeClient.PersistKey.SignInSession] = undefined;
-        this.session[NodeClient.PersistKey.RefreshToken] = undefined;
-        this.sessionChanged = true;
-    }
-    async save() {
-        if (!this.sessionChanged) {
-            return;
-        }
-        await this.session.save();
-        this.sessionChanged = false;
-    }
-}
-
-exports.default = NextStorage;

package/lib/src/storage.d.ts

@@ -1,14 +0,0 @@
-import { type Session, type Storage } from '@logto/node';
-import { PersistKey } from '@logto/node/edge';
-export default class NextStorage implements Storage<PersistKey> {
-    private readonly session;
-    private sessionChanged;
-    constructor(session: Session & {
-        save: () => Promise<void>;
-    });
-    setItem(key: PersistKey, value: string): Promise<void>;
-    getItem(key: PersistKey): Promise<string | null>;
-    removeItem(key: PersistKey): Promise<void>;
-    destroy(): Promise<void>;
-    save(): Promise<void>;
-}

package/lib/src/storage.js

@@ -1,39 +0,0 @@
-import { PersistKey } from '@logto/node/edge';
-
-class NextStorage {
-    constructor(session) {
-        this.session = session;
-        this.sessionChanged = false;
-    }
-    async setItem(key, value) {
-        this.session[key] = value;
-        this.sessionChanged = true;
-    }
-    async getItem(key) {
-        const value = this.session[key];
-        if (value === undefined) {
-            return null;
-        }
-        return String(value);
-    }
-    async removeItem(key) {
-        this.session[key] = undefined;
-        this.sessionChanged = true;
-    }
-    async destroy() {
-        this.session[PersistKey.AccessToken] = undefined;
-        this.session[PersistKey.IdToken] = undefined;
-        this.session[PersistKey.SignInSession] = undefined;
-        this.session[PersistKey.RefreshToken] = undefined;
-        this.sessionChanged = true;
-    }
-    async save() {
-        if (!this.sessionChanged) {
-            return;
-        }
-        await this.session.save();
-        this.sessionChanged = false;
-    }
-}
-
-export { NextStorage as default };

package/lib/src/storage.test.d.ts

@@ -1 +0,0 @@
-export {};