@mongodb-js/oidc-plugin 1.1.8 → 2.0.0

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;;AA+MA,gBAAgB;AAChB,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;AAC/E,cAAc;AACd,MAAa,gBAAiB,SAAQ,KAAK;IAIzC,YAAY,OAAe,EAAE,EAAE,KAAK,KAA0B,EAAE;QAC9D,0DAA0D;QAC1D,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAL5B,gBAAgB;QACR,QAAqB,GAAG,IAAI,CAAC;IAKrC,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,KAAc;QACtC,OAAO;QACL,8DAA8D;QAC9D,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAa,CAAC,mBAAmB,CAAC,CAC1E,CAAC;IACJ,CAAC;CACF;AAfD,4CAeC;KAbU,mBAAmB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AA+MA,gBAAgB;AAChB,MAAM,mBAAmB,GAAG,MAAM,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;AAC/E,cAAc;AACd,MAAa,gBAAiB,SAAQ,KAAK;IACzC,gBAAgB;IACR,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC;IACrB,QAAQ,CAAyB;IAEjD,YACE,OAAe,EACf,EAAE,KAAK,EAAE,QAAQ,EAAyC;QAE1D,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,GAAG,cAAc,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,KAAc;QACtC,OAAO;QACL,8DAA8D;QAC9D,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAa,CAAC,mBAAmB,CAAC,CAC1E,CAAC;IACJ,CAAC;CACF;AAnBD,4CAmBC"}

package/dist/util.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" />
-import type { TokenSet } from 'openid-client';
+import type { IDToken, JsonValue, TokenEndpointResponse, TokenEndpointResponseHelpers } from 'openid-client';
 import type { OIDCAbortSignal } from './types';
 export declare function throwIfAborted(signal?: OIDCAbortSignal): void;
 interface AbortCheckArgs {
@@ -11,9 +10,45 @@ export declare function errorString(err: unknown): string;
 export declare function timeoutSignal(ms: number): AbortSignal;
 export declare function withLock<T extends (...args: any[]) => Promise<any>>(fn: T): (...args: Parameters<T>) => ReturnType<T>;
 export declare function normalizeObject<T extends object>(obj: T): T;
-export declare function validateSecureHTTPUrl(url: unknown, diagnosticId: string): void;
+export declare function validateSecureHTTPUrl(url: string | URL | undefined | null | JsonValue, diagnosticId: string): 'http-allowed' | 'http-disallowed';
 export declare function messageFromError(err: unknown): string;
 export declare function getRefreshTokenId(token: string | null | undefined): string | null;
-export declare function getStableTokenSetId(tokenSet: TokenSet): string;
+export declare class TokenSet {
+    private readonly response;
+    readonly expiresAt: number | undefined;
+    constructor(response: TokenEndpointResponse & TokenEndpointResponseHelpers, expiresAt?: number | undefined);
+    get refreshToken(): string | undefined;
+    get accessToken(): string | undefined;
+    get idToken(): string | undefined;
+    get idTokenClaims(): IDToken | undefined;
+    get tokenType(): TokenEndpointResponse['token_type'];
+    serialize(): {
+        claims: {
+            [claim: string]: JsonValue | undefined;
+            iss: string;
+            sub: string;
+            aud: string | string[];
+            iat: number;
+            exp: number;
+            nonce?: string;
+            auth_time?: number;
+            azp?: string;
+            jti?: string;
+            nbf?: number;
+            cnf?: import("oauth4webapi").ConfirmationClaims;
+        } | undefined;
+        expiresAt: number | undefined;
+        expiresIn: undefined;
+        access_token: string;
+        expires_in?: number;
+        id_token?: string;
+        refresh_token?: string;
+        scope?: string;
+        authorization_details?: import("oauth4webapi").AuthorizationDetails[];
+        token_type: "bearer" | "dpop" | Lowercase<string>;
+    };
+    static fromSerialized(serialized: ReturnType<(typeof TokenSet.prototype)['serialize']>): TokenSet;
+    stableId(): string;
+}
 export {};
 //# sourceMappingURL=util.d.ts.map

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAS/C,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAE7D;AAED,UAAU,cAAc;IACtB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;CAC/B;AACD,wBAAsB,cAAc,CAElC,CAAC,SAAS,CAAC,UAAU,EAAE,cAAc,KAAK,OAAO,CAAC,GAAG,CAAC,EACtD,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAoBpE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAIhD;AAGD,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,CAIrD;AAID,wBAAgB,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EACjE,EAAE,EAAE,CAAC,GACJ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAc3C;AAID,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAE3D;AAGD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,OAAO,EACZ,YAAY,EAAE,MAAM,GACnB,IAAI,CA4BN;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CASrD;AAGD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/B,MAAM,GAAG,IAAI,CAOf;AAGD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAc9D"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,SAAS,EACT,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAS/C,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,CAE7D;AAED,UAAU,cAAc;IACtB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,aAAa,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;CAC/B;AACD,wBAAsB,cAAc,CAElC,CAAC,SAAS,CAAC,UAAU,EAAE,cAAc,KAAK,OAAO,CAAC,GAAG,CAAC,EACtD,MAAM,EAAE,eAAe,GAAG,SAAS,EAAE,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAoBpE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAIhD;AAGD,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,CAIrD;AAID,wBAAgB,QAAQ,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,EACjE,EAAE,EAAE,CAAC,GACJ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAc3C;AAID,wBAAgB,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAE3D;AAOD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,EAChD,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,iBAAiB,CA+BpC;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CASrD;AAGD,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAC/B,MAAM,GAAG,IAAI,CAOf;AAED,qBAAa,QAAQ;IACnB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CACM;IAC/B,SAAgB,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;gBAG5C,QAAQ,EAAE,qBAAqB,GAAG,4BAA4B,EAC9D,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS;IAahC,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAErC;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAEhC;IAED,IAAI,aAAa,IAAI,OAAO,GAAG,SAAS,CAEvC;IAED,IAAI,SAAS,IAAI,qBAAqB,CAAC,YAAY,CAAC,CAEnD;IAID,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;IAaT,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,UAAU,CAAC,CAAC,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,GAC/D,QAAQ;IAcX,QAAQ,IAAI,MAAM;CAcnB"}

package/dist/util.js

@@ -1,6 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStableTokenSetId = exports.getRefreshTokenId = exports.messageFromError = exports.validateSecureHTTPUrl = exports.normalizeObject = exports.withLock = exports.timeoutSignal = exports.errorString = exports.withAbortCheck = exports.throwIfAborted = void 0;
+exports.TokenSet = void 0;
+exports.throwIfAborted = throwIfAborted;
+exports.withAbortCheck = withAbortCheck;
+exports.errorString = errorString;
+exports.timeoutSignal = timeoutSignal;
+exports.withLock = withLock;
+exports.normalizeObject = normalizeObject;
+exports.validateSecureHTTPUrl = validateSecureHTTPUrl;
+exports.messageFromError = messageFromError;
+exports.getRefreshTokenId = getRefreshTokenId;
 const crypto_1 = require("crypto");
 class AbortError extends Error {
     constructor() {
@@ -11,7 +20,6 @@ function throwIfAborted(signal) {
     if (signal?.aborted)
         throw signal.reason ?? new AbortError();
 }
-exports.throwIfAborted = throwIfAborted;
 async function withAbortCheck(signal, fn) {
     const signalCheck = () => throwIfAborted(signal);
     let reject;
@@ -33,18 +41,15 @@ async function withAbortCheck(signal, fn) {
         signal?.removeEventListener('abort', listener);
     }
 }
-exports.withAbortCheck = withAbortCheck;
 function errorString(err) {
     return String(typeof err === 'object' && err && 'message' in err ? err.message : err);
 }
-exports.errorString = errorString;
 // AbortSignal.timeout, but consistently .unref()ed
 function timeoutSignal(ms) {
     const controller = new AbortController();
     setTimeout(() => controller.abort(), ms).unref();
     return controller.signal;
 }
-exports.timeoutSignal = timeoutSignal;
 // Ensure that only one call to the target `fn` is active at a time.
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function withLock(fn) {
@@ -62,30 +67,32 @@ function withLock(fn) {
         return result;
     };
 }
-exports.withLock = withLock;
 // Normalize JS objects by sorting keys so that {a:1,b:2} and {b:2,a:1} are equivalent.
 // eslint-disable-next-line @typescript-eslint/ban-types
 function normalizeObject(obj) {
     return Object.fromEntries(Object.entries(obj).sort());
 }
-exports.normalizeObject = normalizeObject;
+function isURL(url) {
+    return Object.prototype.toString.call(url).toLowerCase() === '[object url]';
+}
 // Throws if the url does not refer to an https: endpoint or a local endpoint, or null or undefined.
 function validateSecureHTTPUrl(url, diagnosticId) {
     try {
         // eslint-disable-next-line eqeqeq
         if (url == null)
-            return;
-        if (typeof url !== 'string')
-            throw new Error(`Expected string, got ${typeof url} instead`);
-        const parsed = new URL(url);
+            return 'http-disallowed';
+        if (typeof url !== 'string' && !isURL(url))
+            throw new Error(`Expected string or URL object, got ${typeof url} instead`);
+        const parsed = isURL(url) ? url : new URL(url);
         if (parsed.protocol === 'https:')
-            return;
+            return 'http-disallowed';
         if (parsed.protocol !== 'http:') {
-            throw new Error(`Unknown protocol '${parsed.protocol}' '${url}'`);
+            throw new Error(`Unknown protocol '${parsed.protocol}' '${String(url)}'`);
         }
         if (!/^(\[::1\]|127(\.\d+){3}|localhost)$/.test(parsed.hostname)) {
-            throw new Error(`Need to specify https: when accessing non-local URL '${url}'`);
+            throw new Error(`Need to specify https: when accessing non-local URL '${String(url)}'`);
         }
+        return 'http-allowed';
     }
     catch (err) {
         if (!err ||
@@ -98,7 +105,6 @@ function validateSecureHTTPUrl(url, diagnosticId) {
         throw err;
     }
 }
-exports.validateSecureHTTPUrl = validateSecureHTTPUrl;
 function messageFromError(err) {
     return String(err &&
         typeof err === 'object' &&
@@ -107,7 +113,6 @@ function messageFromError(err) {
         ? err.message
         : err);
 }
-exports.messageFromError = messageFromError;
 const salt = (0, crypto_1.randomBytes)(16);
 function getRefreshTokenId(token) {
     if (!token)
@@ -116,19 +121,69 @@ function getRefreshTokenId(token) {
     // that might unnecessarily worry users
     return ('debugid:' + (0, crypto_1.createHash)('sha256').update(salt).update(token).digest('hex'));
 }
-exports.getRefreshTokenId = getRefreshTokenId;
-// Identify a token set based on a hash of its contents
-function getStableTokenSetId(tokenSet) {
-    const { access_token, id_token, refresh_token, token_type, expires_at } = tokenSet;
-    return (0, crypto_1.createHash)('sha256')
-        .update(JSON.stringify({
-        access_token,
-        id_token,
-        refresh_token,
-        token_type,
-        expires_at,
-    }))
-        .digest('hex');
+class TokenSet {
+    response;
+    expiresAt;
+    constructor(response, expiresAt) {
+        this.response = response;
+        this.expiresAt =
+            expiresAt ??
+                (() => {
+                    const expiresIn = this.response.expiresIn();
+                    return expiresIn
+                        ? Math.floor(Date.now() / 1000) + expiresIn
+                        : undefined;
+                })();
+    }
+    get refreshToken() {
+        return this.response.refresh_token;
+    }
+    get accessToken() {
+        return this.response.access_token;
+    }
+    get idToken() {
+        return this.response.id_token;
+    }
+    get idTokenClaims() {
+        return this.response.claims();
+    }
+    get tokenType() {
+        return this.response.token_type;
+    }
+    // Explicitly expressing the return type of this function is a bit awkward,
+    // and since it is only consumed by `fromSerialized`, it's fine to leave it inferred.
+    serialize() {
+        const expiresIn = this.response.expiresIn();
+        const claims = this.response.claims();
+        return {
+            ...this.response,
+            claims: claims ? { ...claims } : undefined,
+            expiresAt: this.expiresAt ??
+                (expiresIn ? Math.floor(Date.now() / 1000) + expiresIn : undefined),
+            expiresIn: undefined,
+        };
+    }
+    static fromSerialized(serialized) {
+        const helpers = {
+            claims: () => serialized.claims,
+            expiresIn: () => serialized.expiresAt &&
+                Math.max(0, serialized.expiresAt - Math.floor(Date.now() / 1000)),
+        };
+        return new this(Object.assign({ ...serialized }, helpers), serialized.expiresAt);
+    }
+    // Identify a token set based on a hash of its contents
+    stableId() {
+        const { access_token, id_token, refresh_token, token_type } = this.response;
+        return (0, crypto_1.createHash)('sha256')
+            .update(JSON.stringify({
+            access_token,
+            id_token,
+            refresh_token,
+            token_type,
+            expires_at: this.expiresAt,
+        }))
+            .digest('hex');
+    }
 }
-exports.getStableTokenSetId = getStableTokenSetId;
+exports.TokenSet = TokenSet;
 //# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}

package/index.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-
 import type { IncomingMessage } from 'http';
 import type { RequestOptions } from 'https';
 import type { ServerResponse } from 'http';
@@ -48,7 +46,10 @@ export declare interface DeviceFlowInformation {
  */
 export declare function hookLoggerToMongoLogWriter(emitter: TypedEventEmitter<MongoDBOIDCLogEventsMap>, log: MongoLogWriter, contextPrefix: string): void;
 
-/** @public */
+/**
+ * @public
+ * @deprecated Use a custom `fetch` function instead
+ */
 export declare type HttpOptions = Partial<Pick<RequestOptions, 'agent' | 'ca' | 'cert' | 'crl' | 'headers' | 'key' | 'lookup' | 'passphrase' | 'pfx' | 'timeout'>>;
 
 /**
@@ -74,8 +75,10 @@ export declare interface IdPServerResponse {
 /** @public */
 export declare class MongoDBOIDCError extends Error {
     /* Excluded from this release type: [MongoDBOIDCErrorTag] */
-    constructor(message: string, { cause }?: {
+    readonly codeName: `MongoDBOIDC${string}`;
+    constructor(message: string, { cause, codeName }: {
         cause?: unknown;
+        codeName: string;
     });
     static isMongoDBOIDCError(value: unknown): value is MongoDBOIDCError;
 }
@@ -367,8 +370,16 @@ export declare interface MongoDBOIDCPluginOptions {
     throwOnIncompatibleSerializedState?: boolean;
     /**
      * Provide custom HTTP options for individual HTTP calls.
+     *
+     * @deprecated Use a custom `fetch` function instead.
      */
     customHttpOptions?: HttpOptions | ((url: string, options: Readonly<HttpOptions>) => HttpOptions);
+    /**
+     * Provide a custom `fetch` function to be used for HTTP calls.
+     *
+     * Any API that is compatible with the web `fetch` API can be used here.
+     */
+    customFetch?: (url: string, options: Readonly<unknown>) => Promise<Response>;
     /**
      * Pass ID tokens in place of access tokens. For debugging/working around
      * broken identity providers.

package/package.json

@@ -13,7 +13,7 @@
     "email": "compass@mongodb.com"
   },
   "homepage": "https://github.com/mongodb-js/oidc-plugin",
-  "version": "1.1.8",
+  "version": "2.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/mongodb-js/oidc-plugin.git"
@@ -30,7 +30,7 @@
     "import": "./dist/.esm-wrapper.mjs"
   },
   "engines": {
-    "node": ">= 16.20.1"
+    "node": ">= 20.19.2"
   },
   "types": "./index.d.ts",
   "scripts": {
@@ -53,43 +53,45 @@
     "precommit": "precommit"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.34.4",
+    "@microsoft/api-extractor": "^7.52.8",
     "@mongodb-js/eslint-config-devtools": "^0.9.9",
     "@mongodb-js/mocha-config-devtools": "^1.0.0",
     "@mongodb-js/monorepo-tools": "^1.1.4",
-    "@mongodb-js/oidc-mock-provider": "^0.10.2",
+    "@mongodb-js/oidc-mock-provider": "^0.11.3",
     "@mongodb-js/prettier-config-devtools": "^1.0.1",
     "@mongodb-js/tsconfig-devtools": "^1.0.0",
     "@types/chai": "^4.2.21",
-    "@types/express": "^4.17.17",
+    "@types/electron-to-chromium": "^1.5.0",
+    "@types/express": "^5.0.3",
     "@types/mocha": "^10.0.2",
-    "@types/node": "^18.13.0",
+    "@types/node": "^20.14.8",
     "@types/oidc-provider": "^8.1.1",
     "@types/sinon-chai": "^3.2.5",
     "chai": "^4.3.6",
     "depcheck": "^1.4.1",
-    "electron": "^26.2.0",
-    "electron-mocha": "^12.0.0",
+    "electron": "^36.5.0",
+    "electron-mocha": "^13.1.0",
+    "electron-to-chromium": "^1.5.170",
     "eslint": "^7.25.0",
     "gen-esm-wrapper": "^1.1.0",
     "husky": "^8.0.3",
-    "mocha": "^10.2.0",
+    "mocha": "^11.7.1",
     "mongodb": "^6.7.0",
     "mongodb-log-writer": "^2.1.0",
     "mongodb-runner": "^5.2.0",
-    "node-fetch": "^3.3.1",
     "nyc": "^15.1.0",
     "oidc-provider": "https://github.com/panva/node-oidc-provider/archive/refs/tags/v7.14.3.tar.gz",
-    "prettier": "2.3.2",
+    "prettier": "^2.7.1",
     "rimraf": "^5.0.0",
     "sinon": "^15.0.3",
-    "typescript": "^5.0.4",
-    "webdriverio": "^8.5.9",
+    "typescript": "^5.8.3",
+    "webdriverio": "^9.15.0",
     "xvfb-maybe": "^0.2.1"
   },
   "dependencies": {
-    "express": "^4.18.2",
-    "open": "^9.1.0",
-    "openid-client": "^5.6.4"
+    "express": "^5.1.0",
+    "node-fetch": "^3.3.2",
+    "open": "^10.1.2",
+    "openid-client": "^6.5.1"
   }
 }