From cbbd63f88f990a172f2bed63d9fb3bd3e33e7af3 Mon Sep 17 00:00:00 2001 From: ethella Date: Wed, 29 Mar 2023 20:19:50 -0700 Subject: [PATCH 1/9] * Add cancel event --- packages/@magic-sdk/types/src/modules/intermediary-types.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/@magic-sdk/types/src/modules/intermediary-types.ts b/packages/@magic-sdk/types/src/modules/intermediary-types.ts index 1e6cd8153..ea1fa1202 100644 --- a/packages/@magic-sdk/types/src/modules/intermediary-types.ts +++ b/packages/@magic-sdk/types/src/modules/intermediary-types.ts @@ -1,8 +1,12 @@ import { LoginWithEmailOTPEvents, LoginWithMagicLinkEvents } from './auth-types'; -export type IntermediaryEvents = keyof LoginWithEmailOTPEvents | keyof LoginWithMagicLinkEvents; +export type IntermediaryEvents = keyof LoginWithEmailOTPEvents | keyof LoginWithMagicLinkEvents | keyof GeneralEvents; export type IntermediaryEventPayload = { payloadId: string; eventType: IntermediaryEvents; args: any; }; + +export type GeneralEvents = { + cancel: () => void; +}; From 97056cbcf48a47a5de85fa5f30c0bb509c00640d Mon Sep 17 00:00:00 2001 From: ethella Date: Wed, 29 Mar 2023 21:36:50 -0700 Subject: [PATCH 2/9] * Add cancel event --- packages/@magic-sdk/provider/src/modules/auth.ts | 3 +++ packages/@magic-sdk/types/src/modules/auth-types.ts | 1 + 2 files changed, 4 insertions(+) diff --git a/packages/@magic-sdk/provider/src/modules/auth.ts b/packages/@magic-sdk/provider/src/modules/auth.ts index 2ae263fe0..b3335e05a 100644 --- a/packages/@magic-sdk/provider/src/modules/auth.ts +++ b/packages/@magic-sdk/provider/src/modules/auth.ts @@ -57,6 +57,9 @@ export class AuthModule extends BaseModule { handle.on('otp-input-sent', (otp: string) => { this.createIntermediaryEvent('verify-email-otp', requestPayload.id as any)(otp); }); + handle.on('cancel', () => { + this.createIntermediaryEvent('cancel', requestPayload.id as any)(); + }); } return handle; } diff --git a/packages/@magic-sdk/types/src/modules/auth-types.ts b/packages/@magic-sdk/types/src/modules/auth-types.ts index 4abb415aa..3ac34eb6c 100644 --- a/packages/@magic-sdk/types/src/modules/auth-types.ts +++ b/packages/@magic-sdk/types/src/modules/auth-types.ts @@ -54,4 +54,5 @@ export type LoginWithEmailOTPEvents = { 'otp-input-sent': (otp: string) => void; 'verify-email-otp': (otp: string) => void; 'invalid-email-otp': () => void; + cancel: () => void; }; From 6cc58d875d45d152df334144ebe7c9e24d0d1f0d Mon Sep 17 00:00:00 2001 From: ethella Date: Wed, 29 Mar 2023 21:40:46 -0700 Subject: [PATCH 3/9] update yarn.lock --- yarn.lock | 74 +++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/yarn.lock b/yarn.lock index 716e11ebc..0f5cfe84a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,7 +2731,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2739,7 +2739,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2747,7 +2747,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2755,7 +2755,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2763,7 +2763,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/connect@workspace:packages/@magic-ext/connect" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2771,7 +2771,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2779,7 +2779,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2787,7 +2787,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 "@onflow/fcl": 0.0.41 "@onflow/types": 0.0.3 peerDependencies: @@ -2800,7 +2800,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2808,7 +2808,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2816,18 +2816,18 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/near@workspace:packages/@magic-ext/near" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft -"@magic-ext/oauth@^9.0.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": +"@magic-ext/oauth@^9.1.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth": version: 0.0.0-use.local resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth" dependencies: - "@magic-sdk/types": ^13.0.0 + "@magic-sdk/types": ^13.1.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 - magic-sdk: ^15.0.0 + magic-sdk: ^15.1.0 languageName: unknown linkType: soft @@ -2843,7 +2843,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2851,7 +2851,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth" dependencies: - "@magic-sdk/react-native-bare": ^16.0.0 + "@magic-sdk/react-native-bare": ^16.1.0 "@magic-sdk/types": ^10.0.1 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2867,7 +2867,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth" dependencies: - "@magic-sdk/react-native-expo": ^16.0.0 + "@magic-sdk/react-native-expo": ^16.1.0 "@magic-sdk/types": ^10.0.0 "@types/crypto-js": ~3.1.47 crypto-js: ^3.3.0 @@ -2882,7 +2882,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2890,7 +2890,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2898,7 +2898,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2906,7 +2906,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2914,7 +2914,7 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft @@ -2922,16 +2922,16 @@ __metadata: version: 0.0.0-use.local resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa" dependencies: - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 languageName: unknown linkType: soft -"@magic-sdk/commons@^11.0.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": +"@magic-sdk/commons@^11.1.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons": version: 0.0.0-use.local resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons" dependencies: "@magic-sdk/provider": ^15.0.0 - "@magic-sdk/types": ^13.0.0 + "@magic-sdk/types": ^13.1.0 peerDependencies: "@magic-sdk/provider": ">=4.3.0" "@magic-sdk/types": ">=3.1.1" @@ -2955,8 +2955,8 @@ __metadata: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-ext/oauth": ^9.0.0 - magic-sdk: ^15.0.0 + "@magic-ext/oauth": ^9.1.0 + magic-sdk: ^15.1.0 languageName: unknown linkType: soft @@ -2990,7 +2990,7 @@ __metadata: languageName: node linkType: hard -"@magic-sdk/react-native-bare@^16.0.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": +"@magic-sdk/react-native-bare@^16.1.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare" dependencies: @@ -2998,9 +2998,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 "@magic-sdk/provider": ^15.0.0 - "@magic-sdk/types": ^13.0.0 + "@magic-sdk/types": ^13.1.0 "@react-native-async-storage/async-storage": ^1.15.5 "@types/lodash": ^4.14.158 buffer: ~5.6.0 @@ -3026,7 +3026,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/react-native-expo@^16.0.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": +"@magic-sdk/react-native-expo@^16.1.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo": version: 0.0.0-use.local resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo" dependencies: @@ -3034,9 +3034,9 @@ __metadata: "@babel/core": ^7.15.0 "@babel/plugin-transform-flow-strip-types": ^7.14.5 "@babel/runtime": ~7.10.4 - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 "@magic-sdk/provider": ^15.0.0 - "@magic-sdk/types": ^13.0.0 + "@magic-sdk/types": ^13.1.0 "@react-native-async-storage/async-storage": ^1.15.5 "@types/lodash": ^4.14.158 buffer: ~5.6.0 @@ -3062,7 +3062,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-sdk/types@^13.0.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": +"@magic-sdk/types@^13.1.0, @magic-sdk/types@workspace:packages/@magic-sdk/types": version: 0.0.0-use.local resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types" languageName: unknown @@ -12323,16 +12323,16 @@ fsevents@^2.3.2: languageName: unknown linkType: soft -"magic-sdk@^15.0.0, magic-sdk@workspace:packages/magic-sdk": +"magic-sdk@^15.1.0, magic-sdk@workspace:packages/magic-sdk": version: 0.0.0-use.local resolution: "magic-sdk@workspace:packages/magic-sdk" dependencies: "@babel/core": ^7.9.6 "@babel/plugin-proposal-optional-chaining": ^7.9.0 "@babel/runtime": ^7.9.6 - "@magic-sdk/commons": ^11.0.0 + "@magic-sdk/commons": ^11.1.0 "@magic-sdk/provider": ^15.0.0 - "@magic-sdk/types": ^13.0.0 + "@magic-sdk/types": ^13.1.0 localforage: ^1.7.4 localforage-driver-memory: ^1.0.5 languageName: unknown From c84d635eeef7b3b9dd3354eb7c576d238cea8511 Mon Sep 17 00:00:00 2001 From: ethella Date: Wed, 29 Mar 2023 22:11:14 -0700 Subject: [PATCH 4/9] remove general events --- packages/@magic-sdk/types/src/modules/intermediary-types.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/@magic-sdk/types/src/modules/intermediary-types.ts b/packages/@magic-sdk/types/src/modules/intermediary-types.ts index ea1fa1202..1e6cd8153 100644 --- a/packages/@magic-sdk/types/src/modules/intermediary-types.ts +++ b/packages/@magic-sdk/types/src/modules/intermediary-types.ts @@ -1,12 +1,8 @@ import { LoginWithEmailOTPEvents, LoginWithMagicLinkEvents } from './auth-types'; -export type IntermediaryEvents = keyof LoginWithEmailOTPEvents | keyof LoginWithMagicLinkEvents | keyof GeneralEvents; +export type IntermediaryEvents = keyof LoginWithEmailOTPEvents | keyof LoginWithMagicLinkEvents; export type IntermediaryEventPayload = { payloadId: string; eventType: IntermediaryEvents; args: any; }; - -export type GeneralEvents = { - cancel: () => void; -}; From 48b169b75c383e5ea477089eb260b74696417294 Mon Sep 17 00:00:00 2001 From: ethella Date: Thu, 30 Mar 2023 10:14:34 -0700 Subject: [PATCH 5/9] remove otp-input-sent event to reduce confusion --- packages/@magic-sdk/provider/src/modules/auth.ts | 2 +- packages/@magic-sdk/types/src/modules/auth-types.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/@magic-sdk/provider/src/modules/auth.ts b/packages/@magic-sdk/provider/src/modules/auth.ts index b3335e05a..751fb4376 100644 --- a/packages/@magic-sdk/provider/src/modules/auth.ts +++ b/packages/@magic-sdk/provider/src/modules/auth.ts @@ -54,7 +54,7 @@ export class AuthModule extends BaseModule { if (!showUI) { const handle = this.request(requestPayload); if (handle) { - handle.on('otp-input-sent', (otp: string) => { + handle.on('verify-email-otp', (otp: string) => { this.createIntermediaryEvent('verify-email-otp', requestPayload.id as any)(otp); }); handle.on('cancel', () => { diff --git a/packages/@magic-sdk/types/src/modules/auth-types.ts b/packages/@magic-sdk/types/src/modules/auth-types.ts index 3ac34eb6c..9fe514aa3 100644 --- a/packages/@magic-sdk/types/src/modules/auth-types.ts +++ b/packages/@magic-sdk/types/src/modules/auth-types.ts @@ -51,7 +51,6 @@ export type LoginWithMagicLinkEvents = { export type LoginWithEmailOTPEvents = { 'email-otp-sent': () => void; - 'otp-input-sent': (otp: string) => void; 'verify-email-otp': (otp: string) => void; 'invalid-email-otp': () => void; cancel: () => void; From d2dbc0dc19c4159a2fe0a14318385ba09395f1cb Mon Sep 17 00:00:00 2001 From: ethella Date: Thu, 30 Mar 2023 20:54:48 -0700 Subject: [PATCH 6/9] fix tests --- .../modules/auth/loginWithEmailOTP.spec.ts | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts index 9a0ffe084..8d4b9be23 100644 --- a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts +++ b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts @@ -37,6 +37,27 @@ test('Generates JSON RPC request payload with `showUI: false` parameter', async expect(requestPayload.params).toEqual([{ email: expectedEmail, showUI: false }]); }); +test('Generates JSON RPC pending for otp-input-sent', async () => { + const magic = createMagicSDK(); + magic.auth.overlay.post = jest.fn(); + const createIntermediaryEventFn = jest.fn(); + magic.auth.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn); + + const handle = magic.auth.loginWithEmailOTP({ email: expectedEmail, showUI: false }); + + const troll_otp = '123456'; + handle.emit('verify-email-otp', troll_otp); + handle.emit('cancel'); + + const verifyEvent = magic.auth.createIntermediaryEvent.mock.calls[0]; + expect(verifyEvent[0]).toBe('verify-email-otp'); + expect(verifyEvent[1]).toBe(3); // third call of test + expect(createIntermediaryEventFn.mock.calls[0][0]).toBe(troll_otp); + + const intermediaryEventSecondMethod = magic.auth.createIntermediaryEvent.mock.calls[1][0]; + expect(intermediaryEventSecondMethod).toBe('cancel'); +}); + test('If `testMode` is enabled, testing-specific RPC method is used', async () => { const magic = createMagicSDKTestMode(); magic.auth.request = jest.fn(); From adf35269feb8bbcff2ee988baeb4f58743bdffa7 Mon Sep 17 00:00:00 2001 From: ethella Date: Thu, 30 Mar 2023 21:47:14 -0700 Subject: [PATCH 7/9] move test to a new file --- .../modules/auth/loginWithEmailOTP.spec.ts | 21 -------------- .../auth/loginWithEmailOTPWhitelabel.spec.ts | 29 +++++++++++++++++++ 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts diff --git a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts index 8d4b9be23..9a0ffe084 100644 --- a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts +++ b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTP.spec.ts @@ -37,27 +37,6 @@ test('Generates JSON RPC request payload with `showUI: false` parameter', async expect(requestPayload.params).toEqual([{ email: expectedEmail, showUI: false }]); }); -test('Generates JSON RPC pending for otp-input-sent', async () => { - const magic = createMagicSDK(); - magic.auth.overlay.post = jest.fn(); - const createIntermediaryEventFn = jest.fn(); - magic.auth.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn); - - const handle = magic.auth.loginWithEmailOTP({ email: expectedEmail, showUI: false }); - - const troll_otp = '123456'; - handle.emit('verify-email-otp', troll_otp); - handle.emit('cancel'); - - const verifyEvent = magic.auth.createIntermediaryEvent.mock.calls[0]; - expect(verifyEvent[0]).toBe('verify-email-otp'); - expect(verifyEvent[1]).toBe(3); // third call of test - expect(createIntermediaryEventFn.mock.calls[0][0]).toBe(troll_otp); - - const intermediaryEventSecondMethod = magic.auth.createIntermediaryEvent.mock.calls[1][0]; - expect(intermediaryEventSecondMethod).toBe('cancel'); -}); - test('If `testMode` is enabled, testing-specific RPC method is used', async () => { const magic = createMagicSDKTestMode(); magic.auth.request = jest.fn(); diff --git a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts new file mode 100644 index 000000000..59ec4f866 --- /dev/null +++ b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts @@ -0,0 +1,29 @@ +import browserEnv from '@ikscodes/browser-env'; +import { createMagicSDK } from '../../../factories'; + +beforeEach(() => { + browserEnv.restore(); + jest.restoreAllMocks(); +}); + +const expectedEmail = 'john.doe@mail.com'; + +test.skip('Generates JSON RPC pending for otp-input-sent', async () => { + const magic = createMagicSDK(); + magic.auth.overlay.post = jest.fn(); + const createIntermediaryEventFn = jest.fn(); + magic.auth.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn); + + const handle = magic.auth.loginWithEmailOTP({ email: expectedEmail, showUI: false }); + + const troll_otp = '123456'; + handle.emit('verify-email-otp', troll_otp); + handle.emit('cancel'); + + const verifyEvent = magic.auth.createIntermediaryEvent.mock.calls[0]; + expect(verifyEvent[0]).toBe('verify-email-otp'); + expect(createIntermediaryEventFn.mock.calls[0][0]).toBe(troll_otp); + + const intermediaryEventSecondMethod = magic.auth.createIntermediaryEvent.mock.calls[1][0]; + expect(intermediaryEventSecondMethod).toBe('cancel'); +}); From a5545e3917d2beb0610c1ab446ab44b3ec402a39 Mon Sep 17 00:00:00 2001 From: ethella Date: Thu, 30 Mar 2023 21:57:08 -0700 Subject: [PATCH 8/9] remove skip --- .../test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts index 59ec4f866..213aaebe4 100644 --- a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts +++ b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts @@ -8,7 +8,7 @@ beforeEach(() => { const expectedEmail = 'john.doe@mail.com'; -test.skip('Generates JSON RPC pending for otp-input-sent', async () => { +test('Generates JSON RPC pending for otp-input-sent', async () => { const magic = createMagicSDK(); magic.auth.overlay.post = jest.fn(); const createIntermediaryEventFn = jest.fn(); From f326d90894f0269fd1227f76368e38b66a1cd60f Mon Sep 17 00:00:00 2001 From: ethella Date: Thu, 30 Mar 2023 22:23:46 -0700 Subject: [PATCH 9/9] fix promise in tests --- .../test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts index 213aaebe4..5284eca66 100644 --- a/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts +++ b/packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts @@ -10,7 +10,7 @@ const expectedEmail = 'john.doe@mail.com'; test('Generates JSON RPC pending for otp-input-sent', async () => { const magic = createMagicSDK(); - magic.auth.overlay.post = jest.fn(); + magic.auth.overlay.post = jest.fn().mockImplementation(() => new Promise(() => {})); const createIntermediaryEventFn = jest.fn(); magic.auth.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn);