Upstream/bitwarden-desktop
1
0
Fork 0
mirror of https://github.com/bitwarden/desktop.git synced 2024-11-30 12:54:31 +01:00
Code Issues Projects Releases Wiki Activity

update to electron 6

Browse Source
This commit is contained in:
Kyle Spearrin 2020-01-27 09:46:50 -05:00
parent f975323175
commit c344c5c13d
4 changed files with 865 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit dce1453732553d991ac910e3a93038f7331c8ab9 Subproject commit e1d42f95d9c662bd4ffc8221bc4e5b9b96a095a6

1403
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
package.json
View File

@ -228,11 +228,11 @@
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"css-loader": "^1.0.0", "css-loader": "^1.0.0",
"del": "^3.0.0", "del": "^3.0.0",
"electron": "5.0.8", "electron": "6.1.7",
"electron-builder": "21.1.5", "electron-builder": "22.3.2",
"electron-notarize": "^0.1.1", "electron-notarize": "^0.2.1",
"electron-rebuild": "^1.8.5", "electron-rebuild": "^1.9.0",
"electron-reload": "^1.4.1", "electron-reload": "^1.5.0",
"extract-text-webpack-plugin": "next", "extract-text-webpack-plugin": "next",
"file-loader": "^2.0.0", "file-loader": "^2.0.0",
"font-awesome": "4.7.0", "font-awesome": "4.7.0",
@ -276,7 +276,7 @@
"duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git", "duo_web_sdk": "git+https://github.com/duosecurity/duo_web_sdk.git",
"electron-log": "2.2.17", "electron-log": "2.2.17",
"electron-store": "1.3.0", "electron-store": "1.3.0",
"electron-updater": "4.1.2", "electron-updater": "4.2.0",
"keytar": "4.13.0", "keytar": "4.13.0",
"lunr": "2.3.3", "lunr": "2.3.3",
"node-forge": "0.7.6", "node-forge": "0.7.6",

20
src/main/menu.main.ts
View File

@ -90,7 +90,7 @@ export class MenuMain extends BaseMenu {
label: this.main.i18nService.t('changeMasterPass'), label: this.main.i18nService.t('changeMasterPass'),
id: 'changeMasterPass', id: 'changeMasterPass',
click: async () => { click: async () => {
const result = dialog.showMessageBox(this.main.windowMain.win, { const result = await dialog.showMessageBox(this.main.windowMain.win, {
title: this.main.i18nService.t('changeMasterPass'), title: this.main.i18nService.t('changeMasterPass'),
message: this.main.i18nService.t('changeMasterPass'), message: this.main.i18nService.t('changeMasterPass'),
detail: this.main.i18nService.t('changeMasterPasswordConfirmation'), detail: this.main.i18nService.t('changeMasterPasswordConfirmation'),
@ -99,7 +99,7 @@ export class MenuMain extends BaseMenu {
defaultId: 0, defaultId: 0,
noLink: true, noLink: true,
}); });
if (result === 0) { if (result.response === 0) {
await this.openWebVault(); await this.openWebVault();
} }
}, },
@ -108,7 +108,7 @@ export class MenuMain extends BaseMenu {
label: this.main.i18nService.t('twoStepLogin'), label: this.main.i18nService.t('twoStepLogin'),
id: 'twoStepLogin', id: 'twoStepLogin',
click: async () => { click: async () => {
const result = dialog.showMessageBox(this.main.windowMain.win, { const result = await dialog.showMessageBox(this.main.windowMain.win, {
title: this.main.i18nService.t('twoStepLogin'), title: this.main.i18nService.t('twoStepLogin'),
message: this.main.i18nService.t('twoStepLogin'), message: this.main.i18nService.t('twoStepLogin'),
detail: this.main.i18nService.t('twoStepLoginConfirmation'), detail: this.main.i18nService.t('twoStepLoginConfirmation'),
@ -117,7 +117,7 @@ export class MenuMain extends BaseMenu {
defaultId: 0, defaultId: 0,
noLink: true, noLink: true,
}); });
if (result === 0) { if (result.response === 0) {
await this.openWebVault(); await this.openWebVault();
} }
}, },
@ -131,8 +131,8 @@ export class MenuMain extends BaseMenu {
{ {
label: this.i18nService.t('logOut'), label: this.i18nService.t('logOut'),
id: 'logOut', id: 'logOut',
click: () => { click: async () => {
const result = dialog.showMessageBox(this.windowMain.win, { const result = await dialog.showMessageBox(this.windowMain.win, {
title: this.i18nService.t('logOut'), title: this.i18nService.t('logOut'),
message: this.i18nService.t('logOut'), message: this.i18nService.t('logOut'),
detail: this.i18nService.t('logOutConfirmation'), detail: this.i18nService.t('logOutConfirmation'),
@ -141,7 +141,7 @@ export class MenuMain extends BaseMenu {
defaultId: 0, defaultId: 0,
noLink: true, noLink: true,
}); });
if (result === 0) { if (result.response === 0) {
this.main.messagingService.send('logout'); this.main.messagingService.send('logout');
} }
}, },
@ -431,13 +431,13 @@ export class MenuMain extends BaseMenu {
aboutMenuAdditions.push({ aboutMenuAdditions.push({
label: this.i18nService.t('aboutBitwarden'), label: this.i18nService.t('aboutBitwarden'),
click: () => { click: async () => {
const aboutInformation = this.i18nService.t('version', app.getVersion()) + const aboutInformation = this.i18nService.t('version', app.getVersion()) +
'\nShell ' + process.versions.electron + '\nShell ' + process.versions.electron +
'\nRenderer ' + process.versions.chrome + '\nRenderer ' + process.versions.chrome +
'\nNode ' + process.versions.node + '\nNode ' + process.versions.node +
'\nArchitecture ' + process.arch; '\nArchitecture ' + process.arch;
const result = dialog.showMessageBox(this.windowMain.win, { const result = await dialog.showMessageBox(this.windowMain.win, {
title: 'Bitwarden', title: 'Bitwarden',
message: 'Bitwarden', message: 'Bitwarden',
detail: aboutInformation, detail: aboutInformation,
@ -445,7 +445,7 @@ export class MenuMain extends BaseMenu {
noLink: true, noLink: true,
buttons: [this.i18nService.t('ok'), this.i18nService.t('copy')], buttons: [this.i18nService.t('ok'), this.i18nService.t('copy')],
}); });
if (result === 1) { if (result.response === 1) {
clipboard.writeText(aboutInformation); clipboard.writeText(aboutInformation);
} }
}, },