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

[PM-4349] Migrate hasPremium and debounceNavigation to be functional (#6591)

Browse Source 
Class based router guards are deprecated as of Angular 15.2, per angular.io/guide/deprecations#router-class-and-injection-token-guards. To simplify future angular upgrades we need to resolve these deprecations.

This PR migrates the HasPremium and DebounceNavigationService guards to use the new functional pattern.
This commit is contained in:
Oscar Hinton
2023-12-11 15:22:34 +01:00
committed by GitHub
parent 7db844baf2
commit cf0c6e8896
6 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
apps/web/src/app/core/guards/has-premium.guard.ts
View File

@@ -1,31 +1,35 @@
import { Injectable } from "@angular/core";
import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from "@angular/router";
import { inject } from "@angular/core";
import {
ActivatedRouteSnapshot,
RouterStateSnapshot,
Router,
CanActivateFn,
} from "@angular/router";
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
@Injectable({
providedIn: "root",
})
export class HasPremiumGuard implements CanActivate {
constructor(
private router: Router,
private stateService: StateService,
private messagingService: MessagingService,
) {}
/**
* CanActivate guard that checks if the user has premium and otherwise triggers the "premiumRequired"
* message and blocks navigation.
*/
export function hasPremiumGuard(): CanActivateFn {
return async (_route: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => {
const router = inject(Router);
const stateService = inject(StateService);
const messagingService = inject(MessagingService);
async canActivate(route: ActivatedRouteSnapshot, routerState: RouterStateSnapshot) {
const userHasPremium = await this.stateService.getCanAccessPremium();
const userHasPremium = await stateService.getCanAccessPremium();
if (!userHasPremium) {
this.messagingService.send("premiumRequired");
messagingService.send("premiumRequired");
}
// Prevent trapping the user on the login page, since that's an awful UX flow
if (!userHasPremium && this.router.url === "/login") {
return this.router.createUrlTree(["/"]);
if (!userHasPremium && router.url === "/login") {
return router.createUrlTree(["/"]);
}
return userHasPremium;
}
};
}