Merge branch 'master' into PDEEXP-1544-Implement-magic_auth_recover_a…

…ccount_types
magiclabs · Nov 14, 2024 · 4f2e82c · 4f2e82c
2 parents de66307 + e7f0321
commit 4f2e82c
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 7 deletions.
diff --git a/packages/@magic-sdk/provider/src/modules/user.ts b/packages/@magic-sdk/provider/src/modules/user.ts
@@ -16,6 +16,8 @@ import {
   RecencyCheckEventEmit,
   RecoveryFactorEventHandlers,
   RecoveryFactorEventEmit,
+  RecoverAccountEventHandlers,
+  RecoverAccountEventEmit,
 } from '@magic-sdk/types';
 import { getItem, setItem, removeItem } from '../util/storage';
 import { BaseModule } from './base-module';
@@ -143,11 +145,26 @@ export class UserModule extends BaseModule {
   }
 
   public recoverAccount(configuration: RecoverAccountConfiguration) {
+    const { email, showUI } = configuration;
     const requestPayload = createJsonRpcRequestPayload(
       this.sdk.testMode ? MagicPayloadMethod.RecoverAccountTestMode : MagicPayloadMethod.RecoverAccount,
-      [configuration],
+      [{ email, showUI }],
     );
-    return this.request<boolean | null>(requestPayload);
+    const handle = this.request<string | boolean | null, RecoverAccountEventHandlers>(requestPayload);
+
+    if (!showUI && handle) {
+      handle.on(RecoverAccountEventEmit.Cancel, () => {
+        this.createIntermediaryEvent(RecoverAccountEventEmit.Cancel, requestPayload.id as string)();
+      });
+      handle.on(RecoverAccountEventEmit.ResendSms, () => {
+        this.createIntermediaryEvent(RecoverAccountEventEmit.ResendSms, requestPayload.id as string)();
+      });
+      handle.on(RecoverAccountEventEmit.VerifyOtp, (otp: string) => {
+        this.createIntermediaryEvent(RecoverAccountEventEmit.VerifyOtp, requestPayload.id as string)(otp);
+      });
+    }
+
+    return handle;
   }
 
   public revealPrivateKey() {

diff --git a/packages/@magic-sdk/provider/test/spec/modules/user/recoverAccount.spec.ts b/packages/@magic-sdk/provider/test/spec/modules/user/recoverAccount.spec.ts
@@ -10,27 +10,69 @@ test('Generate JSON RPC request payload with method `magic_auth_recover_account`
   const magic = createMagicSDK();
   magic.user.request = jest.fn();
 
-  await magic.user.recoverAccount({ email: 'test' });
+  await magic.user.recoverAccount({ email: 'test', showUI: false });
 
   const requestPayload = magic.user.request.mock.calls[0][0];
   expect(requestPayload.jsonrpc).toBe('2.0');
   expect(requestPayload.method).toBe('magic_auth_recover_account');
-  expect(requestPayload.params).toEqual([{ email: 'test' }]);
+  expect(requestPayload.params).toEqual([{ email: 'test', showUI: false }]);
 });
 
 test('If `testMode` is enabled, testing-specific RPC method is used', async () => {
   const magic = createMagicSDKTestMode();
   magic.user.request = jest.fn();
 
-  await magic.user.recoverAccount({ email: 'test' });
+  await magic.user.recoverAccount({ email: 'test', showUI: false });
 
   const requestPayload = magic.user.request.mock.calls[0][0];
   expect(requestPayload.jsonrpc).toBe('2.0');
   expect(requestPayload.method).toBe('magic_auth_recover_account_testing_mode');
-  expect(requestPayload.params).toEqual([{ email: 'test' }]);
+  expect(requestPayload.params).toEqual([{ email: 'test', showUI: false }]);
 });
 
 test('method should return a PromiEvent', () => {
   const magic = createMagicSDK();
-  expect(isPromiEvent(magic.user.recoverAccount({ email: 'test' }))).toBeTruthy();
+  expect(isPromiEvent(magic.user.recoverAccount({ email: 'test', showUI: false }))).toBeTruthy();
+});
+
+test('method should create intermediary event on cancel', () => {
+  const magic = createMagicSDK();
+  magic.user.overlay.post = jest.fn().mockImplementation(() => new Promise(() => {}));
+  const createIntermediaryEventFn = jest.fn();
+  magic.user.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn);
+
+  const handle = magic.user.recoverAccount({ email: 'test', showUI: false });
+  handle.emit('cancel');
+
+  const cancelEvent = magic.user.createIntermediaryEvent.mock.calls[0][0];
+
+  expect(cancelEvent).toBe('cancel');
+});
+
+test('method should create intermediary event on ResendSms', () => {
+  const magic = createMagicSDK();
+  magic.user.overlay.post = jest.fn().mockImplementation(() => new Promise(() => {}));
+  const createIntermediaryEventFn = jest.fn();
+  magic.user.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn);
+
+  const handle = magic.user.recoverAccount({ email: 'test', showUI: false });
+  handle.emit('resend-sms-otp');
+
+  const resendEvent = magic.user.createIntermediaryEvent.mock.calls[0][0];
+
+  expect(resendEvent).toBe('resend-sms-otp');
+});
+
+test('method should create intermediary event on VerifyOtp', () => {
+  const magic = createMagicSDK();
+  magic.user.overlay.post = jest.fn().mockImplementation(() => new Promise(() => {}));
+  const createIntermediaryEventFn = jest.fn();
+  magic.user.createIntermediaryEvent = jest.fn().mockImplementation(() => createIntermediaryEventFn);
+
+  const handle = magic.user.recoverAccount({ email: 'test', showUI: false });
+  handle.emit('verify-otp-code');
+
+  const verifyEvent = magic.user.createIntermediaryEvent.mock.calls[0][0];
+
+  expect(verifyEvent).toBe('verify-otp-code');
 });