@logto/express 2.3.17 → 3.0.4

package/lib/index.js

@@ -27,11 +27,18 @@ const handleAuthRoutes = (config) => {
         const nodeClient = createNodeClient(request, response, config);
         switch (action) {
             case 'sign-in': {
-                await nodeClient.signIn(`${config.baseUrl}/${prefix}/sign-in-callback`);
+                await nodeClient.signIn({
+                    ...config.signInOptions,
+                    redirectUri: `${config.baseUrl}/${prefix}/sign-in-callback`,
+                });
                 break;
             }
             case 'sign-up': {
-                await nodeClient.signIn(`${config.baseUrl}/${prefix}/sign-in-callback`, 'signUp');
+                await nodeClient.signIn({
+                    ...config.signInOptions,
+                    redirectUri: `${config.baseUrl}/${prefix}/sign-in-callback`,
+                    firstScreen: 'register',
+                });
                 break;
             }
             case 'sign-in-callback': {

package/lib/types.d.ts

@@ -1,4 +1,4 @@
-import type { GetContextParameters, LogtoConfig } from '@logto/node';
+import type { GetContextParameters, LogtoConfig, SignInOptions } from '@logto/node';
 declare module 'http' {
     interface IncomingMessage {
         session: Record<string, string | undefined>;
@@ -7,4 +7,5 @@ declare module 'http' {
 export type LogtoExpressConfig = LogtoConfig & {
     baseUrl: string;
     authRoutesPrefix?: string;
+    signInOptions?: Omit<SignInOptions, 'redirectUri' | 'postRedirectUri'>;
 } & GetContextParameters;

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "@logto/express",
-  "version": "2.3.17",
+  "version": "3.0.4",
   "type": "module",
-  "main": "./lib/index.cjs",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "exports": {
     "types": "./lib/index.d.ts",
-    "require": "./lib/index.cjs",
     "import": "./lib/index.js",
     "default": "./lib/index.js"
   },
@@ -21,7 +19,7 @@
     "directory": "packages/express"
   },
   "dependencies": {
-    "@logto/node": "^2.5.8"
+    "@logto/node": "^3.1.0"
   },
   "devDependencies": {
     "@silverhand/eslint-config": "^6.0.1",
@@ -29,13 +27,13 @@
     "@silverhand/ts-config-react": "^6.0.0",
     "@swc/core": "^1.6.5",
     "@types/cookie-parser": "^1.4.3",
-    "@types/express": "^4.17.13",
+    "@types/express": "^5.0.0",
     "@types/express-session": "^1.17.5",
     "@types/supertest": "^6.0.0",
     "@vitest/coverage-v8": "^1.6.0",
     "cookie-parser": "^1.4.6",
     "eslint": "^8.57.0",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "express-session": "^1.17.3",
     "lint-staged": "^15.0.0",
     "prettier": "^3.0.0",
@@ -68,6 +66,6 @@
     "build": "rm -rf lib/ && tsc -p tsconfig.build.json --noEmit && rollup -c",
     "lint": "eslint --ext .ts src",
     "test": "vitest",
-    "test:coverage": "node test.cjs && vitest --silent --coverage"
+    "test:coverage": "vitest --silent --coverage"
   }
 }

package/lib/errors.cjs

@@ -1,14 +0,0 @@
-'use strict';
-
-const logtoExpressErrorCodes = Object.freeze({
-    session_not_configured: 'You should configure express-session before using Logto express SDK.',
-});
-class LogtoExpressError extends Error {
-    constructor(code, data) {
-        super(logtoExpressErrorCodes[code]);
-        this.code = code;
-        this.data = data;
-    }
-}
-
-exports.LogtoExpressError = LogtoExpressError;

package/lib/index.cjs

@@ -1,122 +0,0 @@
-'use strict';
-
-var NodeClient = require('@logto/node');
-var express = require('express');
-var errors = require('./errors.cjs');
-var storage = require('./storage.cjs');
-
-function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
-
-var NodeClient__default = /*#__PURE__*/_interopDefault(NodeClient);
-
-const createNodeClient = (request, response, config) => {
-    // We assume that `session` is configured in the express app, but need to check it there.
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    if (!request.session) {
-        throw new errors.LogtoExpressError('session_not_configured');
-    }
-    const storage$1 = new storage.default(request);
-    return new NodeClient__default.default(config, {
-        storage: storage$1,
-        navigate: (url) => {
-            response.redirect(url);
-        },
-    });
-};
-const handleAuthRoutes = (config) => {
-    // eslint-disable-next-line new-cap
-    const router = express.Router();
-    const prefix = config.authRoutesPrefix ?? 'logto';
-    router.use(`/${prefix}/:action`, async (request, response) => {
-        const { action } = request.params;
-        const nodeClient = createNodeClient(request, response, config);
-        switch (action) {
-            case 'sign-in': {
-                await nodeClient.signIn(`${config.baseUrl}/${prefix}/sign-in-callback`);
-                break;
-            }
-            case 'sign-up': {
-                await nodeClient.signIn(`${config.baseUrl}/${prefix}/sign-in-callback`, 'signUp');
-                break;
-            }
-            case 'sign-in-callback': {
-                if (request.url) {
-                    await nodeClient.handleSignInCallback(`${config.baseUrl}${request.originalUrl}`);
-                    response.redirect(config.baseUrl);
-                }
-                break;
-            }
-            case 'sign-out': {
-                await nodeClient.signOut(config.baseUrl);
-                break;
-            }
-            default: {
-                response.status(404).end();
-            }
-        }
-    });
-    return router;
-};
-const withLogto = (config) => async (request, response, next) => {
-    const client = createNodeClient(request, response, config);
-    const user = await client.getContext({
-        getAccessToken: config.getAccessToken,
-        resource: config.resource,
-        fetchUserInfo: config.fetchUserInfo,
-        getOrganizationToken: config.getOrganizationToken,
-    });
-    // eslint-disable-next-line @silverhand/fp/no-mutating-methods
-    Object.defineProperty(request, 'user', { enumerable: true, get: () => user });
-    next();
-};
-
-Object.defineProperty(exports, "LogtoClientError", {
-    enumerable: true,
-    get: function () { return NodeClient.LogtoClientError; }
-});
-Object.defineProperty(exports, "LogtoError", {
-    enumerable: true,
-    get: function () { return NodeClient.LogtoError; }
-});
-Object.defineProperty(exports, "LogtoRequestError", {
-    enumerable: true,
-    get: function () { return NodeClient.LogtoRequestError; }
-});
-Object.defineProperty(exports, "OidcError", {
-    enumerable: true,
-    get: function () { return NodeClient.OidcError; }
-});
-Object.defineProperty(exports, "PersistKey", {
-    enumerable: true,
-    get: function () { return NodeClient.PersistKey; }
-});
-Object.defineProperty(exports, "Prompt", {
-    enumerable: true,
-    get: function () { return NodeClient.Prompt; }
-});
-Object.defineProperty(exports, "ReservedResource", {
-    enumerable: true,
-    get: function () { return NodeClient.ReservedResource; }
-});
-Object.defineProperty(exports, "ReservedScope", {
-    enumerable: true,
-    get: function () { return NodeClient.ReservedScope; }
-});
-Object.defineProperty(exports, "UserScope", {
-    enumerable: true,
-    get: function () { return NodeClient.UserScope; }
-});
-Object.defineProperty(exports, "buildOrganizationUrn", {
-    enumerable: true,
-    get: function () { return NodeClient.buildOrganizationUrn; }
-});
-Object.defineProperty(exports, "getOrganizationIdFromUrn", {
-    enumerable: true,
-    get: function () { return NodeClient.getOrganizationIdFromUrn; }
-});
-Object.defineProperty(exports, "organizationUrnPrefix", {
-    enumerable: true,
-    get: function () { return NodeClient.organizationUrnPrefix; }
-});
-exports.handleAuthRoutes = handleAuthRoutes;
-exports.withLogto = withLogto;

package/lib/storage.cjs

@@ -1,24 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-class ExpressStorage {
-    constructor(request) {
-        this.request = request;
-    }
-    async setItem(key, value) {
-        this.request.session[key] = value;
-    }
-    async getItem(key) {
-        const value = this.request.session[key];
-        if (value === undefined) {
-            return null;
-        }
-        return String(value);
-    }
-    async removeItem(key) {
-        this.request.session[key] = undefined;
-    }
-}
-
-exports.default = ExpressStorage;