Skip to content

Commit

Permalink
Upgrade angular & friends (v15.2.9 ⮕ v16.2.12) (#424)
Browse files Browse the repository at this point in the history
* Upgrade @angular packages to 16.2.12

Upgrade a webpack package

* Rebuild package-lock.json

* Remove use of deprecated Guard interfaces

Update route guards to use mapToCanActivate
  • Loading branch information
addisonbeck authored Feb 1, 2024
1 parent 1fb4378 commit 38b2a13
Show file tree
Hide file tree
Showing 8 changed files with 2,462 additions and 2,634 deletions.
4 changes: 2 additions & 2 deletions jslib/angular/src/services/auth-guard.service.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Injectable } from "@angular/core";
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from "@angular/router";
import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from "@angular/router";

import { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
import { StateService } from "@/jslib/common/src/abstractions/state.service";
import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";

@Injectable()
export class AuthGuardService implements CanActivate {
export class AuthGuardService {
constructor(
private vaultTimeoutService: VaultTimeoutService,
private router: Router,
Expand Down
4 changes: 2 additions & 2 deletions jslib/angular/src/services/lock-guard.service.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Injectable } from "@angular/core";
import { CanActivate, Router } from "@angular/router";
import { Router } from "@angular/router";

import { StateService } from "@/jslib/common/src/abstractions/state.service";
import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";

@Injectable()
export class LockGuardService implements CanActivate {
export class LockGuardService {
protected homepage = "vault";
protected loginpage = "login";
constructor(
Expand Down
4 changes: 2 additions & 2 deletions jslib/angular/src/services/unauth-guard.service.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Injectable } from "@angular/core";
import { CanActivate, Router } from "@angular/router";
import { Router } from "@angular/router";

import { StateService } from "@/jslib/common/src/abstractions/state.service";
import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";

@Injectable()
export class UnauthGuardService implements CanActivate {
export class UnauthGuardService {
protected homepage = "vault";
constructor(
private vaultTimeoutService: VaultTimeoutService,
Expand Down
Loading

0 comments on commit 38b2a13

Please sign in to comment.