diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java index d12378e..0fa9361 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java @@ -229,6 +229,7 @@ public class DataverseHeaderFragment implements java.io.Serializable { StringBuilder queryString = new StringBuilder(); for (Map.Entry entry : ((Map) req.getParameterMap()).entrySet()) { String name = entry.getKey(); + logger.info(name + ":" + entry.getValue()[0] + ":" + entry.getValue()); if (acceptableParameters.contains(name)) { String value = entry.getValue()[0]; queryString.append(queryString.length() == 0 ? "?" : "&").append(name).append("=").append(value); diff --git a/src/main/java/edu/harvard/iq/dataverse/Shib.java b/src/main/java/edu/harvard/iq/dataverse/Shib.java index 673f024..e54b2f6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/Shib.java +++ b/src/main/java/edu/harvard/iq/dataverse/Shib.java @@ -375,6 +375,7 @@ public class Shib implements java.io.Serializable { } logger.info("Debug summary: " + debugSummary + " (state: " + state + ")."); + logger.info("redirect page: " + DataverseHeaderFragment.getRedirectPage()); } /** diff --git a/src/main/webapp/resources/js/shib/idpselect_config.js b/src/main/webapp/resources/js/shib/idpselect_config.js index d7926d7..c7d2a97 100644 --- a/src/main/webapp/resources/js/shib/idpselect_config.js +++ b/src/main/webapp/resources/js/shib/idpselect_config.js @@ -14,7 +14,8 @@ function IdPSelectUIParms() { // Approaching via the Discovery Protocol for example //this.defaultReturn = "https://example.org/Shibboleth.sso/DS?SAMLDS=1&target=https://example.org/secure"; - this.defaultReturn = window.location.protocol + "//" + window.location.hostname + "/Shibboleth.sso/Login?SAMLDS=1&target=" + window.location.protocol + "//" + window.location.hostname + "/shib.xhtml"; +// this.defaultReturn = window.location.protocol + "//" + window.location.hostname + "/Shibboleth.sso/Login?SAMLDS=1&target=" + window.location.protocol + "//" + window.location.hostname + "/shib.xhtml?redirectPage=%2Fdataverse.xhtml%3Falias%3Dunpublished"; + this.defaultReturn = window.location.protocol + "//" + window.location.hostname + "/Shibboleth.sso/Login?SAMLDS=1&target=" + window.location.protocol + "//" + window.location.hostname + "/shib.xhtml?redirectPage=/dataset.xhtml?persistentId=doi%3A10.5072%2FFK2%2F6YBULG&version=DRAFT"; this.defaultReturnIDParam = null; this.helpURL = 'http://guides.dataverse.org/en/latest/user/account.html'; this.ie6Hack = null; // An array of structures to disable when drawing the pull down (needed to