From 1e998094df1af5a6dc7b157e3ff55cc8ca896a4d Mon Sep 17 00:00:00 2001 From: Thomas Rittson Date: Mon, 7 Jun 2021 08:59:02 +1000 Subject: [PATCH] Use lockGuardService to prevent back navigation --- src/popup/app-routing.module.ts | 2 ++ src/popup/services/services.module.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/popup/app-routing.module.ts b/src/popup/app-routing.module.ts index 96fcd02f08..821cf1fed9 100644 --- a/src/popup/app-routing.module.ts +++ b/src/popup/app-routing.module.ts @@ -7,6 +7,7 @@ import { } from '@angular/router'; import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; +import { LockGuardService } from 'jslib/angular/services/lock-guard.service'; import { LaunchGuardService } from './services/launch-guard.service'; @@ -76,6 +77,7 @@ const routes: Routes = [ { path: 'lock', component: LockComponent, + canActivate: [LockGuardService], data: { state: 'lock' }, }, { diff --git a/src/popup/services/services.module.ts b/src/popup/services/services.module.ts index 45b359112a..a3b76e8bc3 100644 --- a/src/popup/services/services.module.ts +++ b/src/popup/services/services.module.ts @@ -10,6 +10,7 @@ import { LaunchGuardService } from './launch-guard.service'; import { AuthGuardService } from 'jslib/angular/services/auth-guard.service'; import { BroadcasterService } from 'jslib/angular/services/broadcaster.service'; +import { LockGuardService } from 'jslib/angular/services/lock-guard.service'; import { ValidationService } from 'jslib/angular/services/validation.service'; import { BrowserApi } from '../../browser/browserApi'; @@ -115,6 +116,7 @@ export function initFactory(platformUtilsService: PlatformUtilsService, i18nServ ValidationService, AuthGuardService, LaunchGuardService, + LockGuardService, PopupUtilsService, BroadcasterService, { provide: MessagingService, useValue: messagingService },