Ignore:
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/shared
Files:
1 added
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

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

    rafc9a9a rad60966  
    9595
    9696
    97     getPandemic() : Observable<IPandemic[]> {
    98         return this.http.get<IPandemic[]>(this.basePandemicUrl)
     97    getPandemic() : Observable<IPandemic> {
     98        return this.http.get<IPandemic>(this.basePandemicUrl)
    9999                   .pipe(catchError(this.handleError));
    100100    }

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

    rafc9a9a rad60966  
    77} from '@angular/common/http';
    88import { Observable } from 'rxjs';
     9import { environment } from '../../../environments/environment';
    910import { AuthService } from '../services/auth.service';
    10 import { environment } from '../../../environments/environment';
    1111
    1212@Injectable()

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

    rafc9a9a rad60966  
    5353    Pharmacy?: IPharmacy[];
    5454    Email: string;
     55    Name: string;
    5556    Passwd: string;
    56     Name: string;
    5757    originalUserName?: string;
    5858    Role?: string;

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

    rafc9a9a rad60966  
    3636        this.http.get<LoginResult>(`${this.apiUrl}/user`).subscribe((x) => {
    3737          this._user.next({
    38             Email: x.head.Email,
    39             Role: x.head.Role,
    40             originalUserName: x.head.originalUserName,
     38            Email: x.username,
    4139            Passwd: x.head.Passwd,
     40            Role: x.role,
     41            originalUserName: x.originalUserName,
    4242            Name: x.head.Name,
    4343            PharmacyMedicines: x.head.PharmacyMedicines,
    … …  
    6464        map((x) => {
    6565          this._user.next({
    66             Email: x.head.Email,
    67             Role: x.head.Role,
    68             originalUserName: x.head.originalUserName,
     66            Email: x.username,
    6967            Passwd: x.head.Passwd,
     68            Role: x.role,
     69            originalUserName: x.originalUserName,
    7070            Name: x.head.Name,
    7171            PharmacyMedicines: x.head.PharmacyMedicines,
    … …  
    105105        map((x) => {
    106106          this._user.next({
    107             Email: x.head.Email,
    108             Role: x.head.Role,
    109             originalUserName: x.head.originalUserName,
     107            Email: x.username,
    110108            Passwd: x.head.Passwd,
     109            Role: x.role,
     110            originalUserName: x.originalUserName,
    111111            Name: x.head.Name,
    112112            PharmacyMedicines: x.head.PharmacyMedicines,
Note: See TracChangeset for help on using the changeset viewer.