From b6bb3dbcfd592b7e102c992117a84fad3ac114aa Mon Sep 17 00:00:00 2001 From: Amritanshu Date: Fri, 31 May 2024 12:38:17 +0530 Subject: [PATCH] Chore: Auth Guard converted to CanActivateFn --- brewman/pyproject.toml | 1 - .../src/app/account/account-routing.module.ts | 18 +++---- .../attendance/attendance-routing.module.ts | 14 ++---- .../src/app/auth/auth-guard.service.spec.ts | 20 ++++---- overlord/src/app/auth/auth-guard.service.ts | 48 ++++++++----------- .../balance-sheet-routing.module.ts | 14 ++---- .../batch-integrity-report-routing.module.ts | 10 ++-- .../app/cash-flow/cash-flow-routing.module.ts | 14 ++---- .../src/app/client/client-routing.module.ts | 14 ++---- .../closing-stock-routing.module.ts | 14 ++---- .../cost-centre/cost-centre-routing.module.ts | 18 +++---- .../src/app/daybook/daybook-routing.module.ts | 10 ++-- .../employee-attendance-routing.module.ts | 14 ++---- .../employee-benefits-routing.module.ts | 14 ++---- .../employee-functions-routing.module.ts | 10 ++-- .../app/employee/employee-routing.module.ts | 18 +++---- .../src/app/entries/entries-routing.module.ts | 10 ++-- .../app/incentive/incentive-routing.module.ts | 14 ++---- .../src/app/issue/issue-routing.module.ts | 14 ++---- .../src/app/journal/journal-routing.module.ts | 14 ++---- .../src/app/ledger/ledger-routing.module.ts | 14 ++---- .../net-transactions-routing.module.ts | 10 ++-- .../non-contract-purchase-routing.module.ts | 10 ++-- .../src/app/payment/payment-routing.module.ts | 14 ++---- .../src/app/period/period-routing.module.ts | 18 +++---- .../product-group-routing.module.ts | 18 +++---- .../product-ledger-routing.module.ts | 14 ++---- .../src/app/product/product-routing.module.ts | 18 +++---- .../profit-loss/profit-loss-routing.module.ts | 10 ++-- .../purchase-entries-routing.module.ts | 10 ++-- .../purchase-return-routing.module.ts | 14 ++---- .../app/purchase/purchase-routing.module.ts | 14 ++---- .../app/purchases/purchases-routing.module.ts | 10 ++-- .../rate-contract-routing.module.ts | 18 +++---- .../raw-material-cost-routing.module.ts | 14 ++---- .../src/app/receipt/receipt-routing.module.ts | 14 ++---- .../recipe-template-routing.module.ts | 18 +++---- .../src/app/recipe/recipe-routing.module.ts | 18 +++---- overlord/src/app/role/role-routing.module.ts | 18 +++---- .../app/settings/settings-routing.module.ts | 10 ++-- .../stock-movement-routing.module.ts | 10 ++-- .../trial-balance-routing.module.ts | 14 ++---- overlord/src/app/user/user-routing.module.ts | 18 +++---- 43 files changed, 231 insertions(+), 398 deletions(-) diff --git a/brewman/pyproject.toml b/brewman/pyproject.toml index 10af0fb2..6fe583bb 100644 --- a/brewman/pyproject.toml +++ b/brewman/pyproject.toml @@ -18,7 +18,6 @@ alembic = "^1.13.1" itsdangerous = "^2.2.0" python-dotenv = "^1.0.1" pydantic = {extras = ["dotenv"], version = "^2.7.2"} -starlette = "^0.37.2" pandas = "^2.2.2" arq = "^0.26.0" openpyxl = "^3.1.3" diff --git a/overlord/src/app/account/account-routing.module.ts b/overlord/src/app/account/account-routing.module.ts index ddc7eb80..8a8d93ad 100644 --- a/overlord/src/app/account/account-routing.module.ts +++ b/overlord/src/app/account/account-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver'; import { AccountDetailComponent } from './account-detail/account-detail.component'; @@ -15,9 +15,7 @@ const accountRoutes: Routes = [ { path: '', component: AccountListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Accounts', }, @@ -29,9 +27,7 @@ const accountRoutes: Routes = [ { path: 'new', component: AccountDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Accounts', }, @@ -44,9 +40,7 @@ const accountRoutes: Routes = [ { path: ':id', component: AccountDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Accounts', }, diff --git a/overlord/src/app/attendance/attendance-routing.module.ts b/overlord/src/app/attendance/attendance-routing.module.ts index f419d1b9..a012b840 100644 --- a/overlord/src/app/attendance/attendance-routing.module.ts +++ b/overlord/src/app/attendance/attendance-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { attendanceTypeResolver } from './attendance-type.resolver'; import { AttendanceComponent } from './attendance.component'; @@ -12,9 +12,7 @@ const attendanceRoutes: Routes = [ { path: '', component: AttendanceComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Attendance', }, @@ -27,9 +25,7 @@ const attendanceRoutes: Routes = [ { path: ':date', component: AttendanceComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Attendance', }, diff --git a/overlord/src/app/auth/auth-guard.service.spec.ts b/overlord/src/app/auth/auth-guard.service.spec.ts index 19ce85c1..02bb4e53 100644 --- a/overlord/src/app/auth/auth-guard.service.spec.ts +++ b/overlord/src/app/auth/auth-guard.service.spec.ts @@ -1,15 +1,17 @@ -import { inject, TestBed } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; +import { CanActivateFn } from '@angular/router'; -import { AuthGuard } from './auth-guard.service'; +import { authGuard } from './auth-guard.service'; + +describe('authGuard', () => { + const executeGuard: CanActivateFn = (...guardParameters) => + TestBed.runInInjectionContext(() => authGuard(...guardParameters)); -describe('AuthGuard', () => { beforeEach(() => { - TestBed.configureTestingModule({ - providers: [AuthGuard], - }); + TestBed.configureTestingModule({}); }); - it('should be created', inject([AuthGuard], (service: AuthGuard) => { - expect(service).toBeTruthy(); - })); + it('should be created', () => { + expect(executeGuard).toBeTruthy(); + }); }); diff --git a/overlord/src/app/auth/auth-guard.service.ts b/overlord/src/app/auth/auth-guard.service.ts index 365713ff..c098faec 100644 --- a/overlord/src/app/auth/auth-guard.service.ts +++ b/overlord/src/app/auth/auth-guard.service.ts @@ -1,34 +1,26 @@ -import { Injectable } from '@angular/core'; -import { Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; +import { inject } from '@angular/core'; +import { CanActivateFn } from '@angular/router'; +import { Router } from '@angular/router'; import { ToasterService } from '../core/toaster.service'; import { AuthService } from './auth.service'; -@Injectable({ providedIn: 'root' }) -export class AuthGuard { - constructor( - private router: Router, - private authService: AuthService, - private toaster: ToasterService, - ) {} - - canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) { - const { user } = this.authService; - const permission = - route.data['permission'] === undefined - ? route.data['permission'] - : route.data['permission'].replace(/ /g, '-').toLowerCase(); - if (!user) { - // not logged in so redirect to login page with the return url - this.router.navigate(['/login'], { queryParams: { returnUrl: state.url } }); - return false; - } - if (permission !== undefined && user.perms.indexOf(permission) === -1) { - this.toaster.show('Danger', 'You do not have the permission to access this area.'); - return false; - } - // logged in so return true - return true; +export const authGuard: CanActivateFn = (route, state) => { + const user = inject(AuthService).user; + const permission = + route.data['permission'] === undefined + ? route.data['permission'] + : route.data['permission'].replace(/ /g, '-').toLowerCase(); + if (!user) { + // not logged in so redirect to login page with the return url + inject(Router).navigate(['/login'], { queryParams: { returnUrl: state.url } }); + return false; } -} + if (permission !== undefined && user.perms.indexOf(permission) === -1) { + inject(ToasterService).show('Danger', 'You do not have the permission to access this area.'); + return false; + } + // logged in so return true + return true; +}; diff --git a/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts b/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts index bb0751a6..b06903eb 100644 --- a/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts +++ b/overlord/src/app/balance-sheet/balance-sheet-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { BalanceSheetComponent } from './balance-sheet.component'; import { balanceSheetResolver } from './balance-sheet.resolver'; @@ -11,9 +11,7 @@ const balanceSheetRoutes: Routes = [ { path: '', component: BalanceSheetComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Balance Sheet', }, @@ -25,9 +23,7 @@ const balanceSheetRoutes: Routes = [ { path: ':date', component: BalanceSheetComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Balance Sheet', }, diff --git a/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts b/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts index 997c8c5e..6afa039f 100644 --- a/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts +++ b/overlord/src/app/batch-integrity-report/batch-integrity-report-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { BatchIntegrityReportComponent } from './batch-integrity-report.component'; import { batchIntegrityResolver } from './batch-integrity.resolver'; @@ -11,9 +11,7 @@ const batchIntegrityRoutes: Routes = [ { path: '', component: BatchIntegrityReportComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Product Ledger', }, diff --git a/overlord/src/app/cash-flow/cash-flow-routing.module.ts b/overlord/src/app/cash-flow/cash-flow-routing.module.ts index 60319367..47fcc869 100644 --- a/overlord/src/app/cash-flow/cash-flow-routing.module.ts +++ b/overlord/src/app/cash-flow/cash-flow-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { CashFlowComponent } from './cash-flow.component'; import { cashFlowResolver } from './cash-flow.resolver'; @@ -11,9 +11,7 @@ const cashFlowRoutes: Routes = [ { path: '', component: CashFlowComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cash Flow', }, @@ -25,9 +23,7 @@ const cashFlowRoutes: Routes = [ { path: ':id', component: CashFlowComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cash Flow', }, diff --git a/overlord/src/app/client/client-routing.module.ts b/overlord/src/app/client/client-routing.module.ts index a80ee9d9..eceea1ac 100644 --- a/overlord/src/app/client/client-routing.module.ts +++ b/overlord/src/app/client/client-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { ClientDetailComponent } from './client-detail/client-detail.component'; import { ClientListComponent } from './client-list/client-list.component'; @@ -13,9 +13,7 @@ const clientRoutes: Routes = [ { path: '', component: ClientListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, @@ -26,9 +24,7 @@ const clientRoutes: Routes = [ { path: ':id', component: ClientDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, diff --git a/overlord/src/app/closing-stock/closing-stock-routing.module.ts b/overlord/src/app/closing-stock/closing-stock-routing.module.ts index 71104374..7f5929c8 100644 --- a/overlord/src/app/closing-stock/closing-stock-routing.module.ts +++ b/overlord/src/app/closing-stock/closing-stock-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver'; import { ClosingStockComponent } from './closing-stock.component'; @@ -12,9 +12,7 @@ const closingStockRoutes: Routes = [ { path: '', component: ClosingStockComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Closing Stock', }, @@ -27,9 +25,7 @@ const closingStockRoutes: Routes = [ { path: ':date', component: ClosingStockComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Closing Stock', }, diff --git a/overlord/src/app/cost-centre/cost-centre-routing.module.ts b/overlord/src/app/cost-centre/cost-centre-routing.module.ts index d88766c0..7cb79531 100644 --- a/overlord/src/app/cost-centre/cost-centre-routing.module.ts +++ b/overlord/src/app/cost-centre/cost-centre-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { CostCentreDetailComponent } from './cost-centre-detail/cost-centre-detail.component'; import { CostCentreListComponent } from './cost-centre-list/cost-centre-list.component'; @@ -13,9 +13,7 @@ const costCentreRoutes: Routes = [ { path: '', component: CostCentreListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, @@ -26,9 +24,7 @@ const costCentreRoutes: Routes = [ { path: 'new', component: CostCentreDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, @@ -39,9 +35,7 @@ const costCentreRoutes: Routes = [ { path: ':id', component: CostCentreDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, diff --git a/overlord/src/app/daybook/daybook-routing.module.ts b/overlord/src/app/daybook/daybook-routing.module.ts index 63b76f28..7b3f7205 100644 --- a/overlord/src/app/daybook/daybook-routing.module.ts +++ b/overlord/src/app/daybook/daybook-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { DaybookComponent } from './daybook.component'; import { daybookResolver } from './daybook.resolver'; @@ -11,9 +11,7 @@ const daybookRoutes: Routes = [ { path: '', component: DaybookComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Daybook', }, diff --git a/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts b/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts index 590f7ede..89cc8acb 100644 --- a/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts +++ b/overlord/src/app/employee-attendance/employee-attendance-routing.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; import { attendanceTypeResolver } from '../attendance/attendance-type.resolver'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { EmployeeAttendanceComponent } from './employee-attendance.component'; import { employeeAttendanceResolver } from './employee-attendance.resolver'; @@ -12,9 +12,7 @@ const employeeEmployeeAttendanceRoutes: Routes = [ { path: '', component: EmployeeAttendanceComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Attendance', }, @@ -27,9 +25,7 @@ const employeeEmployeeAttendanceRoutes: Routes = [ { path: ':id', component: EmployeeAttendanceComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Attendance', }, diff --git a/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts b/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts index 0c796fc1..58a9fb08 100644 --- a/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts +++ b/overlord/src/app/employee-benefits/employee-benefits-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { EmployeeBenefitsComponent } from './employee-benefits.component'; import { employeeBenefitsResolver } from './employee-benefits.resolver'; @@ -11,9 +11,7 @@ const employeeBenefitsRoutes: Routes = [ { path: '', component: EmployeeBenefitsComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'employee-benefit', }, @@ -25,9 +23,7 @@ const employeeBenefitsRoutes: Routes = [ { path: ':id', component: EmployeeBenefitsComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'employee-benefit', }, diff --git a/overlord/src/app/employee-functions/employee-functions-routing.module.ts b/overlord/src/app/employee-functions/employee-functions-routing.module.ts index f4a31d98..73971a39 100644 --- a/overlord/src/app/employee-functions/employee-functions-routing.module.ts +++ b/overlord/src/app/employee-functions/employee-functions-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { EmployeeFunctionsComponent } from './employee-functions.component'; @@ -10,9 +10,7 @@ const employeeFunctionsRoutes: Routes = [ { path: '', component: EmployeeFunctionsComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'employee-benefit', }, diff --git a/overlord/src/app/employee/employee-routing.module.ts b/overlord/src/app/employee/employee-routing.module.ts index 78d7b2b9..dbdc97ce 100644 --- a/overlord/src/app/employee/employee-routing.module.ts +++ b/overlord/src/app/employee/employee-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver'; import { EmployeeDetailComponent } from './employee-detail/employee-detail.component'; @@ -14,9 +14,7 @@ const employeeRoutes: Routes = [ { path: '', component: EmployeeListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Employees', }, @@ -27,9 +25,7 @@ const employeeRoutes: Routes = [ { path: 'new', component: EmployeeDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Employees', }, @@ -41,9 +37,7 @@ const employeeRoutes: Routes = [ { path: ':id', component: EmployeeDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Employees', }, diff --git a/overlord/src/app/entries/entries-routing.module.ts b/overlord/src/app/entries/entries-routing.module.ts index e816aa09..226fa2d2 100644 --- a/overlord/src/app/entries/entries-routing.module.ts +++ b/overlord/src/app/entries/entries-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { EntriesComponent } from './entries.component'; import { entriesResolver } from './entries.resolver'; @@ -11,9 +11,7 @@ const entriesRoutes: Routes = [ { path: '', component: EntriesComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Ledger', }, diff --git a/overlord/src/app/incentive/incentive-routing.module.ts b/overlord/src/app/incentive/incentive-routing.module.ts index 3f7c4f19..51691c61 100644 --- a/overlord/src/app/incentive/incentive-routing.module.ts +++ b/overlord/src/app/incentive/incentive-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { IncentiveComponent } from './incentive.component'; import { incentiveResolver } from './incentive.resolver'; @@ -11,9 +11,7 @@ const incentiveRoutes: Routes = [ { path: '', component: IncentiveComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'incentive', }, @@ -25,9 +23,7 @@ const incentiveRoutes: Routes = [ { path: ':id', component: IncentiveComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'incentive', }, diff --git a/overlord/src/app/issue/issue-routing.module.ts b/overlord/src/app/issue/issue-routing.module.ts index 8231925e..fea48d52 100644 --- a/overlord/src/app/issue/issue-routing.module.ts +++ b/overlord/src/app/issue/issue-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver'; import { IssueComponent } from './issue.component'; @@ -12,9 +12,7 @@ const issueRoutes: Routes = [ { path: '', component: IssueComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Issue', }, @@ -27,9 +25,7 @@ const issueRoutes: Routes = [ { path: ':id', component: IssueComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Issue', }, diff --git a/overlord/src/app/journal/journal-routing.module.ts b/overlord/src/app/journal/journal-routing.module.ts index 5f1ae814..cbda1890 100644 --- a/overlord/src/app/journal/journal-routing.module.ts +++ b/overlord/src/app/journal/journal-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { JournalComponent } from './journal.component'; import { journalResolver } from './journal.resolver'; @@ -11,9 +11,7 @@ const journalRoutes: Routes = [ { path: '', component: JournalComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Journal', }, @@ -25,9 +23,7 @@ const journalRoutes: Routes = [ { path: ':id', component: JournalComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Journal', }, diff --git a/overlord/src/app/ledger/ledger-routing.module.ts b/overlord/src/app/ledger/ledger-routing.module.ts index acae86e8..d1851fdc 100644 --- a/overlord/src/app/ledger/ledger-routing.module.ts +++ b/overlord/src/app/ledger/ledger-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { LedgerComponent } from './ledger.component'; import { ledgerResolver } from './ledger.resolver'; @@ -11,9 +11,7 @@ const ledgerRoutes: Routes = [ { path: '', component: LedgerComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Ledger', }, @@ -25,9 +23,7 @@ const ledgerRoutes: Routes = [ { path: ':id', component: LedgerComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Ledger', }, diff --git a/overlord/src/app/net-transactions/net-transactions-routing.module.ts b/overlord/src/app/net-transactions/net-transactions-routing.module.ts index 21890d14..86103800 100644 --- a/overlord/src/app/net-transactions/net-transactions-routing.module.ts +++ b/overlord/src/app/net-transactions/net-transactions-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { NetTransactionsComponent } from './net-transactions.component'; import { netTransactionsResolver } from './net-transactions.resolver'; @@ -11,9 +11,7 @@ const netTransactionsRoutes: Routes = [ { path: '', component: NetTransactionsComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Net Transactions', }, diff --git a/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts b/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts index 2669d06e..ee80c3e1 100644 --- a/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts +++ b/overlord/src/app/non-contact-purchase/non-contract-purchase-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { NonContractPurchaseComponent } from './non-contract-purchase.component'; import { nonContractPurchaseResolver } from './non-contract-purchase.resolver'; @@ -11,9 +11,7 @@ const nonContractPurchaseRoutes: Routes = [ { path: '', component: NonContractPurchaseComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Product Ledger', }, diff --git a/overlord/src/app/payment/payment-routing.module.ts b/overlord/src/app/payment/payment-routing.module.ts index c553c6e7..9534dfbe 100644 --- a/overlord/src/app/payment/payment-routing.module.ts +++ b/overlord/src/app/payment/payment-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { paymentAccountsResolver } from './payment-accounts.resolver'; import { PaymentComponent } from './payment.component'; @@ -12,9 +12,7 @@ const paymentRoutes: Routes = [ { path: '', component: PaymentComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'journal', }, @@ -27,9 +25,7 @@ const paymentRoutes: Routes = [ { path: ':id', component: PaymentComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'journal', }, diff --git a/overlord/src/app/period/period-routing.module.ts b/overlord/src/app/period/period-routing.module.ts index b27b78fc..50bc4d78 100644 --- a/overlord/src/app/period/period-routing.module.ts +++ b/overlord/src/app/period/period-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { costCentreListResolver } from '../cost-centre/cost-centre-list.resolver'; import { PeriodDetailComponent } from './period-detail/period-detail.component'; @@ -14,9 +14,7 @@ const periodRoutes: Routes = [ { path: '', component: PeriodListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, @@ -27,9 +25,7 @@ const periodRoutes: Routes = [ { path: 'new', component: PeriodDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, @@ -41,9 +37,7 @@ const periodRoutes: Routes = [ { path: ':id', component: PeriodDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, diff --git a/overlord/src/app/product-group/product-group-routing.module.ts b/overlord/src/app/product-group/product-group-routing.module.ts index efcff1e1..50a614c6 100644 --- a/overlord/src/app/product-group/product-group-routing.module.ts +++ b/overlord/src/app/product-group/product-group-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { ProductGroupDetailComponent } from './product-group-detail/product-group-detail.component'; import { ProductGroupListComponent } from './product-group-list/product-group-list.component'; @@ -13,9 +13,7 @@ const productGroupRoutes: Routes = [ { path: '', component: ProductGroupListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, @@ -26,9 +24,7 @@ const productGroupRoutes: Routes = [ { path: 'new', component: ProductGroupDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, @@ -39,9 +35,7 @@ const productGroupRoutes: Routes = [ { path: ':id', component: ProductGroupDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Cost Centres', }, diff --git a/overlord/src/app/product-ledger/product-ledger-routing.module.ts b/overlord/src/app/product-ledger/product-ledger-routing.module.ts index 00283003..02d0b04b 100644 --- a/overlord/src/app/product-ledger/product-ledger-routing.module.ts +++ b/overlord/src/app/product-ledger/product-ledger-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { ProductLedgerComponent } from './product-ledger.component'; import { productLedgerResolver } from './product-ledger.resolver'; @@ -11,9 +11,7 @@ const productLedgerRoutes: Routes = [ { path: '', component: ProductLedgerComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Product Ledger', }, @@ -25,9 +23,7 @@ const productLedgerRoutes: Routes = [ { path: ':id', component: ProductLedgerComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Product Ledger', }, diff --git a/overlord/src/app/product/product-routing.module.ts b/overlord/src/app/product/product-routing.module.ts index 3033c143..4a5c1642 100644 --- a/overlord/src/app/product/product-routing.module.ts +++ b/overlord/src/app/product/product-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { productGroupListResolver } from '../product-group/product-group-list.resolver'; import { ProductDetailComponent } from './product-detail/product-detail.component'; @@ -14,9 +14,7 @@ const productRoutes: Routes = [ { path: '', component: ProductListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Products', }, @@ -27,9 +25,7 @@ const productRoutes: Routes = [ { path: 'new', component: ProductDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Products', }, @@ -41,9 +37,7 @@ const productRoutes: Routes = [ { path: ':id', component: ProductDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Products', }, diff --git a/overlord/src/app/profit-loss/profit-loss-routing.module.ts b/overlord/src/app/profit-loss/profit-loss-routing.module.ts index 6e770faf..ed71c217 100644 --- a/overlord/src/app/profit-loss/profit-loss-routing.module.ts +++ b/overlord/src/app/profit-loss/profit-loss-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { ProfitLossComponent } from './profit-loss.component'; import { profitLossResolver } from './profit-loss.resolver'; @@ -11,9 +11,7 @@ const profitLossRoutes: Routes = [ { path: '', component: ProfitLossComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Profit & Loss', }, diff --git a/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts b/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts index d4847db1..2bb38cc4 100644 --- a/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts +++ b/overlord/src/app/purchase-entries/purchase-entries-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { PurchaseEntriesComponent } from './purchase-entries.component'; import { purchaseEntriesResolver } from './purchase-entries.resolver'; @@ -11,9 +11,7 @@ const purchaseEntriesRoutes: Routes = [ { path: '', component: PurchaseEntriesComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Purchase Entries', }, diff --git a/overlord/src/app/purchase-return/purchase-return-routing.module.ts b/overlord/src/app/purchase-return/purchase-return-routing.module.ts index ceae5990..64324b39 100644 --- a/overlord/src/app/purchase-return/purchase-return-routing.module.ts +++ b/overlord/src/app/purchase-return/purchase-return-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { PurchaseReturnComponent } from './purchase-return.component'; import { purchaseReturnResolver } from './purchase-return.resolver'; @@ -11,9 +11,7 @@ const purchaseReturnRoutes: Routes = [ { path: '', component: PurchaseReturnComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Purchase Return', }, @@ -25,9 +23,7 @@ const purchaseReturnRoutes: Routes = [ { path: ':id', component: PurchaseReturnComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Purchase Return', }, diff --git a/overlord/src/app/purchase/purchase-routing.module.ts b/overlord/src/app/purchase/purchase-routing.module.ts index ffc15fc6..848e9986 100644 --- a/overlord/src/app/purchase/purchase-routing.module.ts +++ b/overlord/src/app/purchase/purchase-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { PurchaseComponent } from './purchase.component'; import { purchaseResolver } from './purchase.resolver'; @@ -11,9 +11,7 @@ const purchaseRoutes: Routes = [ { path: '', component: PurchaseComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Purchase', }, @@ -25,9 +23,7 @@ const purchaseRoutes: Routes = [ { path: ':id', component: PurchaseComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Purchase', }, diff --git a/overlord/src/app/purchases/purchases-routing.module.ts b/overlord/src/app/purchases/purchases-routing.module.ts index 91c15383..5243518e 100644 --- a/overlord/src/app/purchases/purchases-routing.module.ts +++ b/overlord/src/app/purchases/purchases-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { PurchasesComponent } from './purchases.component'; import { purchasesResolver } from './purchases.resolver'; @@ -11,9 +11,7 @@ const purchasesRoutes: Routes = [ { path: '', component: PurchasesComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Purchases', }, diff --git a/overlord/src/app/rate-contract/rate-contract-routing.module.ts b/overlord/src/app/rate-contract/rate-contract-routing.module.ts index cfad85ce..019bcd59 100644 --- a/overlord/src/app/rate-contract/rate-contract-routing.module.ts +++ b/overlord/src/app/rate-contract/rate-contract-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { RateContractDetailComponent } from './rate-contract-detail/rate-contract-detail.component'; import { RateContractListComponent } from './rate-contract-list/rate-contract-list.component'; @@ -13,9 +13,7 @@ const rateContractRoutes: Routes = [ { path: '', component: RateContractListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Rate Contracts', }, @@ -26,9 +24,7 @@ const rateContractRoutes: Routes = [ { path: 'new', component: RateContractDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Rate Contracts', }, @@ -39,9 +35,7 @@ const rateContractRoutes: Routes = [ { path: ':id', component: RateContractDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Rate Contracts', }, diff --git a/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts b/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts index 997ad6a9..9cda6c2c 100644 --- a/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts +++ b/overlord/src/app/raw-material-cost/raw-material-cost-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { RawMaterialCostComponent } from './raw-material-cost.component'; import { rawMaterialCostResolver } from './raw-material-cost.resolver'; @@ -11,9 +11,7 @@ const rawMaterialCostRoutes: Routes = [ { path: '', component: RawMaterialCostComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Raw Material Cost', }, @@ -25,9 +23,7 @@ const rawMaterialCostRoutes: Routes = [ { path: ':id', component: RawMaterialCostComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Raw Material Cost', }, diff --git a/overlord/src/app/receipt/receipt-routing.module.ts b/overlord/src/app/receipt/receipt-routing.module.ts index 5c2770ac..7c943104 100644 --- a/overlord/src/app/receipt/receipt-routing.module.ts +++ b/overlord/src/app/receipt/receipt-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { receiptAccountsResolver } from './receipt-accounts.resolver'; import { ReceiptComponent } from './receipt.component'; @@ -12,9 +12,7 @@ const receiptRoutes: Routes = [ { path: '', component: ReceiptComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'journal', }, @@ -27,9 +25,7 @@ const receiptRoutes: Routes = [ { path: ':id', component: ReceiptComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'journal', }, diff --git a/overlord/src/app/recipe-template/recipe-template-routing.module.ts b/overlord/src/app/recipe-template/recipe-template-routing.module.ts index 3b2f67c6..b2db3227 100644 --- a/overlord/src/app/recipe-template/recipe-template-routing.module.ts +++ b/overlord/src/app/recipe-template/recipe-template-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { RecipeTemplateDetailComponent } from './recipe-template-detail/recipe-template-detail.component'; import { RecipeTemplateListComponent } from './recipe-template-list/recipe-template-list.component'; @@ -13,9 +13,7 @@ const recipeTemplateRoutes: Routes = [ { path: '', component: RecipeTemplateListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, @@ -26,9 +24,7 @@ const recipeTemplateRoutes: Routes = [ { path: 'new', component: RecipeTemplateDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, @@ -39,9 +35,7 @@ const recipeTemplateRoutes: Routes = [ { path: ':id', component: RecipeTemplateDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, diff --git a/overlord/src/app/recipe/recipe-routing.module.ts b/overlord/src/app/recipe/recipe-routing.module.ts index 649a57b0..56586770 100644 --- a/overlord/src/app/recipe/recipe-routing.module.ts +++ b/overlord/src/app/recipe/recipe-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { periodListResolver } from '../period/period-list.resolver'; import { productGroupListResolver } from '../product-group/product-group-list.resolver'; @@ -15,9 +15,7 @@ const recipeRoutes: Routes = [ { path: '', component: RecipeListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, @@ -31,9 +29,7 @@ const recipeRoutes: Routes = [ { path: 'new', component: RecipeDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, @@ -45,9 +41,7 @@ const recipeRoutes: Routes = [ { path: ':id', component: RecipeDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Recipes', }, diff --git a/overlord/src/app/role/role-routing.module.ts b/overlord/src/app/role/role-routing.module.ts index 78f21580..e58b4fe9 100644 --- a/overlord/src/app/role/role-routing.module.ts +++ b/overlord/src/app/role/role-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { RoleDetailComponent } from './role-detail/role-detail.component'; import { RoleListComponent } from './role-list/role-list.component'; @@ -13,9 +13,7 @@ const roleRoutes: Routes = [ { path: '', component: RoleListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Users', }, @@ -26,9 +24,7 @@ const roleRoutes: Routes = [ { path: 'new', component: RoleDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Users', }, @@ -39,9 +35,7 @@ const roleRoutes: Routes = [ { path: ':id', component: RoleDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Users', }, diff --git a/overlord/src/app/settings/settings-routing.module.ts b/overlord/src/app/settings/settings-routing.module.ts index 79a6a49d..3626700c 100644 --- a/overlord/src/app/settings/settings-routing.module.ts +++ b/overlord/src/app/settings/settings-routing.module.ts @@ -1,9 +1,9 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; import { accountTypeResolver } from '../account/account-type.resolver'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { lockInformationResolver } from './lock-information.resolver'; import { maintenanceResolver } from './maintenance.resolver'; @@ -14,9 +14,7 @@ const settingsRoutes: Routes = [ { path: '', component: SettingsComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Maintenance', // 'Lock Date' }, diff --git a/overlord/src/app/stock-movement/stock-movement-routing.module.ts b/overlord/src/app/stock-movement/stock-movement-routing.module.ts index a3b76f03..4eb43e7c 100644 --- a/overlord/src/app/stock-movement/stock-movement-routing.module.ts +++ b/overlord/src/app/stock-movement/stock-movement-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { StockMovementComponent } from './stock-movement.component'; import { stockMovementResolver } from './stock-movement.resolver'; @@ -11,9 +11,7 @@ const stockMovementRoutes: Routes = [ { path: '', component: StockMovementComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Stock Movement', }, diff --git a/overlord/src/app/trial-balance/trial-balance-routing.module.ts b/overlord/src/app/trial-balance/trial-balance-routing.module.ts index ef32a670..cdd3470d 100644 --- a/overlord/src/app/trial-balance/trial-balance-routing.module.ts +++ b/overlord/src/app/trial-balance/trial-balance-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { TrialBalanceComponent } from './trial-balance.component'; import { trialBalanceResolver } from './trial-balance.resolver'; @@ -11,9 +11,7 @@ const trialBalanceRoutes: Routes = [ { path: '', component: TrialBalanceComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Trial Balance', }, @@ -25,9 +23,7 @@ const trialBalanceRoutes: Routes = [ { path: ':date', component: TrialBalanceComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Trial Balance', }, diff --git a/overlord/src/app/user/user-routing.module.ts b/overlord/src/app/user/user-routing.module.ts index 2acb95ab..83b50ee9 100644 --- a/overlord/src/app/user/user-routing.module.ts +++ b/overlord/src/app/user/user-routing.module.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; -import { NgModule, inject } from '@angular/core'; -import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard } from '../auth/auth-guard.service'; +import { authGuard } from '../auth/auth-guard.service'; import { UserDetailComponent } from './user-detail/user-detail.component'; import { UserListComponent } from './user-list/user-list.component'; @@ -13,9 +13,7 @@ const userRoutes: Routes = [ { path: '', component: UserListComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Users', }, @@ -26,9 +24,7 @@ const userRoutes: Routes = [ { path: 'new', component: UserDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], data: { permission: 'Users', }, @@ -39,9 +35,7 @@ const userRoutes: Routes = [ { path: ':id', component: UserDetailComponent, - canActivate: [ - (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) => inject(AuthGuard).canActivate(route, state), - ], + canActivate: [authGuard], resolve: { item: userResolver, },