Changeset ad60966 for Farmatiko/ClientApp

Timestamp:

11/05/20 08:53:48 (3 years ago)

Author:

Mile Jankuloski <mile.jankuloski@…>

Branches:

master

Children:

1db5673

Parents:

afc9a9a

Message:

Auth fixes, bug fixes etc.

Location:

Farmatiko/ClientApp/src/app

Files:

• admin/admin.component.ts (modified) (1 diff)
• app.module.ts (modified) (1 diff)
• counter/counter.component.ts (modified) (1 diff)
• dashboard/dashboard.component.html (modified) (1 diff)
• dashboard/dashboard.component.ts (modified) (3 diffs)
• home/home.component.ts (modified) (1 diff)
• korona/korona.component.ts (modified) (1 diff)
• login/login.component.ts (modified) (1 diff)
• shared/data.service.ts (modified) (1 diff)
• shared/index.ts (added)
• shared/interceptors/jwt.interceptor.ts (modified) (1 diff)
• shared/interfaces.ts (modified) (1 diff)
• shared/services/auth.service.ts (modified) (3 diffs)
• shared/services/data.service.ts (deleted)

Farmatiko/ClientApp/src/app/admin/admin.component.ts

@@ -4 +4 @@
 import { Router } from '@angular/router';
 import { IPharmacyHead, IPharmacyHeadRequest, IPharmacy } from '../shared/interfaces';
-import { DataService } from '../shared/services/data.service';
+import { DataService } from '../shared/data.service';
 import { EditPharmacyHeadDialogComponent } from '../dialogs/edit-pharmacy-head-dialog/edit-pharmacy-head-dialog.component';
 import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';

Farmatiko/ClientApp/src/app/app.module.ts

@@ -10 +10 @@
 
 import { AuthGuard } from './shared/guards/auth.guard';
-import { DataService } from './shared/services/data.service';
+import { DataService } from './shared/data.service';
 import { AppComponent } from './app.component';
 import { NavMenuComponent } from './nav-menu/nav-menu.component';

Farmatiko/ClientApp/src/app/counter/counter.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
 import { IHealthFacilities, IHealthcareWorkers } from '../shared/interfaces';
-import { DataService } from '../shared/services/data.service';
+import { DataService } from '../shared/data.service';
 import { MatDialog } from '@angular/material/dialog';
 import { FacilityDialogComponent } from '../dialogs/facility-dialog/facility-dialog.component';

Farmatiko/ClientApp/src/app/dashboard/dashboard.component.html

@@ -12 +12 @@
         <div class="navbar-collapse collapse d-sm-inline-flex flex-sm-row-reverse">
           <ul class="navbar-nav flex-grow">
-            <li>Logged as ...<p *ngIf="head">{{head.Name}}</p> </li>
+            <li>Logged as <p *ngIf="head">{{head.Name}}</p> </li>
+            <li (click)="logout()" class="btn btn-link"><a>Logout</a></li>
           </ul>
         </div>

Farmatiko/ClientApp/src/app/dashboard/dashboard.component.ts

@@ -3 +3 @@
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { IPharmacy, IMedicine, IPharmacyHead, IPharmacyHeadRequest } from '../shared/interfaces';
-import { DataService } from '../shared/services/data.service';
+import { DataService } from '../shared/data.service';
 import { PharmacyDialogComponent } from '../dialogs/pharmacy-dialog/pharmacy-dialog.component';
 import { EditPharmacyDialogComponent } from '../dialogs/edit-pharmacy-dialog/edit-pharmacy-dialog.component';
@@ -27 +27 @@
 
   ngOnInit(): void {
-    this.authService.getUser().subscribe((data : IPharmacyHead) => {
-        this.head = data;
-    });
+    this.authService.getUser()
+        .subscribe((data) => {
+          console.log(data);
+          this.head = data;
+        },
+        (err: any) => console.log(err),
+        () => console.log('User data retrieved'));
     this.dataService.getPharmacies()
         .subscribe((pharmacy: IPharmacy[]) => {
@@ -102 +106 @@
   }
 
+  logout() {
+    this.authService.logout();
+  }
+
   openPharmacyDialog(pharmacy: IPharmacy): void {
     this.dialog.open(PharmacyDialogComponent, {

Farmatiko/ClientApp/src/app/home/home.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
 import { IMedicine, IPharmacy } from '../shared/interfaces';
-import { DataService } from '../shared/services/data.service';
+import { DataService } from '../shared/data.service';
 import { MatDialog } from '@angular/material/dialog';
 import { MedicineDialogComponent } from '../dialogs/medicine-dialog/medicine-dialog.component';

Farmatiko/ClientApp/src/app/korona/korona.component.ts

@@ -1 +1 @@
 import { Component, OnInit } from '@angular/core';
-import { DataService } from '../shared/services/data.service';
+import { DataService } from '../shared/data.service';
 import { IPandemic } from '../shared/interfaces';
 

Farmatiko/ClientApp/src/app/login/login.component.ts

@@ -53 +53 @@
       .pipe(finalize(() => (this.busy = false)))
       .subscribe(
-        () => {
-          this.router.navigate(['/dashboard']);
+        (data) => {
+          if(data.role == 'Admin') {
+            this.router.navigate(['/admin']);
+          }
+          else {
+            this.router.navigate(['/dashboard']);
+          }
         },
         () => {

Farmatiko/ClientApp/src/app/shared/data.service.ts

@@ -95 +95 @@
 
 
-    getPandemic() : Observable<IPandemic[]> {
-        return this.http.get<IPandemic[]>(this.basePandemicUrl)
+    getPandemic() : Observable<IPandemic> {
+        return this.http.get<IPandemic>(this.basePandemicUrl)
                    .pipe(catchError(this.handleError));
     }

Farmatiko/ClientApp/src/app/shared/interceptors/jwt.interceptor.ts

@@ -7 +7 @@
 } from '@angular/common/http';
 import { Observable } from 'rxjs';
+import { environment } from '../../../environments/environment';
 import { AuthService } from '../services/auth.service';
-import { environment } from '../../../environments/environment';
 
 @Injectable()

Farmatiko/ClientApp/src/app/shared/interfaces.ts

@@ -53 +53 @@
     Pharmacy?: IPharmacy[];
     Email: string;
+    Name: string;
     Passwd: string;
-    Name: string;
     originalUserName?: string;
     Role?: string;

Farmatiko/ClientApp/src/app/shared/services/auth.service.ts

@@ -36 +36 @@
         this.http.get<LoginResult>(`${this.apiUrl}/user`).subscribe((x) => {
           this._user.next({
-            Email: x.head.Email,
-            Role: x.head.Role,
-            originalUserName: x.head.originalUserName,
+            Email: x.username,
             Passwd: x.head.Passwd,
+            Role: x.role,
+            originalUserName: x.originalUserName,
             Name: x.head.Name,
             PharmacyMedicines: x.head.PharmacyMedicines,
@@ -64 +64 @@
         map((x) => {
           this._user.next({
-            Email: x.head.Email,
-            Role: x.head.Role,
-            originalUserName: x.head.originalUserName,
+            Email: x.username,
             Passwd: x.head.Passwd,
+            Role: x.role,
+            originalUserName: x.originalUserName,
             Name: x.head.Name,
             PharmacyMedicines: x.head.PharmacyMedicines,
@@ -105 +105 @@
         map((x) => {
           this._user.next({
-            Email: x.head.Email,
-            Role: x.head.Role,
-            originalUserName: x.head.originalUserName,
+            Email: x.username,
             Passwd: x.head.Passwd,
+            Role: x.role,
+            originalUserName: x.originalUserName,
             Name: x.head.Name,
             PharmacyMedicines: x.head.PharmacyMedicines,