Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AngularUI: Remove confirmation for 401 status code #17544

Merged
merged 3 commits into from
Sep 4, 2023
Merged

AngularUI: Remove confirmation for 401 status code #17544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07e42f9
Remove confirmation for 401 status code
masum-ulu Sep 4, 2023
3dac4e6
Apply request change
masum-ulu Sep 4, 2023
a8af6b9
Revert "Apply request change"
masum-ulu Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
import { Injectable, inject } from '@angular/core';
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 { AuthService, HttpErrorReporterService, IAbpGuard } from '@abp/ng.core';
import { AuthService, IAbpGuard } from '@abp/ng.core';

@Injectable({
providedIn: 'root',
})
export class AbpOAuthGuard implements IAbpGuard {
protected readonly oAuthService = inject(OAuthService);
protected readonly authService = inject(AuthService);
protected readonly httpErrorReporter = inject(HttpErrorReporterService);

canActivate(
route: ActivatedRouteSnapshot,
Expand All @@ -23,6 +21,7 @@ export class AbpOAuthGuard implements IAbpGuard {
if (hasValidAccessToken) {
return true;
}

const params = { returnUrl: state.url };
this.authService.navigateToLogin(params);
return false;
Expand Down
12 changes: 7 additions & 5 deletions npm/ng-packs/packages/theme-shared/src/lib/services/status-code-error-handler.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,13 @@ export class StatusCodeErrorHandlerService implements CustomHttpErrorHandlerServ
this.showPage();
break;
}
this.showConfirmation(title, message).subscribe(() => {
if (this.status === 401) {
this.navigateToLogin();
}
});

if (this.status === 401) {
this.authService.navigateToLogin();
break;
}

this.showConfirmation(title, message).subscribe();
break;

case 403:
Expand Down
Loading