1 files changed, 27 insertions, 2 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index d235f54fd..90b72b72b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -443,6 +443,9 @@ public List<OAStorkAttribute> getRequestedAttributes() {
 @Override
 public boolean isRequireConsentForStorkAttributes() {
 	try{
+		if (isSTORKPVPGateway())
+			return false;
+		
 		return oa_auth.getOASTORK().isRequireConsent();
 	}catch(Exception e)
 	{
@@ -457,7 +460,13 @@ public boolean isRequireConsentForStorkAttributes() {
  */
 @Override
 public List<AttributeProviderPlugin> getStorkAPs() {
-	return oa_auth.getOASTORK().getAttributeProviders();
+	if (oa_auth.getOASTORK() != null && 
+			oa_auth.getOASTORK().getAttributeProviders() != null)
+		return oa_auth.getOASTORK().getAttributeProviders();
+	
+	else
+		return new ArrayList<AttributeProviderPlugin>();
+	
 }
 
 /* (non-Javadoc)
@@ -528,9 +537,25 @@ public boolean isOutboundSSOInterfederationAllowed() {
 }
 
 @Override
+public boolean isPassivRequestUsedForInterfederation() {
+	if (inderfederatedIDP != null)
+		return inderfederatedIDP.isPerformPassivRequest().booleanValue();	
+	else
+		return false;	
+}
+
+@Override
+public boolean isPerformLocalAuthenticationOnInterfederationError() {
+	if (inderfederatedIDP != null)
+		return inderfederatedIDP.isPerformLocalAuthenticationOnError().booleanValue();	
+	else
+		return false;	
+}
+
+@Override
 public boolean isInterfederationSSOStorageAllowed() {
 	if (inderfederatedIDP != null)
-		return inderfederatedIDP.isStoreSSOSession();	
+		return inderfederatedIDP.isStoreSSOSession().booleanValue();	
 	else
 		return false;	
 }