1 files changed, 11 insertions, 7 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java
index 9f655761b..ddc7f6671 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/MandateProfRepOIDAttributeBuilder.java
@@ -3,11 +3,11 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 import org.opensaml.saml2.core.Attribute;
 import org.w3c.dom.Element;
 
-import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.validator.parep.ParepValidator;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMandateDataAvailableException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
-import at.gv.egovernment.moa.id.util.MandateBuilder;
+import at.gv.egovernment.moa.id.protocols.pvp2x.utils.AttributeExtractor;
 
 public class MandateProfRepOIDAttributeBuilder extends BaseAttributeBuilder {
 
@@ -21,14 +21,17 @@ public class MandateProfRepOIDAttributeBuilder extends BaseAttributeBuilder {
 			if(mandate == null) {
 				throw new NoMandateDataAvailableException();
 			}
-			Mandate mandateObject = MandateBuilder.buildMandate(mandate);
-			if(mandateObject == null) {
-				throw new NoMandateDataAvailableException();
+			
+			String oid = AttributeExtractor.extractSAMLAttributeOA(
+					ParepValidator.EXT_SAML_MANDATE_OID,  
+					authSession);
+			
+			if(oid == null) {
+				return null;
 			}
 			
-			//TODO: extract PROF REP OID
 			return buildStringAttribute(MANDATE_PROF_REP_OID_FRIENDLY_NAME, 
-					MANDATE_PROF_REP_OID_NAME, "TODO");
+					MANDATE_PROF_REP_OID_NAME, oid);
 			
 		}
 		return null;
@@ -40,3 +43,4 @@ public class MandateProfRepOIDAttributeBuilder extends BaseAttributeBuilder {
 				MANDATE_PROF_REP_OID_NAME);
 	}
 }
+ 
+\ No newline at end of file