diff --git a/README.md b/README.md index 34044ef..6030443 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,14 @@ And then add the artifact `incognia-api-client` **or** `incognia-api-client-shad com.incognia incognia-api-client - 3.11.1 + 3.13.0 ``` ```xml com.incognia incognia-api-client-shaded - 3.11.1 + 3.13.0 ``` @@ -47,13 +47,13 @@ repositories { And then add the dependency ```gradle dependencies { - implementation 'com.incognia:incognia-api-client:3.11.1' + implementation 'com.incognia:incognia-api-client:3.13.0' } ``` OR ```gradle dependencies { - implementation 'com.incognia:incognia-api-client-shaded:3.11.1' + implementation 'com.incognia:incognia-api-client-shaded:3.13.0' } ``` diff --git a/build.gradle b/build.gradle index b15b2fb..1a13e43 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { } group = "com.incognia" -version = "3.11.1" +version = "3.13.0" task createProjectVersionFile { def projectVersionDir = "$projectDir/src/main/java/com/incognia/api" diff --git a/src/main/java/com/incognia/api/IncogniaAPI.java b/src/main/java/com/incognia/api/IncogniaAPI.java index 5c7da46..beaf349 100644 --- a/src/main/java/com/incognia/api/IncogniaAPI.java +++ b/src/main/java/com/incognia/api/IncogniaAPI.java @@ -202,6 +202,8 @@ public SignupAssessment registerSignup(RegisterSignupRequest request) throws Inc .additionalLocations(request.getAdditionalLocations()) .customProperties(request.getCustomProperties()) .personId(request.getPersonId()) + .tenantId(request.getTenantId()) + .relatedWebRequestToken(request.getRelatedWebRequestToken()) .build(); return tokenAwareNetworkingClient.doPost( "api/v2/onboarding/signups", postSignupRequestBody, SignupAssessment.class); @@ -254,6 +256,8 @@ public TransactionAssessment registerLogin(RegisterLoginRequest request) .relatedAccountId(request.getRelatedAccountId()) .customProperties(request.getCustomProperties()) .personId(request.getPersonId()) + .tenantId(request.getTenantId()) + .relatedWebRequestToken(request.getRelatedWebRequestToken()) .type("login") .build(); @@ -313,6 +317,7 @@ public TransactionAssessment registerWebLogin(RegisterWebLoginRequest request) .policyId(request.getPolicyId()) .customProperties(request.getCustomProperties()) .personId(request.getPersonId()) + .tenantId(request.getTenantId()) .type("login") .build(); @@ -365,6 +370,7 @@ public SignupAssessment registerWebSignup(RegisterWebSignupRequest request) .accountId(request.getAccountId()) .customProperties(request.getCustomProperties()) .personId(request.getPersonId()) + .tenantId(request.getTenantId()) .build(); return tokenAwareNetworkingClient.doPost( "api/v2/onboarding/signups", postSignupRequestBody, SignupAssessment.class); @@ -465,6 +471,8 @@ public TransactionAssessment registerPayment(RegisterPaymentRequest request) .personId(request.getPersonId()) .debtorAccount(request.getDebtorAccount()) .creditorAccount(request.getCreditorAccount()) + .tenantId(request.getTenantId()) + .relatedWebRequestToken(request.getRelatedWebRequestToken()) .build(); Map queryParameters = new HashMap<>(); diff --git a/src/main/java/com/incognia/onboarding/PostSignupRequestBody.java b/src/main/java/com/incognia/onboarding/PostSignupRequestBody.java index 14f257a..6ba568a 100644 --- a/src/main/java/com/incognia/onboarding/PostSignupRequestBody.java +++ b/src/main/java/com/incognia/onboarding/PostSignupRequestBody.java @@ -33,4 +33,10 @@ public class PostSignupRequestBody { @JsonInclude(JsonInclude.Include.NON_EMPTY) @Builder.Default Map customProperties = Collections.emptyMap(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + String relatedWebRequestToken; + + @JsonInclude(JsonInclude.Include.NON_NULL) + String tenantId; } diff --git a/src/main/java/com/incognia/onboarding/RegisterSignupRequest.java b/src/main/java/com/incognia/onboarding/RegisterSignupRequest.java index 1cefb98..b524dd5 100644 --- a/src/main/java/com/incognia/onboarding/RegisterSignupRequest.java +++ b/src/main/java/com/incognia/onboarding/RegisterSignupRequest.java @@ -23,4 +23,6 @@ public class RegisterSignupRequest { List additionalLocations; Map customProperties; PersonID personId; + String relatedWebRequestToken; + String tenantId; } diff --git a/src/main/java/com/incognia/onboarding/RegisterWebSignupRequest.java b/src/main/java/com/incognia/onboarding/RegisterWebSignupRequest.java index f85bb13..da85238 100644 --- a/src/main/java/com/incognia/onboarding/RegisterWebSignupRequest.java +++ b/src/main/java/com/incognia/onboarding/RegisterWebSignupRequest.java @@ -15,4 +15,5 @@ public class RegisterWebSignupRequest { String accountId; Map customProperties; PersonID personId; + String tenantId; } diff --git a/src/main/java/com/incognia/transaction/PostTransactionRequestBody.java b/src/main/java/com/incognia/transaction/PostTransactionRequestBody.java index 61c58cb..3c0e139 100644 --- a/src/main/java/com/incognia/transaction/PostTransactionRequestBody.java +++ b/src/main/java/com/incognia/transaction/PostTransactionRequestBody.java @@ -47,4 +47,10 @@ public class PostTransactionRequestBody { @JsonInclude(JsonInclude.Include.NON_EMPTY) @Builder.Default Map customProperties = Collections.emptyMap(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + String relatedWebRequestToken; + + @JsonInclude(JsonInclude.Include.NON_NULL) + String tenantId; } diff --git a/src/main/java/com/incognia/transaction/login/RegisterLoginRequest.java b/src/main/java/com/incognia/transaction/login/RegisterLoginRequest.java index d99f70d..cce28e5 100644 --- a/src/main/java/com/incognia/transaction/login/RegisterLoginRequest.java +++ b/src/main/java/com/incognia/transaction/login/RegisterLoginRequest.java @@ -22,6 +22,8 @@ public class RegisterLoginRequest { Map customProperties; Location location; PersonID personId; + String relatedWebRequestToken; + String tenantId; @Getter(AccessLevel.NONE) Boolean evaluateTransaction; diff --git a/src/main/java/com/incognia/transaction/login/RegisterWebLoginRequest.java b/src/main/java/com/incognia/transaction/login/RegisterWebLoginRequest.java index 53a5b9e..3d2c08a 100644 --- a/src/main/java/com/incognia/transaction/login/RegisterWebLoginRequest.java +++ b/src/main/java/com/incognia/transaction/login/RegisterWebLoginRequest.java @@ -17,6 +17,7 @@ public class RegisterWebLoginRequest { String policyId; Map customProperties; PersonID personId; + String tenantId; @Getter(AccessLevel.NONE) Boolean evaluateTransaction; diff --git a/src/main/java/com/incognia/transaction/payment/RegisterPaymentRequest.java b/src/main/java/com/incognia/transaction/payment/RegisterPaymentRequest.java index 36b83f3..50c81a1 100644 --- a/src/main/java/com/incognia/transaction/payment/RegisterPaymentRequest.java +++ b/src/main/java/com/incognia/transaction/payment/RegisterPaymentRequest.java @@ -34,6 +34,8 @@ public class RegisterPaymentRequest { PersonID personId; BankAccountInfo debtorAccount; BankAccountInfo creditorAccount; + String relatedWebRequestToken; + String tenantId; @Getter(AccessLevel.NONE) Boolean evaluateTransaction; diff --git a/src/test/java/com/incognia/api/IncogniaAPITest.java b/src/test/java/com/incognia/api/IncogniaAPITest.java index d8eeae3..5ef9176 100644 --- a/src/test/java/com/incognia/api/IncogniaAPITest.java +++ b/src/test/java/com/incognia/api/IncogniaAPITest.java @@ -250,6 +250,8 @@ void testRegisterSignup_whenDataIsValid() { Map map = new HashMap<>(); map.put("custom-property", "custom-value"); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; dispatcher.setExpectedAddressLine(address.getAddressLine()); dispatcher.setExpectedRequestToken(requestToken); @@ -268,6 +270,8 @@ void testRegisterSignup_whenDataIsValid() { .address(address) .customProperties(map) .personId(personId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); SignupAssessment signupAssessment = client.registerSignup(registerSignupRequest); assertThat(signupAssessment) @@ -318,6 +322,8 @@ void testRegisterSignup_whenDataIsValidAndExpectSignals() { Map map = new HashMap<>(); map.put("custom-property", "custom-value"); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; dispatcher.setExpectedAddressLine(address.getAddressLine()); dispatcher.setExpectedRequestToken(requestToken); @@ -337,6 +343,8 @@ void testRegisterSignup_whenDataIsValidAndExpectSignals() { .address(address) .customProperties(map) .personId(personId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); SignupAssessment signupAssessment = client.registerSignup(registerSignupRequest); assertThat(signupAssessment) @@ -370,6 +378,8 @@ void testRegisterSignup_withEmptyAddress() { String externalId = "external-id"; String appVersion = "1.4.3"; String deviceOs = "iOS"; + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; dispatcher.setExpectedAddressLine(null); dispatcher.setExpectedRequestToken(requestToken); @@ -389,6 +399,8 @@ void testRegisterSignup_withEmptyAddress() { .appVersion(appVersion) .deviceOs(deviceOs) .customProperties(null) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); SignupAssessment signupAssessment = client.registerSignup(registerSignupRequest); assertThat(signupAssessment) @@ -433,6 +445,7 @@ void testRegisterWebSignup_whenDataIsValid() { Map map = new HashMap<>(); map.put("custom-property", "custom-value"); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; dispatcher.setExpectedRequestToken(requestToken); dispatcher.setExpectedExternalId(externalId); @@ -449,6 +462,7 @@ void testRegisterWebSignup_whenDataIsValid() { .externalId(externalId) .customProperties(map) .personId(personId) + .tenantId(tenantId) .build(); SignupAssessment webSignupAssessment = client.registerWebSignup(registerSignupRequest); assertThat(webSignupAssessment) @@ -497,6 +511,7 @@ void testRegisterLogin_whenReachesTheTimeout(Boolean eval) { String requestToken = "request-token"; String accountId = "account-id"; String policyId = "policy-id"; + String tenantId = "tenant_id"; dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() @@ -506,6 +521,7 @@ void testRegisterLogin_whenReachesTheTimeout(Boolean eval) { .addresses(null) .paymentMethods(null) .policyId(policyId) + .tenantId(tenantId) .build()); mockServer.setDispatcher(dispatcher); RegisterLoginRequest loginRequest = @@ -514,6 +530,7 @@ void testRegisterLogin_whenReachesTheTimeout(Boolean eval) { .accountId(accountId) .evaluateTransaction(eval) .policyId(policyId) + .tenantId(tenantId) .build(); assertThatThrownBy(() -> clientWithLowTimeout.registerLogin(loginRequest)) .isInstanceOf(IncogniaException.class) @@ -542,6 +559,8 @@ void testRegisterLogin_whenDataIsValid(Boolean eval) { Map map = new HashMap<>(); map.put("custom-property", "custom-value"); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() @@ -558,6 +577,8 @@ void testRegisterLogin_whenDataIsValid(Boolean eval) { .relatedAccountId(relatedAccountId) .customProperties(map) .personId(personId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build()); mockServer.setDispatcher(dispatcher); RegisterLoginRequest loginRequest = @@ -573,6 +594,8 @@ void testRegisterLogin_whenDataIsValid(Boolean eval) { .relatedAccountId(relatedAccountId) .customProperties(map) .personId(personId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); TransactionAssessment transactionAssessment = client.registerLogin(loginRequest); assertTransactionAssessment(transactionAssessment); @@ -598,6 +621,8 @@ void testRegisterLogin_whenDataIsValidForSignalsResponse() { Map map = new HashMap<>(); map.put("custom-property", "custom-value"); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() @@ -614,6 +639,8 @@ void testRegisterLogin_whenDataIsValidForSignalsResponse() { .relatedAccountId(relatedAccountId) .customProperties(map) .personId(personId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build()); dispatcher.setIsSignalConfigured(true); mockServer.setDispatcher(dispatcher); @@ -629,6 +656,8 @@ void testRegisterLogin_whenDataIsValidForSignalsResponse() { .relatedAccountId(relatedAccountId) .customProperties(map) .personId(personId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); Map expectedSignalsMap = createSignalsMapping(); @@ -658,6 +687,7 @@ void testRegisterWebLogin_whenDataIsValid(Boolean eval) { customProperties.put("string-property", "string-value"); customProperties.put("float-property", 12.345); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() @@ -670,6 +700,7 @@ void testRegisterWebLogin_whenDataIsValid(Boolean eval) { .policyId(policyId) .customProperties(customProperties) .personId(personId) + .tenantId(tenantId) .build()); mockServer.setDispatcher(dispatcher); RegisterWebLoginRequest loginRequest = @@ -681,6 +712,7 @@ void testRegisterWebLogin_whenDataIsValid(Boolean eval) { .policyId(policyId) .customProperties(customProperties) .personId(personId) + .tenantId(tenantId) .build(); TransactionAssessment transactionAssessment = client.registerWebLogin(loginRequest); assertTransactionAssessment(transactionAssessment); @@ -694,6 +726,8 @@ void testRegisterLogin_whenEvalIsFalse() { String accountId = "account-id"; String externalId = "external-id"; String policyId = "policy-id"; + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() @@ -705,6 +739,8 @@ void testRegisterLogin_whenEvalIsFalse() { .paymentMethods(null) .policyId(policyId) .customProperties(null) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build()); mockServer.setDispatcher(dispatcher); RegisterLoginRequest loginRequest = @@ -714,6 +750,8 @@ void testRegisterLogin_whenEvalIsFalse() { .externalId(externalId) .evaluateTransaction(false) .policyId(policyId) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); TransactionAssessment transactionAssessment = client.registerLogin(loginRequest); assertThat(transactionAssessment).isEqualTo(TransactionAssessment.builder().build()); @@ -781,6 +819,8 @@ void testRegisterPayment_whenDataIsValid(Boolean eval) { .build()); PaymentValue paymentValue = PaymentValue.builder().amount(13.0).currency("BRL").build(); PersonID personId = PersonID.ofCPF("12345678901"); + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; List transactionAddresses = Collections.singletonList( @@ -823,6 +863,8 @@ void testRegisterPayment_whenDataIsValid(Boolean eval) { .personId(personId) .debtorAccount(bankAccount) .creditorAccount(bankAccount) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() @@ -843,6 +885,8 @@ void testRegisterPayment_whenDataIsValid(Boolean eval) { .personId(personId) .debtorAccount(bankAccount) .creditorAccount(bankAccount) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build()); mockServer.setDispatcher(dispatcher); TransactionAssessment transactionAssessment = client.registerPayment(paymentRequest); @@ -893,6 +937,9 @@ void testRegisterPayment_whenEvalIsFalse() { .type(PaymentType.CREDIT_CARD) .build()); PaymentValue paymentValue = PaymentValue.builder().amount(13.0).currency("BRL").build(); + String tenantId = "tenant_id"; + String relatedWebRequestToken = "related_web_request_token"; + dispatcher.setExpectedTransactionRequestBody( PostTransactionRequestBody.builder() .requestToken(requestToken) @@ -904,6 +951,8 @@ void testRegisterPayment_whenEvalIsFalse() { .paymentMethods(paymentMethods) .paymentValue(paymentValue) .customProperties(null) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build()); mockServer.setDispatcher(dispatcher); RegisterPaymentRequest paymentRequest = @@ -916,6 +965,8 @@ void testRegisterPayment_whenEvalIsFalse() { .evaluateTransaction(false) .paymentValue(paymentValue) .paymentMethods(paymentMethods) + .tenantId(tenantId) + .relatedWebRequestToken(relatedWebRequestToken) .build(); TransactionAssessment transactionAssessment = client.registerPayment(paymentRequest); assertThat(transactionAssessment).isEqualTo(TransactionAssessment.builder().build());