add functionality for global authentication protocol activation/deactivation

1 files changed, 21 insertions, 1 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 69a73215a..d1872b2bc 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
@@ -105,6 +105,7 @@ import at.gv.egovernment.moa.id.config.ConnectionParameter;
 import at.gv.egovernment.moa.id.config.ConnectionParameterForeign;
 import at.gv.egovernment.moa.id.config.ConnectionParameterMOASP;
 import at.gv.egovernment.moa.id.config.ConnectionParameterMandate;
+import at.gv.egovernment.moa.id.config.auth.data.ProtocolAllowed;
 import at.gv.egovernment.moa.id.config.legacy.BuildFromLegacyConfig;
 import at.gv.egovernment.moa.id.config.stork.STORKConfig;
 import at.gv.egovernment.moa.id.data.IssuerAndSerial;
@@ -190,6 +191,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
   private static String alternativesourceid = null;
   
   private static List<String> legacyallowedprotocols = new ArrayList<String>();
+  private static ProtocolAllowed allowedProtcols = null;
   
   private static VerifyAuthBlock verifyidl = null;
   
@@ -246,6 +248,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
     return instance;
   }
 
+
   /**
    * Constructor for AuthConfigurationProvider.
    * @param fileName
@@ -515,8 +518,22 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 		//set PVP2 general config
 		Protocols protocols = auth.getProtocols();
 			if (protocols != null) {
+				
+				allowedProtcols = new ProtocolAllowed();
+				
+				if (protocols.getSAML1() != null) {
+					allowedProtcols.setSAML1Active(protocols.getSAML1().isIsActive());
+				}
+				
+				if (protocols.getOAuth() != null) {
+					allowedProtcols.setOAUTHActive(protocols.getOAuth().isIsActive());
+				}
+				
 				if (protocols.getPVP2() != null) {
-					PVP2 el = protocols.getPVP2();;
+					PVP2 el = protocols.getPVP2();
+					
+					allowedProtcols.setPVP21Active(el.isIsActive());
+					
 					pvp2general =  new PVP2();
 					pvp2general.setIssuerName(el.getIssuerName());	
 					pvp2general.setPublicURLPrefix(el.getPublicURLPrefix());
@@ -730,6 +747,9 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
       return this.getGeneralProperiesConfig("protocols.oauth20.");
   }
   
+  public ProtocolAllowed getAllowedProtocols() {
+	  return this.allowedProtcols;
+  }
   
   public PVP2 getGeneralPVP2DBConfig() {
 	  return pvp2general;