Update electron and related modules.
This commit is contained in:
parent
fce4f0af8e
commit
fb72aee403
|
@ -1,6 +1,6 @@
|
||||||
let angApp = require(__dirname+'/../init')
|
let angApp = require(__dirname+'/../init')
|
||||||
|
|
||||||
angApp.controller('LoginController', function($scope, DesktopService, CredentialsServise) {
|
angApp.controller('LoginController', function($scope, DesktopService, CredentialsService) {
|
||||||
|
|
||||||
$scope.help = {}
|
$scope.help = {}
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ angApp.controller('LoginController', function($scope, DesktopService, Credential
|
||||||
}
|
}
|
||||||
|
|
||||||
$scope.addAccountAndLoginAction = () => {
|
$scope.addAccountAndLoginAction = () => {
|
||||||
CredentialsServise.addCredentials($scope.credentials.connectionManager,
|
CredentialsService.addCredentials($scope.credentials.connectionManager,
|
||||||
$scope.credentials.login,
|
$scope.credentials.login,
|
||||||
$scope.credentials.password
|
$scope.credentials.password
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
let angApp = require(__dirname+'/../init')
|
let angApp = require(__dirname+'/../init')
|
||||||
|
|
||||||
angApp.factory('CredentialsServise', () => {
|
angApp.factory('CredentialsService', () => {
|
||||||
|
|
||||||
const keytar = require('keytar')
|
const keytar = require('keytar')
|
||||||
const settings = require('electron-settings')
|
const settings = require('electron-settings')
|
||||||
|
@ -9,10 +9,10 @@ angApp.factory('CredentialsServise', () => {
|
||||||
|
|
||||||
credentialsService.getCredentials = () => {
|
credentialsService.getCredentials = () => {
|
||||||
let credentials = {}
|
let credentials = {}
|
||||||
credentials.login = settings.get('login')
|
credentials.login = settings.getSync('login')
|
||||||
let promise = new Promise((resolve, reject) => {
|
let promise = new Promise((resolve, reject) => {
|
||||||
if (credentials.login) {
|
if (credentials.login) {
|
||||||
credentials.connectionManager = settings.get('connectionManager')
|
credentials.connectionManager = settings.getSync('connectionManager')
|
||||||
credentials.xmppService = credentials.login.split('@').pop()
|
credentials.xmppService = credentials.login.split('@').pop()
|
||||||
let password = keytar.getPassword(credentials.xmppService, credentials.login)
|
let password = keytar.getPassword(credentials.xmppService, credentials.login)
|
||||||
password.then((result) => {
|
password.then((result) => {
|
||||||
|
@ -29,8 +29,8 @@ angApp.factory('CredentialsServise', () => {
|
||||||
|
|
||||||
credentialsService.addCredentials = (connectionManager, login, password) => {
|
credentialsService.addCredentials = (connectionManager, login, password) => {
|
||||||
let xmppService = login.split('@').pop()
|
let xmppService = login.split('@').pop()
|
||||||
settings.set('connectionManager', connectionManager)
|
settings.setSync('connectionManager', connectionManager)
|
||||||
settings.set('login', login)
|
settings.setSync('login', login)
|
||||||
keytar.setPassword(xmppService, login, password)
|
keytar.setPassword(xmppService, login, password)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -39,8 +39,8 @@ angApp.factory('CredentialsServise', () => {
|
||||||
passwordDelete = keytar.deletePassword(xmppService, login)
|
passwordDelete = keytar.deletePassword(xmppService, login)
|
||||||
let promise = new Promise((resolve, reject) => {
|
let promise = new Promise((resolve, reject) => {
|
||||||
passwordDelete.then((result) => {
|
passwordDelete.then((result) => {
|
||||||
settings.delete('login')
|
settings.unsetSync('login')
|
||||||
settings.delete('connectionManager')
|
settings.unsetSync('connectionManager')
|
||||||
resolve()
|
resolve()
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
reject(error)
|
reject(error)
|
||||||
|
|
|
@ -3,7 +3,7 @@ let angApp = require(__dirname + '/../init')
|
||||||
const desktopPlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/desktop-plugin')
|
const desktopPlugin = require(__dirname +'/../../libs/converse.js/converse-desktop/desktop-plugin')
|
||||||
|
|
||||||
angApp.factory('DesktopService', (
|
angApp.factory('DesktopService', (
|
||||||
$window, $timeout, CredentialsServise, SystemService, AppStateService,
|
$window, $timeout, CredentialsService, SystemService, AppStateService,
|
||||||
SettingsService, XmppHelperService
|
SettingsService, XmppHelperService
|
||||||
) => {
|
) => {
|
||||||
|
|
||||||
|
@ -19,9 +19,9 @@ angApp.factory('DesktopService', (
|
||||||
}
|
}
|
||||||
|
|
||||||
desktopService.logout = () => {
|
desktopService.logout = () => {
|
||||||
let credentials = CredentialsServise.getCredentials()
|
let credentials = CredentialsService.getCredentials()
|
||||||
credentials.then((result) => {
|
credentials.then((result) => {
|
||||||
let remove = CredentialsServise.removeCredentials(result.login)
|
let remove = CredentialsService.removeCredentials(result.login)
|
||||||
console.log('Remove credentials on logout')
|
console.log('Remove credentials on logout')
|
||||||
remove.then(() => {
|
remove.then(() => {
|
||||||
AppStateService.set(AppStateService.APP_STATE_LOGIN)
|
AppStateService.set(AppStateService.APP_STATE_LOGIN)
|
||||||
|
@ -66,7 +66,7 @@ angApp.factory('DesktopService', (
|
||||||
}
|
}
|
||||||
|
|
||||||
desktopService.getCredentialsAndLogin = () => {
|
desktopService.getCredentialsAndLogin = () => {
|
||||||
let credentials = CredentialsServise.getCredentials()
|
let credentials = CredentialsService.getCredentials()
|
||||||
credentials.then((result) => {
|
credentials.then((result) => {
|
||||||
desktopService.initConverse(result.connectionManager, result.login, result.password)
|
desktopService.initConverse(result.connectionManager, result.login, result.password)
|
||||||
}, (error) => {
|
}, (error) => {
|
||||||
|
|
|
@ -59,23 +59,23 @@ angApp.factory('SettingsService', () => {
|
||||||
// Callback
|
// Callback
|
||||||
// TODO: replace with promise?
|
// TODO: replace with promise?
|
||||||
const saveDefault = (key, value) => {
|
const saveDefault = (key, value) => {
|
||||||
if (!electronSettings.has(key)) {
|
if (!electronSettings.hasSync(key)) {
|
||||||
electronSettings.set(key, value)
|
electronSettings.setSync(key, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Callback
|
// Callback
|
||||||
const save = (key, defaultValue, settingsList) => {
|
const save = (key, defaultValue, settingsList) => {
|
||||||
let value = settingsList[key]['value']
|
let value = settingsList[key]['value']
|
||||||
electronSettings.set(key, value)
|
electronSettings.setSync(key, value)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Callback
|
// Callback
|
||||||
const loadAll = (key, defaultValue, settingsList) => {
|
const loadAll = (key, defaultValue, settingsList) => {
|
||||||
if (!electronSettings.has(key)) {
|
if (!electronSettings.hasSync(key)) {
|
||||||
settingsList[key]['value'] = defaultValue
|
settingsList[key]['value'] = defaultValue
|
||||||
}
|
}
|
||||||
settingsList[key]['value'] = electronSettings.get(key)
|
settingsList[key]['value'] = electronSettings.getSync(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -84,14 +84,14 @@ angApp.factory('SettingsService', () => {
|
||||||
settingsService.initDefaults = () => {
|
settingsService.initDefaults = () => {
|
||||||
iterateSettings(saveDefault)
|
iterateSettings(saveDefault)
|
||||||
// Logout for versions with BOSH only
|
// Logout for versions with BOSH only
|
||||||
if (electronSettings.has('bosh')) {
|
if (electronSettings.hasSync('bosh')) {
|
||||||
electronSettings.delete('bosh')
|
electronSettings.unsetSync('bosh')
|
||||||
electronSettings.delete('login')
|
electronSettings.unsetSync('login')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
settingsService.get = (key) => {
|
settingsService.get = (key) => {
|
||||||
return electronSettings.get(key)
|
return electronSettings.getSync(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
settingsService.loadAll = () => {
|
settingsService.loadAll = () => {
|
||||||
|
|
4
main.js
4
main.js
|
@ -29,7 +29,9 @@ function createWindow () {
|
||||||
minWidth: 780,
|
minWidth: 780,
|
||||||
minHeight: 560,
|
minHeight: 560,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true
|
nodeIntegration: true,
|
||||||
|
contextIsolation: false,
|
||||||
|
enableRemoteModule: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ const electronSettings = require('electron-settings')
|
||||||
let settingsService = {}
|
let settingsService = {}
|
||||||
|
|
||||||
settingsService.get = (itemKey) => {
|
settingsService.get = (itemKey) => {
|
||||||
settingValue = electronSettings.get(itemKey)
|
settingValue = electronSettings.getSync(itemKey)
|
||||||
if (typeof settingValue === 'undefined' || settingValue === null) {
|
if (typeof settingValue === 'undefined' || settingValue === null) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,7 @@ settingsService.get = (itemKey) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
settingsService.set = (itemKey, settingValue) => {
|
settingsService.set = (itemKey, settingValue) => {
|
||||||
electronSettings.set(itemKey, settingValue)
|
electronSettings.setSync(itemKey, settingValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
module.exports = settingsService
|
module.exports = settingsService
|
12
package.json
12
package.json
|
@ -23,18 +23,16 @@
|
||||||
"author": "Nick Denry <nick@denry.ru>",
|
"author": "Nick Denry <nick@denry.ru>",
|
||||||
"license": "MPL-2.0",
|
"license": "MPL-2.0",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^4.2.12",
|
"electron": "11.2.3",
|
||||||
"electron-builder": "^20.44.4",
|
"electron-builder": "^22.9.1",
|
||||||
"electron-packager": "^13.1.1",
|
"electron-packager": "^15.2.0"
|
||||||
"electron-rebuild": "^1.10.1"
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"angular": "^1.7.9",
|
"angular": "^1.7.9",
|
||||||
"converse.js": "^6.0.0",
|
"converse.js": "^6.0.0",
|
||||||
"electron-settings": "^3.2.0",
|
"electron-settings": "^4.0.2",
|
||||||
"github-buttons": "^2.8.0",
|
"github-buttons": "^2.8.0",
|
||||||
"keytar": "^4.13.0",
|
"keytar": "^7.3.0",
|
||||||
"n": "^6.5.1",
|
|
||||||
"open-iconic": "^1.1.1"
|
"open-iconic": "^1.1.1"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
|
|
Loading…
Reference in New Issue