Skip to content

Commit 1bef4af

Browse files
authored
chore(passport): ID-3373 upgrade Magic SDK @29.0.2 (#2597)
1 parent 9600fe3 commit 1bef4af

File tree

6 files changed

+3468
-829
lines changed

6 files changed

+3468
-829
lines changed

packages/internal/toolkit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"bugs": "https://github.com/immutable/ts-immutable-sdk/issues",
77
"dependencies": {
88
"@imtbl/x-client": "workspace:*",
9-
"@magic-ext/oidc": "12.0.0",
9+
"@magic-ext/oidc": "12.0.2",
1010
"@metamask/detect-provider": "^2.0.0",
1111
"axios": "^1.6.5",
1212
"bn.js": "^5.2.1",
1313
"enc-utils": "^3.0.0",
1414
"ethers": "^6.13.4",
15-
"magic-sdk": "^29.0.0",
15+
"magic-sdk": "^29.0.2",
1616
"oidc-client-ts": "2.4.0"
1717
},
1818
"devDependencies": {

packages/passport/sdk/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"@imtbl/toolkit": "workspace:*",
1414
"@imtbl/x-client": "workspace:*",
1515
"@imtbl/x-provider": "workspace:*",
16-
"@magic-ext/oidc": "12.0.0",
17-
"@magic-sdk/provider": "^29.0.0",
16+
"@magic-ext/oidc": "12.0.2",
17+
"@magic-sdk/provider": "^29.0.2",
1818
"@metamask/detect-provider": "^2.0.0",
1919
"axios": "^1.6.5",
2020
"ethers": "^6.13.4",
2121
"events": "^3.3.0",
2222
"jwt-decode": "^3.1.2",
2323
"localforage": "^1.10.0",
24-
"magic-sdk": "^29.0.0",
24+
"magic-sdk": "^29.0.2",
2525
"oidc-client-ts": "2.4.0",
2626
"uuid": "^8.3.2"
2727
},

packages/passport/sdk/src/magic/magicAdapter.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('MagicWallet', () => {
6161
jest.spyOn(window.document, 'readyState', 'get').mockReturnValue('complete');
6262
const magicAdapter = new MagicAdapter(config, magicProviderProxyFactory);
6363
// @ts-ignore
64-
expect(magicAdapter.lazyMagicClient).toBeDefined();
64+
expect(magicAdapter.magicClient).toBeDefined();
6565
});
6666
});
6767

packages/passport/sdk/src/magic/magicAdapter.ts

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Flow, trackDuration } from '@imtbl/metrics';
44
import { Eip1193Provider } from 'ethers';
55
import { PassportErrorType, withPassportError } from '../errors/passportError';
66
import { PassportConfiguration } from '../config';
7-
import { lazyDocumentReady } from '../utils/lazyLoad';
87
import { withMetricsAsync } from '../utils/metrics';
98
import { MagicProviderProxyFactory } from './magicProviderProxyFactory';
109
import { MagicClient } from './types';
@@ -16,29 +15,26 @@ export default class MagicAdapter {
1615

1716
private readonly magicProviderProxyFactory: MagicProviderProxyFactory;
1817

19-
private readonly lazyMagicClient?: Promise<MagicClient>;
18+
private readonly magicClient?: MagicClient;
2019

2120
constructor(config: PassportConfiguration, magicProviderProxyFactory: MagicProviderProxyFactory) {
2221
this.config = config;
2322
this.magicProviderProxyFactory = magicProviderProxyFactory;
2423

2524
if (typeof window !== 'undefined') {
26-
this.lazyMagicClient = lazyDocumentReady<MagicClient>(() => {
27-
const client = new Magic(this.config.magicPublishableApiKey, {
28-
extensions: [new OpenIdExtension()],
29-
network: MAINNET, // We always connect to mainnet to ensure addresses are the same across envs
30-
});
31-
return client;
25+
this.magicClient = new Magic(this.config.magicPublishableApiKey, {
26+
extensions: [new OpenIdExtension()],
27+
network: MAINNET, // We always connect to mainnet to ensure addresses are the same across envs
3228
});
3329
}
3430
}
3531

36-
private get magicClient(): Promise<MagicClient> {
37-
if (!this.lazyMagicClient) {
32+
private getMagicClient(): MagicClient {
33+
if (!this.magicClient) {
3834
throw new Error('Cannot perform this action outside of the browser');
3935
}
4036

41-
return this.lazyMagicClient;
37+
return this.magicClient;
4238
}
4339

4440
async login(
@@ -48,7 +44,7 @@ export default class MagicAdapter {
4844
withMetricsAsync(async (flow: Flow) => {
4945
const startTime = performance.now();
5046

51-
const magicClient = await this.magicClient;
47+
const magicClient = this.getMagicClient();
5248
flow.addEvent('endMagicClientInit');
5349

5450
await magicClient.openid.loginWithOIDC({
@@ -69,7 +65,7 @@ export default class MagicAdapter {
6965
}
7066

7167
async logout() {
72-
const magicClient = await this.magicClient;
68+
const magicClient = this.getMagicClient();
7369
if (magicClient.user) {
7470
await magicClient.user.logout();
7571
}

packages/x-provider/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"@imtbl/generated-clients": "workspace:*",
1010
"@imtbl/toolkit": "workspace:*",
1111
"@imtbl/x-client": "workspace:*",
12-
"@magic-ext/oidc": "12.0.0",
12+
"@magic-ext/oidc": "12.0.2",
1313
"@metamask/detect-provider": "^2.0.0",
1414
"axios": "^1.6.5",
1515
"enc-utils": "^3.0.0",
1616
"ethers": "^6.13.4",
17-
"magic-sdk": "^29.0.0",
17+
"magic-sdk": "^29.0.2",
1818
"oidc-client-ts": "2.4.0"
1919
},
2020
"devDependencies": {

0 commit comments

Comments
 (0)