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

ensure that message is for proper logged in user

Browse Source
This commit is contained in:
Kyle Spearrin 2018-08-28 08:47:06 -04:00
parent 45da8aa9eb
commit a72843af3e
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/models/response/notificationResponse.ts
View File

@ -26,7 +26,8 @@ export class NotificationResponse {
case NotificationType.SyncCiphers:
case NotificationType.SyncOrgKeys:
case NotificationType.SyncSettings:
this.payload = new SyncUserNotification(payload);
case NotificationType.LogOut:
this.payload = new UserNotification(payload);
break;
default:
break;
@ -62,7 +63,7 @@ export class SyncFolderNotification {
}
}
export class SyncUserNotification {
export class UserNotification {
userId: string;
date: Date;

25
src/services/notifications.service.ts
View File

@ -107,6 +107,13 @@ export class NotificationsService implements NotificationsServiceAbstraction {
return;
}
const isAuthenticated = await this.userService.isAuthenticated();
const payloadUserId = notification.payload.userId || notification.payload.UserId;
const myUserId = await this.userService.getUserId();
if (isAuthenticated && payloadUserId != null && payloadUserId !== myUserId) {
return;
}
switch (notification.type) {
case NotificationType.SyncCipherCreate:
case NotificationType.SyncCipherUpdate:
@ -128,16 +135,22 @@ export class NotificationsService implements NotificationsServiceAbstraction {
case NotificationType.SyncVault:
case NotificationType.SyncCiphers:
case NotificationType.SyncSettings:
await this.syncService.fullSync(false);
if (isAuthenticated) {
await this.syncService.fullSync(false);
}
break;
case NotificationType.SyncOrgKeys:
await this.apiService.refreshIdentityToken();
await this.syncService.fullSync(true);
// Stop so a reconnect can be made
await this.signalrConnection.stop();
if (isAuthenticated) {
await this.apiService.refreshIdentityToken();
await this.syncService.fullSync(true);
// Stop so a reconnect can be made
await this.signalrConnection.stop();
}
break;
case NotificationType.LogOut:
this.logoutCallback();
if (isAuthenticated) {
this.logoutCallback();
}
break;
default:
break;