Merge pull request #10 from elven-js/adjust-callbacks

adjust callbacks

CHANGELOG.md

@@ -1,3 +1,7 @@
+### [0.17.0](https://github.com/elven-js/elven.js/releases/tag/v0.17.0) (2024-01-29)
+- remove onLoginEnd and onLogoutEnd callbacks. With success and failure callbacks, they are not needed
+- fix duplicate callbacks calls
+
 ### [0.16.0](https://github.com/elven-js/elven.js/releases/tag/v0.16.0) (2024-01-28)
 - rename and add more login callbacks (breaking)
 - rename some of the transaction and message signing callbacks (breaking)

build/types/types.d.ts

@@ -12,11 +12,9 @@ export interface InitOptions {
     walletConnectV2ProjectId?: string;
     walletConnectV2RelayAddresses?: string[];
     onLoginStart?: () => void;
-    onLoginEnd?: () => void;
     onLoginSuccess?: () => void;
     onLoginFailure?: (error: string) => void;
     onLogoutStart?: () => void;
-    onLogoutEnd?: () => void;
     onLogoutSuccess?: () => void;
     onLogoutFailure?: (error: string) => void;
     onQrPending?: () => void;
@@ -34,11 +32,9 @@ export interface InitOptions {
 }
 export declare enum EventStoreEvents {
     onLoginStart = "onLoginStart",
-    onLoginEnd = "onLoginEnd",
     onLoginSuccess = "onLoginSuccess",
     onLoginFailure = "onLoginFailure",
     onLogoutStart = "onLogoutStart",
-    onLogoutEnd = "onLogoutEnd",
     onLogoutSuccess = "onLogoutSuccess",
     onLogoutFailure = "onLogoutFailure",
     onQrPending = "onQrPending",

example/index.html

@@ -192,12 +192,10 @@ <h3>Other demos:</h3>
           // You could also rely on try catch to some extent, but callbacks in one place seems convenient
           // Login callbacks:
           onLoginStart: () => { uiPending(true) },
-          onLoginEnd: () => { uiPending(false) },
           onLoginSuccess: () => { uiLoggedInState(true); },
           onLoginFailure: (error) => { displayError(error); },
           // Logout callbacks:
           onLogoutStart: () => { uiPending(true) },
-          onLogoutEnd: () => { uiPending(false) },
           onLogoutSuccess: () => { uiLoggedInState(false); },
           onLogoutFailure: (error) => { displayError(error); },
           // Transaction callbacks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "elven.js",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "Authenticate, sign and send transactions on the MultiversX blockchain in the browser.",
   "type": "module",
   "module": "build/elven.js",
@@ -49,8 +49,8 @@
     "@multiversx/sdk-web-wallet-provider": "3.2.0",
     "@types/qrcode": "1.5.5",
     "@types/serve-handler": "6.1.4",
-    "@typescript-eslint/eslint-plugin": "6.19.1",
-    "@typescript-eslint/parser": "6.19.1",
+    "@typescript-eslint/eslint-plugin": "6.20.0",
+    "@typescript-eslint/parser": "6.20.0",
     "esbuild": "0.20.0",
     "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",

src/auth/init-mobile-provider.ts

@@ -4,10 +4,7 @@ import {
 } from '@multiversx/sdk-wallet-connect-provider/out/walletConnectV2Provider';
 import { networkConfig } from '../utils/constants';
 import { logout } from './logout';
-import { accountSync } from './account-sync';
-import { EventsStore } from '../events-store';
 import { getRandomAddressFromNetwork } from '../utils/get-random-address-from-network';
-import { EventStoreEvents } from '../types';
 
 export const initMobileProvider = async (elven: any) => {
   if (
@@ -18,9 +15,7 @@ export const initMobileProvider = async (elven: any) => {
   }
 
   const providerHandlers = {
-    onClientLogin: () => {
-      accountSync(elven), EventsStore.run(EventStoreEvents.onLoginSuccess);
-    },
+    onClientLogin: () => {},
     onClientLogout: () => logout(elven),
     onClientEvent: (event: SessionEventTypes['event']) => {
       console.log('wc2 session event: ', event);

src/auth/login-with-extension.ts

@@ -26,9 +26,7 @@ export const loginWithExtension = async (
   try {
     if (dappProvider) {
       const address = await dappProvider.login(providerLoginData);
-      if (address) {
-        EventsStore.run(EventStoreEvents.onLoginStart);
-      } else {
+      if (!address) {
         throw new Error('There were problems while logging in!');
       }
     }
@@ -63,15 +61,15 @@ export const loginWithExtension = async (
 
       await accountSync(elven);
 
-      EventsStore.run(EventStoreEvents.onLoginSuccess);
-
       const accessToken = nativeAuthClient.getToken(
         address,
         loginToken,
         signature
       );
       ls.set('accessToken', accessToken);
 
+      EventsStore.run(EventStoreEvents.onLoginSuccess);
+
       return dappProvider;
     } catch (e: any) {
       throw new Error(

src/auth/login-with-mobile.ts

@@ -52,7 +52,6 @@ export const loginWithMobile = async (
   const providerHandlers = {
     onClientLogin: async () => {
       if (elven.dappProvider instanceof WalletConnectV2Provider) {
-        EventsStore.run(EventStoreEvents.onLoginStart);
         const address = await elven.dappProvider.getAddress();
         const signature = await elven.dappProvider.getSignature();
 

src/auth/login-with-web-wallet.ts

@@ -24,7 +24,6 @@ export const loginWithWebWallet = async (
   };
 
   try {
-    EventsStore.run(EventStoreEvents.onLoginStart);
     ls.set(
       'loginMethod',
       networkConfig[chainType].xAliasAddress === urlAddress

src/auth/logout.ts

@@ -22,7 +22,5 @@ export const logout = async (elven: any) => {
     const err = errorParse(e);
     console.warn(`Something went wrong trying to logout the user: ${err}`);
     EventsStore.run(EventStoreEvents.onLogoutFailure, err);
-  } finally {
-    EventsStore.run(EventStoreEvents.onLogoutEnd);
   }
 };

src/initialize-events-store.ts

@@ -18,9 +18,6 @@ export const initializeEventsStore = (initOptions: InitOptions) => {
       initOptions.onLoginFailure
     );
   }
-  if (initOptions.onLoginEnd) {
-    EventsStore.set(EventStoreEvents.onLoginEnd, initOptions.onLoginEnd);
-  }
 
   // Logout initialiation
   if (initOptions.onLogoutStart) {
@@ -38,9 +35,6 @@ export const initializeEventsStore = (initOptions: InitOptions) => {
       initOptions.onLogoutFailure
     );
   }
-  if (initOptions.onLogoutEnd) {
-    EventsStore.set(EventStoreEvents.onLogoutEnd, initOptions.onLogoutEnd);
-  }
 
   // Qr code initialization
   if (initOptions.onQrPending) {