Browse Source

Remove confirmation for 401 status code

pull/17544/head
Masum ULU 3 years ago
parent
commit
07e42f915e
  1. 7
      npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
  2. 11
      npm/ng-packs/packages/theme-shared/src/lib/services/status-code-error-handler.service.ts

7
npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts

@ -1,11 +1,10 @@
import { Injectable, inject } from '@angular/core'; import { Injectable, inject } from '@angular/core';
import { UrlTree, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router'; import { UrlTree, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { HttpErrorResponse } from '@angular/common/http';
import { Observable, delay, of, tap } from 'rxjs'; import { Observable } from 'rxjs';
import { OAuthService } from 'angular-oauth2-oidc'; import { OAuthService } from 'angular-oauth2-oidc';
import { AuthService, HttpErrorReporterService, IAbpGuard } from '@abp/ng.core'; import { AuthService, IAbpGuard } from '@abp/ng.core';
@Injectable({ @Injectable({
providedIn: 'root', providedIn: 'root',
@ -13,7 +12,6 @@ import { AuthService, HttpErrorReporterService, IAbpGuard } from '@abp/ng.core';
export class AbpOAuthGuard implements IAbpGuard { export class AbpOAuthGuard implements IAbpGuard {
protected readonly oAuthService = inject(OAuthService); protected readonly oAuthService = inject(OAuthService);
protected readonly authService = inject(AuthService); protected readonly authService = inject(AuthService);
protected readonly httpErrorReporter = inject(HttpErrorReporterService);
canActivate( canActivate(
route: ActivatedRouteSnapshot, route: ActivatedRouteSnapshot,
@ -23,6 +21,7 @@ export class AbpOAuthGuard implements IAbpGuard {
if (hasValidAccessToken) { if (hasValidAccessToken) {
return true; return true;
} }
const params = { returnUrl: state.url }; const params = { returnUrl: state.url };
this.authService.navigateToLogin(params); this.authService.navigateToLogin(params);
return false; return false;

11
npm/ng-packs/packages/theme-shared/src/lib/services/status-code-error-handler.service.ts

@ -78,15 +78,16 @@ export class StatusCodeErrorHandlerService implements CustomHttpErrorHandlerServ
switch (this.status) { switch (this.status) {
case 401: case 401:
case 404: case 404:
if (this.status === 401) {
this.authService.navigateToLogin();
return;
}
if (canCreateCustomError) { if (canCreateCustomError) {
this.showPage(); this.showPage();
break; break;
} }
this.showConfirmation(title, message).subscribe(() => { this.showConfirmation(title, message).subscribe();
if (this.status === 401) {
this.navigateToLogin();
}
});
break; break;
case 403: case 403:

Loading…
Cancel
Save