sunfire bug

2 files changed, 17 insertions, 12 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java
index ab5db0a6..e3e482ef 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/AuthBlockAttributeBuilder.java
@@ -34,12 +34,14 @@ import java.text.SimpleDateFormat;
 @PvpMetadata
 public class AuthBlockAttributeBuilder implements IPvpAttributeBuilder {
 
-  private static final String AUTHBLOCK_FRIENDLY_NAME = "AUTHBLOCK";
-  private static final String AUTHBLOCK_NAME = "urn:oid:x.x.x.x"; //TODO set oid
+//  private static final String AUTHBLOCK_FRIENDLY_NAME = "AUTHBLOCK";
+//  private static final String AUTHBLOCK_NAME = "urn:oid:x.x.x.x"; //TODO set oid
+String EID_AUTHBLOCK_SIGNED_NAME = "urn:eidgvat:attributes.authblock.signed";
+String EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME = "userAuthBlock";
 
   @Override
   public String getName() {
-    return AUTHBLOCK_NAME;
+    return EID_AUTHBLOCK_SIGNED_NAME;
   }
 
   @Override
@@ -48,17 +50,17 @@ public class AuthBlockAttributeBuilder implements IPvpAttributeBuilder {
 
     String authBlock = authData.getGenericData(Constants.SZR_AUTHBLOCK, String.class);
     if (authBlock != null) {
-      return g.buildStringAttribute(AUTHBLOCK_FRIENDLY_NAME, AUTHBLOCK_NAME, authBlock);
+      return g.buildStringAttribute(EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME, EID_AUTHBLOCK_SIGNED_NAME, authBlock);
 
     } else {
-      throw new UnavailableAttributeException(AUTHBLOCK_NAME);
+      throw new UnavailableAttributeException(EID_AUTHBLOCK_SIGNED_NAME);
     }
 
   }
 
   @Override
   public <ATT> ATT buildEmpty(final IAttributeGenerator<ATT> g) {
-    return g.buildEmptyAttribute(AUTHBLOCK_FRIENDLY_NAME, AUTHBLOCK_NAME);
+    return g.buildEmptyAttribute(EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME, EID_AUTHBLOCK_SIGNED_NAME);
   }
 
 }
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java
index c6dfed1a..e43689a1 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/attributes/EidasBindAttributeBuilder.java
@@ -31,15 +31,18 @@ import at.gv.egiz.eaaf.core.impl.idp.builder.attributes.PvpMetadata;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
+import static at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions.EID_EIDBIND_FRIENDLY_NAME;
+import static at.gv.egiz.eaaf.core.api.data.ExtendedPvpAttributeDefinitions.EID_EIDBIND_NAME;
+
 @PvpMetadata
 public class EidasBindAttributeBuilder implements IPvpAttributeBuilder {
 
-  private static final String EIDASBIND_FRIENDLY_NAME = "EIDASBIND";
-  private static final String EIDASBIND_NAME = "urn:oid:x.x.x.x"; //TODO set oid
+//  private static final String EIDASBIND_FRIENDLY_NAME = "EIDASBIND";
+//  private static final String EIDASBIND_NAME = "urn:oid:x.x.x.x"; //TODO set oid
 
   @Override
   public String getName() {
-    return EIDASBIND_NAME;
+    return EID_EIDBIND_NAME;
   }
 
   @Override
@@ -48,17 +51,17 @@ public class EidasBindAttributeBuilder implements IPvpAttributeBuilder {
 
     String eidasBind = authData.getGenericData(Constants.EIDAS_BIND, String.class);
     if (eidasBind != null) {
-      return g.buildStringAttribute(EIDASBIND_FRIENDLY_NAME, EIDASBIND_NAME, eidasBind);
+      return g.buildStringAttribute(EID_EIDBIND_FRIENDLY_NAME, EID_EIDBIND_NAME, eidasBind);
 
     } else {
-      throw new UnavailableAttributeException(EIDASBIND_NAME);
+      throw new UnavailableAttributeException(EID_EIDBIND_NAME);
     }
 
   }
 
   @Override
   public <ATT> ATT buildEmpty(final IAttributeGenerator<ATT> g) {
-    return g.buildEmptyAttribute(EIDASBIND_FRIENDLY_NAME, EIDASBIND_NAME);
+    return g.buildEmptyAttribute(EID_EIDBIND_FRIENDLY_NAME, EID_EIDBIND_NAME);
   }
 
 }