Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jerryliu sc 74424 email otp login invalid email otp event #487

Merged
merged 10 commits into from
Mar 31, 2023
Merged

Jerryliu sc 74424 email otp login invalid email otp event #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cbbd63f
* Add cancel event
Ethella Mar 30, 2023
97056cb
* Add cancel event
Ethella Mar 30, 2023
7b2774a
Merge remote-tracking branch 'origin/master' into jerryliu-sc-74424-e…
Ethella Mar 30, 2023
6cc58d8
update yarn.lock
Ethella Mar 30, 2023
c84d635
remove general events
Ethella Mar 30, 2023
48b169b
remove otp-input-sent event to reduce confusion
Ethella Mar 30, 2023
d2dbc0d
fix tests
Ethella Mar 31, 2023
adf3526
move test to a new file
Ethella Mar 31, 2023
a5545e3
remove skip
Ethella Mar 31, 2023
f326d90
fix promise in tests
Ethella Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/@magic-sdk/provider/src/modules/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@ export class AuthModule extends BaseModule {
if (!showUI) {
const handle = this.request<string | null, LoginWithEmailOTPEvents>(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', () => {
this.createIntermediaryEvent('cancel', requestPayload.id as any)();
});
}
return handle;
}
Expand Down
29 changes: 29 additions & 0 deletions packages/@magic-sdk/provider/test/spec/modules/auth/loginWithEmailOTPWhitelabel.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import browserEnv from '@ikscodes/browser-env';
import { createMagicSDK } from '../../../factories';

beforeEach(() => {
browserEnv.restore();
jest.restoreAllMocks();
});

const expectedEmail = '[email protected]';

test('Generates JSON RPC pending for otp-input-sent', async () => {
const magic = createMagicSDK();
magic.auth.overlay.post = jest.fn().mockImplementation(() => new Promise(() => {}));
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');
});
2 changes: 1 addition & 1 deletion packages/@magic-sdk/types/src/modules/auth-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ 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;
};
74 changes: 37 additions & 37 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2731,63 +2731,63 @@ __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

"@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche":
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

"@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin":
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

"@magic-ext/conflux@workspace:packages/@magic-ext/conflux":
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

"@magic-ext/connect@workspace:packages/@magic-ext/connect":
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

"@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos":
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

"@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519":
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

"@magic-ext/flow@workspace:packages/@magic-ext/flow":
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:
Expand All @@ -2800,34 +2800,34 @@ __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

"@magic-ext/icon@workspace:packages/@magic-ext/icon":
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

"@magic-ext/near@workspace:packages/@magic-ext/near":
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

Expand All @@ -2843,15 +2843,15 @@ __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

"@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth":
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
Expand All @@ -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
Expand All @@ -2882,56 +2882,56 @@ __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

"@magic-ext/taquito@workspace:packages/@magic-ext/taquito":
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

"@magic-ext/terra@workspace:packages/@magic-ext/terra":
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

"@magic-ext/tezos@workspace:packages/@magic-ext/tezos":
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

"@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn":
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

"@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa":
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"
Expand All @@ -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

Expand Down Expand Up @@ -2990,17 +2990,17 @@ __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:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@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
Expand All @@ -3026,17 +3026,17 @@ __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:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down