Skip to content

hotfix/shibboleth-redirect-url #440

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
milanmajchrak merged 1 commit into from
Jan 5, 2024
Merged

hotfix/shibboleth-redirect-url #440

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions src/aai/aai.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
function AAI() {
var host = 'https://' + window.location.hostname,
ourEntityID = host.match("lindat.mff.cuni.cz") ? "https://ufal-point.mff.cuni.cz" : host;
var namespace = ''
var namespace = '';
this.defaults = {
//host : 'https://ufal-point.mff.cuni.cz',
host : host, //better default (useful when testing on ufal-point-dev)
Expand All @@ -21,7 +21,28 @@
var targetUrl = '';
var opts = jQuery.extend({}, this.defaults, options),
defaultCallback = function(e) {
targetUrl = opts.target + '?redirectUrl=' + window.location.href;
targetUrl = opts.target + '?redirectUrl=';
// E.g. Redirect to Item page
var redirectUrl = window.location.href;

// Redirection could be initiated from the login page; in that case,
// we need to retrieve the redirect URL from the URL parameters.
var urlParams = '';
var redirectUrlFromLogin = '';
var splitQMarks = window.location.href.split('?');
if (splitQMarks.length > 1) {
// The redirect URL is in the `1` index of the array in the Shibboleth redirect from the login page
urlParams = new URLSearchParams(splitQMarks[1]);
redirectUrlFromLogin = urlParams.get('redirectUrl') || null;
}

if (redirectUrlFromLogin != null && redirectUrlFromLogin !== '') {
// Redirect from the login page with retrieved redirect URL
redirectUrl = window.location.origin + (namespace === '' ? namespace : '/' + namespace) + redirectUrlFromLogin;
}

// Encode the redirect URL
targetUrl += window.encodeURIComponent(redirectUrl);
window.location = opts.host + '/Shibboleth.sso/Login?SAMLDS=1&target=' + targetUrl + '&entityID=' + window.encodeURIComponent(e.entityID);
};
//console.log(opts);
Expand Down