bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2025-12-15 15:53:18 +00:00
Code Issues Releases Wiki Activity

route to previous url after unlock

Browse Source
This commit is contained in:
Kyle Spearrin
2018-06-09 22:40:53 -04:00
parent 7ebd18b00d
commit 5db9e9531f
5 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/accounts/lock.component.ts
View File

@@ -13,6 +13,8 @@ import { MessagingService } from 'jslib/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { UserService } from 'jslib/abstractions/user.service';
import { RouterService } from '../services/router.service';
import { LockComponent as BaseLockComponent } from 'jslib/angular/components/lock.component';
@Component({
@@ -23,7 +25,8 @@ export class LockComponent extends BaseLockComponent implements OnInit {
constructor(router: Router, analytics: Angulartics2,
toasterService: ToasterService, i18nService: I18nService,
platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
userService: UserService, cryptoService: CryptoService) {
userService: UserService, cryptoService: CryptoService,
private routerService: RouterService) {
super(router, analytics, toasterService, i18nService, platformUtilsService,
messagingService, userService, cryptoService);
}
@@ -36,5 +39,10 @@ export class LockComponent extends BaseLockComponent implements OnInit {
} else if (key != null) {
this.router.navigate(['vault']);
}
const previousUrl = this.routerService.getPreviousUrl();
if (previousUrl !== '/' && previousUrl.indexOf('lock') === -1) {
this.successRoute = previousUrl;
}
}
}