dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix HTTP interceptor loading state handling

Browse Source
This commit is contained in:
Igor Kulikov 2021-08-31 19:34:49 +03:00
parent 76da0a0de5
commit 104d03443a
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui-ngx/src/app/core/interceptors/global-http-interceptor.ts
View File

@ -61,8 +61,7 @@ export class GlobalHttpInterceptor implements HttpInterceptor {
intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> { intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
if (req.url.startsWith('/api/')) { if (req.url.startsWith('/api/')) {
const config = this.getInterceptorConfig(req); const config = this.getInterceptorConfig(req);
const isLoading = !this.isInternalUrlPrefix(req.url); this.updateLoadingState(config, true);
this.updateLoadingState(config, isLoading);
if (this.isTokenBasedAuthEntryPoint(req.url)) { if (this.isTokenBasedAuthEntryPoint(req.url)) {
if (!AuthService.getJwtToken() && !this.authService.refreshTokenPending()) { if (!AuthService.getJwtToken() && !this.authService.refreshTokenPending()) {
return this.handleResponseError(req, next, new HttpErrorResponse({error: {message: 'Unauthorized!'}, status: 401})); return this.handleResponseError(req, next, new HttpErrorResponse({error: {message: 'Unauthorized!'}, status: 401}));
@ -258,11 +257,16 @@ export class GlobalHttpInterceptor implements HttpInterceptor {
} }
private getInterceptorConfig(req: HttpRequest<any>): InterceptorConfig { private getInterceptorConfig(req: HttpRequest<any>): InterceptorConfig {
let config: InterceptorConfig;
if (req.params && req.params instanceof InterceptorHttpParams) { if (req.params && req.params instanceof InterceptorHttpParams) {
return (req.params as InterceptorHttpParams).interceptorConfig; config = (req.params as InterceptorHttpParams).interceptorConfig;
} else { } else {
return new InterceptorConfig(false, false); config = new InterceptorConfig(false, false);
} }
if (this.isInternalUrlPrefix(req.url)) {
config.ignoreLoading = true;
}
return config;
} }
private showError(error: string, timeout: number = 0) { private showError(error: string, timeout: number = 0) {