diff options
2 files changed, 6 insertions, 12 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/CitizenTokenBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/CitizenTokenBuilder.java index a2f46694f..e464536de 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/CitizenTokenBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/CitizenTokenBuilder.java @@ -125,11 +125,7 @@ public class CitizenTokenBuilder { Attribute birthdate = buildBirthday(authData.getDateOfBirth()); //TL: getIdentificationValue holds the baseID --> change to pBK - Attribute bpk; - if (authSession.getBusinessService()) - bpk = buildBPK(authData.getWBPK()); - else - bpk = buildBPK(authData.getBPK()); + Attribute bpk = buildBPK(authData.getBPK()); Attribute eid_citizen_qaa = buildEID_CITIZEN_QAALEVEL(3); Attribute eid_issuing_nation = buildEID_ISSUING_NATION("AT"); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java index c265e7231..2d29f7454 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java @@ -203,13 +203,11 @@ public class PVP2AssertionBuilder implements PVPConstants { // subjectNameID.setValue(authData.getIdentificationValue()); subjectNameID.setFormat(NameID.PERSISTENT); - // TODO: build IdType in authData - subjectNameID.setNameQualifier(authData.getIdentificationType()); - if (authSession.getBusinessService()) - subjectNameID.setValue(authData.getWBPK()); - else - subjectNameID.setValue(authData.getBPK()); - // } + + //TLenz: set correct bPK Type and Value from AuthData + subjectNameID.setNameQualifier(authData.getBPKType()); + subjectNameID.setValue(authData.getBPK()); + subject.setNameID(subjectNameID); |