bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 01:03:35 +00:00
Code Issues Releases Wiki Activity

activity connect/disconnect events

Browse Source
This commit is contained in:
Kyle Spearrin
2018-08-22 21:09:58 -04:00
parent 74b31daf14
commit d37fa836da
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/abstractions/notifications.service.ts
View File

@@ -3,4 +3,6 @@ import { EnvironmentService } from './environment.service';
export abstract class NotificationsService { export abstract class NotificationsService {
init: (environmentService: EnvironmentService) => Promise<void>; init: (environmentService: EnvironmentService) => Promise<void>;
updateConnection: () => Promise<void>; updateConnection: () => Promise<void>;
reconnectFromActivity: () => Promise<any>;
disconnectFromInactivity: () => Promise<any>;
} }

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

@@ -21,6 +21,7 @@ export class NotificationsService implements NotificationsServiceAbstraction {
private url: string; private url: string;
private connected = false; private connected = false;
private inited = false; private inited = false;
private inactive = false;
private reconnectTimer: any = null; private reconnectTimer: any = null;
constructor(private userService: UserService, private tokenService: TokenService, constructor(private userService: UserService, private tokenService: TokenService,
@@ -75,6 +76,22 @@ export class NotificationsService implements NotificationsServiceAbstraction {
} }
} }
async reconnectFromActivity(): Promise<any> {
this.inactive = false;
if (!this.connected) {
if (await this.userService.isAuthenticated()) {
return this.reconnect().then(() => this.syncService.fullSync(false));
}
}
}
async disconnectFromInactivity(): Promise<any> {
this.inactive = true;
if (this.connected) {
await this.signalrConnection.stop();
}
}
private async processNotification(notification: NotificationResponse) { private async processNotification(notification: NotificationResponse) {
const appId = await this.appIdService.getAppId(); const appId = await this.appIdService.getAppId();
if (notification == null || notification.contextId === appId) { if (notification == null || notification.contextId === appId) {
@@ -125,8 +142,11 @@ export class NotificationsService implements NotificationsServiceAbstraction {
clearTimeout(this.reconnectTimer); clearTimeout(this.reconnectTimer);
this.reconnectTimer = null; this.reconnectTimer = null;
} }
if (this.connected || !this.inited || this.inactive) {
return;
}
const authed = await this.userService.isAuthenticated(); const authed = await this.userService.isAuthenticated();
if (this.connected || !this.inited || !authed) { if (!authed) {
return; return;
} }