From 6809e9fccf2656d72a4c042ca45c249127c8166e Mon Sep 17 00:00:00 2001
From: Keith Maika <keithm@aoeex.com>
Date: Wed, 5 Jan 2022 14:44:36 -0500
Subject: [PATCH] Fix login process.

---
 app/controllers/login-controller.js | 5 +++--
 app/services/credentials-service.js | 6 +++---
 app/services/desktop-service.js     | 2 +-
 main.js                             | 2 --
 preload.js                          | 7 +++++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/controllers/login-controller.js b/app/controllers/login-controller.js
index a846229..da7a4b8 100644
--- a/app/controllers/login-controller.js
+++ b/app/controllers/login-controller.js
@@ -12,8 +12,9 @@ angApp.controller('LoginController', function($scope, DesktopService, Credential
         CredentialsService.addCredentials($scope.credentials.connectionManager,
             $scope.credentials.login,
             $scope.credentials.password
-        )
-        DesktopService.getCredentialsAndLogin()
+        ).then(()=>{
+            DesktopService.getCredentialsAndLogin()
+        });
         $scope.accountForm.$setPristine()
         $scope.accountForm.$setUntouched()
         $scope.credentials = {}
diff --git a/app/services/credentials-service.js b/app/services/credentials-service.js
index d7e8d59..0fc1db5 100644
--- a/app/services/credentials-service.js
+++ b/app/services/credentials-service.js
@@ -9,7 +9,7 @@ angApp.factory('CredentialsService', () => {
             if (credentials.login) {
                 credentials.connectionManager = api.electronSettings.getSync('connectionManager')
                 credentials.xmppService = credentials.login.split('@').pop()
-                let password = keytar.getPassword(credentials.xmppService, credentials.login)
+                let password = api.keytar.getPassword(credentials.xmppService, credentials.login)
                 password.then((result) => {
                     credentials.password = result
                     resolve(credentials)
@@ -25,12 +25,12 @@ angApp.factory('CredentialsService', () => {
         let xmppService = login.split('@').pop()
         api.electronSettings.setSync('connectionManager', connectionManager)
         api.electronSettings.setSync('login', login)
-        keytar.setPassword(xmppService, login, password)
+        return api.keytar.setPassword(xmppService, login, password)
     }
 
     credentialsService.removeCredentials = (login) => {
         let xmppService = login.split('@').pop()
-        keytar.deletePassword(xmppService, login)
+        let passwordDelete = api.keytar.deletePassword(xmppService, login)
         let promise = new Promise((resolve, reject) => {
             passwordDelete.then((result) => {
                 api.electronSettings.unsetSync('login')
diff --git a/app/services/desktop-service.js b/app/services/desktop-service.js
index f4f1894..2e757e2 100644
--- a/app/services/desktop-service.js
+++ b/app/services/desktop-service.js
@@ -1,5 +1,5 @@
 const angApp = (await import('../init.js')).default;
-const desktopPlugin = (await import('../../libs/converse.js/converse-desktop/desktop-plugin.js')).desktopPlugin;
+const desktopPlugin = (await import('../../libs/converse.js/converse-desktop/desktop-plugin.js')).default;
 
 angApp.factory('DesktopService', (
         $window, $timeout, CredentialsService, SystemService, AppStateService,
diff --git a/main.js b/main.js
index f280bf8..0fdde92 100644
--- a/main.js
+++ b/main.js
@@ -135,8 +135,6 @@ function createWindow() {
             case 'unsetSync':
                 electronSettings.unsetSync(...args);
         }
-
-        return event.returnValue;
     })
 
     ipcMain.on('tray-service', (event, method) => {
diff --git a/preload.js b/preload.js
index 42364f3..f022655 100644
--- a/preload.js
+++ b/preload.js
@@ -1,4 +1,6 @@
 const {ipcRenderer, contextBridge} = require('electron');
+const keytar = require('keytar');
+
 contextBridge.exposeInMainWorld('api', {
     send(channel, ...data) {
         return ipcRenderer.send(channel, ...data);
@@ -33,5 +35,6 @@ contextBridge.exposeInMainWorld('api', {
         hideEnvelope() {
             ipcRenderer.send('tray-service', 'hideEnvelope')
         }
-    }
-});
\ No newline at end of file
+    },
+    keytar: keytar
+});