refactor: clean code
This commit is contained in:
@ -1,6 +1,6 @@
|
||||
import {EventEmitter, Injectable} from '@angular/core';
|
||||
import {HttpClient, HttpHeaders} from "@angular/common/http";
|
||||
import {catchError, Observable, of, tap} from "rxjs";
|
||||
import {Observable, tap} from "rxjs";
|
||||
import {TokenResponse} from "@api/v1/tokenResponse";
|
||||
import ApiService from "@api/api.service";
|
||||
|
||||
@ -36,7 +36,6 @@ export class AuthToken {
|
||||
})
|
||||
export class AuthService {
|
||||
public expireTokenChange = new EventEmitter<Date>();
|
||||
public tokenChangeError = new EventEmitter();
|
||||
|
||||
constructor(private http: HttpClient) {
|
||||
}
|
||||
@ -60,8 +59,9 @@ export class AuthService {
|
||||
public refreshToken(): Observable<TokenResponse> {
|
||||
const token = localStorage.getItem(ApiService.tokenKey);
|
||||
|
||||
console.log(token);
|
||||
if (!token)
|
||||
return of({} as TokenResponse);
|
||||
throw new Error("token is not found");
|
||||
|
||||
const authToken = JSON.parse(token) as AuthToken;
|
||||
|
||||
@ -69,10 +69,6 @@ export class AuthService {
|
||||
case AvailableAuthenticationProvider.Bearer:
|
||||
return this.http.get<TokenResponse>(authToken.endpoint, {withCredentials: true})
|
||||
.pipe(
|
||||
catchError(error => {
|
||||
this.tokenChangeError.emit();
|
||||
throw error;
|
||||
}),
|
||||
tap(response => {
|
||||
const newExpireDate = new Date(response.expiresIn);
|
||||
const oldExpireDate = new Date(authToken.expiresIn);
|
||||
|
@ -15,11 +15,6 @@ export class TokenRefreshService {
|
||||
constructor(private authService: AuthService) {
|
||||
this.setRefreshTokenExpireMs(AuthService.tokenExpiresIn.getTime() - 1000 - Date.now());
|
||||
|
||||
authService.tokenChangeError.subscribe(_ => {
|
||||
console.debug('Token change error event received');
|
||||
this.tokenRefreshing$.next(false);
|
||||
this.stopTokenRefresh();
|
||||
});
|
||||
authService.expireTokenChange.subscribe(date => {
|
||||
console.debug('Expire token change event received:', date);
|
||||
this.setRefreshTokenExpireMs(date.getTime() - 1000 - Date.now());
|
||||
|
Reference in New Issue
Block a user