refactor: clean code

This commit is contained in:
2024-12-18 06:57:27 +03:00
parent 3af8c43cd9
commit a2d4151cc3
47 changed files with 181 additions and 150 deletions

View File

@ -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;
})
);
}