diff --git a/package.json b/package.json index 1654654278..1dfbafd411 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,6 @@ "test": "nx affected -t test", "test:examples": "pnpm --recursive --sequential --filter '@examples/**' test", "test:vpn": "RUN_VPN_TESTS=1 wsrun --exclude-missing -e test", - "typecheck": "nx affected -t typecheck" + "typecheck": "nx affected -t typecheck" } -} +} \ No newline at end of file diff --git a/packages/internal/toolkit/package.json b/packages/internal/toolkit/package.json index ed6a329938..5054da2e69 100644 --- a/packages/internal/toolkit/package.json +++ b/packages/internal/toolkit/package.json @@ -13,7 +13,7 @@ "enc-utils": "^3.0.0", "ethers": "^6.13.4", "magic-sdk": "^29.0.5", - "oidc-client-ts": "2.4.0" + "oidc-client-ts": "3.3.0" }, "devDependencies": { "@swc/core": "^1.3.36", @@ -75,4 +75,4 @@ }, "type": "module", "types": "./dist/types/index.d.ts" -} +} \ No newline at end of file diff --git a/packages/passport/sdk/package.json b/packages/passport/sdk/package.json index fc266cbb42..99ed34572a 100644 --- a/packages/passport/sdk/package.json +++ b/packages/passport/sdk/package.json @@ -22,7 +22,7 @@ "jwt-decode": "^3.1.2", "localforage": "^1.10.0", "magic-sdk": "^29.0.5", - "oidc-client-ts": "2.4.0", + "oidc-client-ts": "3.3.0", "uuid": "^8.3.2" }, "devDependencies": { @@ -88,4 +88,4 @@ }, "type": "module", "types": "./dist/types/index.d.ts" -} +} \ No newline at end of file diff --git a/packages/passport/sdk/src/authManager.test.ts b/packages/passport/sdk/src/authManager.test.ts index 0538bbd3f0..9dbc69cbc4 100644 --- a/packages/passport/sdk/src/authManager.test.ts +++ b/packages/passport/sdk/src/authManager.test.ts @@ -135,7 +135,7 @@ describe('AuthManager', () => { authority: config.authenticationDomain, client_id: config.oidcConfiguration.clientId, extraQueryParams: {}, - mergeClaims: true, + mergeClaimsStrategy: { array: 'merge' }, automaticSilentRenew: false, metadata: { authorization_endpoint: `${config.authenticationDomain}/authorize`, diff --git a/packages/passport/sdk/src/authManager.ts b/packages/passport/sdk/src/authManager.ts index f2107a9b98..9d4c2a4232 100644 --- a/packages/passport/sdk/src/authManager.ts +++ b/packages/passport/sdk/src/authManager.ts @@ -73,7 +73,7 @@ const getAuthConfiguration = (config: PassportConfiguration): UserManagerSetting end_session_endpoint: endSessionEndpoint.toString(), revocation_endpoint: `${authenticationDomain}/oauth/revoke`, }, - mergeClaims: true, + mergeClaimsStrategy: { array: 'merge' }, automaticSilentRenew: false, // Disabled until https://github.com/authts/oidc-client-ts/issues/430 has been resolved scope: oidcConfiguration.scope, userStore, diff --git a/packages/x-provider/package.json b/packages/x-provider/package.json index 59f74099c5..0a638c8632 100644 --- a/packages/x-provider/package.json +++ b/packages/x-provider/package.json @@ -15,7 +15,7 @@ "enc-utils": "^3.0.0", "ethers": "^6.13.4", "magic-sdk": "^29.0.5", - "oidc-client-ts": "2.4.0" + "oidc-client-ts": "3.3.0" }, "devDependencies": { "@swc/core": "^1.3.36", @@ -76,4 +76,4 @@ }, "type": "module", "types": "./dist/types/index.d.ts" -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7f1d18c4b1..a0889e2f60 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1932,8 +1932,8 @@ importers: specifier: ^29.0.5 version: 29.0.5 oidc-client-ts: - specifier: 2.4.0 - version: 2.4.0 + specifier: 3.3.0 + version: 3.3.0 devDependencies: '@swc/core': specifier: ^1.3.36 @@ -2167,8 +2167,8 @@ importers: specifier: ^29.0.5 version: 29.0.5 oidc-client-ts: - specifier: 2.4.0 - version: 2.4.0 + specifier: 3.3.0 + version: 3.3.0 uuid: specifier: ^8.3.2 version: 8.3.2 @@ -2465,8 +2465,8 @@ importers: specifier: ^29.0.5 version: 29.0.5 oidc-client-ts: - specifier: 2.4.0 - version: 2.4.0 + specifier: 3.3.0 + version: 3.3.0 devDependencies: '@swc/core': specifier: ^1.3.36 @@ -12370,6 +12370,10 @@ packages: jwt-decode@3.1.2: resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==} + jwt-decode@4.0.0: + resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==} + engines: {node: '>=18'} + jwt-encode@1.0.1: resolution: {integrity: sha512-QrGiNhynbAYyFdbC1GbjborzenSFs5Ga+2nE0uBokGXsH11xrgd1AX55HR7P+wGQyyZOn6LUO5iKlh74dlhBkA==} @@ -13402,6 +13406,10 @@ packages: resolution: {integrity: sha512-WijhkTrlXK2VvgGoakWJiBdfIsVGz6CFzgjNNqZU1hPKV2kyeEaJgLs7RwuiSp2WhLfWBQuLvr2SxVlZnk3N1w==} engines: {node: '>=12.13.0'} + oidc-client-ts@3.3.0: + resolution: {integrity: sha512-t13S540ZwFOEZKLYHJwSfITugupW4uYLwuQSSXyKH/wHwZ+7FvgHE7gnNJh1YQIZ1Yd1hKSRjqeXGSUtS0r9JA==} + engines: {node: '>=18'} + on-exit-leak-free@0.2.0: resolution: {integrity: sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==} @@ -32277,6 +32285,8 @@ snapshots: jwt-decode@3.1.2: {} + jwt-decode@4.0.0: {} + jwt-encode@1.0.1: dependencies: ts.cryptojs256: 1.0.1 @@ -33619,6 +33629,10 @@ snapshots: crypto-js: 4.2.0 jwt-decode: 3.1.2 + oidc-client-ts@3.3.0: + dependencies: + jwt-decode: 4.0.0 + on-exit-leak-free@0.2.0: {} on-exit-leak-free@2.1.2: {}