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

Added null/undefined check for authMethodModels

Browse Source
This commit is contained in:
Julius Gruber
2019-08-05 17:16:15 +02:00
parent 9234f8bc46
commit 92989a618a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,7 +91,6 @@ export class AuthInterceptor implements HttpInterceptor {
// if so the next part is the shibboleth location // if so the next part is the shibboleth location
// e.g part i: shibboleth realm="DSpace REST API", part i+1: location="/Shibboleth.sso/Login?target=https%3A%2F%2Flocalhost%3A8080" // e.g part i: shibboleth realm="DSpace REST API", part i+1: location="/Shibboleth.sso/Login?target=https%3A%2F%2Flocalhost%3A8080"
if (methodName.includes('shibboleth')) { if (methodName.includes('shibboleth')) {
console.log('Index 2: ', parts[2]);
const location: string = this.parseShibbolethLocation(parts[+i + 1]); // +1: unaray + operator is necessaray because i is a string, the operator works like parseInt() const location: string = this.parseShibbolethLocation(parts[+i + 1]); // +1: unaray + operator is necessaray because i is a string, the operator works like parseInt()
// console.log('shib location: ', location); // console.log('shib location: ', location);
authMethod.location = location; authMethod.location = location;
@@ -105,13 +104,15 @@ export class AuthInterceptor implements HttpInterceptor {
private makeAuthStatusObject(authenticated: boolean, accessToken?: string, error?: string, httpHeaders?: HttpHeaders,): AuthStatus { private makeAuthStatusObject(authenticated: boolean, accessToken?: string, error?: string, httpHeaders?: HttpHeaders,): AuthStatus {
const authStatus = new AuthStatus(); const authStatus = new AuthStatus();
// let authMethods: AuthMethodModel[];
if (httpHeaders) {
authStatus.authMethods = this.parseAuthMethodsfromHeaders(httpHeaders);
}
const authMethods: AuthMethodModel[] = this.parseAuthMethodsfromHeaders(httpHeaders);
authStatus.authMethods = authMethods;
authStatus.id = null; authStatus.id = null;
authStatus.okay = true; authStatus.okay = true;
authStatus.authMethods = authMethods; // authStatus.authMethods = authMethods;
if (authenticated) { if (authenticated) {
authStatus.authenticated = true; authStatus.authenticated = true;