Merge branch 'master' into production

CESNET · Aug 9, 2022 · 57bf53c · 57bf53c
2 parents 8fdbf5b + 01d7dc5
commit 57bf53c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/perun-wui-consolidator/src/main/java/cz/metacentrum/perun/wui/consolidator/widgets/Wayf.java b/perun-wui-consolidator/src/main/java/cz/metacentrum/perun/wui/consolidator/widgets/Wayf.java
@@ -117,7 +117,7 @@ public void onClick(ClickEvent clickEvent) {
 
 						// TODO - we won't support template in a future
 						String consolidatorUrl = Utils.getIdentityConsolidatorLink(group.getUrl(), false) + URL.encodeQueryString("?token=" + token + target);
-						String authnContextClassRef = "urn:cesnet:proxyidp:template:cesnet";
+						String authnContextClassRef = "urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified%20urn:cesnet:proxyidp:template:cesnet";
 
 						// button is single IdP - pass it to the proxy
 						if (group.getIdpEntityID() != null && !group.getIdpEntityID().isEmpty()) {

diff --git a/perun-wui-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/pages/FormView.java b/perun-wui-registrar/src/main/java/cz/metacentrum/perun/wui/registrar/pages/FormView.java
@@ -596,7 +596,7 @@ public void onFinished(JavaScriptObject jso) {
 										// FINAL URL must logout from SP, login to SP using specified IdP, redirect to IC and after that return to application form
 										String token = ((BasicOverlayObject) jso).getString();
 										String consolidatorUrl = Utils.getIdentityConsolidatorLink("fed", true) + URL.encodeQueryString("&token=" + token);
-										String redirectUrl = PerunConfiguration.getWayfSpLogoutUrl() + "?return=" + PerunConfiguration.getWayfSpLoginUrl() + URL.encodeQueryString("?authnContextClassRef=urn:cesnet:proxyidp:template:cesnet%20urn:cesnet:proxyidp:idpentityid:" + finalEntityId + "&target=" + consolidatorUrl);
+										String redirectUrl = PerunConfiguration.getWayfSpLogoutUrl() + "?return=" + PerunConfiguration.getWayfSpLoginUrl() + URL.encodeQueryString("?authnContextClassRef=urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified%20urn:cesnet:proxyidp:template:cesnet%20urn:cesnet:proxyidp:idpentityid:" + finalEntityId + "&target=" + consolidatorUrl);
 										Window.Location.assign(redirectUrl);
 									}