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, 26 insertions, 18 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 1804b5fd5..304b63de0 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -519,6 +519,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 				
 				if (protocols.getSAML1() != null) {
 					allowedProtcols.setSAML1Active(protocols.getSAML1().isIsActive());
+					
+					//load alternative sourceID
+					if (MiscUtil.isNotEmpty(protocols.getSAML1().getSourceID()))
+							alternativesourceid = protocols.getSAML1().getSourceID();
+					
 				}
 				
 				if (protocols.getOAuth() != null) {
@@ -562,8 +567,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 		}
 				
 		//set alternativeSourceID
-		if (auth.getGeneralConfiguration() != null)		  
-			alternativesourceid =  auth.getGeneralConfiguration().getAlternativeSourceID();
+		if (auth.getGeneralConfiguration() != null)
+			
+			//TODO: can be removed in a further version, because it is moved to SAML1 config
+			if (MiscUtil.isEmpty(alternativesourceid))
+				alternativesourceid =  auth.getGeneralConfiguration().getAlternativeSourceID();
 		
 	        // sets the authentication session and authentication data time outs
 	        BigInteger param = auth.getGeneralConfiguration().getTimeOuts().getMOASessionCreated();
@@ -744,7 +752,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
   }
   
   public ProtocolAllowed getAllowedProtocols() {
-	  return this.allowedProtcols;
+	  return allowedProtcols;
   }
   
   public PVP2 getGeneralPVP2DBConfig() {
@@ -895,27 +903,27 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
   	}
   }
   
-  public boolean isSSOBusinessService() throws ConfigurationException {
-	  
-	if (ssoconfig != null && ssoconfig.getIdentificationNumber() != null)
-		return true;
-	else
-		return false;
-  }
+//  public boolean isSSOBusinessService() throws ConfigurationException {
+//	  
+//	if (ssoconfig != null && ssoconfig.getIdentificationNumber() != null)
+//		return true;
+//	else
+//		return false;
+//  }
   
-  public IdentificationNumber getSSOBusinessService() throws ConfigurationException {
+  public String getSSOTagetIdentifier() throws ConfigurationException {
 	  if (ssoconfig != null)
-		  return ssoconfig.getIdentificationNumber();
+		  return ssoconfig.getTarget();
 	  else 
 		  return null;
   }
   
-  public String getSSOTarget() throws ConfigurationException {	
-	  if (ssoconfig!= null)		  
-		  return ssoconfig.getTarget();
-	  
-	  return null;
-  }
+//  public String getSSOTarget() throws ConfigurationException {	
+//	  if (ssoconfig!= null)		  
+//		  return ssoconfig.getTarget();
+//	  
+//	  return null;
+//  }
   
   public String getSSOFriendlyName() {	
 	if (ssoconfig!= null) {