Merge branch 'main' of https://github.com/bcgov/nr-bcws-wfprev into feature/WFPREV-402

Author: ssylver93

client/wfprev-war/src/main/angular/src/app/components/shared-layout/app-header/app-header.component.scss

@@ -82,6 +82,7 @@
       }
 
       button {
+        white-space: nowrap;
         display: flex;
         align-items: center;
         color: white;

client/wfprev-war/src/main/angular/src/app/components/shared-layout/app-header/app-header.component.spec.ts

@@ -4,26 +4,65 @@ import { Router } from '@angular/router';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ResourcesRoutes } from 'src/app/utils';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { AppConfigService } from 'src/app/services/app-config.service';
+import { Subject } from 'rxjs';
+import { TokenService } from 'src/app/services/token.service';
 
 describe('AppHeaderComponent', () => {
   let component: AppHeaderComponent;
   let fixture: ComponentFixture<AppHeaderComponent>;
+  let mockTokenService: any;
+  let credentialsSubject: Subject<void>;
+
+  const mockConfig = {
+    application: {
+      lazyAuthenticate: false,
+      enableLocalStorageToken: true,
+      localStorageTokenKey: 'test-oauth',
+      allowLocalExpiredToken: false,
+      baseUrl: 'http://test.com'
+    },
+    webade: {
+      oauth2Url: 'http://oauth.test',
+      clientId: 'test-client',
+      authScopes: ['GET_PROJECT'],
+      enableCheckToken: false,
+      checkTokenUrl: 'http://check-token.test'
+    }
+  };
+  
+  const mockAppConfigService = {
+    getConfig: jasmine.createSpy('getConfig').and.returnValue(mockConfig),
+    loadConfig: jasmine.createSpy('loadConfig').and.returnValue(Promise.resolve(mockConfig))
+  };
 
   beforeEach(async () => {
+    credentialsSubject = new Subject<void>();
+  
+    mockTokenService = {
+      getUserFullName: jasmine.createSpy('getUserFullName').and.returnValue('Mocked User'),
+      credentialsEmitter: credentialsSubject
+    };
+  
     await TestBed.configureTestingModule({
       imports: [
         AppHeaderComponent,
         BrowserAnimationsModule,
+        HttpClientTestingModule
       ],
       providers: [
         { provide: Router, useValue: { navigate: jasmine.createSpy('navigate') } },
+        { provide: AppConfigService, useValue: mockAppConfigService },
+        { provide: TokenService, useValue: mockTokenService }
       ],
     }).compileComponents();
-
+  
     fixture = TestBed.createComponent(AppHeaderComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });
+  
 
   it('should create the component', () => {
     expect(component).toBeTruthy();
@@ -95,4 +134,15 @@ describe('AppHeaderComponent', () => {
     const menuElement = fixture.debugElement.query(By.css('mat-menu'));
     expect(menuElement).toBeTruthy();
   });
+
+  it('should set currentUser when credentialsEmitter emits a value', () => {
+    const mockName = 'Mike David';
+    mockTokenService.getUserFullName.and.returnValue(mockName);
+  
+    component.ngOnInit();
+    credentialsSubject.next();
+  
+    expect(component.currentUser).toBe(mockName);
+  });
+  
 });

client/wfprev-war/src/main/angular/src/app/components/shared-layout/app-header/app-header.component.ts

@@ -1,10 +1,11 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { ResourcesRoutes } from 'src/app/utils';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { CommonModule } from '@angular/common';
+import { TokenService } from 'src/app/services/token.service';
 
 @Component({
   selector: 'app-app-header',
@@ -18,10 +19,11 @@ import { CommonModule } from '@angular/common';
   templateUrl: './app-header.component.html',
   styleUrls: ['./app-header.component.scss']
 })
-export class AppHeaderComponent {
+export class AppHeaderComponent implements OnInit{
 
   constructor(
     protected router: Router,
+    private readonly tokenService: TokenService
   ) {
   }
 
@@ -30,6 +32,15 @@ export class AppHeaderComponent {
   title:string = 'PREVENTION'
   currentUser: string = 'User_1'
 
+  ngOnInit(): void {
+    this.tokenService.credentialsEmitter.subscribe(() => {
+      const name = this.tokenService.getUserFullName();
+      if (name) {
+        this.currentUser = name;
+      }
+    });
+  }
+
   onLogoutClick(){
     //clear token will be implemented after authorization piece done
     // this.tokenService.clearLocalStorageToken();

client/wfprev-war/src/main/angular/src/app/services/token.service.spec.ts

@@ -310,4 +310,21 @@ describe('emitTokens', () => {
   });
 });
 
+describe('getUserFullName', () => {
+  it('should return full name when both first and last names are present', () => {
+    service['tokenDetails'] = { given_name: 'John', family_name: 'Doe' };
+    expect(service.getUserFullName()).toBe('John Doe');
+  });
+
+  it('should return null if both names are missing', () => {
+    service['tokenDetails'] = {};
+    expect(service.getUserFullName()).toBeNull();
+  });
+
+  it('should return null if tokenDetails is undefined', () => {
+    service['tokenDetails'] = undefined!;
+    expect(service.getUserFullName()).toBeNull();
+  });
+});
+
 });

client/wfprev-war/src/main/angular/src/app/services/token.service.ts

@@ -215,6 +215,13 @@ export class TokenService {
     return this.oauth?.access_token ?? null;
   }
 
+  public getUserFullName(): string | null {
+    const first = (this.tokenDetails?.given_name ?? this.tokenDetails?.givenName) ?? '';
+    const last = (this.tokenDetails?.family_name ?? this.tokenDetails?.familyName) ?? '';
+    const fullName = `${first} ${last}`.trim();
+    return fullName || null;
+  }
+
   public doesUserHaveApplicationPermissions(scopes?: string[]): boolean {
     if (this.tokenDetails?.scope?.length > 0 && scopes?.length) {
       return scopes.every(scope => this.tokenDetails.scope.includes(scope));

client/wfprev-war/src/main/angular/src/assets/data/appConfig.json

@@ -5,8 +5,8 @@
 
     "webade": {
         "oauth2Url": "#{WEBADE_OAUTH2_CHECK_AUTHORIZE_URL}#",
-        "clientId": "WFNEWS-UI",
-        "authScopes": "WFNEWS.* WFDM.*",
+        "clientId": "WFPREV-UI",
+        "authScopes": "WFPREV.* WFDM.*",
         "enableCheckToken": true, 
         "checkTokenUrl": "#{WFPREV_CHECK_TOKEN_URL}#"
       },

client/wfprev-war/src/main/angular/src/assets/data/appConfig.local.json

@@ -5,8 +5,8 @@
 
   "webade": {
       "oauth2Url": "https://wfappsi.nrs.gov.bc.ca/ext/oauth2/v1/oauth/authorize",
-      "clientId": "WFNEWS-UI",
-      "authScopes": "WFNEWS.* WFDM.*",
+      "clientId": "WFPREV-UI",
+      "authScopes": "WFPREV.* WFDM.*",
       "enableCheckToken": true,
       "checkTokenUrl": "./assets/data/checktoken-user.json"
     },