1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-29 06:33:40 +00:00

settings and lock options

This commit is contained in:
Kyle Spearrin
2018-02-10 23:24:22 -05:00
parent 692e5b7dbc
commit 132c59f8fc
14 changed files with 278 additions and 77 deletions

View File

@@ -10,21 +10,21 @@ import {
import { WindowMain } from './window.main';
import { I18nService } from '../services/i18n.service';
import { MessagingService } from 'jslib/abstractions/messaging.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
export class MenuMain {
constructor(private windowMain: WindowMain, private i18nService: I18nService) { }
constructor(private windowMain: WindowMain, private i18nService: I18nService,
private messagingService: MessagingService) { }
init() {
const self = this;
const template: MenuItemConstructorOptions[] = [
{
label: this.i18nService.t('file'),
submenu: [
{
label: this.i18nService.t('addNewLogin'),
click: () => self.send('newLogin'),
click: () => this.messagingService.send('newLogin'),
accelerator: 'CmdOrCtrl+N',
},
{
@@ -32,34 +32,34 @@ export class MenuMain {
submenu: [
{
label: this.i18nService.t('typeLogin'),
click: () => self.send('newLogin'),
click: () => this.messagingService.send('newLogin'),
accelerator: 'Alt+L',
},
{
label: this.i18nService.t('typeCard'),
click: () => self.send('newCard'),
click: () => this.messagingService.send('newCard'),
accelerator: 'Alt+C',
},
{
label: this.i18nService.t('typeIdentity'),
click: () => self.send('newIdentity'),
click: () => this.messagingService.send('newIdentity'),
accelerator: 'Alt+I',
},
{
label: this.i18nService.t('typeSecureNote'),
click: () => self.send('newSecureNote'),
click: () => this.messagingService.send('newSecureNote'),
accelerator: 'Alt+S',
},
],
},
{
label: this.i18nService.t('addNewFolder'),
click: () => self.send('newFolder'),
click: () => this.messagingService.send('newFolder'),
},
{ type: 'separator' },
{
label: this.i18nService.t('syncVault'),
click: () => self.send('syncVault'),
click: () => this.messagingService.send('syncVault'),
},
],
},
@@ -80,12 +80,12 @@ export class MenuMain {
submenu: [
{
label: this.i18nService.t('passwordGenerator'),
click: () => self.send('openPasswordGenerator'),
click: () => this.messagingService.send('openPasswordGenerator'),
accelerator: 'CmdOrCtrl+G',
},
{
label: this.i18nService.t('searchVault'),
click: () => self.send('focusSearch'),
click: () => this.messagingService.send('focusSearch'),
accelerator: 'CmdOrCtrl+F',
},
{ type: 'separator' },
@@ -105,15 +105,15 @@ export class MenuMain {
submenu: [
{
label: this.i18nService.t('premiumMembership'),
click: () => self.send('premiumMembership'),
click: () => this.messagingService.send('premiumMembership'),
},
{
label: this.i18nService.t('changeMasterPass'),
click: () => {
const result = dialog.showMessageBox(self.windowMain.win, {
title: self.i18nService.t('changeMasterPass'),
message: self.i18nService.t('changeMasterPasswordConfirmation'),
buttons: [self.i18nService.t('yes'), self.i18nService.t('no')],
const result = dialog.showMessageBox(this.windowMain.win, {
title: this.i18nService.t('changeMasterPass'),
message: this.i18nService.t('changeMasterPasswordConfirmation'),
buttons: [this.i18nService.t('yes'), this.i18nService.t('no')],
cancelId: 1,
defaultId: 0,
noLink: true,
@@ -126,10 +126,10 @@ export class MenuMain {
{
label: this.i18nService.t('changeEmail'),
click: () => {
const result = dialog.showMessageBox(self.windowMain.win, {
title: self.i18nService.t('changeEmail'),
message: self.i18nService.t('changeEmailConfirmation'),
buttons: [self.i18nService.t('yes'), self.i18nService.t('no')],
const result = dialog.showMessageBox(this.windowMain.win, {
title: this.i18nService.t('changeEmail'),
message: this.i18nService.t('changeEmailConfirmation'),
buttons: [this.i18nService.t('yes'), this.i18nService.t('no')],
cancelId: 1,
defaultId: 0,
noLink: true,
@@ -142,10 +142,10 @@ export class MenuMain {
{
label: this.i18nService.t('twoStepLogin'),
click: () => {
const result = dialog.showMessageBox(self.windowMain.win, {
title: self.i18nService.t('twoStepLogin'),
message: self.i18nService.t('twoStepLoginConfirmation'),
buttons: [self.i18nService.t('yes'), self.i18nService.t('no')],
const result = dialog.showMessageBox(this.windowMain.win, {
title: this.i18nService.t('twoStepLogin'),
message: this.i18nService.t('twoStepLoginConfirmation'),
buttons: [this.i18nService.t('yes'), this.i18nService.t('no')],
cancelId: 1,
defaultId: 0,
noLink: true,
@@ -159,16 +159,16 @@ export class MenuMain {
{
label: this.i18nService.t('logOut'),
click: () => {
const result = dialog.showMessageBox(self.windowMain.win, {
title: self.i18nService.t('logOut'),
message: self.i18nService.t('logOutConfirmation'),
buttons: [self.i18nService.t('logOut'), self.i18nService.t('cancel')],
const result = dialog.showMessageBox(this.windowMain.win, {
title: this.i18nService.t('logOut'),
message: this.i18nService.t('logOutConfirmation'),
buttons: [this.i18nService.t('logOut'), this.i18nService.t('cancel')],
cancelId: 1,
defaultId: 0,
noLink: true,
});
if (result === 0) {
self.send('logout');
this.messagingService.send('logout');
}
},
},
@@ -294,11 +294,11 @@ export class MenuMain {
{ type: 'separator' },
{
label: this.i18nService.t('settings'),
click: () => self.send('openSettings'),
click: () => this.messagingService.send('openSettings'),
},
{
label: this.i18nService.t('lockNow'),
click: () => self.send('lockVault'),
click: () => this.messagingService.send('lockVault'),
accelerator: 'CmdOrCtrl+L',
},
];
@@ -338,11 +338,4 @@ export class MenuMain {
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
}
send(command: string, message?: any) {
this.windowMain.win.webContents.send('messagingService', {
command: command,
message: message,
});
}
}

View File

@@ -13,22 +13,7 @@ export class MessagingMain {
init() {
this.scheduleNextSync();
ipcMain.on('messagingService', async (event: any, message: any) => {
switch (message.command) {
case 'loggedIn':
break;
case 'logout':
break;
case 'syncCompleted':
break;
case 'scheduleNextSync':
this.scheduleNextSync();
break;
default:
break;
}
});
ipcMain.on('messagingService', async (event: any, message: any) => this.onMessage(message));
/*
ipcMain.on('keytar', async (event: any, message: any) => {
@@ -53,6 +38,22 @@ export class MessagingMain {
*/
}
onMessage(message: any) {
switch (message.command) {
case 'loggedIn':
break;
case 'logout':
break;
case 'syncCompleted':
break;
case 'scheduleNextSync':
this.scheduleNextSync();
break;
default:
break;
}
}
private scheduleNextSync() {
if (this.syncTimeout) {
global.clearTimeout(this.syncTimeout);

View File

@@ -0,0 +1,24 @@
import { powerMonitor } from 'electron';
import { ConstantsService } from 'jslib/services/constants.service';
import { MessagingService } from 'jslib/abstractions/messaging.service';
import { StorageService } from 'jslib/abstractions/storage.service';
export class PowerMonitorMain {
constructor(private storageService: StorageService, private messagingService: MessagingService) { }
init() {
// System sleep
powerMonitor.on('suspend', async () => {
const lockOption = await this.storageService.get<number>(ConstantsService.lockOptionKey);
if (lockOption === -3) {
this.messagingService.send('lockVault');
}
});
// TODO: System idle
// TODO: System locked
}
}