profile work

Author: kenstanley37

web/src/app/_components/layout/toolbar/toolbar.ts

@@ -8,6 +8,7 @@ import { CommonModule } from '@angular/common';
 import { AuthService } from '../../../_services/auth-service';
 import { Profile } from '../../../_pages/user/profile/profile';
 import { ProfileDto } from '../../../_models/user-model';
+import { UserService } from '../../../_services/user-service';
 
 @Component({
   selector: 'app-toolbar',
@@ -28,6 +29,7 @@ export class Toolbar implements OnInit {
   @Output() toggle = new EventEmitter<boolean>();
 
   private authService = inject(AuthService);
+  private userService = inject(UserService);
   private router = inject(Router);
 
 
@@ -36,7 +38,7 @@ export class Toolbar implements OnInit {
   hasShadow = signal(false);
 
   isAuthenticated = this.authService.isAuthenticated;
-  profile = this.authService.userProfile;
+  profile = this.userService.userProfile;
 
   constructor() {
 

web/src/app/_guards/login-guard.spec.ts

@@ -0,0 +1,17 @@
+import { TestBed } from '@angular/core/testing';
+import { CanActivateFn } from '@angular/router';
+
+import { loginGuard } from './login-guard';
+
+describe('loginGuard', () => {
+  const executeGuard: CanActivateFn = (...guardParameters) => 
+      TestBed.runInInjectionContext(() => loginGuard(...guardParameters));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(executeGuard).toBeTruthy();
+  });
+});

web/src/app/_guards/login-guard.ts

@@ -0,0 +1,16 @@
+import { inject } from '@angular/core';
+import { CanActivateFn, Router } from '@angular/router';
+import { AuthService } from '../_services/auth-service';
+
+export const loginGuard: CanActivateFn = (route, state) => {
+  const authService = inject(AuthService);
+  const router = inject(Router);
+
+  if (authService.isAuthenticated()) {
+    // Redirect authenticated users to home or dashboard
+    router.navigate(['/dashboard']);
+    return false;
+  }
+  
+  return true;
+};

web/src/app/_interceptors/auth-interceptor.ts

@@ -3,9 +3,11 @@ import { inject } from '@angular/core';
 import { AuthService } from '../_services/auth-service';
 import { catchError, switchMap, throwError } from 'rxjs';
 import { Router } from '@angular/router';
+import { UserService } from '../_services/user-service';
 
 export const authInterceptor: HttpInterceptorFn = (req, next) => {
   const authService = inject(AuthService);
+  const userService = inject(UserService)
   const router = inject(Router);
 
   return next(req).pipe(
@@ -16,6 +18,8 @@ export const authInterceptor: HttpInterceptorFn = (req, next) => {
         return authService.refreshToken().pipe(
           switchMap(() => {
             const clonedRequest = req.clone({ withCredentials: true });
+            userService.getProfile().subscribe(); // Update user profile after token refresh
+            // Retry the original request with the new token
             console.log('Token refreshed, retrying request:', clonedRequest);
             return next(clonedRequest);
           }),

web/src/app/_models/user-model.ts

@@ -27,7 +27,11 @@ export interface ProfileDto {
   id?: number; // Added to match backend
   name: string;
   email: string;
+  address: string;
+  phoneNumber: string;
   profilePicture?: string | null; // Explicitly allow null
+  role: string;
+  bio: string;
 }
 
 // UpdateProfilePictureDto is correct

web/src/app/_pages/auth/login/login.html

@@ -42,12 +42,12 @@
 
       <div class="social-login">
         <div id="google-button"></div>
-        <button (click)="triggerSignIn()">Google Login</button>
+        <!-- <button (click)="triggerSignIn()">Google Login</button> -->
       </div>
 
       @if (errorMessage) {
       <mat-error class="error-message">{{ errorMessage }}</mat-error>
       }
     </mat-card-content>
   </mat-card>
-</div>
+</div>

web/src/app/_pages/auth/login/login.ts

@@ -9,6 +9,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { Router, RouterLink, RouterModule } from '@angular/router';
 import { LoginDto, SocialLoginDto } from '../../../_models/user-model';
 import { GoogleAuthService } from '../../../_services/google-auth-service';
+import { UserService } from '../../../_services/user-service';
 
 
 @Component({
@@ -33,6 +34,7 @@ export class Login implements OnInit {
   private fb = inject(FormBuilder);
   private authService = inject(AuthService);
   private router = inject(Router);
+  private userService = inject(UserService);
   loginForm: FormGroup;
   errorMessage = '';
 
@@ -55,7 +57,17 @@ export class Login implements OnInit {
 
     const loginDto: LoginDto = this.loginForm.value;
     this.authService.login(loginDto).subscribe({
-      next: () => this.router.navigate(['/']),
+      next: () => {
+        this.userService.getProfile().subscribe({
+          next: (profile) => {
+            this.userService.setProfile(profile);
+            this.router.navigate(['/']);
+          },
+          error: (err: Error) => {
+            this.errorMessage = err.message;
+          }
+        });
+      },
       error: (err: Error) => this.errorMessage = err.message
     });
   }

web/src/app/_pages/not-found/not-found.html

@@ -0,0 +1 @@
+<p>not-found works!</p>

web/src/app/_pages/not-found/not-found.scss

@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NotFound } from './not-found';
+
+describe('NotFound', () => {
+  let component: NotFound;
+  let fixture: ComponentFixture<NotFound>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [NotFound]
+    })
+    .compileComponents();
+
+    fixture = TestBed.createComponent(NotFound);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});