@logto/client 2.6.6 → 2.6.8

package/lib/adapter/defaults.cjs

@@ -17,9 +17,7 @@ class DefaultJwtVerifier {
     async verifyIdToken(idToken) {
         const { appId } = this.client.logtoConfig;
         const { issuer, jwksUri } = await this.client.getOidcConfig();
-        if (!this.getJwtVerifyGetKey) {
-            this.getJwtVerifyGetKey = jose.createRemoteJWKSet(new URL(jwksUri));
-        }
+        this.getJwtVerifyGetKey ||= jose.createRemoteJWKSet(new URL(jwksUri));
         await verifyIdToken(idToken, appId, issuer, this.getJwtVerifyGetKey);
     }
 }

package/lib/adapter/defaults.js

@@ -15,9 +15,7 @@ class DefaultJwtVerifier {
     async verifyIdToken(idToken) {
         const { appId } = this.client.logtoConfig;
         const { issuer, jwksUri } = await this.client.getOidcConfig();
-        if (!this.getJwtVerifyGetKey) {
-            this.getJwtVerifyGetKey = createRemoteJWKSet(new URL(jwksUri));
-        }
+        this.getJwtVerifyGetKey ||= createRemoteJWKSet(new URL(jwksUri));
         await verifyIdToken(idToken, appId, issuer, this.getJwtVerifyGetKey);
     }
 }

package/lib/mock.d.ts

@@ -1,6 +1,7 @@
-/// <reference types="jest" />
 import { type OidcConfigResponse, Prompt } from '@logto/js';
 import { type Nullable } from '@silverhand/essentials';
+import nock from 'nock';
+import { type Mock } from 'vitest';
 import type { Storage } from './adapter/index.js';
 import type { AccessToken, LogtoConfig, LogtoSignInSessionItem } from './index.js';
 import LogtoClient from './index.js';
@@ -35,38 +36,22 @@ export declare const accessToken = "access_token_value";
 export declare const refreshToken = "new_refresh_token_value";
 export declare const idToken = "id_token_value";
 export declare const currentUnixTimeStamp: number;
-export declare const mockFetchOidcConfig: (delay?: number) => jest.Mock<Promise<{
-    authorizationEndpoint: string;
-    tokenEndpoint: string;
-    userinfoEndpoint: string;
-    endSessionEndpoint: string;
-    revocationEndpoint: string;
-    jwksUri: string;
-    issuer: string;
-}>, [], any>;
-export declare const fetchOidcConfig: jest.Mock<Promise<{
-    authorizationEndpoint: string;
-    tokenEndpoint: string;
-    userinfoEndpoint: string;
-    endSessionEndpoint: string;
-    revocationEndpoint: string;
-    jwksUri: string;
-    issuer: string;
-}>, [], any>;
-export declare const requester: jest.Mock<any, any, any>;
-export declare const failingRequester: jest.Mock<any, any, any>;
-export declare const navigate: jest.Mock<any, any, any>;
-export declare const generateCodeChallenge: jest.Mock<Promise<string>, [], any>;
-export declare const generateCodeVerifier: jest.Mock<string, [], any>;
-export declare const generateState: jest.Mock<string, [], any>;
+export declare const mockFetchOidcConfig: (delay?: number) => Mock<unknown[], Promise<OidcConfigResponse>>;
+export declare const fetchOidcConfig: Mock<unknown[], Promise<OidcConfigResponse>>;
+export declare const requester: Mock<any, any>;
+export declare const failingRequester: Mock<any, any>;
+export declare const navigate: Mock<any, any>;
+export declare const generateCodeChallenge: Mock<[], Promise<string>>;
+export declare const generateCodeVerifier: Mock<[], string>;
+export declare const generateState: Mock<[], string>;
 export declare const createAdapters: (withCache?: boolean) => {
-    requester: jest.Mock<any, any, any>;
+    requester: Mock<any, any>;
     storage: MockedStorage;
     unstable_cache: import("@silverhand/essentials").Optional<MockedStorage>;
-    navigate: jest.Mock<any, any, any>;
-    generateCodeChallenge: jest.Mock<Promise<string>, [], any>;
-    generateCodeVerifier: jest.Mock<string, [], any>;
-    generateState: jest.Mock<string, [], any>;
+    navigate: Mock<any, any>;
+    generateCodeChallenge: Mock<[], Promise<string>>;
+    generateCodeVerifier: Mock<[], string>;
+    generateState: Mock<[], string>;
 };
 export declare const createClient: (prompt?: Prompt, storage?: MockedStorage, withCache?: boolean, scopes?: string[]) => LogtoClientWithAccessors;
 /**
@@ -79,3 +64,4 @@ export declare class LogtoClientWithAccessors extends LogtoClient {
     setSignInSessionItem(item: Nullable<LogtoSignInSessionItem>): Promise<void>;
     getAccessTokenMap(): Map<string, AccessToken>;
 }
+export declare const nocked: nock.Scope;

package/lib/types/index.cjs

@@ -6,18 +6,21 @@ var essentials = require('@silverhand/essentials');
 /**
  * Normalize the Logto client configuration per the following rules:
  *
- * - Add default scopes (`openid`, `offline_access` and `profile`) if not provided.
- * - Add {@link ReservedResource.Organization} to resources if {@link UserScope.Organizations} is included in scopes.
+ * - Add default scopes (`openid`, `offline_access` and `profile`) if not provided and
+ * `includeReservedScopes` is `true`.
+ * - Add {@link ReservedResource.Organization} to resources if {@link UserScope.Organizations} is
+ * included in scopes.
  *
  * @param config The Logto client configuration to be normalized.
  * @returns The normalized Logto client configuration.
  */
 const normalizeLogtoConfig = (config) => {
     const { prompt = js.Prompt.Consent, scopes = [], resources, ...rest } = config;
+    const includeReservedScopes = config.includeReservedScopes ?? true;
     return {
         ...rest,
         prompt,
-        scopes: js.withDefaultScopes(scopes).split(' '),
+        scopes: includeReservedScopes ? js.withReservedScopes(scopes).split(' ') : scopes,
         resources: scopes.includes(js.UserScope.Organizations)
             ? essentials.deduplicate([...(resources ?? []), js.ReservedResource.Organization])
             : resources,

package/lib/types/index.d.ts

@@ -39,12 +39,20 @@ export type LogtoConfig = {
      * The prompt parameter to be used for the authorization request.
      */
     prompt?: Prompt | Prompt[];
+    /**
+     * Whether to include reserved scopes (`openid`, `offline_access` and `profile`) in the scopes.
+     *
+     * @default true
+     */
+    includeReservedScopes?: boolean;
 };
 /**
  * Normalize the Logto client configuration per the following rules:
  *
- * - Add default scopes (`openid`, `offline_access` and `profile`) if not provided.
- * - Add {@link ReservedResource.Organization} to resources if {@link UserScope.Organizations} is included in scopes.
+ * - Add default scopes (`openid`, `offline_access` and `profile`) if not provided and
+ * `includeReservedScopes` is `true`.
+ * - Add {@link ReservedResource.Organization} to resources if {@link UserScope.Organizations} is
+ * included in scopes.
  *
  * @param config The Logto client configuration to be normalized.
  * @returns The normalized Logto client configuration.

package/lib/types/index.js

@@ -1,21 +1,24 @@
-import { Prompt, withDefaultScopes, UserScope, ReservedResource, isArbitraryObject } from '@logto/js';
+import { Prompt, withReservedScopes, UserScope, ReservedResource, isArbitraryObject } from '@logto/js';
 import { deduplicate } from '@silverhand/essentials';
 
 /**
  * Normalize the Logto client configuration per the following rules:
  *
- * - Add default scopes (`openid`, `offline_access` and `profile`) if not provided.
- * - Add {@link ReservedResource.Organization} to resources if {@link UserScope.Organizations} is included in scopes.
+ * - Add default scopes (`openid`, `offline_access` and `profile`) if not provided and
+ * `includeReservedScopes` is `true`.
+ * - Add {@link ReservedResource.Organization} to resources if {@link UserScope.Organizations} is
+ * included in scopes.
  *
  * @param config The Logto client configuration to be normalized.
  * @returns The normalized Logto client configuration.
  */
 const normalizeLogtoConfig = (config) => {
     const { prompt = Prompt.Consent, scopes = [], resources, ...rest } = config;
+    const includeReservedScopes = config.includeReservedScopes ?? true;
     return {
         ...rest,
         prompt,
-        scopes: withDefaultScopes(scopes).split(' '),
+        scopes: includeReservedScopes ? withReservedScopes(scopes).split(' ') : scopes,
         resources: scopes.includes(UserScope.Organizations)
             ? deduplicate([...(resources ?? []), ReservedResource.Organization])
             : resources,

package/lib/utils/memoize.cjs

@@ -3,7 +3,7 @@
 function memoize(run) {
     const promiseCache = new Map();
     const memoized = async function (...args) {
-        const promiseKey = args[0];
+        const promiseKey = JSON.stringify(args);
         const cachedPromise = promiseCache.get(promiseKey);
         if (cachedPromise) {
             return cachedPromise;

package/lib/utils/memoize.js

@@ -1,7 +1,7 @@
 function memoize(run) {
     const promiseCache = new Map();
     const memoized = async function (...args) {
-        const promiseKey = args[0];
+        const promiseKey = JSON.stringify(args);
         const cachedPromise = promiseCache.get(promiseKey);
         if (cachedPromise) {
             return cachedPromise;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logto/client",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "type": "module",
   "main": "./lib/index.cjs",
   "module": "./lib/index.js",
@@ -32,25 +32,20 @@
     "@silverhand/essentials": "^2.8.7",
     "camelcase-keys": "^7.0.1",
     "jose": "^5.2.2",
-    "@logto/js": "^4.1.1"
+    "@logto/js": "^4.1.2"
   },
   "devDependencies": {
-    "@peculiar/webcrypto": "^1.4.5",
-    "@silverhand/eslint-config": "^5.0.0",
-    "@silverhand/ts-config": "^5.0.0",
-    "@swc/core": "^1.3.50",
-    "@swc/jest": "^0.2.24",
-    "@types/jest": "^29.5.0",
+    "@silverhand/eslint-config": "^6.0.1",
+    "@silverhand/ts-config": "^6.0.0",
     "@types/node": "^20.11.19",
+    "@vitest/coverage-v8": "^1.4.0",
     "eslint": "^8.57.0",
-    "jest": "^29.5.0",
-    "jest-matcher-specific-error": "^1.0.0",
+    "happy-dom": "^14.0.0",
     "lint-staged": "^15.0.0",
-    "nock": "^13.3.0",
+    "nock": "14.0.0-beta.5",
     "prettier": "^3.0.0",
-    "text-encoder": "^0.0.4",
-    "type-fest": "^4.0.0",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^1.4.0"
   },
   "eslintConfig": {
     "extends": "@silverhand"
@@ -65,7 +60,8 @@
     "check": "tsc --noEmit",
     "build": "rm -rf lib/ && tsc -p tsconfig.build.json --noEmit && rollup -c",
     "lint": "eslint --ext .ts src",
-    "test": "jest",
-    "test:coverage": "jest --silent --env=jsdom && jest --silent --coverage"
+    "test": "vitest",
+    "test:dom": "vitest --config=vitest.config.dom.ts",
+    "test:coverage": "pnpm test:dom --silent --no-watch && pnpm run test --no-watch --silent --coverage"
   }
 }