BRZ:

 -add SAML1 SourceID parameter in moa-id general

Bugfix:
 -SSO target had an error in case of business-service
 -OA with business-service whichout single sign-on produce an error

1 files changed, 35 insertions, 18 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index c6b9b984a..d81d03780 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -57,6 +57,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.VerifyAuthBlock;
 import at.gv.egovernment.moa.id.commons.db.dao.config.VerifyIdentityLink;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.data.pvp2.ContactForm;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class GeneralMOAIDConfig {
 
@@ -90,6 +91,8 @@ public class GeneralMOAIDConfig {
 	private boolean legacy_saml1 = false;
 	private boolean legacy_pvp2 = false;
 	
+	private String saml1SourceID = null;
+	
 	private String pvp2PublicUrlPrefix = null;
 	private String pvp2IssuerName = null;
 	private String pvp2OrgName = null;
@@ -214,6 +217,11 @@ public class GeneralMOAIDConfig {
 					SAML1 saml1 = protocols.getSAML1();
 					if (saml1 != null) {
 						protocolActiveSAML1 = saml1.isIsActive();
+						saml1SourceID = saml1.getSourceID();
+						
+						//TODO: could removed in a later version
+						if (MiscUtil.isEmpty(saml1SourceID) && MiscUtil.isNotEmpty(alternativeSourceID))
+							saml1SourceID = alternativeSourceID;
 						
 					}
 					
@@ -263,13 +271,21 @@ public class GeneralMOAIDConfig {
 				if (sso != null) {
 					ssoFriendlyName = sso.getFriendlyName();
 					
-					IdentificationNumber idl = sso.getIdentificationNumber();
-					if (idl != null) 
-						ssoIdentificationNumber = idl.getValue();
+//					IdentificationNumber idl = sso.getIdentificationNumber();
+//					if (idl != null) 
+//						ssoIdentificationNumber = idl.getValue();
 					
 					ssoPublicUrl = sso.getPublicURL();
 					ssoSpecialText = sso.getSpecialText();
-					ssoTarget = sso.getTarget();
+					
+					if (MiscUtil.isNotEmpty(sso.getTarget()) &&
+							sso.getTarget().startsWith(Constants.PREFIX_WPBK)) {
+						ssoTarget = sso.getTarget().substring(Constants.PREFIX_WPBK.length()).
+								replace("+", "");
+						
+					} else					
+						ssoTarget = sso.getTarget();
+					
 				}
 			}
 			
@@ -320,20 +336,6 @@ public class GeneralMOAIDConfig {
 	}
 
 	/**
-	 * @return the alternativeSourceID
-	 */
-	public String getAlternativeSourceID() {
-		return alternativeSourceID;
-	}
-
-	/**
-	 * @param alternativeSourceID the alternativeSourceID to set
-	 */
-	public void setAlternativeSourceID(String alternativeSourceID) {
-		this.alternativeSourceID = alternativeSourceID;
-	}
-
-	/**
 	 * @return the certStoreDirectory
 	 */
 	public String getCertStoreDirectory() {
@@ -913,6 +915,21 @@ public class GeneralMOAIDConfig {
 	public void setProtocolActiveOAuth(boolean protocolActiveOAuth) {
 		this.protocolActiveOAuth = protocolActiveOAuth;
 	}
+
+	/**
+	 * @return the saml1SourceID
+	 */
+	public String getSaml1SourceID() {
+		return saml1SourceID;
+	}
+
+	/**
+	 * @param saml1SourceID the saml1SourceID to set
+	 */
+	public void setSaml1SourceID(String saml1SourceID) {
+		this.saml1SourceID = saml1SourceID;
+	}
+