Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 28 additions & 9 deletions AngularClient/src/app/shared/services/auth-interceptor.service.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { AuthService } from './auth.service';
import { Injectable } from '@angular/core';
import { HttpInterceptor, HttpRequest, HttpHandler, HttpEvent, HttpHeaders } from '@angular/common/http';
import { Observable, from } from 'rxjs';
import { Observable, from, lastValueFrom } from 'rxjs';
import { Constants } from '../constants';

@Injectable({
Expand All @@ -13,17 +13,36 @@ export class AuthInterceptorService implements HttpInterceptor {

intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
if(req.url.startsWith(Constants.apiRoot)){
return from(
this._authService.getAccessToken()
.then(token => {
const headers = new HttpHeaders().set('Authorization', `Bearer ${token}`);
const authRequest = req.clone({ headers });
return next.handle(authRequest).toPromise();
})
);
return this.interceptRequestWithAccessToken(req, next);
}
else {
return next.handle(req);
}
}

interceptRequestWithAccessToken(request: HttpRequest<any>, next: HttpHandler) {
return from(
this._authService.getAccessToken()
.then(accessToken => {

if (!accessToken) {
this._authService.signinSilent().then(user => {
return this.updateRequestHeader(request, next, user.access_token);
});
} else {
return this.updateRequestHeader(request, next, accessToken);
}
})
);
}

updateRequestHeader(request: HttpRequest<any>, next: HttpHandler, accessToken: string) {
const headerss = request.headers.set(
"Authorization",
`Bearer ${accessToken}`
);

const authReq = request.clone({ headers: headerss });
return lastValueFrom(next.handle(authReq));
}
}
4 changes: 4 additions & 0 deletions AngularClient/src/app/shared/services/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ export class AuthService {
return this._userManager.signinRedirect();
}

public signinSilent(): Promise<User> {
return this.userManager.signinSilent();
}

public isAuthenticated = (): Promise<boolean> => {
return this._userManager.getUser()
.then(user => {
Expand Down