hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed auth-interceptor: location used to makeAuthStatusObject()

Browse Source
This commit is contained in:
Julius Gruber
2019-06-03 09:57:52 +02:00
parent 10085ccf41
commit 70d95b4764
5 changed files with 88 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/core/auth/auth.interceptor.ts
View File

@@ -56,10 +56,11 @@ export class AuthInterceptor implements HttpInterceptor {
return http.url && http.url.endsWith('/authn/logout');
}
private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string): AuthStatus {
private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string, location?): AuthStatus {
const authStatus = new AuthStatus();
authStatus.id = null;
authStatus.okay = true;
authStatus.ssoLoginUrl = location; // this line added while developing shibboleth dev
if (authenticated) {
authStatus.authenticated = true;
authStatus.token = new AuthTokenInfo(accessToken);
@@ -133,9 +134,10 @@ export class AuthInterceptor implements HttpInterceptor {
if (this.isAuthRequest(error)) {
// clean eventually refresh Requests list
this.refreshTokenRequestUrls = [];
const location = error.headers.get('Location');// this line added while shibboleth dev
// Create a new HttpResponse and return it, so it can be handle properly by AuthService.
const authResponse = new HttpResponse({
body: this.makeAuthStatusObject(false, null, error.error),
body: this.makeAuthStatusObject(false, null, error.error, location),
headers: error.headers,
status: error.status,
statusText: error.statusText,