Keytar 6.x

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.1.0
 *   Upgraded to Electron 10.x
+*   Upgraded to Keytar 6.x – you will need to re-enter your password
 *   Added Furaffinity image previews (non-adult only)
 *   Added support for species-fluid characters
 *   Fixed logging out and then logging in with a new character breaking character comparison

electron/Index.vue

@@ -97,7 +97,7 @@
     import * as path from 'path';
     import * as qs from 'querystring';
     import Raven from 'raven-js';
-    import {promisify} from 'util';
+    // import {promisify} from 'util';
     import Vue from 'vue';
     import Chat from '../chat/Chat.vue';
     import {getKey, Settings} from '../chat/common';
@@ -144,14 +144,19 @@
     log.info('init.chat.keytar.load.start');
 
     /* tslint:disable: no-any no-unsafe-any */ //because this is hacky
-
+    //
     const keyStore = nativeRequire<{
-        getPassword(account: string): Promise<string>
+        getPassword(service: string, account: string): Promise<string>
-        setPassword(account: string, password: string): Promise<void>
+        setPassword(service: string, account: string, password: string): Promise<void>
-        deletePassword(account: string): Promise<void>
+        deletePassword(service: string, account: string): Promise<void>
+        findCredentials(service: string): Promise<{ account: string, password: string }>,
+        findPassword(service: string): Promise<string>
         [key: string]: (...args: any[]) => Promise<any>
     }>('keytar/build/Release/keytar.node');
-    for(const key in keyStore) keyStore[key] = promisify(<(...args: any[]) => any>keyStore[key].bind(keyStore, 'fchat'));
+
+    // const keyStore = import('keytar');
+    //
+    // for(const key in keyStore) keyStore[key] = promisify(<(...args: any[]) => any>keyStore[key].bind(keyStore, 'fchat'));
     //tslint:enable
 
     log.info('init.chat.keytar.load.done');
@@ -216,7 +221,7 @@
 
             if(this.settings.account.length > 0) this.saveLogin = true;
 
-            keyStore.getPassword(this.settings.account)
+            keyStore.getPassword('f-list.net', this.settings.account)
                 .then((value: string) => this.password = value, (err: Error) => this.error = err.message);
 
             log.debug('init.chat.keystore.get.done');
@@ -257,7 +262,7 @@
             if(this.loggingIn) return;
             this.loggingIn = true;
             try {
-                if(!this.saveLogin) await keyStore.deletePassword(this.settings.account);
+                if(!this.saveLogin) await keyStore.deletePassword('f-list.net', this.settings.account);
 
                 const data = <{ticket?: string, error: string, characters: {[key: string]: number}, default_character: number}>
                     (await Axios.post('https://www.f-list.net/json/getApiTicket.php', qs.stringify({
@@ -270,7 +275,7 @@
                 }
                 if(this.saveLogin) {
                     electron.ipcRenderer.send('save-login', this.settings.account, this.settings.host);
-                    await keyStore.setPassword(this.settings.account, this.password);
+                    await keyStore.setPassword('f-list.net', this.settings.account, this.password);
                 }
                 Socket.host = this.settings.host;
 

package.json

@@ -23,7 +23,7 @@
     "electron": "^10.1.3",
     "electron-log": "^4.2.4",
     "electron-packager": "^15.1.0",
-    "electron-rebuild": "^2.2.0",
+    "electron-rebuild": "^1.11.0",
     "extract-loader": "^5.1.0",
     "file-loader": "^6.1.0",
     "lodash": "^4.17.20",
@@ -49,7 +49,7 @@
     "@cliqz/adblocker-electron": "^1.18.3",
     "bluebird": "^3.7.2",
     "jquery": "^3.5.1",
-    "keytar": "^5.4.0",
+    "keytar": "^6.0.1",
     "node-fetch": "^2.6.1"
   },
   "optionalDependencies": {