1 files changed, 8 insertions, 6 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);
   }
 
 }