fix: desktop setPassword error (#2347)

Co-authored-by: loatheb <18140164+loatheb@users.noreply.github.com>
OneKeyHQ · Jan 4, 2023 · 73b577f · 73b577f
1 parent df68fe0
commit 73b577f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/desktop/src-electron/preload.ts b/packages/desktop/src-electron/preload.ts
@@ -13,6 +13,10 @@ let keytar = {
     console.error('keytar.getPassword() not working.');
     return Promise.resolve('');
   },
+  async deletePassword(...args: any[]) {
+    console.error('keytar.deletePassword() not working.');
+    return Promise.resolve('');
+  },
 };
 
 try {
@@ -45,6 +49,7 @@ export type DesktopAPI = {
   promptTouchID: (msg: string) => Promise<{ success: boolean; error?: string }>;
   secureSetItemAsync: (key: string, value: string) => Promise<void>;
   secureGetItemAsync: (key: string) => Promise<string | null>;
+  secureDelItemAsync: (key: string) => Promise<string | null>;
   reloadBridgeProcess: () => void;
   addIpcEventListener: (
     event: string,
@@ -151,6 +156,9 @@ const desktopApi = {
   secureGetItemAsync(key: string) {
     return keytar.getPassword('OneKey', key);
   },
+  secureDelItemAsync(key: string) {
+    return keytar.deletePassword('OneKey', key);
+  },
   reloadBridgeProcess: () => {
     ipcRenderer.send('app/reloadBridgeProcess');
   },

diff --git a/packages/kit/src/utils/localAuthentication.desktop.tsx b/packages/kit/src/utils/localAuthentication.desktop.tsx
@@ -40,8 +40,13 @@ export const localAuthenticate: () => Promise<LocalAuthenticationResult> =
     }
   };
 
-export const savePassword = (password: string) =>
-  window?.desktopApi.secureSetItemAsync('password', password);
+export const savePassword = (password: string) => {
+  if (password) {
+    window?.desktopApi.secureSetItemAsync('password', password);
+  } else {
+    window?.desktopApi.secureDelItemAsync('password');
+  }
+};
 
 export const getPassword = () =>
   window?.desktopApi.secureGetItemAsync('password');