Skip to content

fix: TTA-209 add subscription to login component for redirecting user #949

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

Merged
merged 2 commits into from
Nov 3, 2022
Merged

fix: TTA-209 add subscription to login component for redirecting user #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1056f12
fix: TTA-209 add subscription to login component for redirecting user…
andresacg30 Oct 31, 2022
af1b014
TTA-209 added redirectioning for any 401 status response
andresacg30 Nov 2, 2022
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
5 changes: 1 addition & 4 deletions src/app/modules/login/login.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,12 @@ export class LoginComponent implements OnInit {
ngOnInit() {

this.googleAuthSDK();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviisale si esta linea no te da conflictos porque es del Auth de google

if (this.isProduction && this.azureAdB2CService.isLogin()) {
this.router.navigate(['']);
} else {
this.loginService.isLogin().subscribe(isLogin => {
if (isLogin) {
this.router.navigate(['']);
}
});
}

window.handleCredentialResponse = (response) => {
const {credential = ''} = response;
this.featureToggleCookiesService.setCookies();
Expand Down
18 changes: 16 additions & 2 deletions src/app/modules/shared/interceptors/inject.token.interceptor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ import {
HttpInterceptor,
HttpHandler,
HttpRequest,
HttpErrorResponse,
} from '@angular/common/http';
import { Observable } from 'rxjs';
import { tap } from 'rxjs/operators';

import { AzureAdB2CService } from 'src/app/modules/login/services/azure.ad.b2c.service';
import { environment } from './../../../../environments/environment';
import { EnvironmentType } from 'src/environments/enum';
import { LoginService } from '../../login/services/login.service';
import { catchError } from 'rxjs/operators';
import { Router } from '@angular/router';

@Injectable()
export class InjectTokenInterceptor implements HttpInterceptor {
isProduction = environment.production === EnvironmentType.TT_PROD_LEGACY;
constructor(private azureAdB2CService: AzureAdB2CService, private loginService: LoginService) { }
constructor(private azureAdB2CService: AzureAdB2CService, private loginService: LoginService, private router: Router) { }

intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
if (request.url.startsWith(environment.timeTrackerApiUrl)) {
Expand All @@ -25,7 +29,17 @@ export class InjectTokenInterceptor implements HttpInterceptor {
headers: request.headers.set('Authorization',
'Bearer ' + token)
});
return next.handle(requestWithHeaders);
return next.handle(requestWithHeaders)
.pipe(
tap(() => { }, (err: any) => {
if (err instanceof HttpErrorResponse) {
if (err.status === 401) {
this.loginService.logout();
window.open("/login", "_self")
}
}
})
);
} else {
return next.handle(request);
}
Expand Down