1
0
mirror of https://github.com/bitwarden/directory-connector synced 2025-12-10 21:33:20 +00:00

Upgrade angular & friends (v15.2.9 ⮕ v16.2.12) (#424)

* 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
This commit is contained in:
Addison Beck
2024-02-01 11:26:22 -06:00
committed by GitHub
parent 1fb4378046
commit 38b2a13df6
8 changed files with 2266 additions and 2438 deletions

View File

@@ -1,5 +1,5 @@
import { Injectable } from "@angular/core"; 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 { KeyConnectorService } from "@/jslib/common/src/abstractions/keyConnector.service";
import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
@@ -7,7 +7,7 @@ import { StateService } from "@/jslib/common/src/abstractions/state.service";
import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service"; import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
@Injectable() @Injectable()
export class AuthGuardService implements CanActivate { export class AuthGuardService {
constructor( constructor(
private vaultTimeoutService: VaultTimeoutService, private vaultTimeoutService: VaultTimeoutService,
private router: Router, private router: Router,

View File

@@ -1,11 +1,11 @@
import { Injectable } from "@angular/core"; 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 { StateService } from "@/jslib/common/src/abstractions/state.service";
import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service"; import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
@Injectable() @Injectable()
export class LockGuardService implements CanActivate { export class LockGuardService {
protected homepage = "vault"; protected homepage = "vault";
protected loginpage = "login"; protected loginpage = "login";
constructor( constructor(

View File

@@ -1,11 +1,11 @@
import { Injectable } from "@angular/core"; 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 { StateService } from "@/jslib/common/src/abstractions/state.service";
import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service"; import { VaultTimeoutService } from "@/jslib/common/src/abstractions/vaultTimeout.service";
@Injectable() @Injectable()
export class UnauthGuardService implements CanActivate { export class UnauthGuardService {
protected homepage = "vault"; protected homepage = "vault";
constructor( constructor(
private vaultTimeoutService: VaultTimeoutService, private vaultTimeoutService: VaultTimeoutService,

4653
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -70,14 +70,12 @@
"test:types": "npx tsc --noEmit" "test:types": "npx tsc --noEmit"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "15.2.9",
"@angular-eslint/eslint-plugin-template": "17.2.0", "@angular-eslint/eslint-plugin-template": "17.2.0",
"@angular-eslint/template-parser": "17.2.0", "@angular-eslint/template-parser": "17.2.0",
"@angular/compiler-cli": "15.2.9", "@angular/compiler-cli": "16.2.12",
"@angular/platform-browser-dynamic": "15.2.9",
"@fluffy-spoon/substitute": "1.208.0", "@fluffy-spoon/substitute": "1.208.0",
"@microsoft/microsoft-graph-types": "2.40.0", "@microsoft/microsoft-graph-types": "2.40.0",
"@ngtools/webpack": "15.2.9", "@ngtools/webpack": "16.2.12",
"@types/inquirer": "8.2.6", "@types/inquirer": "8.2.6",
"@types/jest": "29.5.11", "@types/jest": "29.5.11",
"@types/ldapjs": "2.2.5", "@types/ldapjs": "2.2.5",
@@ -140,15 +138,15 @@
"zone.js": "0.13.1" "zone.js": "0.13.1"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "15.2.9", "@angular/animations": "16.2.12",
"@angular/cdk": "15.2.9", "@angular/cdk": "15.2.9",
"@angular/common": "15.2.9", "@angular/common": "16.2.12",
"@angular/compiler": "15.2.9", "@angular/compiler": "16.2.12",
"@angular/core": "15.2.9", "@angular/core": "16.2.12",
"@angular/forms": "15.2.9", "@angular/forms": "16.2.12",
"@angular/platform-browser": "15.2.9", "@angular/platform-browser": "16.2.12",
"@angular/platform-browser-dynamic": "15.2.9", "@angular/platform-browser-dynamic": "16.2.12",
"@angular/router": "15.2.9", "@angular/router": "16.2.12",
"@microsoft/microsoft-graph-client": "3.0.7", "@microsoft/microsoft-graph-client": "3.0.7",
"@microsoft/signalr": "7.0.10", "@microsoft/signalr": "7.0.10",
"@microsoft/signalr-protocol-msgpack": "7.0.10", "@microsoft/signalr-protocol-msgpack": "7.0.10",

View File

@@ -1,5 +1,5 @@
import { NgModule } from "@angular/core"; import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router"; import { RouterModule, Routes, mapToCanActivate } from "@angular/router";
import { ApiKeyComponent } from "./accounts/apiKey.component"; import { ApiKeyComponent } from "./accounts/apiKey.component";
import { AuthGuardService } from "./services/auth-guard.service"; import { AuthGuardService } from "./services/auth-guard.service";
@@ -14,7 +14,7 @@ const routes: Routes = [
{ {
path: "login", path: "login",
component: ApiKeyComponent, component: ApiKeyComponent,
canActivate: [LaunchGuardService], canActivate: mapToCanActivate([LaunchGuardService]),
}, },
{ {
path: "tabs", path: "tabs",
@@ -28,17 +28,17 @@ const routes: Routes = [
{ {
path: "dashboard", path: "dashboard",
component: DashboardComponent, component: DashboardComponent,
canActivate: [AuthGuardService], canActivate: mapToCanActivate([AuthGuardService]),
}, },
{ {
path: "settings", path: "settings",
component: SettingsComponent, component: SettingsComponent,
canActivate: [AuthGuardService], canActivate: mapToCanActivate([AuthGuardService]),
}, },
{ {
path: "more", path: "more",
component: MoreComponent, component: MoreComponent,
canActivate: [AuthGuardService], canActivate: mapToCanActivate([AuthGuardService]),
}, },
], ],
}, },

View File

@@ -1,12 +1,11 @@
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { CanActivate } from "@angular/router";
import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service"; import { MessagingService } from "@/jslib/common/src/abstractions/messaging.service";
import { StateService } from "../../abstractions/state.service"; import { StateService } from "../../abstractions/state.service";
@Injectable() @Injectable()
export class AuthGuardService implements CanActivate { export class AuthGuardService {
constructor( constructor(
private stateService: StateService, private stateService: StateService,
private messagingService: MessagingService, private messagingService: MessagingService,

View File

@@ -1,10 +1,10 @@
import { Injectable } from "@angular/core"; import { Injectable } from "@angular/core";
import { CanActivate, Router } from "@angular/router"; import { Router } from "@angular/router";
import { StateService } from "../../abstractions/state.service"; import { StateService } from "../../abstractions/state.service";
@Injectable() @Injectable()
export class LaunchGuardService implements CanActivate { export class LaunchGuardService {
constructor( constructor(
private stateService: StateService, private stateService: StateService,
private router: Router, private router: Router,