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

menu with messages back to app

Browse Source
This commit is contained in:
Kyle Spearrin 2018-02-08 15:58:47 -05:00
parent 5e8ccd19c5
commit c76b4821c6
10 changed files with 233 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/app/app.component.ts
View File

@ -6,6 +6,7 @@ import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
import {
Component,
NgZone,
OnInit,
} from '@angular/core';
import { Router } from '@angular/router';
@ -21,6 +22,7 @@ import { CryptoService } from 'jslib/abstractions/crypto.service';
import { FolderService } from 'jslib/abstractions/folder.service';
import { I18nService } from 'jslib/abstractions/i18n.service';
import { PasswordGenerationService } from 'jslib/abstractions/passwordGeneration.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { SettingsService } from 'jslib/abstractions/settings.service';
import { SyncService } from 'jslib/abstractions/sync.service';
import { TokenService } from 'jslib/abstractions/token.service';
@ -47,45 +49,60 @@ export class AppComponent implements OnInit {
private settingsService: SettingsService, private syncService: SyncService,
private passwordGenerationService: PasswordGenerationService, private cipherService: CipherService,
private authService: AuthService, private router: Router, private analytics: Angulartics2,
private toasterService: ToasterService, private i18nService: I18nService) { }
private toasterService: ToasterService, private i18nService: I18nService,
private platformUtilsService: PlatformUtilsService, private ngZone: NgZone) { }
ngOnInit() {
this.broadcasterService.subscribe(async (message: any) => {
switch (message.command) {
case 'loggedIn':
break;
case 'logout':
const userId = await this.userService.getUserId();
await Promise.all([
this.syncService.setLastSync(new Date(0)),
this.tokenService.clearToken(),
this.cryptoService.clearKeys(),
this.userService.clear(),
this.settingsService.clear(userId),
this.cipherService.clear(userId),
this.folderService.clear(userId),
this.passwordGenerationService.clear(),
]);
this.doneLoggingOut(message.expired);
break;
case 'doneLoggingOut':
this.doneLoggingOut(message.expired);
break;
case 'locked':
break;
case 'unlocked':
break;
case 'syncStarted':
break;
case 'syncCompleted':
break;
default:
}
this.broadcasterService.subscribe((message: any) => {
this.ngZone.run(async () => {
switch (message.command) {
case 'loggedIn':
break;
case 'logout':
this.logOut(message.expired);
break;
case 'doneLoggingOut':
this.doneLoggingOut(message.expired);
break;
case 'locked':
break;
case 'unlocked':
break;
case 'syncStarted':
break;
case 'syncCompleted':
break;
case 'confirmLogout':
const logoutConfirmed = await this.platformUtilsService.showDialog(
this.i18nService.t('logOutConfirmation'), this.i18nService.t('logOut'),
this.i18nService.t('logOut'), this.i18nService.t('cancel'));
if (logoutConfirmed) {
this.logOut(false);
}
break;
default:
}
});
});
}
private async logOut(expired: boolean) {
const userId = await this.userService.getUserId();
await Promise.all([
this.syncService.setLastSync(new Date(0)),
this.tokenService.clearToken(),
this.cryptoService.clearKeys(),
this.userService.clear(),
this.settingsService.clear(userId),
this.cipherService.clear(userId),
this.folderService.clear(userId),
this.passwordGenerationService.clear(),
]);
this.doneLoggingOut(expired);
}
private doneLoggingOut(expired: boolean) {
this.authService.logOut(() => {
this.analytics.eventTrack.next({ action: 'Logged Out' });

3
src/app/vault/add-edit.component.ts
View File

@ -35,6 +35,7 @@ import { SecureNoteView } from 'jslib/models/view/secureNoteView';
export class AddEditComponent implements OnChanges {
@Input() folderId: string;
@Input() cipherId: string;
@Input() type: CipherType;
@Output() onSavedCipher = new EventEmitter<CipherView>();
@Output() onDeletedCipher = new EventEmitter<CipherView>();
@Output() onCancelled = new EventEmitter<CipherView>();
@ -119,7 +120,7 @@ export class AddEditComponent implements OnChanges {
this.title = this.i18nService.t('addItem');
this.cipher = new CipherView();
this.cipher.folderId = this.folderId;
this.cipher.type = CipherType.Login;
this.cipher.type = this.type == null ? CipherType.Login : this.type;
this.cipher.login = new LoginView();
this.cipher.card = new CardView();
this.cipher.identity = new IdentityView();

1
src/app/vault/vault.component.html
View File

@ -21,6 +21,7 @@
<app-vault-add-edit id="details"
*ngIf="action === 'add' || action === 'edit'"
[folderId]="action === 'add' && folderId !== 'none' ? folderId : null"
[type]="action === 'add' ? addType : null"
[cipherId]="action === 'edit' ? cipherId : null"
(onSavedCipher)="savedCipher($event)"
(onDeletedCipher)="deletedCipher($event)"

43
src/app/vault/vault.component.ts
View File

@ -2,8 +2,10 @@ import * as template from './vault.component.html';
import { Location } from '@angular/common';
import {
ChangeDetectorRef,
Component,
ComponentFactoryResolver,
NgZone,
OnInit,
ViewChild,
ViewContainerRef,
@ -15,6 +17,8 @@ import {
import { ModalComponent } from '../modal.component';
import { BroadcasterService } from '../services/broadcaster.service';
import { AddEditComponent } from './add-edit.component';
import { AttachmentsComponent } from './attachments.component';
import { CiphersComponent } from './ciphers.component';
@ -48,12 +52,46 @@ export class VaultComponent implements OnInit {
type: CipherType = null;
folderId: string = null;
collectionId: string = null;
addType: CipherType = null;
constructor(private route: ActivatedRoute, private router: Router, private location: Location,
private componentFactoryResolver: ComponentFactoryResolver, private i18nService: I18nService) {
private componentFactoryResolver: ComponentFactoryResolver, private i18nService: I18nService,
private broadcasterService: BroadcasterService, private changeDetectorRef: ChangeDetectorRef,
private ngZone: NgZone) {
}
async ngOnInit() {
this.broadcasterService.subscribe((message: any) => {
this.ngZone.run(async () => {
let detectChanges = true;
switch (message.command) {
case 'newLogin':
this.addCipher(CipherType.Login);
break;
case 'newCard':
this.addCipher(CipherType.Card);
break;
case 'newIdentity':
this.addCipher(CipherType.Identity);
break;
case 'newSecureNote':
this.addCipher(CipherType.SecureNote);
break;
case 'newFolder':
await this.addFolder();
break;
default:
detectChanges = false;
break;
}
if (detectChanges) {
this.changeDetectorRef.detectChanges();
}
});
});
this.route.queryParams.subscribe(async (params) => {
if (params.cipherId) {
const cipherView = new CipherView();
@ -108,11 +146,12 @@ export class VaultComponent implements OnInit {
this.go();
}
addCipher() {
addCipher(type: CipherType = null) {
if (this.action === 'add') {
return;
}
this.addType = type;
this.action = 'add';
this.cipherId = null;
this.go();

6
src/locales/en/messages.json
View File

@ -600,5 +600,11 @@
},
"loginExpired": {
"message": "Your login session has expired."
},
"logOutConfirmation": {
"message": "Are you sure you want to log out?"
},
"logOut": {
"message": "Log Out"
}
}

5
src/main.ts
View File

@ -17,10 +17,9 @@ if (watch) {
const i18nService = new I18nService('en', './locales/');
i18nService.init().then(() => { });
let win: BrowserWindow;
const windowMain = new WindowMain(dev);
const messagingMain = new MessagingMain();
const menuMain = new MenuMain();
const windowMain = new WindowMain(win, dev);
const menuMain = new MenuMain(windowMain);
messagingMain.init();
menuMain.init();

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

@ -1,10 +1,69 @@
import { app, Menu, MenuItemConstructorOptions } from 'electron';
import {
app,
BrowserWindow,
Menu,
MenuItemConstructorOptions,
ipcMain,
} from 'electron';
import { WindowMain } from './window.main';
export class MenuMain {
constructor() { }
constructor(private windowMain: WindowMain) { }
init() {
const self = this;
const template: MenuItemConstructorOptions[] = [
{
label: 'bitwarden'
},
{
label: 'File',
submenu: [
{
label: 'New Item',
submenu: [
{
label: 'New Login',
click() {
self.send('newLogin');
}
},
{
label: 'New Card',
click() {
self.send('newCard');
}
},
{
label: 'New Identity',
click() {
self.send('newIdentity');
}
},
{
label: 'New Secure Note',
click() {
self.send('newSecureNote');
}
}
]
},
{
label: 'New Login',
click() {
self.send('newLogin');
}
},
{
label: 'New Folder',
click() {
self.send('newFolder');
}
}
]
},
{
label: 'Edit',
submenu: [
@ -33,6 +92,17 @@ export class MenuMain {
{ role: 'togglefullscreen' }
]
},
{
label: 'Account',
submenu: [
{
label: 'Log Out',
click() {
self.send('confirmLogout');
}
},
]
},
{
role: 'window',
submenu: [
@ -52,32 +122,64 @@ export class MenuMain {
];
if (process.platform === 'darwin') {
template.unshift({
label: app.getName(),
submenu: [
{ role: 'about' },
{ type: 'separator' },
{ role: 'services', submenu: [] },
{ type: 'separator' },
{ role: 'hide' },
{ role: 'hideothers' },
{ role: 'unhide' },
{ type: 'separator' },
{ role: 'quit' }
]
})
template[0].submenu = [
{
label: 'Settings',
click() {
self.send('openSettings');
}
},
{
label: 'Lock',
click() {
self.send('lockApp');
}
},
{ type: 'separator' },
{ role: 'about' },
{ type: 'separator' },
{ role: 'services', submenu: [] },
{ type: 'separator' },
{ role: 'hide' },
{ role: 'hideothers' },
{ role: 'unhide' },
{ type: 'separator' },
{ role: 'quit' }
];
// Window menu
template[3].submenu = [
template[4].submenu = [
{ role: 'close' },
{ role: 'minimize' },
{ role: 'zoom' },
{ type: 'separator' },
{ role: 'front' }
]
};
} else {
template[0].submenu = [
{
label: 'Settings',
click() {
self.send('openSettings');
}
},
{
label: 'Lock',
click() {
self.send('lockApp');
}
},
];
}
const menu = Menu.buildFromTemplate(template);
Menu.setApplicationMenu(menu);
}
send(command: string, message?: any) {
this.windowMain.win.webContents.send('messagingService', {
command: command,
message: message,
});
}
}

1
src/main/messaging.main.ts
View File

@ -12,7 +12,6 @@ export class MessagingMain {
case 'logout':
break;
case 'syncCompleted':
console.log('sync completed!!');
break;
default:
break;

4
src/main/window.main.ts
View File

@ -3,7 +3,9 @@ import * as path from 'path';
import * as url from 'url';
export class WindowMain {
constructor(private win: BrowserWindow, private dev: boolean) { }
win: BrowserWindow;
constructor(private dev: boolean) { }
init() {
try {

8
src/services/desktopMessaging.service.ts
View File

@ -5,7 +5,13 @@ import { MessagingService } from 'jslib/abstractions';
import { BroadcasterService } from '../app/services/broadcaster.service';
export class DesktopMessagingService implements MessagingService {
constructor(private broadcasterService: BroadcasterService) { }
constructor(private broadcasterService: BroadcasterService) {
ipcRenderer.on('messagingService', async (event: any, message: any) => {
if (message.command) {
this.send(message.command, message);
}
});
}
send(subscriber: string, arg: any = {}) {
const message = Object.assign({}, { command: subscriber }, arg);