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

Hardcoded ssoLoginUrl in auth.service retrieveAuthMethods

Browse Source
This commit is contained in:
Julius Gruber
2019-06-06 14:29:46 +02:00
parent ecdf585216
commit 99576dc64a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/environment.default.js
View File

@@ -33,7 +33,7 @@ module.exports = {
auth: { auth: {
target: { target: {
host: 'https://fis.tiss.tuwien.ac.at', host: 'https://fis.tiss.tuwien.ac.at',
page: '/spring-rest/login.html' page: ''
} }
}, },
// Form settings // Form settings

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

@@ -77,7 +77,7 @@ export class AuthInterceptor implements HttpInterceptor {
return authStatus; return authStatus;
} }
private getLocationfromHeader(header: HttpHeaders): string { private getSSOLocationfromHeader(header: HttpHeaders): string {
console.log('HEADER www-authenticate: ', header.get('www-authenticate')); console.log('HEADER www-authenticate: ', header.get('www-authenticate'));
let location = ''; let location = '';
if (header.get('www-authenticate').startsWith('shibboleth realm')) { if (header.get('www-authenticate').startsWith('shibboleth realm')) {
@@ -164,7 +164,7 @@ export class AuthInterceptor implements HttpInterceptor {
// console.log('error: ', error); // console.log('error: ', error);
let location = ''; let location = '';
if (error.headers.get('www-authenticate') != null) { if (error.headers.get('www-authenticate') != null) {
location = this.getLocationfromHeader(error.headers); location = this.getSSOLocationfromHeader(error.headers);
} }
// Create a new HttpResponse and return it, so it can be handle properly by AuthService. // Create a new HttpResponse and return it, so it can be handle properly by AuthService.
const authResponse = new HttpResponse({ const authResponse = new HttpResponse({

2
src/app/core/auth/auth.service.ts
View File

@@ -209,7 +209,9 @@ export class AuthService {
let url = ''; let url = '';
if (isNotEmpty(status.ssoLoginUrl)) { if (isNotEmpty(status.ssoLoginUrl)) {
// url = this.parseSSOLocation(status.ssoLoginUrl); // url = this.parseSSOLocation(status.ssoLoginUrl);
// console.log('Parsed SSOLoginUrl: ', url);
url = 'https://fis.tiss.tuwien.ac.at/Shibboleth.sso/Login?target=https://fis.tiss.tuwien.ac.at'; url = 'https://fis.tiss.tuwien.ac.at/Shibboleth.sso/Login?target=https://fis.tiss.tuwien.ac.at';
// url = status.ssoLoginUrl;
} }
return url; return url;
}) })