refactor: clean code
This commit is contained in:
@ -15,7 +15,7 @@ import {Router} from "@angular/router";
|
||||
import {Injectable} from "@angular/core";
|
||||
import {RequestBuilder, RequestData} from "@api/RequestBuilder";
|
||||
import {ToastrService} from "ngx-toastr";
|
||||
import {AuthRoles} from "@model/AuthRoles";
|
||||
import {AuthRoles} from "@model/authRoles";
|
||||
|
||||
export enum AvailableVersion {
|
||||
v1
|
||||
@ -69,7 +69,7 @@ export default abstract class ApiService {
|
||||
}).pipe(
|
||||
catchError(error => {
|
||||
if (!secondTry && error.status === 401)
|
||||
return this.handle401Error().pipe(
|
||||
return this.handle401Error(error).pipe(
|
||||
switchMap(() => this.sendHttpRequest<Type>(method, request, true))
|
||||
);
|
||||
else {
|
||||
@ -88,7 +88,7 @@ export default abstract class ApiService {
|
||||
});
|
||||
}
|
||||
|
||||
private handle401Error(): Observable<any> {
|
||||
private handle401Error(error: any): Observable<any> {
|
||||
if (ApiService.isRefreshingToken.value)
|
||||
return ApiService.refreshTokenSubject.asObservable();
|
||||
|
||||
@ -103,7 +103,7 @@ export default abstract class ApiService {
|
||||
ApiService.isRefreshingToken.next(false);
|
||||
ApiService.refreshTokenSubject.error(err);
|
||||
ApiService.refreshTokenSubject = new ReplaySubject(1);
|
||||
throw err;
|
||||
throw error;
|
||||
})
|
||||
);
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ export default class AuthApiService extends ApiService {
|
||||
return this.post<AuthRoles>(request);
|
||||
}
|
||||
|
||||
public reLogin(){
|
||||
public reLogin() {
|
||||
let request = this.createRequestBuilder()
|
||||
.setEndpoint('ReLogin')
|
||||
.setWithCredentials()
|
||||
|
@ -1,7 +1,7 @@
|
||||
import {Injectable} from "@angular/core";
|
||||
import ApiService, {AvailableVersion} from "@api/api.service";
|
||||
import {DateOnly} from "@model/DateOnly";
|
||||
import {PeriodTimes} from "@model/pairPeriodTime";
|
||||
import {DateOnly} from "@model/dateOnly";
|
||||
import {PairPeriodTime} from "@model/pairPeriodTime";
|
||||
import {ScheduleRequest} from "@api/v1/scheduleRequest";
|
||||
import {ScheduleResponse} from "@api/v1/scheduleResponse";
|
||||
import {map} from "rxjs";
|
||||
@ -16,7 +16,7 @@ export class ScheduleService extends ApiService {
|
||||
}
|
||||
|
||||
public pairPeriod() {
|
||||
return this.get<PeriodTimes>('PairPeriod');
|
||||
return this.get<PairPeriodTime>('PairPeriod');
|
||||
}
|
||||
|
||||
public postSchedule(data: ScheduleRequest) {
|
||||
|
Reference in New Issue
Block a user