Merge pull request #112 from AElfProject/feature/awaken-access

feat: maitain v1 login status while use sdk

README.md

@@ -125,6 +125,45 @@ const config: IConfigProps = {
 };
 ```
 
+_IConfigProps Clarifications_
+
+```ts
+import { GlobalConfigProps } from '@portkey/did-ui-react/dist/_types/src/components/config-provider/types';
+import { SignInProps, ISignIn, PortkeyProvider } from '@portkey/did-ui-react';
+import { WalletAdapter } from '@aelf-web-login/wallet-adapter-base';
+
+interface IConfirmLogoutDialogProps {
+  title: string;
+  subTitle: string[];
+  okTxt: string;
+  cancelTxt: string;
+  visible: boolean;
+  onOk: () => void;
+  onCancel: () => void;
+  width: number;
+  mobileWidth: number;
+}
+
+interface IConfigProps {
+  didConfig: GlobalConfigProps;
+  baseConfig: IBaseConfig;
+  wallets: WalletAdapter[];
+}
+interface IBaseConfig {
+  networkType: NetworkEnum;
+  chainId: TChainId;
+  keyboard?: boolean;
+  design?: SignInDesignEnum;
+  iconSrcForSocialDesign?: string;
+  titleForSocialDesign?: string;
+  noCommonBaseModal?: boolean;
+  showVconsole?: boolean;
+  SignInComponent?: React.FC<SignInProps & RefAttributes<ISignIn>>;
+  PortkeyProviderProps?: Partial<Omit<React.ComponentProps<typeof PortkeyProvider>, 'children'>>;
+  ConfirmLogoutDialog?: React.FC<Partial<IConfirmLogoutDialogProps>>;
+}
+```
+
 # Usage
 
 1. Import `WebLoginProvider`, `init` and `useConnectWallet`

packages/base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-base",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-bridge",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/bridge/src/bridge.ts

@@ -26,6 +26,7 @@ import { DIDWalletInfo, TelegramPlatform } from '@portkey/did-ui-react';
 import { isPortkeyApp } from '@aelf-web-login/utils';
 import { IBaseConfig } from '.';
 
+let isDisconnectClicked = false;
 class Bridge {
   private _wallets: WalletAdapter[];
   private _activeWallet: WalletAdapter | undefined;
@@ -80,19 +81,24 @@ class Bridge {
     return new Promise((resolve, reject) => {
       this._loginResolve = resolve;
       this._loginReject = reject;
-      console.log('connect');
       this.openLoginPanel();
     });
   };
 
   disConnect = async (isDoubleCheck = false) => {
-    console.log('disconnect', isDoubleCheck, this.isAAWallet);
+    console.log('disconnect, isDoubleCheck: isAAWallet:', isDoubleCheck, this.isAAWallet);
     try {
       if (isDoubleCheck || (this.isAAWallet && this.activeWallet!.noNeedForConfirm)) {
+        if (isDisconnectClicked) {
+          return;
+        }
+        isDisconnectClicked = true;
+
         // only click confirmLogout button/or noNeedForConfirm can enter here
         await this.activeWallet?.logout();
         this.closeConfirmLogoutPanel();
         this.closeLockPanel();
+        isDisconnectClicked = false;
       } else {
         if (this.isAAWallet) {
           this.openConfirmLogoutPanel();
@@ -170,7 +176,6 @@ class Bridge {
   };
 
   onConnectedHandler = (walletInfo: TWalletInfo) => {
-    console.log('xxxxxxxxxxxxx-------');
     dispatch(setWalletInfo(walletInfo));
     dispatch(setWalletType(this.activeWallet?.name));
     dispatch(clearLoginError());
@@ -256,9 +261,9 @@ class Bridge {
       console.log('onUniqueWalletClick--', e);
     } finally {
       if (!this._noCommonBaseModal) {
-        this.closeLoadingModal();
         this.closeLoginPanel();
       }
+      this.closeLoadingModal();
     }
   };
 

packages/bridge/src/index.ts

@@ -11,6 +11,7 @@ import { store, AppStore } from './store';
 import { GlobalConfigProps } from '@portkey/did-ui-react/dist/_types/src/components/config-provider/types';
 import { ConfigProvider, SignInProps, ISignIn, PortkeyProvider } from '@portkey/did-ui-react';
 import { RefAttributes } from 'react';
+import { IConfirmLogoutDialogProps } from './ui';
 
 type BaseConfigProviderProps = Omit<React.ComponentProps<typeof PortkeyProvider>, 'children'>;
 
@@ -25,6 +26,7 @@ export interface IBaseConfig {
   showVconsole?: boolean;
   SignInComponent?: React.FC<SignInProps & RefAttributes<ISignIn>>;
   PortkeyProviderProps?: Partial<BaseConfigProviderProps>;
+  ConfirmLogoutDialog?: React.FC<Partial<IConfirmLogoutDialogProps>>;
 }
 export interface IConfigProps {
   didConfig: GlobalConfigProps;

packages/bridge/src/store.ts

@@ -55,12 +55,16 @@ export const store: EnhancedStore<TState> = configureStore({
           'walletInfo.extraInfo.provider',
           'walletInfo.extraInfo.portkeyInfo.walletInfo',
           'walletInfo.extraInfo.nightElfInfo',
+          'loginError.nativeError',
+          'payload.nativeError',
         ],
         // Ignore these paths in the state
         ignoredPaths: [
           'walletInfo.extraInfo.provider',
           'walletInfo.extraInfo.portkeyInfo.walletInfo',
           'walletInfo.extraInfo.nightElfInfo',
+          'loginError.nativeError',
+          'payload.nativeError',
         ],
       },
     }),

packages/bridge/src/ui.tsx

@@ -21,7 +21,7 @@ import { Modal, Button, Typography, Drawer } from 'antd';
 import useTelegram from './useTelegram';
 import './ui.css';
 
-interface ConfirmLogoutDialogProps {
+export interface IConfirmLogoutDialogProps {
   title: string;
   subTitle: string[];
   okTxt: string;
@@ -49,7 +49,7 @@ const constant = {
   connectWallet: 'Connect Wallet',
 };
 
-const defaultProps: Partial<ConfirmLogoutDialogProps> = {
+const defaultProps: Partial<IConfirmLogoutDialogProps> = {
   title: 'Are you sure you want to exit your wallet?',
   subTitle: [
     'Your current wallet and assets will be removed from this app permanently. This action cannot be undone.',
@@ -71,7 +71,7 @@ interface ISignInModalProps {
 }
 const { isMobile } = utils;
 
-const ConfirmLogoutDialog = (props: Partial<ConfirmLogoutDialogProps>) => {
+const ConfirmLogoutDialog = (props: Partial<IConfirmLogoutDialogProps>) => {
   const { title, subTitle, okTxt, cancelTxt, visible, onOk, onCancel, width, mobileWidth } = {
     ...defaultProps,
     ...props,
@@ -235,8 +235,13 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
   );
   const filteredWallets = wallets.filter((ele) => ele.name !== PORTKEYAA);
   const isMobileDevice = isMobile();
-  const { noCommonBaseModal = false, SignInComponent } = baseConfig;
+  const {
+    noCommonBaseModal = false,
+    SignInComponent,
+    ConfirmLogoutDialog: CustomizedConfirmLogoutDialog,
+  } = baseConfig;
   const FinalSignInComponent = SignInComponent || SignIn;
+  const FinalConfirmLogoutDialog = CustomizedConfirmLogoutDialog || ConfirmLogoutDialog;
   // const isLocking = store.getState().isLocking;
   // console.log('isLocking', isLocking);
 
@@ -446,7 +451,7 @@ const SignInModal: React.FC<ISignInModalProps> = (props: ISignInModalProps) => {
         </DynamicWrapper>
       )}
 
-      <ConfirmLogoutDialog
+      <FinalConfirmLogoutDialog
         visible={isShowConfirmLogoutPanel}
         onOk={confirmLogoutHandler}
         onCancel={cancelLogoutHandler}

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-react",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/starter/src/Demo/demo.tsx

@@ -12,9 +12,9 @@ import ContractDemo from './ContractDemo';
 import SignatureDemo from './SignatureDemo';
 import UtilsDemo from './UtilsDemo';
 
-const APP_NAME = 'explorer.aelf.io';
+const APP_NAME = 'forest';
 const WEBSITE_ICON = 'https://explorer.aelf.io/favicon.main.ico';
-const CHAIN_ID = 'AELF' as TChainId;
+const CHAIN_ID = 'tDVW' as TChainId;
 const NETWORK_TYPE = NetworkEnum.TESTNET;
 const RPC_SERVER_AELF = 'https://explorer-test.aelf.io/chain';
 const RPC_SERVER_TDVV = 'https://explorer-test-side02.aelf.io/chain';
@@ -55,6 +55,7 @@ const didConfig = {
 // };
 
 const baseConfig = {
+  // ConfirmLogoutDialog: CustomizedConfirmLogoutDialog,
   // SignInComponent: SignInProxy,
   PortkeyProviderProps: {
     theme: 'dark' as any,

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/utils",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/wallets/night-elf/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-night-elf",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/wallets/night-elf/src/index.ts

@@ -317,7 +317,6 @@ export class NightElfWallet extends BaseWalletAdapter {
     }
     const finalChainId = chainId || this._config.chainId;
     const bridge = this._wallet.extraInfo?.nightElfInfo?.aelfBridges?.[finalChainId];
-    console.log(finalChainId, bridge, '---');
     if (!bridge) {
       throw makeError(ERR_CODE.NIGHT_ELF_NOT_CONNECTED);
     }

packages/wallets/portkey-aa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-portkey-aa",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",

packages/wallets/portkey-aa/src/index.ts

@@ -55,9 +55,19 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
   get wallet() {
     return this._wallet as TWalletInfo;
   }
+  get appName() {
+    const compatibleAppName = `V2-${this._config.appName}`;
+    if (enhancedLocalStorage.getItem(compatibleAppName)) {
+      return compatibleAppName;
+    } else {
+      return this._config.appName;
+    }
+  }
 
   async autoRequestAccountHandler() {
-    const canLoginEargly = !!enhancedLocalStorage.getItem(this._config.appName);
+    const canLoginEargly =
+      !!enhancedLocalStorage.getItem(this._config.appName) ||
+      !!enhancedLocalStorage.getItem(`V2-${this._config.appName}`);
     if (!canLoginEargly) {
       return;
     }
@@ -86,7 +96,7 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
       const holderInfo = await did.getCAHolderInfo(didWalletInfo.chainId);
       nickName = holderInfo.nickName;
 
-      await did.save(didWalletInfo.pin, this._config.appName);
+      await did.save(didWalletInfo.pin, this.appName);
 
       const portkeyInfo = {
         ...didWalletInfo,
@@ -149,7 +159,7 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
       this._loginState = LoginStateEnum.INITIAL;
       enhancedLocalStorage.removeItem(ConnectedWallet);
       enhancedLocalStorage.removeItem(PORTKEY_ORIGIN_CHAIN_ID_KEY);
-      enhancedLocalStorage.removeItem(this._config.appName);
+      enhancedLocalStorage.removeItem(this.appName);
 
       this.emit('disconnected');
     } catch (error) {
@@ -171,13 +181,15 @@ export class PortkeyAAWallet extends BaseWalletAdapter {
 
   async onUnlock(password: string): Promise<TWalletInfo> {
     try {
-      const appName = this._config.appName;
+      const appName = this.appName;
       const chainId = this._config.chainId;
       const isValidPinCode = await this.checkPassword(appName, password);
       if (!isValidPinCode) {
         return;
       }
+
       const localWallet = await did.load(password, appName);
+
       let caInfo = localWallet.didWallet.caInfo[chainId];
       let caHash = caInfo?.caHash;
       if (!caInfo) {

packages/wallets/portkey-discover/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aelf-web-login/wallet-adapter-portkey-discover",
-  "version": "0.1.3-alpha.2",
+  "version": "0.1.3-alpha.5",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",