refactor: User types

GeminiEnergySolutions · Feb 15, 2024 · 6ac6d7a · 6ac6d7a
1 parent 05935ee
commit 6ac6d7a
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 19 deletions.
diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,5 +1,5 @@
 <div class="h-100 d-flex flex-column">
-  <app-nav-bar *ngIf="authService.currentLoginUser.role !== null"></app-nav-bar>
+  <app-nav-bar></app-nav-bar>
   <div class="flex-grow-1 overflow-auto">
     <router-outlet ></router-outlet>
   </div>

diff --git a/src/app/audit/pre-audit/pre-audit.component.html b/src/app/audit/pre-audit/pre-audit.component.html
@@ -25,20 +25,20 @@ <h2 ngbAccordionHeader>
                        [routerLink]="[audit.auditId]" routerLinkActive="active text-white">
                       <div class="flex-grow-1">
                         {{ audit.auditName | titlecase }}
-                        @if (authService.currentLoginUser.role === 'superAdmin' && audit.user.role.role !== 'superAdmin') {
-                          ({{ audit.user.userName | titlecase }})
+                        @if (authService.currentLoginUser?.role === 'superAdmin' && audit.user?.role?.role !== 'superAdmin') {
+                          ({{ audit.user?.userName | titlecase }})
                         }
                       </div>
                       <app-option-dropdown class="visible-hover">
                         <button ngbDropdownItem (click)="rename(section.key, audit)">Rename</button>
                         <div class="dropdown-divider"></div>
-                        @if ((authService.currentLoginUser.role === 'admin' || authService.currentLoginUser.role === 'superAdmin') && audit.user.role.role !== 'guest') {
+                        @if ((authService.currentLoginUser?.role === 'admin' || authService.currentLoginUser?.role === 'superAdmin') && audit.user?.role?.role !== 'guest') {
                           <button ngbDropdownItem (click)="openAddDataCollectorModal(audit)">
                             Add DataCollector
                           </button>
                           <div class="dropdown-divider"></div>
                         }
-                        @if (authService.currentLoginUser.role !== 'dataCollector' || (audit.user.role.role !== 'admin' && audit.user.role.role !== 'superAdmin')) {
+                        @if (authService.currentLoginUser?.role !== 'dataCollector' || (audit.user?.role?.role !== 'admin' && audit.user?.role?.role !== 'superAdmin')) {
                           <button ngbDropdownItem class="text-danger" (click)="delete(section.key, audit)">
                             Delete
                           </button>

diff --git a/src/app/audit/pre-audit/pre-audit.component.ts b/src/app/audit/pre-audit/pre-audit.component.ts
@@ -21,7 +21,7 @@ export class PreAuditComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    if (this.authService.currentLoginUser.role === 'dataCollector') {
+    if (this.authService.currentLoginUser?.role === 'dataCollector') {
       this.auditService.getAllDataCollectorAudit().subscribe(res => {
         this.groupAudits(res);
       });

diff --git a/src/app/settings/setting.component.html b/src/app/settings/setting.component.html
@@ -2,7 +2,7 @@
   <div ngbAccordionItem *ngFor="let auditGroup of auditsGrouped; let i = index" id="{{ 'auditPanel' + i }}">
     <h2 ngbAccordionHeader>
       {{ auditGroup.auditName | titlecase }}
-      <div *ngIf="authService.currentLoginUser.role === 'superAdmin'">
+      <div *ngIf="authService.currentLoginUser?.role === 'superAdmin'">
         <div *ngFor="let audit of auditGroup.audits">
            &nbsp;
            ({{ audit.admin_name| titlecase }})
@@ -12,7 +12,7 @@ <h2 ngbAccordionHeader>
     <div ngbAccordionCollapse>
       <div ngbAccordionBody class="mb-3">
         <div class="label marked-rows" style="color : white">
-          <div *ngIf="authService.currentLoginUser.role === 'superAdmin'">
+          <div *ngIf="authService.currentLoginUser?.role === 'superAdmin'">
             <div *ngFor="let audit of auditGroup.audits">
             <ul>
               <li *ngFor="let dataCollector of audit.data_collectors">
@@ -21,7 +21,7 @@ <h2 ngbAccordionHeader>
             </ul>
           </div>
         </div>
-          <div *ngIf="authService.currentLoginUser.role === 'admin'">
+          <div *ngIf="authService.currentLoginUser?.role === 'admin'">
             <ul>
               <li *ngFor="let audit of auditGroup.audits">
                 {{ audit.assignedTo | titlecase}}

diff --git a/src/app/shared/components/nav-bar/nav-bar.component.ts b/src/app/shared/components/nav-bar/nav-bar.component.ts
@@ -18,7 +18,7 @@ export class NavBarComponent {
   logout(): void {
     this.authService.logout().subscribe((res: any) => {
       localStorage.clear();
-      this.authService.currentLoginUser = {};
+      this.authService.currentLoginUser = undefined;
       this.router.navigate(['/auth/login']);
     })
   }

diff --git a/src/app/shared/model/audit.interface.ts b/src/app/shared/model/audit.interface.ts
@@ -1,11 +1,12 @@
 import {PreAuditData} from './pre-audit-data.interface';
+import {UserWithRoleObject} from "./user.interface";
 
 export interface Audit {
   auditId: number;
   auditCreatedOn: string;
   auditName: string;
   deleteStatus: false;
   userId: number;
-  user?: any; // TODO User
+  user?: UserWithRoleObject;
   pre_audit_form: PreAuditData;
 }
diff --git a/src/app/shared/model/user.interface.ts b/src/app/shared/model/user.interface.ts
@@ -0,0 +1,15 @@
+export interface User {
+  id: number;
+  userName: string;
+  email: string;
+  roleId: number;
+  expirationDate: string | null;
+}
+
+export interface UserWithRoleName extends User {
+  role: string;
+}
+
+export interface UserWithRoleObject extends User {
+  role: { roleId: number; role: string; };
+}
diff --git a/src/app/shared/services/auth.service.ts b/src/app/shared/services/auth.service.ts
@@ -1,15 +1,16 @@
-import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { environment } from 'src/environments/environment.prod';
+import {HttpClient} from '@angular/common/http';
+import {Injectable} from '@angular/core';
+import {Observable} from 'rxjs';
+import {environment} from 'src/environments/environment.prod';
+import {UserWithRoleName} from "../model/user.interface";
 
 @Injectable({
   providedIn: 'root'
 })
 export class AuthService {
 
   rootUrl = environment.url + 'authApi/v1/';
-  currentLoginUser: any = {};
+  currentLoginUser?: UserWithRoleName;
 
   constructor(private http: HttpClient,
   ) { }
@@ -22,8 +23,8 @@ export class AuthService {
     return this.http.get(`${this.rootUrl}all-states/`);
   }
 
-  getUser(): Observable<any> {
-    return this.http.get(`${this.rootUrl}user/`);
+  getUser(): Observable<UserWithRoleName> {
+    return this.http.get<UserWithRoleName>(`${this.rootUrl}user/`);
   }
 
   signUp(data: any): Observable<any> {
@@ -45,4 +46,4 @@ export class AuthService {
   changePassword(data: any): Observable<any> {
     return this.http.post(`${this.rootUrl}change-password/`, data);
   }
-}
+}