add intermediary events for nft.checkout

packages/@magic-sdk/provider/src/modules/nft.ts

@@ -2,12 +2,12 @@ import {
  MagicPayloadMethod,
  NFTCheckoutRequest,
  NFTCheckoutResponse,
+ NFTCheckoutEvents,
  NFTPurchaseRequest,
  NFTPurchaseResponse,
  NFTTransferRequest,
  NFTTransferResponse,
- NftCheckoutEventEmit,
- NftCheckoutEventOnReceived,
+ NftCheckoutIntermediaryEvents,
 } from '@magic-sdk/types';
 import { BaseModule } from './base-module';
 import { createJsonRpcRequestPayload } from '../core/json-rpc';
@@ -29,27 +29,26 @@ export class NFTModule extends BaseModule {
  walletProvider: isThirdPartyWalletConnected ? 'web3modal' : 'magic',
  },
  ]);
- const req = this.request<NFTCheckoutResponse>(requestPayload);
+ const promiEvent = this.request<NFTCheckoutResponse, NFTCheckoutEvents>(requestPayload);
 
- // Add intermediary event listener if user is purchasing with a third-party wallet
  if (isThirdPartyWalletConnected) {
- req.on(NftCheckoutEventOnReceived.Initiated as any, async (rawTransaction) => {
+ promiEvent.on(NftCheckoutIntermediaryEvents.Initiated, async (rawTransaction) => {
  try {
- // prompt third party wallet with transaction details
  const hash = await this.request({
  method: 'eth_sendTransaction',
  params: [rawTransaction],
  });
-
- console.log('hash from sdk', hash);
- this.createIntermediaryEvent(NftCheckoutEventEmit.Success, requestPayload.id as string)(hash);
+ this.createIntermediaryEvent(NftCheckoutIntermediaryEvents.Success, requestPayload.id as string)(hash);
  } catch (error) {
- console.error('error from sdk', error);
- this.createIntermediaryEvent(NftCheckoutEventEmit.Failure, requestPayload.id as string)();
+ this.createIntermediaryEvent(NftCheckoutIntermediaryEvents.Failure, requestPayload.id as string)();
  }
  });
+ promiEvent.on(NftCheckoutIntermediaryEvents.Disconnect, () => {
+ this.sdk.thirdPartyWallets.resetThirdPartyWalletState();
+ promiEvent.emit('disconnect');
+ });
  }
- return req;
+ return promiEvent;
  }
 
  /* Start an NFT Transfer flow */

packages/@magic-sdk/provider/test/spec/modules/auth/setAuthorizationToken.spec.ts

@@ -1,10 +1,7 @@
 /* eslint-disable global-require, @typescript-eslint/no-var-requires */
 
 import browserEnv from '@ikscodes/browser-env';
-import { MagicPayloadMethod } from '@magic-sdk/types';
-
-import { isPromiEvent } from '../../../../src/util';
-import { createMagicSDK, createMagicSDKTestMode } from '../../../factories';
+import { createMagicSDK } from '../../../factories';
 
 beforeEach(() => {
  browserEnv.restore();

packages/@magic-sdk/provider/test/spec/modules/nft/checkout.spec.ts

@@ -1,22 +1,7 @@
 import browserEnv from '@ikscodes/browser-env';
-import { BaseModule } from '../../../../src/modules/base-module';
-import { createMagicSDK, createViewController } from '../../../factories';
+import { createMagicSDK } from '../../../factories';
 import { createPromiEvent } from '../../../../src/util';
-import { NftCheckoutEventHandler, NftCheckoutEventOnReceived } from '../../../../../types/src/modules/nft-types';
-
-function createBaseModule(postStub: jest.Mock) {
- const sdk = createMagicSDK();
- const viewController = createViewController('');
-
- viewController.post = postStub;
- Object.defineProperty(sdk, 'overlay', {
- get: () => viewController,
- });
-
- const baseModule: any = new BaseModule(sdk);
-
- return { baseModule };
-}
+import { NftCheckoutIntermediaryEvents, NftCheckoutEventHandler } from '../../../../../types/src/modules/nft-types';
 
 beforeEach(() => {
  browserEnv.restore();
@@ -114,7 +99,7 @@ test('Third party wallet is connected', async () => {
  isCryptoCheckoutEnabled: true,
  });
 
- mockPromiEvent.emit(NftCheckoutEventOnReceived.Initiated, '0x1234');
+ mockPromiEvent.emit(NftCheckoutIntermediaryEvents.Initiated, '0x1234');
 
  expect(response.status).toBe('processed');
 

packages/@magic-sdk/provider/test/spec/modules/third-party-wallet/getInfo.spec.ts

@@ -31,7 +31,7 @@ describe('third party wallet getInfo', () => {
 });
 
 describe('format web3modal getinfo response', () => {
- it('should format the response correctly', async () => {
+ it('should format the response correctly', () => {
  const magic = createMagicSDK();
 
  magic.web3modal = {
@@ -51,7 +51,7 @@ describe('format web3modal getinfo response', () => {
  expect(response).toEqual({
  publicAddress: '0x1234567890',
  email: null,
- issuer: `$did:ethr:0x1234567890`,
+ issuer: '$did:ethr:0x1234567890',
  phoneNumber: null,
  isMfaEnabled: false,
  recoveryFactors: [],

packages/@magic-sdk/types/src/modules/intermediary-types.ts

@@ -11,7 +11,7 @@ import {
  UpdateEmailEventEmit,
  UpdateEmailEventOnReceived,
 } from './auth-types';
-import { NftCheckoutEventEmit, NftCheckoutEventOnReceived } from './nft-types';
+import { NftCheckoutIntermediaryEvents } from './nft-types';
 
 export type IntermediaryEvents =
  // EmailOTP
@@ -32,5 +32,4 @@ export type IntermediaryEvents =
  // Third Party Wallet Events
  | `${ThirdPartyWalletEvents}`
  // Nft Checkout Events
- | `${NftCheckoutEventEmit}`
- | `${NftCheckoutEventOnReceived}`;
+ | `${NftCheckoutIntermediaryEvents}`;

packages/@magic-sdk/types/src/modules/nft-types.ts

@@ -51,6 +51,11 @@ export interface NFTCheckoutRequest {
 
 export type NFTCheckoutResponse = NFTResponse;
 
+export type NFTCheckoutEvents = {
+ disconnect: () => void;
+ 'nft-checkout-initiated': (rawTransaction: string) => void;
+};
+
 export interface NFTTransferRequest {
  tokenId: string;
  contractAddress: string;
@@ -60,18 +65,15 @@ export interface NFTTransferRequest {
 
 export type NFTTransferResponse = NFTResponse;
 
-export enum NftCheckoutEventEmit {
+export enum NftCheckoutIntermediaryEvents {
  Success = 'nft-checkout-success',
  Failure = 'nft-checkout-failure',
-}
-
-export enum NftCheckoutEventOnReceived {
  Initiated = 'nft-checkout-initiated',
+ Disconnect = 'disconnect',
 }
 
 export type NftCheckoutEventHandler = {
- [NftCheckoutEventOnReceived.Initiated]: (rawTransaction: string) => void;
-
- [NftCheckoutEventEmit.Success]: (signedTransaction: string) => void;
- [NftCheckoutEventEmit.Failure]: () => void;
+ [NftCheckoutIntermediaryEvents.Initiated]: (rawTransaction: string) => void;
+ [NftCheckoutIntermediaryEvents.Success]: (signedTransaction: string) => void;
+ [NftCheckoutIntermediaryEvents.Failure]: () => void;
 };