diff --git a/FrejaEidClient/pom.xml b/FrejaEidClient/pom.xml index 3339c73..18c02d9 100644 --- a/FrejaEidClient/pom.xml +++ b/FrejaEidClient/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.verisec.frejaeid FrejaEidClient - 2.33.0-SNAPSHOT + 2.33.2-SNAPSHOT jar FrejaEidClient diff --git a/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequest.java b/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequest.java index 25efcb3..d556671 100644 --- a/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequest.java +++ b/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequest.java @@ -59,6 +59,20 @@ public static InitiateAuthenticationRequest createDefaultWithSsn(SsnUserInfo ssn MinRegistrationLevel.BASIC, null, null, null, null, false); } + /** + * Returns instance of {@linkplain InitiateAuthenticationRequest} with: + *
{@linkplain UserInfoType} {@code UPI}, {@link MinRegistrationLevel} {@code BASIC} and without + * {@link AttributeToReturnInfo}. + * + * @param upi user's unique personal identifier for which transaction will be initiated. It cannot be {@code null} or empty. Maximum + * length is 256 characters. + * @return request + */ + public static InitiateAuthenticationRequest createDefaultWithUpi(String upi) { + return new InitiateAuthenticationRequest( + UserInfoType.UPI, upi, MinRegistrationLevel.BASIC, null, null, null, null, false); + } + /** * Returns instance of builder that is used for creating {@linkplain InitiateAuthenticationRequest} with custom * request parameters. diff --git a/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequest.java b/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequest.java index 7b87ae9..d889618 100644 --- a/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequest.java +++ b/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequest.java @@ -58,6 +58,21 @@ public static InitiateAddOrganisationIdRequest createDefaultWithSsn(SsnUserInfo organisationId, MinRegistrationLevel.EXTENDED, null, null); } + /** + * Returns instance of {@linkplain InitiateAddOrganisationIdRequest} with + * {@linkplain UserInfoType} {@code UPI}. + * + * @param upi user's unique personal identifier for which transaction will be initiated. It + * cannot be {@code null} or empty. Maximum length is 256 characters. + * @param organisationId instance of {@linkplain OrganisationId} that + * contains information regarding organisation id. + * @return request + */ + public static InitiateAddOrganisationIdRequest createDefaultWithUpi(String upi, OrganisationId organisationId) { + return new InitiateAddOrganisationIdRequest(UserInfoType.UPI, upi, organisationId, + MinRegistrationLevel.EXTENDED, null, null); + } + /** * Returns instance of builder that is used for creating * {@linkplain InitiateAddOrganisationIdRequest} with custom request diff --git a/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequest.java b/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequest.java index 7acf3c7..068d90c 100644 --- a/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequest.java +++ b/FrejaEidClient/src/main/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequest.java @@ -79,6 +79,27 @@ public static InitiateSignRequest createDefaultWithSsn(SsnUserInfo ssnUserInfo, DataToSign.create(text), SignatureType.SIMPLE, null, null, null, null, null, false); } + /** + * Returns instance of {@linkplain InitiateSignRequest} with: + *
{@linkplain UserInfoType} {@code UPI}, + * {@link MinRegistrationLevel} {@code PLUS}, default push notification, + * default expiry time of two minutes and without binary data to sign and + * {@link AttributeToReturnInfo}. + * + * @param upi user's unique personal identifier for which transaction will be initiated. It + * cannot be {@code null} or empty. + * @param title this is transaction title that will be shown to user through + * Freja eID mobile application. + * @param text data that user will sign by approving this transaction, also + * will be shown through Freja eID mobile application. + * @return request + */ + public static InitiateSignRequest createDefaultWithUpi(String upi, String title, String text) { + return new InitiateSignRequest(UserInfoType.UPI, upi, MinRegistrationLevel.PLUS, title, null, null, + DataToSignType.SIMPLE_UTF8_TEXT, DataToSign.create(text), SignatureType.SIMPLE, + null, null, null, null, null, false); + } + /** * Returns instance of builder that is used for creating * {@linkplain InitiateSignRequest} with custom request parameters. diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequestBuildersTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequestBuildersTest.java index d607d73..6d44cc1 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequestBuildersTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/authentication/init/InitiateAuthenticationRequestBuildersTest.java @@ -25,6 +25,7 @@ public class InitiateAuthenticationRequestBuildersTest { private static final String ORG_ID_ISSUER = "orgIdIssuer"; private static final OriginDeviceDetails ORIGIN_DEVICE_DETAILS = OriginDeviceDetails.create("frejaCookie"); private static final Set REQUESTED_ATTRIBUTES = new HashSet<>(); + private static final String UPI = "5633-823597-7862"; @BeforeClass public static void createRequestedAttributes() { @@ -79,6 +80,16 @@ public void createDefaultSsnRequest() throws FrejaEidClientInternalException { Assert.assertEquals(expectedInitiateAuthenticationRequest, initiateAuthenticationRequest); } + @Test + public void createDefaultUpiRequest() { + InitiateAuthenticationRequest expectedInitiateAuthenticationRequest = + new InitiateAuthenticationRequest( + UserInfoType.UPI, UPI, MinRegistrationLevel.BASIC, null, null, null, null, null, false); + InitiateAuthenticationRequest initiateAuthenticationRequest = + InitiateAuthenticationRequest.createDefaultWithUpi(UPI); + Assert.assertEquals(expectedInitiateAuthenticationRequest, initiateAuthenticationRequest); + } + @Test public void createCustomRequest_userInfoTypeEmail() { InitiateAuthenticationRequest expectedInitiateAuthenticationRequest = diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequestBuildersTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequestBuildersTest.java index e2fcc23..000afe4 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequestBuildersTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/organisationid/init/InitiateAddOrganisationIdRequestBuildersTest.java @@ -24,6 +24,7 @@ public class InitiateAddOrganisationIdRequestBuildersTest { private static final String INFERRED_USER_INFO = "N/A"; private static final OrganisationId ORGANISATION_ID = OrganisationId.create(ORGANISATION_ID_TITLE, IDENTIFIER_NAME, IDENTIFIER); + private static final String UPI = "5633-823597-7862"; @Test public void createDefaultEmailRequest() { @@ -45,6 +46,16 @@ public void createDefaultSsnRequest() throws FrejaEidClientInternalException { Assert.assertEquals(expectedInitiateAddOrganisationIdRequest, initiateAddOrganisationIdRequest); } + @Test + public void createDefaultUpiRequest() { + InitiateAddOrganisationIdRequest expectedInitiateAddOrganisationIdRequest = + new InitiateAddOrganisationIdRequest(UserInfoType.UPI, UPI, ORGANISATION_ID, + MinRegistrationLevel.EXTENDED, null, null); + InitiateAddOrganisationIdRequest initiateAddOrganisationIdRequest = + InitiateAddOrganisationIdRequest.createDefaultWithUpi(UPI, ORGANISATION_ID); + Assert.assertEquals(expectedInitiateAddOrganisationIdRequest, initiateAddOrganisationIdRequest); + } + @Test public void createCustomRequest_userInfoTypeEmail() { InitiateAddOrganisationIdRequest expectedInitiateAddOrganisationIdRequest = diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequestBuildersTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequestBuildersTest.java index a1337a7..e43108a 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequestBuildersTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/sign/init/InitiateSignRequestBuildersTest.java @@ -28,6 +28,7 @@ public class InitiateSignRequestBuildersTest { private static final PushNotification PUSH_NOTIFICATION = PushNotification.create(TITLE, TEXT); private static final OriginDeviceDetails ORIGIN_DEVICE_DETAILS = OriginDeviceDetails.create("frejaCookie"); private static final Set REQUESTED_ATTRIBUTES = new HashSet<>(); + private static final String UPI = "5633-823597-7862"; @BeforeClass public static void createRequestedAttributes() { @@ -82,6 +83,16 @@ public void createDefaultSsnRequest() throws FrejaEidClientInternalException { Assert.assertEquals(expectedInitiateSignRequest, initiateSignRequest); } + @Test + public void createDefaultUpiRequest() { + InitiateSignRequest expectedInitiateSignRequest = + new InitiateSignRequest(UserInfoType.UPI, UPI, MinRegistrationLevel.PLUS, TITLE, null, null, + DataToSignType.SIMPLE_UTF8_TEXT, DataToSign.create(TEXT), + SignatureType.SIMPLE, null, null, null, null, null, false); + InitiateSignRequest initiateSignRequest = InitiateSignRequest.createDefaultWithUpi(UPI, TITLE, TEXT); + Assert.assertEquals(expectedInitiateSignRequest, initiateSignRequest); + } + @Test public void createCustomRequest_userInfoTypeEmail() { InitiateSignRequest expectedInitiateSignRequest = diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/usermanagement/customidentifier/set/SetCustomIdentifierRequestBuilderTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/usermanagement/customidentifier/set/SetCustomIdentifierRequestBuilderTest.java index 9bb11f1..43ecabe 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/usermanagement/customidentifier/set/SetCustomIdentifierRequestBuilderTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/beans/usermanagement/customidentifier/set/SetCustomIdentifierRequestBuilderTest.java @@ -15,6 +15,7 @@ public class SetCustomIdentifierRequestBuilderTest { private static final String PHONE_NUMBER = "123123123"; private static final String IDENTIFIER = "identifier"; private static final String RELYING_PARTY_ID = "relyingPartyId"; + private static final String UPI = "5633-823597-7862"; @Test public void createDefaultEmailRequest() { @@ -35,6 +36,15 @@ public void createDefaultSsnRequest() throws FrejaEidClientInternalException { Assert.assertEquals(expectedSetCustomIdentifierRequest, setCustomIdentifierRequest); } + @Test + public void createDefaultUpiRequest() { + SetCustomIdentifierRequest expectedSetCustomIdentifierRequest = + new SetCustomIdentifierRequest(UserInfoType.UPI, UPI, IDENTIFIER, null); + SetCustomIdentifierRequest setCustomIdentifierRequest = + SetCustomIdentifierRequest.createDefaultWithUpi(UPI, IDENTIFIER); + Assert.assertEquals(expectedSetCustomIdentifierRequest, setCustomIdentifierRequest); + } + @Test public void createCustomRequest_userInfoTypeEmail() { SetCustomIdentifierRequest expectedSetCustomIdentifierRequest = diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/AuthenticationClientInitAuthenticationTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/AuthenticationClientInitAuthenticationTest.java index 869e38c..99e0b9a 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/AuthenticationClientInitAuthenticationTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/AuthenticationClientInitAuthenticationTest.java @@ -35,6 +35,7 @@ public class AuthenticationClientInitAuthenticationTest { private static final Country COUNTRY = Country.SWEDEN; private static final AttributeToReturn[] ATTRIBUTES_TO_RETURN = AttributeToReturn.values(); private static final String QR_CODE_GENERATION_URL_PREFIX = "https://resources.test.frejaeid.com/qrcode/generate"; + protected static final String UPI = "5633-823597-7862"; @Test public void initiateAuthenticationV1_1_userInfoTypeEmail_success() throws FrejaEidClientInternalException, FrejaEidException { @@ -43,6 +44,12 @@ public void initiateAuthenticationV1_1_userInfoTypeEmail_success() throws FrejaE initiateAuthenticationV1_1_relyingPartyNull_success(initiateAuthenticationRequest); } + @Test + public void initiateAuthenticationV1_1_userInfoTypeUpi_success() throws FrejaEidClientInternalException, FrejaEidException { + InitiateAuthenticationRequest initiateAuthenticationRequest = + InitiateAuthenticationRequest.createDefaultWithUpi(UPI); + initiateAuthenticationV1_1_relyingPartyNull_success(initiateAuthenticationRequest); + } @Test public void generateQRCode_expectSuccess() throws FrejaEidClientInternalException, FrejaEidException, IOException { diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/CustomIdentifierClientTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/CustomIdentifierClientTest.java index 99431a1..085e8b7 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/CustomIdentifierClientTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/CustomIdentifierClientTest.java @@ -31,6 +31,7 @@ public class CustomIdentifierClientTest { private static final String SSN = "199207295578"; private static final String CUSTOM_IDENTIFIER = "vealmar"; private static final String RELYING_PARTY_ID = "verisec_integrator"; + protected static final String UPI = "5633-823597-7862"; private static CustomIdentifierClientApi customIdentifierClient; @Before @@ -59,6 +60,13 @@ public void setCustomIdentifier_success() throws FrejaEidClientInternalException Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.CUSTOM_IDENTIFIER_SET, RequestTemplate.SET_CUSTOM_IDENTIFIER_TEMPLATE, setCustomIdentifierRequestDefaultSsn, EmptyFrejaResponse.class, null); + + SetCustomIdentifierRequest setCustomIdentifierRequestDefaultUpi = + SetCustomIdentifierRequest.createDefaultWithUpi(UPI, CUSTOM_IDENTIFIER); + customIdentifierClient.set(setCustomIdentifierRequestDefaultUpi); + Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.CUSTOM_IDENTIFIER_SET, + RequestTemplate.SET_CUSTOM_IDENTIFIER_TEMPLATE, + setCustomIdentifierRequestDefaultUpi, EmptyFrejaResponse.class, null); } @Test diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/OrganisationIdClientInitAddOrganisationIdTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/OrganisationIdClientInitAddOrganisationIdTest.java index c68b844..5139d80 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/OrganisationIdClientInitAddOrganisationIdTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/OrganisationIdClientInitAddOrganisationIdTest.java @@ -33,6 +33,7 @@ public class OrganisationIdClientInitAddOrganisationIdTest { private static final String ORGANISATION_ID_TITLE = "OrgananisationId title"; private static final String IDENTIFIER_NAME = "Identifier name"; private static final String IDENTIFIER = "identifier"; + private static final String UPI = "5633-823597-7862"; private final MinRegistrationLevel minRegistrationLevel = MinRegistrationLevel.EXTENDED; private final Long expiry = TimeUnit.MINUTES.toMillis(6); @@ -61,6 +62,9 @@ public void initAddOrganisationId_defaultRequests_expectSuccess() InitiateAddOrganisationIdRequest.createDefaultWithSsn( SsnUserInfo.create(Country.SWEDEN, SSN), OrganisationId.create(ORGANISATION_ID_TITLE, IDENTIFIER_NAME, IDENTIFIER)); + InitiateAddOrganisationIdRequest initiateAddOrganisationIdDefaultUpiRequest = + InitiateAddOrganisationIdRequest.createDefaultWithUpi( + UPI, OrganisationId.create(ORGANISATION_ID_TITLE, IDENTIFIER_NAME, IDENTIFIER)); String reference = organisationIdClient.initiateAdd(initiateAddOrganisationIdDefaultEmailRequest); Mockito.verify(httpServiceMock) @@ -75,6 +79,13 @@ public void initAddOrganisationId_defaultRequests_expectSuccess() RequestTemplate.INIT_ADD_ORGANISATION_ID_TEMPLATE, initiateAddOrganisationIdDefaultSsnRequest, InitiateAddOrganisationIdResponse.class, null); Assert.assertEquals(REFERENCE, reference); + + reference = organisationIdClient.initiateAdd(initiateAddOrganisationIdDefaultUpiRequest); + Mockito.verify(httpServiceMock) + .send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.ORGANISATION_ID_INIT_ADD, + RequestTemplate.INIT_ADD_ORGANISATION_ID_TEMPLATE, initiateAddOrganisationIdDefaultUpiRequest, + InitiateAddOrganisationIdResponse.class, null); + Assert.assertEquals(REFERENCE, reference); } @Test diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/SignClientInitSignTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/SignClientInitSignTest.java index df91933..3ba97cd 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/SignClientInitSignTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/client/impl/SignClientInitSignTest.java @@ -30,6 +30,7 @@ public class SignClientInitSignTest { private static final String SIGN_REFERENCE = "123456789123456789"; private static final String QR_CODE_SECRET = "qrCodeSecret"; private static final String RELYING_PARTY_ID = "verisec_integrator"; + private static final String UPI = "5633-823597-7862"; private MinRegistrationLevel minRegistrationLevel; private String title; @@ -69,6 +70,8 @@ public void initiateSignV1_1_defaultRequests_personal_expectSuccess() InitiateSignRequest.createDefaultWithEmail(EMAIL, title, text); InitiateSignRequest initiateSignDefaultSsnRequest = InitiateSignRequest.createDefaultWithSsn(SsnUserInfo.create(Country.SWEDEN, SSN), title, text); + InitiateSignRequest initiateSignDefaultUpiRequest = + InitiateSignRequest.createDefaultWithUpi(UPI, title, text); InitiateSignResponse response = signClient.initiateV1_1(initiateSignDefaultEmailRequest); Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.SIGN_INIT, @@ -81,6 +84,12 @@ public void initiateSignV1_1_defaultRequests_personal_expectSuccess() RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultSsnRequest, InitiateSignResponse.class, null); Assert.assertEquals(expectedResponse, response); + + response = signClient.initiateV1_1(initiateSignDefaultUpiRequest); + Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.SIGN_INIT, + RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultUpiRequest, + InitiateSignResponse.class, null); + Assert.assertEquals(expectedResponse, response); } @Test @@ -99,6 +108,8 @@ public void initiateSignV1_1_defaultRequests_organisational_expectSuccess() InitiateSignRequest.createDefaultWithEmail(EMAIL, title, text); InitiateSignRequest initiateSignDefaultSsnRequest = InitiateSignRequest.createDefaultWithSsn(SsnUserInfo.create(Country.SWEDEN, SSN), title, text); + InitiateSignRequest initiateSignDefaultUpiRequest = + InitiateSignRequest.createDefaultWithUpi(UPI, title, text); InitiateSignResponse response = signClient.initiateV1_1(initiateSignDefaultEmailRequest); Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.ORGANISATION_SIGN_INIT, @@ -111,6 +122,12 @@ public void initiateSignV1_1_defaultRequests_organisational_expectSuccess() RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultSsnRequest, InitiateSignResponse.class, null); Assert.assertEquals(expectedResponse, response); + + response = signClient.initiateV1_1(initiateSignDefaultUpiRequest); + Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.ORGANISATION_SIGN_INIT, + RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultUpiRequest, + InitiateSignResponse.class, null); + Assert.assertEquals(expectedResponse, response); } @Test @@ -264,6 +281,8 @@ public void initiateSign_defaultRequests_personal_expectSuccess() InitiateSignRequest.createDefaultWithEmail(EMAIL, title, text); InitiateSignRequest initiateSignDefaultSsnRequest = InitiateSignRequest.createDefaultWithSsn(SsnUserInfo.create(Country.SWEDEN, SSN), title, text); + InitiateSignRequest initiateSignDefaultUpiRequest = + InitiateSignRequest.createDefaultWithUpi(UPI, title, text); String response = signClient.initiate(initiateSignDefaultEmailRequest); Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.SIGN_INIT, @@ -276,6 +295,12 @@ public void initiateSign_defaultRequests_personal_expectSuccess() RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultSsnRequest, InitiateSignResponse.class, null); Assert.assertEquals(expectedResponse.getSignRef(), response); + + response = signClient.initiate(initiateSignDefaultUpiRequest); + Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.SIGN_INIT, + RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultUpiRequest, + InitiateSignResponse.class, null); + Assert.assertEquals(expectedResponse.getSignRef(), response); } @Test @@ -294,6 +319,8 @@ public void initiateSign_defaultRequests_organisational_expectSuccess() InitiateSignRequest.createDefaultWithEmail(EMAIL, title, text); InitiateSignRequest initiateSignDefaultSsnRequest = InitiateSignRequest.createDefaultWithSsn(SsnUserInfo.create(Country.SWEDEN, SSN), title, text); + InitiateSignRequest initiateSignDefaultUpiRequest = + InitiateSignRequest.createDefaultWithUpi(UPI, title, text); String response = signClient.initiate(initiateSignDefaultEmailRequest); Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.ORGANISATION_SIGN_INIT, @@ -306,6 +333,12 @@ public void initiateSign_defaultRequests_organisational_expectSuccess() RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultSsnRequest, InitiateSignResponse.class, null); Assert.assertEquals(expectedResponse.getSignRef(), response); + + response = signClient.initiate(initiateSignDefaultUpiRequest); + Mockito.verify(httpServiceMock).send(FrejaEnvironment.TEST.getServiceUrl() + MethodUrl.ORGANISATION_SIGN_INIT, + RequestTemplate.INIT_SIGN_TEMPLATE, initiateSignDefaultUpiRequest, + InitiateSignResponse.class, null); + Assert.assertEquals(expectedResponse.getSignRef(), response); } @Test diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/AuthenticationClientHttpTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/AuthenticationClientHttpTest.java index 9e887b5..938abf9 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/AuthenticationClientHttpTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/AuthenticationClientHttpTest.java @@ -92,6 +92,10 @@ public void initiateAuthenticationV1_1_success() InitiateAuthenticationRequest.createDefaultWithSsn(SsnUserInfo.create(Country.NORWAY, SSN)); sendInitiateAuthenticationV1_1RequestAndAssertResponse(initiateAuthenticationRequestDefaultWithSsn, initAuthResponseString); + InitiateAuthenticationRequest initiateAuthenticationRequestDefaultWithUpi = + InitiateAuthenticationRequest.createDefaultWithUpi(UPI); + sendInitiateAuthenticationV1_1RequestAndAssertResponse(initiateAuthenticationRequestDefaultWithUpi, initAuthResponseString); + InitiateAuthenticationRequest initAuthenticationRequestWithRequestedAttributesUserInfoEmail = InitiateAuthenticationRequest.createCustom() .setEmail(EMAIL) @@ -173,6 +177,10 @@ public void initiateAuthentication_success() InitiateAuthenticationRequest.createDefaultWithSsn(SsnUserInfo.create(Country.NORWAY, SSN)); sendInitiateAuthenticationRequestAndAssertResponse(initiateAuthenticationRequestDefaultWithSsn, initAuthResponseString); + InitiateAuthenticationRequest initiateAuthenticationRequestDefaultWithUpi = + InitiateAuthenticationRequest.createDefaultWithUpi(UPI); + sendInitiateAuthenticationRequestAndAssertResponse(initiateAuthenticationRequestDefaultWithUpi, initAuthResponseString); + InitiateAuthenticationRequest initAuthenticationRequestWithRequestedAttributesUserInfoEmail = InitiateAuthenticationRequest.createCustom() .setEmail(EMAIL) diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/OrganisationIdClientHttpTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/OrganisationIdClientHttpTest.java index 8b0f8b9..fa05b1c 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/OrganisationIdClientHttpTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/OrganisationIdClientHttpTest.java @@ -86,6 +86,11 @@ public void initAddOrganisationId_success() OrganisationId.create(ORGANISATION_ID_TITLE, IDENTIFIER_NAME, IDENTIFIER)); sendInitiateAddOrganisationIdRequestAndAssertResponse(initiateAddOrganisationIdRequestDefaultSsn); + InitiateAddOrganisationIdRequest initiateAddOrganisationIdRequestDefaultUpi = + InitiateAddOrganisationIdRequest.createDefaultWithUpi( + UPI, OrganisationId.create(ORGANISATION_ID_TITLE, IDENTIFIER_NAME, IDENTIFIER)); + sendInitiateAddOrganisationIdRequestAndAssertResponse(initiateAddOrganisationIdRequestDefaultUpi); + InitiateAddOrganisationIdRequest initAddOrganisationIdRequestCustomEmail = InitiateAddOrganisationIdRequest.createCustom() .setEmailAndOrganisationId(EMAIL, OrganisationId.create(ORGANISATION_ID_TITLE, diff --git a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/SignClientHttpTest.java b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/SignClientHttpTest.java index 6ffd866..109a0a7 100644 --- a/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/SignClientHttpTest.java +++ b/FrejaEidClient/src/test/java/com/verisec/frejaeid/client/http/SignClientHttpTest.java @@ -91,6 +91,10 @@ public void initiateSignV1_1_success() InitiateSignRequest.createDefaultWithSsn(SsnUserInfo.create( Country.FINLAND, SSN), title, dataToSignText); sendInitiateV11SignRequestAndAssertResponse(initiateSignRequestDefaultSsn); + InitiateSignRequest initiateSignRequestDefaultUpi = + InitiateSignRequest.createDefaultWithUpi(UPI, title, dataToSignText); + sendInitiateV11SignRequestAndAssertResponse(initiateSignRequestDefaultUpi); + InitiateSignRequest initSignCustomRequestWithRequestedAttributes = InitiateSignRequest.createCustom() .setEmail(EMAIL) .setDataToSign(dataToSign) @@ -210,6 +214,10 @@ public void initiateSign_success() InitiateSignRequest.createDefaultWithSsn(SsnUserInfo.create( Country.FINLAND, SSN), title, dataToSignText); sendInitiateSignRequestAndAssertResponse(initiateSignRequestDefaultSsn); + InitiateSignRequest initiateSignRequestDefaultUpi = + InitiateSignRequest.createDefaultWithUpi(UPI, title, dataToSignText); + sendInitiateSignRequestAndAssertResponse(initiateSignRequestDefaultUpi); + InitiateSignRequest initSignCustomRequestWithRequestedAttributes = InitiateSignRequest.createCustom() .setEmail(EMAIL) .setDataToSign(dataToSign)