From 5dfb2c6370d5d7f64bc6980bb1b0cd9cfb8eb996 Mon Sep 17 00:00:00 2001 From: T-DiegoF Date: Sat, 4 Apr 2026 19:03:39 -0300 Subject: [PATCH 1/2] feat(): setup challenge 66 Co-Authored-By: Claude Sonnet 4.6 --- .../66-functional-auth-guard/.eslintrc.json | 36 ++++++++ .../66-functional-auth-guard/README.md | 13 +++ .../66-functional-auth-guard/project.json | 87 ++++++++++++++++++ .../public/favicon.ico | Bin 0 -> 15086 bytes .../src/app/admin.component.ts | 15 +++ .../src/app/admin.guard.ts | 19 ++++ .../src/app/app.component.spec.ts | 60 ++++++++++++ .../src/app/app.component.ts | 10 ++ .../src/app/app.config.ts | 16 ++++ .../src/app/app.routes.ts | 12 +++ .../src/app/auth.guard.ts | 19 ++++ .../src/app/auth.service.ts | 17 ++++ .../src/app/dashboard.component.ts | 15 +++ .../src/app/home.component.ts | 47 ++++++++++ .../66-functional-auth-guard/src/index.html | 13 +++ .../66-functional-auth-guard/src/main.ts | 5 + .../66-functional-auth-guard/src/styles.scss | 3 + .../src/test-setup/no-teardown.ts | 25 +++++ .../tailwind.config.js | 14 +++ .../tsconfig.app.json | 14 +++ .../66-functional-auth-guard/tsconfig.json | 33 +++++++ .../tsconfig.spec.json | 8 ++ .../vitest-base.config.ts | 20 ++++ challenge-number.json | 4 +- 24 files changed, 503 insertions(+), 2 deletions(-) create mode 100644 apps/angular/66-functional-auth-guard/.eslintrc.json create mode 100644 apps/angular/66-functional-auth-guard/README.md create mode 100644 apps/angular/66-functional-auth-guard/project.json create mode 100644 apps/angular/66-functional-auth-guard/public/favicon.ico create mode 100644 apps/angular/66-functional-auth-guard/src/app/admin.component.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/admin.guard.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/app.component.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/app.config.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/app.routes.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/auth.guard.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/auth.service.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/dashboard.component.ts create mode 100644 apps/angular/66-functional-auth-guard/src/app/home.component.ts create mode 100644 apps/angular/66-functional-auth-guard/src/index.html create mode 100644 apps/angular/66-functional-auth-guard/src/main.ts create mode 100644 apps/angular/66-functional-auth-guard/src/styles.scss create mode 100644 apps/angular/66-functional-auth-guard/src/test-setup/no-teardown.ts create mode 100644 apps/angular/66-functional-auth-guard/tailwind.config.js create mode 100644 apps/angular/66-functional-auth-guard/tsconfig.app.json create mode 100644 apps/angular/66-functional-auth-guard/tsconfig.json create mode 100644 apps/angular/66-functional-auth-guard/tsconfig.spec.json create mode 100644 apps/angular/66-functional-auth-guard/vitest-base.config.ts diff --git a/apps/angular/66-functional-auth-guard/.eslintrc.json b/apps/angular/66-functional-auth-guard/.eslintrc.json new file mode 100644 index 000000000..8ebcbfd59 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/.eslintrc.json @@ -0,0 +1,36 @@ +{ + "extends": ["../../../.eslintrc.json"], + "ignorePatterns": ["!**/*"], + "overrides": [ + { + "files": ["*.ts"], + "extends": [ + "plugin:@nx/angular", + "plugin:@angular-eslint/template/process-inline-templates" + ], + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "app", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "app", + "style": "kebab-case" + } + ] + } + }, + { + "files": ["*.html"], + "extends": ["plugin:@nx/angular-template"], + "rules": {} + } + ] +} diff --git a/apps/angular/66-functional-auth-guard/README.md b/apps/angular/66-functional-auth-guard/README.md new file mode 100644 index 000000000..247e3e054 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/README.md @@ -0,0 +1,13 @@ +# functional-auth-guard + +> author: thomas-laforge + +### Run Application + +```bash +npx nx serve angular-functional-auth-guard +``` + +### Documentation and Instruction + +Challenge documentation is [here](https://angular-challenges.vercel.app/challenges/angular/66-functional-auth-guard/). diff --git a/apps/angular/66-functional-auth-guard/project.json b/apps/angular/66-functional-auth-guard/project.json new file mode 100644 index 000000000..d4c024a74 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/project.json @@ -0,0 +1,87 @@ +{ + "name": "angular-functional-auth-guard", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", + "projectType": "application", + "prefix": "app", + "sourceRoot": "apps/angular/66-functional-auth-guard/src", + "tags": [], + "targets": { + "build": { + "executor": "@angular/build:application", + "outputs": ["{options.outputPath}"], + "options": { + "outputPath": "dist/apps/angular/66-functional-auth-guard", + "browser": "apps/angular/66-functional-auth-guard/src/main.ts", + "tsConfig": "apps/angular/66-functional-auth-guard/tsconfig.app.json", + "inlineStyleLanguage": "scss", + "assets": [ + { + "glob": "**/*", + "input": "apps/angular/66-functional-auth-guard/public" + } + ], + "styles": ["apps/angular/66-functional-auth-guard/src/styles.scss"] + }, + "configurations": { + "production": { + "budgets": [ + { + "type": "initial", + "maximumWarning": "500kb", + "maximumError": "1mb" + }, + { + "type": "anyComponentStyle", + "maximumWarning": "4kb", + "maximumError": "8kb" + } + ], + "outputHashing": "all" + }, + "development": { + "optimization": false, + "extractLicenses": false, + "sourceMap": true + } + }, + "defaultConfiguration": "production" + }, + "serve": { + "continuous": true, + "executor": "@angular/build:dev-server", + "configurations": { + "production": { + "buildTarget": "angular-functional-auth-guard:build:production" + }, + "development": { + "buildTarget": "angular-functional-auth-guard:build:development" + } + }, + "defaultConfiguration": "development" + }, + "extract-i18n": { + "executor": "@angular/build:extract-i18n", + "options": { + "buildTarget": "angular-functional-auth-guard:build" + } + }, + "lint": { + "executor": "@nx/eslint:lint" + }, + "test": { + "executor": "@angular/build:unit-test", + "options": { + "runnerConfig": "apps/angular/66-functional-auth-guard/vitest-base.config.ts" + } + }, + "serve-static": { + "continuous": true, + "executor": "@nx/web:file-server", + "options": { + "buildTarget": "angular-functional-auth-guard:build", + "staticFilePath": "dist/apps/angular/66-functional-auth-guard/browser", + "spa": true + } + } + } +} diff --git a/apps/angular/66-functional-auth-guard/public/favicon.ico b/apps/angular/66-functional-auth-guard/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..317ebcb2336e0833a22dddf0ab287849f26fda57 GIT binary patch literal 15086 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 +

Admin

+ Back to Home + + `, + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [RouterLink], +}) +export class AdminComponent {} diff --git a/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts b/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts new file mode 100644 index 000000000..40008578c --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { CanActivate, Router } from '@angular/router'; +import { AuthService } from './auth.service'; + +@Injectable({ providedIn: 'root' }) +export class AdminGuard implements CanActivate { + constructor( + private authService: AuthService, + private router: Router, + ) {} + + canActivate(): boolean { + if (this.authService.isLoggedIn && this.authService.role === 'admin') { + return true; + } + this.router.navigate(['/']); + return false; + } +} diff --git a/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts b/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts new file mode 100644 index 000000000..944aa0818 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts @@ -0,0 +1,60 @@ +import { TestBed } from '@angular/core/testing'; +import { provideRouter } from '@angular/router'; +import { page, userEvent } from 'vitest/browser'; +import { AdminComponent } from './admin.component'; +import { AdminGuard } from './admin.guard'; +import { AuthGuard } from './auth.guard'; +import { AuthService } from './auth.service'; +import { DashboardComponent } from './dashboard.component'; +import { HomeComponent } from './home.component'; +import { routes } from './app.routes'; +import { AppComponent } from './app.component'; + +describe('Auth Guards', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [provideRouter(routes)], + }); + TestBed.createComponent(AppComponent); + }); + + describe('AuthGuard', () => { + it('Then should redirect to / when not logged in', async () => { + const guard = TestBed.inject(AuthGuard); + const result = guard.canActivate(); + expect(result).toBeFalsy(); + }); + + it('Then should allow access when logged in', async () => { + const authService = TestBed.inject(AuthService); + authService.login('user'); + const guard = TestBed.inject(AuthGuard); + const result = guard.canActivate(); + expect(result).toBe(true); + }); + }); + + describe('AdminGuard', () => { + it('Then should redirect to / when not logged in', async () => { + const guard = TestBed.inject(AdminGuard); + const result = guard.canActivate(); + expect(result).toBeFalsy(); + }); + + it('Then should redirect to / when logged in as user', async () => { + const authService = TestBed.inject(AuthService); + authService.login('user'); + const guard = TestBed.inject(AdminGuard); + const result = guard.canActivate(); + expect(result).toBeFalsy(); + }); + + it('Then should allow access when logged in as admin', async () => { + const authService = TestBed.inject(AuthService); + authService.login('admin'); + const guard = TestBed.inject(AdminGuard); + const result = guard.canActivate(); + expect(result).toBe(true); + }); + }); +}); diff --git a/apps/angular/66-functional-auth-guard/src/app/app.component.ts b/apps/angular/66-functional-auth-guard/src/app/app.component.ts new file mode 100644 index 000000000..6f48a095f --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/app.component.ts @@ -0,0 +1,10 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { RouterOutlet } from '@angular/router'; + +@Component({ + selector: 'app-root', + template: ``, + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [RouterOutlet], +}) +export class AppComponent {} diff --git a/apps/angular/66-functional-auth-guard/src/app/app.config.ts b/apps/angular/66-functional-auth-guard/src/app/app.config.ts new file mode 100644 index 000000000..414eeaeb8 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/app.config.ts @@ -0,0 +1,16 @@ +import { + ApplicationConfig, + provideBrowserGlobalErrorListeners, + provideZoneChangeDetection, +} from '@angular/core'; +import { provideRouter } from '@angular/router'; + +import { routes } from './app.routes'; + +export const appConfig: ApplicationConfig = { + providers: [ + provideBrowserGlobalErrorListeners(), + provideZoneChangeDetection({ eventCoalescing: true }), + provideRouter(routes), + ], +}; diff --git a/apps/angular/66-functional-auth-guard/src/app/app.routes.ts b/apps/angular/66-functional-auth-guard/src/app/app.routes.ts new file mode 100644 index 000000000..35b0cbd76 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/app.routes.ts @@ -0,0 +1,12 @@ +import { Routes } from '@angular/router'; +import { AdminGuard } from './admin.guard'; +import { AdminComponent } from './admin.component'; +import { AuthGuard } from './auth.guard'; +import { DashboardComponent } from './dashboard.component'; +import { HomeComponent } from './home.component'; + +export const routes: Routes = [ + { path: '', component: HomeComponent }, + { path: 'dashboard', component: DashboardComponent, canActivate: [AuthGuard] }, + { path: 'admin', component: AdminComponent, canActivate: [AuthGuard, AdminGuard] }, +]; diff --git a/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts b/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts new file mode 100644 index 000000000..6e3f3dc5e --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { CanActivate, Router } from '@angular/router'; +import { AuthService } from './auth.service'; + +@Injectable({ providedIn: 'root' }) +export class AuthGuard implements CanActivate { + constructor( + private authService: AuthService, + private router: Router, + ) {} + + canActivate(): boolean { + if (this.authService.isLoggedIn) { + return true; + } + this.router.navigate(['/']); + return false; + } +} diff --git a/apps/angular/66-functional-auth-guard/src/app/auth.service.ts b/apps/angular/66-functional-auth-guard/src/app/auth.service.ts new file mode 100644 index 000000000..08a679e8e --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/auth.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; + +@Injectable({ providedIn: 'root' }) +export class AuthService { + isLoggedIn = false; + role: 'user' | 'admin' = 'user'; + + login(role: 'user' | 'admin'): void { + this.isLoggedIn = true; + this.role = role; + } + + logout(): void { + this.isLoggedIn = false; + this.role = 'user'; + } +} diff --git a/apps/angular/66-functional-auth-guard/src/app/dashboard.component.ts b/apps/angular/66-functional-auth-guard/src/app/dashboard.component.ts new file mode 100644 index 000000000..bf5db8a90 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/dashboard.component.ts @@ -0,0 +1,15 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { RouterLink } from '@angular/router'; + +@Component({ + selector: 'app-dashboard', + template: ` +
+

Dashboard

+ Back to Home +
+ `, + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [RouterLink], +}) +export class DashboardComponent {} diff --git a/apps/angular/66-functional-auth-guard/src/app/home.component.ts b/apps/angular/66-functional-auth-guard/src/app/home.component.ts new file mode 100644 index 000000000..2a02de3c0 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/app/home.component.ts @@ -0,0 +1,47 @@ +import { ChangeDetectionStrategy, Component, inject } from '@angular/core'; +import { RouterLink } from '@angular/router'; +import { AuthService } from './auth.service'; + +@Component({ + selector: 'app-home', + template: ` +
+

Home

+ +

+ Status: + + {{ authService.isLoggedIn ? 'Logged in as ' + authService.role : 'Not logged in' }} + +

+ +
+ + + +
+ +
+ Go to Dashboard + Go to Admin +
+
+ `, + changeDetection: ChangeDetectionStrategy.OnPush, + imports: [RouterLink], +}) +export class HomeComponent { + protected authService = inject(AuthService); +} diff --git a/apps/angular/66-functional-auth-guard/src/index.html b/apps/angular/66-functional-auth-guard/src/index.html new file mode 100644 index 000000000..592c9264b --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/index.html @@ -0,0 +1,13 @@ + + + + + angular-functional-auth-guard + + + + + + + + diff --git a/apps/angular/66-functional-auth-guard/src/main.ts b/apps/angular/66-functional-auth-guard/src/main.ts new file mode 100644 index 000000000..7205a13df --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/main.ts @@ -0,0 +1,5 @@ +import { bootstrapApplication } from '@angular/platform-browser'; +import { AppComponent } from './app/app.component'; +import { appConfig } from './app/app.config'; + +bootstrapApplication(AppComponent, appConfig).catch((err) => console.error(err)); diff --git a/apps/angular/66-functional-auth-guard/src/styles.scss b/apps/angular/66-functional-auth-guard/src/styles.scss new file mode 100644 index 000000000..b5c61c956 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/styles.scss @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/apps/angular/66-functional-auth-guard/src/test-setup/no-teardown.ts b/apps/angular/66-functional-auth-guard/src/test-setup/no-teardown.ts new file mode 100644 index 000000000..655736368 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/src/test-setup/no-teardown.ts @@ -0,0 +1,25 @@ +import { getTestBed } from '@angular/core/testing'; +import { + BrowserTestingModule, + platformBrowserTesting, +} from '@angular/platform-browser/testing'; +import { beforeEach } from 'vitest'; + +/** + * @see https://github.com/angular/angular-cli/issues/31733 + */ +const symbol = Symbol.for('@angular-challenge/testbed-setup'); +const g = globalThis as unknown as { [symbol]: boolean }; + +if (!g[symbol]) { + g[symbol] = true; + + getTestBed().resetTestEnvironment(); + getTestBed().initTestEnvironment( + BrowserTestingModule, + platformBrowserTesting(), + { teardown: { destroyAfterEach: false } }, + ); +} + +beforeEach(() => getTestBed().resetTestingModule()); diff --git a/apps/angular/66-functional-auth-guard/tailwind.config.js b/apps/angular/66-functional-auth-guard/tailwind.config.js new file mode 100644 index 000000000..38183db2c --- /dev/null +++ b/apps/angular/66-functional-auth-guard/tailwind.config.js @@ -0,0 +1,14 @@ +const { createGlobPatternsForDependencies } = require('@nx/angular/tailwind'); +const { join } = require('path'); + +/** @type {import('tailwindcss').Config} */ +module.exports = { + content: [ + join(__dirname, 'src/**/!(*.stories|*.spec).{ts,html}'), + ...createGlobPatternsForDependencies(__dirname), + ], + theme: { + extend: {}, + }, + plugins: [], +}; diff --git a/apps/angular/66-functional-auth-guard/tsconfig.app.json b/apps/angular/66-functional-auth-guard/tsconfig.app.json new file mode 100644 index 000000000..5d5af52c7 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/tsconfig.app.json @@ -0,0 +1,14 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "types": [] + }, + "include": ["src/**/*.ts"], + "exclude": [ + "jest.config.ts", + "src/test-setup.ts", + "src/**/*.test.ts", + "src/**/*.spec.ts" + ] +} diff --git a/apps/angular/66-functional-auth-guard/tsconfig.json b/apps/angular/66-functional-auth-guard/tsconfig.json new file mode 100644 index 000000000..1ae47abeb --- /dev/null +++ b/apps/angular/66-functional-auth-guard/tsconfig.json @@ -0,0 +1,33 @@ +{ + "extends": "../../../tsconfig.base.json", + "compilerOptions": { + "strict": true, + "noImplicitOverride": true, + "noPropertyAccessFromIndexSignature": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "target": "es2022", + "moduleResolution": "bundler", + "isolatedModules": true, + "emitDecoratorMetadata": false, + "module": "preserve", + "lib": ["dom", "es2022"] + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true, + "typeCheckHostBindings": true, + "strictTemplates": true + }, + "files": [], + "include": [], + "references": [ + { + "path": "./tsconfig.app.json" + }, + { + "path": "./tsconfig.spec.json" + } + ] +} diff --git a/apps/angular/66-functional-auth-guard/tsconfig.spec.json b/apps/angular/66-functional-auth-guard/tsconfig.spec.json new file mode 100644 index 000000000..55718726e --- /dev/null +++ b/apps/angular/66-functional-auth-guard/tsconfig.spec.json @@ -0,0 +1,8 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "outDir": "../../../dist/out-tsc", + "types": ["vitest/globals"] + }, + "include": ["src/**/*.ts", "src/**/*.d.ts"] +} diff --git a/apps/angular/66-functional-auth-guard/vitest-base.config.ts b/apps/angular/66-functional-auth-guard/vitest-base.config.ts new file mode 100644 index 000000000..d5747f9a9 --- /dev/null +++ b/apps/angular/66-functional-auth-guard/vitest-base.config.ts @@ -0,0 +1,20 @@ +import { playwright } from '@vitest/browser-playwright'; +import { defineConfig } from 'vitest/config'; + +export default defineConfig({ + test: { + setupFiles: [ + 'apps/angular/66-functional-auth-guard/src/test-setup/no-teardown.ts', + ], + testTimeout: 3_000, + browser: { + enabled: true, + provider: playwright({ + launchOptions: { + args: ['--remote-debugging-port=9222'], + }, + }), + instances: [{ browser: 'chromium' }], + }, + }, +}); diff --git a/challenge-number.json b/challenge-number.json index c828ee7e3..f8ba4a130 100644 --- a/challenge-number.json +++ b/challenge-number.json @@ -1,6 +1,6 @@ { - "total": 62, - "🟢": 25, + "total": 63, + "🟢": 26, "🟠": 124, "🔴": 212 } From 411806766be26540e3b97d2b871fe6d7433d12e8 Mon Sep 17 00:00:00 2001 From: T-DiegoF Date: Sat, 4 Apr 2026 19:18:39 -0300 Subject: [PATCH 2/2] Answer:66 --- .../src/app/admin.guard.ts | 23 +++----- .../src/app/app.component.spec.ts | 56 +++++++++---------- .../src/app/app.routes.ts | 8 +-- .../src/app/auth.guard.ts | 23 +++----- .../src/app/auth.service.ts | 18 +++--- .../src/app/home.component.ts | 2 +- 6 files changed, 55 insertions(+), 75 deletions(-) diff --git a/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts b/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts index 40008578c..6bbfbd2d1 100644 --- a/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts +++ b/apps/angular/66-functional-auth-guard/src/app/admin.guard.ts @@ -1,19 +1,10 @@ -import { Injectable } from '@angular/core'; -import { CanActivate, Router } from '@angular/router'; +import { inject } from '@angular/core'; +import { CanActivateFn, Router } from '@angular/router'; import { AuthService } from './auth.service'; -@Injectable({ providedIn: 'root' }) -export class AdminGuard implements CanActivate { - constructor( - private authService: AuthService, - private router: Router, - ) {} +export const adminGuard: CanActivateFn = () => { + const authService = inject(AuthService); + const router = inject(Router); - canActivate(): boolean { - if (this.authService.isLoggedIn && this.authService.role === 'admin') { - return true; - } - this.router.navigate(['/']); - return false; - } -} + return authService.isAdmin() || router.createUrlTree(['/']); +}; diff --git a/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts b/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts index 944aa0818..4b8632966 100644 --- a/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts +++ b/apps/angular/66-functional-auth-guard/src/app/app.component.spec.ts @@ -1,16 +1,10 @@ import { TestBed } from '@angular/core/testing'; -import { provideRouter } from '@angular/router'; -import { page, userEvent } from 'vitest/browser'; -import { AdminComponent } from './admin.component'; -import { AdminGuard } from './admin.guard'; -import { AuthGuard } from './auth.guard'; +import { Router, provideRouter } from '@angular/router'; +import { AppComponent } from './app.component'; import { AuthService } from './auth.service'; -import { DashboardComponent } from './dashboard.component'; -import { HomeComponent } from './home.component'; import { routes } from './app.routes'; -import { AppComponent } from './app.component'; -describe('Auth Guards', () => { +describe('Functional Auth Guards', () => { beforeEach(() => { TestBed.configureTestingModule({ providers: [provideRouter(routes)], @@ -18,43 +12,43 @@ describe('Auth Guards', () => { TestBed.createComponent(AppComponent); }); - describe('AuthGuard', () => { - it('Then should redirect to / when not logged in', async () => { - const guard = TestBed.inject(AuthGuard); - const result = guard.canActivate(); - expect(result).toBeFalsy(); + describe('authGuard', () => { + it('should redirect to / when not logged in', async () => { + const router = TestBed.inject(Router); + await router.navigate(['/dashboard']); + expect(router.url).toBe('/'); }); - it('Then should allow access when logged in', async () => { + it('should allow navigation when logged in', async () => { const authService = TestBed.inject(AuthService); + const router = TestBed.inject(Router); authService.login('user'); - const guard = TestBed.inject(AuthGuard); - const result = guard.canActivate(); - expect(result).toBe(true); + await router.navigate(['/dashboard']); + expect(router.url).toBe('/dashboard'); }); }); - describe('AdminGuard', () => { - it('Then should redirect to / when not logged in', async () => { - const guard = TestBed.inject(AdminGuard); - const result = guard.canActivate(); - expect(result).toBeFalsy(); + describe('adminGuard', () => { + it('should redirect to / when not logged in', async () => { + const router = TestBed.inject(Router); + await router.navigate(['/admin']); + expect(router.url).toBe('/'); }); - it('Then should redirect to / when logged in as user', async () => { + it('should redirect to / when logged in as user', async () => { const authService = TestBed.inject(AuthService); + const router = TestBed.inject(Router); authService.login('user'); - const guard = TestBed.inject(AdminGuard); - const result = guard.canActivate(); - expect(result).toBeFalsy(); + await router.navigate(['/admin']); + expect(router.url).toBe('/'); }); - it('Then should allow access when logged in as admin', async () => { + it('should allow navigation when logged in as admin', async () => { const authService = TestBed.inject(AuthService); + const router = TestBed.inject(Router); authService.login('admin'); - const guard = TestBed.inject(AdminGuard); - const result = guard.canActivate(); - expect(result).toBe(true); + await router.navigate(['/admin']); + expect(router.url).toBe('/admin'); }); }); }); diff --git a/apps/angular/66-functional-auth-guard/src/app/app.routes.ts b/apps/angular/66-functional-auth-guard/src/app/app.routes.ts index 35b0cbd76..0a43617e9 100644 --- a/apps/angular/66-functional-auth-guard/src/app/app.routes.ts +++ b/apps/angular/66-functional-auth-guard/src/app/app.routes.ts @@ -1,12 +1,12 @@ import { Routes } from '@angular/router'; -import { AdminGuard } from './admin.guard'; +import { adminGuard } from './admin.guard'; import { AdminComponent } from './admin.component'; -import { AuthGuard } from './auth.guard'; +import { authGuard } from './auth.guard'; import { DashboardComponent } from './dashboard.component'; import { HomeComponent } from './home.component'; export const routes: Routes = [ { path: '', component: HomeComponent }, - { path: 'dashboard', component: DashboardComponent, canActivate: [AuthGuard] }, - { path: 'admin', component: AdminComponent, canActivate: [AuthGuard, AdminGuard] }, + { path: 'dashboard', component: DashboardComponent, canActivate: [authGuard] }, + { path: 'admin', component: AdminComponent, canActivate: [authGuard, adminGuard] }, ]; diff --git a/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts b/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts index 6e3f3dc5e..abb444031 100644 --- a/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts +++ b/apps/angular/66-functional-auth-guard/src/app/auth.guard.ts @@ -1,19 +1,10 @@ -import { Injectable } from '@angular/core'; -import { CanActivate, Router } from '@angular/router'; +import { inject } from '@angular/core'; +import { CanActivateFn, Router } from '@angular/router'; import { AuthService } from './auth.service'; -@Injectable({ providedIn: 'root' }) -export class AuthGuard implements CanActivate { - constructor( - private authService: AuthService, - private router: Router, - ) {} +export const authGuard: CanActivateFn = () => { + const authService = inject(AuthService); + const router = inject(Router); - canActivate(): boolean { - if (this.authService.isLoggedIn) { - return true; - } - this.router.navigate(['/']); - return false; - } -} + return authService.isLoggedIn() || router.createUrlTree(['/']); +}; diff --git a/apps/angular/66-functional-auth-guard/src/app/auth.service.ts b/apps/angular/66-functional-auth-guard/src/app/auth.service.ts index 08a679e8e..012ffb44c 100644 --- a/apps/angular/66-functional-auth-guard/src/app/auth.service.ts +++ b/apps/angular/66-functional-auth-guard/src/app/auth.service.ts @@ -1,17 +1,21 @@ -import { Injectable } from '@angular/core'; +import { computed, Injectable, signal } from '@angular/core'; @Injectable({ providedIn: 'root' }) export class AuthService { - isLoggedIn = false; - role: 'user' | 'admin' = 'user'; + private readonly _isLoggedIn = signal(false); + private readonly _role = signal<'user' | 'admin'>('user'); + + readonly isLoggedIn = this._isLoggedIn.asReadonly(); + readonly role = this._role.asReadonly(); + readonly isAdmin = computed(() => this._isLoggedIn() && this._role() === 'admin'); login(role: 'user' | 'admin'): void { - this.isLoggedIn = true; - this.role = role; + this._isLoggedIn.set(true); + this._role.set(role); } logout(): void { - this.isLoggedIn = false; - this.role = 'user'; + this._isLoggedIn.set(false); + this._role.set('user'); } } diff --git a/apps/angular/66-functional-auth-guard/src/app/home.component.ts b/apps/angular/66-functional-auth-guard/src/app/home.component.ts index 2a02de3c0..5b56ed2f4 100644 --- a/apps/angular/66-functional-auth-guard/src/app/home.component.ts +++ b/apps/angular/66-functional-auth-guard/src/app/home.component.ts @@ -11,7 +11,7 @@ import { AuthService } from './auth.service';

Status: - {{ authService.isLoggedIn ? 'Logged in as ' + authService.role : 'Not logged in' }} + {{ authService.isLoggedIn() ? 'Logged in as ' + authService.role() : 'Not logged in' }}