@logto/next 2.1.4 → 2.2.1

package/lib/edge/index.cjs

@@ -71,7 +71,7 @@ class LogtoClient extends client.default {
         };
         this.getLogtoContext = async (request, config = {}) => {
             const { nodeClient } = await this.createNodeClientFromEdgeRequest(request);
-            const context = await nodeClient.getContext();
+            const context = await nodeClient.getContext(config);
             return context;
         };
     }

package/lib/edge/index.js

@@ -63,7 +63,7 @@ class LogtoClient extends LogtoNextBaseClient {
         };
         this.getLogtoContext = async (request, config = {}) => {
             const { nodeClient } = await this.createNodeClientFromEdgeRequest(request);
-            const context = await nodeClient.getContext();
+            const context = await nodeClient.getContext(config);
             return context;
         };
     }

package/lib/server-actions/index.cjs

@@ -0,0 +1,89 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var NodeClient = require('@logto/node/edge');
+var client = require('../src/client.cjs');
+var session = require('../src/session.cjs');
+
+function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
+
+var NodeClient__default = /*#__PURE__*/_interopDefault(NodeClient);
+
+class LogtoClient extends client.default {
+    constructor(config) {
+        super(config, {
+            NodeClient: NodeClient__default.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
+     */
+    async handleSignIn(cookie, redirectUri, interactionMode) {
+        const { nodeClient, session } = await this.createNodeClientFromHeaders(cookie);
+        await nodeClient.signIn(redirectUri, interactionMode);
+        if (!this.navigateUrl) {
+            // Not expected to happen
+            throw new Error('navigateUrl is not set');
+        }
+        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);
+        await nodeClient.signOut(redirectUri);
+        if (!this.navigateUrl) {
+            // Not expected to happen
+            throw new Error('navigateUrl is not set');
+        }
+        return this.navigateUrl;
+    }
+    /**
+     * 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);
+        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);
+        const context = await nodeClient.getContext(config);
+        return context;
+    }
+    async createNodeClientFromHeaders(cookie) {
+        const session$1 = await session.createSession({
+            secret: this.config.cookieSecret,
+            crypto,
+        }, cookie);
+        const nodeClient = super.createNodeClient(session$1);
+        return { nodeClient, session: session$1 };
+    }
+}
+
+exports.default = LogtoClient;

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

@@ -0,0 +1,44 @@
+import { type GetContextParameters, type InteractionMode } from '@logto/node';
+import BaseClient from '../src/client';
+import type { LogtoNextConfig } from '../src/types.js';
+export type { LogtoContext, InteractionMode } from '@logto/node';
+export default class LogtoClient extends BaseClient {
+    constructor(config: LogtoNextConfig);
+    /**
+     * 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
+     */
+    handleSignIn(cookie: string, 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>;
+    /**
+     * 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>;
+    /**
+     * 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>;
+    private createNodeClientFromHeaders;
+}

package/lib/server-actions/index.js

@@ -0,0 +1,81 @@
+import NodeClient from '@logto/node/edge';
+import LogtoNextBaseClient from '../src/client.js';
+import { createSession } from '../src/session.js';
+
+class LogtoClient extends LogtoNextBaseClient {
+    constructor(config) {
+        super(config, {
+            NodeClient,
+        });
+    }
+    /**
+     * 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
+     */
+    async handleSignIn(cookie, redirectUri, interactionMode) {
+        const { nodeClient, session } = await this.createNodeClientFromHeaders(cookie);
+        await nodeClient.signIn(redirectUri, interactionMode);
+        if (!this.navigateUrl) {
+            // Not expected to happen
+            throw new Error('navigateUrl is not set');
+        }
+        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);
+        await nodeClient.signOut(redirectUri);
+        if (!this.navigateUrl) {
+            // Not expected to happen
+            throw new Error('navigateUrl is not set');
+        }
+        return this.navigateUrl;
+    }
+    /**
+     * 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);
+        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);
+        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 };
+    }
+}
+
+export { LogtoClient as default };

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

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

package/lib/src/session.cjs

@@ -57,11 +57,13 @@ const wrapSession = async (session, secret, crypto) => {
 };
 const createSession = async ({ secret, crypto }, cookie, setCookie) => {
     const data = await unwrapSession(cookie, secret, crypto);
+    const getValues = async () => wrapSession(session, secret, crypto);
     const session = {
         ...data,
         save: async () => {
-            setCookie(await wrapSession(session, secret, crypto));
+            setCookie?.(await getValues());
         },
+        getValues,
     };
     return session;
 };

package/lib/src/session.d.ts

@@ -5,5 +5,5 @@ type SessionConfigs = {
     secret: string;
     crypto: Crypto;
 };
-export declare const createSession: ({ secret, crypto }: SessionConfigs, cookie: string, setCookie: (value: string) => void) => Promise<Session>;
+export declare const createSession: ({ secret, crypto }: SessionConfigs, cookie: string, setCookie?: ((value: string) => void) | undefined) => Promise<Session>;
 export {};

package/lib/src/session.js

@@ -55,11 +55,13 @@ const wrapSession = async (session, secret, crypto) => {
 };
 const createSession = async ({ secret, crypto }, cookie, setCookie) => {
     const data = await unwrapSession(cookie, secret, crypto);
+    const getValues = async () => wrapSession(session, secret, crypto);
     const session = {
         ...data,
         save: async () => {
-            setCookie(await wrapSession(session, secret, crypto));
+            setCookie?.(await getValues());
         },
+        getValues,
     };
     return session;
 };

package/lib/src/types.d.ts

@@ -8,6 +8,7 @@ export type SessionData = {
 };
 export type Session = SessionData & {
     save: () => Promise<void>;
+    getValues?: () => Promise<string>;
 };
 export type LogtoNextConfig = LogtoConfig & {
     cookieSecret: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/next",
-  "version": "2.1.4",
+  "version": "2.2.1",
   "type": "module",
   "main": "./lib/src/index.cjs",
   "module": "./lib/src/index.js",
@@ -12,6 +12,9 @@
       ],
       "edge": [
         "./lib/edge/index.d.ts"
+      ],
+      "server-actions": [
+        "./lib/server-actions/index.d.ts"
       ]
     }
   },
@@ -25,6 +28,11 @@
       "require": "./lib/edge/index.cjs",
       "import": "./lib/edge/index.js",
       "types": "./lib/edge/index.d.ts"
+    },
+    "./server-actions": {
+      "require": "./lib/server-actions/index.cjs",
+      "import": "./lib/server-actions/index.js",
+      "types": "./lib/server-actions/index.d.ts"
     }
   },
   "files": [
@@ -52,7 +60,7 @@
     "jest-location-mock": "^2.0.0",
     "jest-matcher-specific-error": "^1.0.0",
     "lint-staged": "^14.0.0",
-    "next": "^13.0.4",
+    "next": "^13.5.3",
     "next-test-api-route-handler": "^3.1.6",
     "prettier": "^3.0.0",
     "react": "^18.2.0",