diff options
Diffstat (limited to 'id')
4 files changed, 1 insertions, 58 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js index d31a65d87..18c755f4b 100644 --- a/id/ConfigWebTool/src/main/webapp/js/common.js +++ b/id/ConfigWebTool/src/main/webapp/js/common.js @@ -22,32 +22,15 @@ *******************************************************************************/ function oaBusinessService() { if ($('#OAisbusinessservice').attr('checked') == 'checked') { - $('#OAisstorkservice').attr('checked',false); - $('#oa_config_storkservice').css('display', "none"); $('#oa_config_businessservice').css('display', "block"); $('#oa_config_publicservice').css('display', "none"); } else { - $('#oa_config_storkservice').css('display', "none"); $('#oa_config_businessservice').css('display', "none"); $('#oa_config_publicservice').css('display', "block"); } } -function oaStorkService() { - if ($('#OAisstorkservice').attr('checked') == 'checked') { - $('#OAisbusinessservice').attr('checked',false); - $('#oa_config_storkservice').css('display', "block"); - $('#oa_config_businessservice').css('display', "none"); - $('#oa_config_publicservice').css('display', "none"); - - } else { - $('#oa_config_storkservice').css('display', "none"); - $('#oa_config_businessservice').css('display', "none"); - $('#oa_config_publicservice').css('display', "block"); - - } -} function oaSSOService() { if ($('#OAuseSSO').attr('checked') == 'checked') { @@ -214,7 +197,6 @@ function userOnLoad() { return true; } function oaOnLoad() { - oaStorkService(); oaBusinessService(); oaSSOService(); oaLegacyService(); diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp index 94f4a9d21..c3ea97ab9 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp @@ -70,17 +70,6 @@ > </s:checkbox> - <s:if test="authUser.isAdmin()"> - <s:checkbox name="generalOA.storkService" - value="%{generalOA.storkService}" - labelposition="left" - key="webpages.oaconfig.general.isstorkservice" - cssClass="checkbox" - onclick="oaStorkService();" - id="OAisstorkservice" - disabled="%{isOnlyStorkService()}"> - </s:checkbox> - </s:if> </div> @@ -532,17 +521,6 @@ cssClass="checkbox" id="OAuseVidp" /></p> - <div id="oa_config_storkservice" class="oa_config_block"> -<%-- <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.stork.header", request) %></h3> --%> - <s:textfield name="generalOA.storkSPTargetCountry" - labelposition="left" - key="webpages.oaconfig.general.stork.countrycode" - value="%{generalOA.storkSPTargetCountry}" - cssClass="textfield_middle" - disabled="%{isDeactivatedStorkService()}"> - </s:textfield> - </div> - <p><s:checkbox name="storkOA.requireConsent" value="%{storkOA.requireConsent}" labelposition="left" diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index 1b120c7c1..0bb822c09 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -277,16 +277,11 @@ public class AuthenticationServer implements MOAIDAuthConstants { } else { Log.info("Non-SSO Login requested"); - if (oaParam.getStorkService()) { - // build stork request - infoboxReadRequest = new InfoboxReadRequestBuilder().buildStorkReadRequest( - oaParam.getIdentityLinkDomainIdentifier()); - } else { //build ReadInfobox request infoboxReadRequest = new InfoboxReadRequestBuilder().build( oaParam.getBusinessService(), oaParam .getIdentityLinkDomainIdentifier()); - } + } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java index 2d0a0e367..88fc29314 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java @@ -56,10 +56,6 @@ public class OAParameter { else this.businessService = false; - if (this.oaType.equals("storkService")) - this.storkService = true; - else - this.storkService = false; this.publicURLPrefix = oa.getPublicURLPrefix(); @@ -87,12 +83,6 @@ public class OAParameter { */ private boolean businessService; - /** - * specifies whether the online application is a stork application or not (<code>true</code> - * if value of {@link #oaType} is "storkService" - */ - private boolean storkService; - /** * public URL prefix of the online application @@ -152,6 +142,4 @@ public class OAParameter { return oAuth20Config; } - public boolean getStorkService() { return storkService; } - } |