send pin code after scan qr (#52)

rubenmodamio · web-flow · commit 0f2f3a821901 · 2024-12-23T16:54:06.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.1.2](https://github.com/in2workspace/in2-issuer-api/releases/tag/v1.1.2)
+### Changed
+- Change the order of the received email from the pin during the issuance of a credential.
+
 ## [v1.1.1](https://github.com/in2workspace/in2-issuer-api/releases/tag/v1.1.1)
 ### Fixed
 - Fixed LEARCredentialEmployee data model. Implement W3C DATA model v2.0 (validFrom, validUntil). 
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ plugins {
 }
 
 group = 'es.in2'
-version = '1.1.1'
+version = '1.1.2'
 
 java {
     sourceCompatibility = '17'
diff --git a/src/main/java/es/in2/issuer/application/workflow/impl/CredentialOfferIssuanceWorkflowImpl.java b/src/main/java/es/in2/issuer/application/workflow/impl/CredentialOfferIssuanceWorkflowImpl.java
@@ -16,8 +16,6 @@
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
-import java.util.Objects;
-
 import static es.in2.issuer.domain.util.Constants.BEARER_PREFIX;
 
 @Slf4j
@@ -43,21 +41,21 @@ public Mono<String> buildCredentialOfferUri(String processId, String transaction
                         .flatMap(credentialType -> getPreAuthorizationCodeFromIam()
                                 .flatMap(preAuthCodeResponse ->
                                         deferredCredentialMetadataService.updateAuthServerNonceByTransactionCode(transactionCode, preAuthCodeResponse.grant().preAuthorizedCode())
-                                                .then(credentialOfferService.buildCustomCredentialOffer(credentialType, preAuthCodeResponse.grant())
+                                                .then(credentialProcedureService.getMandateeEmailFromDecodedCredentialByProcedureId(procedureId))
+                                                .flatMap(email -> credentialOfferService.buildCustomCredentialOffer(credentialType, preAuthCodeResponse.grant(),email,preAuthCodeResponse.pin())
                                                         .flatMap(credentialOfferCacheStorageService::saveCustomCredentialOffer)
-                                                        .flatMap(credentialOfferService::createCredentialOfferUri)
-                                                        .flatMap(credentialOfferUri -> credentialProcedureService.getMandateeEmailFromDecodedCredentialByProcedureId(procedureId)
-                                                                .flatMap(email -> emailService.sendPin(email, "Pin Code", preAuthCodeResponse.pin()))
-                                                                .thenReturn(credentialOfferUri))
+                                                        .flatMap(credentialOfferService::createCredentialOfferUri))
                                                 )
                                 )
-                        )
                 );
     }
 
     @Override
     public Mono<CustomCredentialOffer> getCustomCredentialOffer(String nonce) {
-        return credentialOfferCacheStorageService.getCustomCredentialOffer(nonce);
+        return credentialOfferCacheStorageService.getCustomCredentialOffer(nonce)
+                .flatMap(credentialOfferData -> emailService.sendPin(credentialOfferData.employeeEmail(), "Pin Code", credentialOfferData.pin())
+                        .then(Mono.just(credentialOfferData.credentialOffer()))
+                );
     }
 
     private Mono<PreAuthCodeResponse> getPreAuthorizationCodeFromIam() {
diff --git a/src/main/java/es/in2/issuer/domain/model/dto/CredentialOfferData.java b/src/main/java/es/in2/issuer/domain/model/dto/CredentialOfferData.java
@@ -0,0 +1,11 @@
+package es.in2.issuer.domain.model.dto;
+
+import lombok.Builder;
+
+@Builder
+public record CredentialOfferData(
+        CustomCredentialOffer credentialOffer,
+        String employeeEmail,
+        String pin
+) {
+}
diff --git a/src/main/java/es/in2/issuer/domain/service/CredentialOfferCacheStorageService.java b/src/main/java/es/in2/issuer/domain/service/CredentialOfferCacheStorageService.java
@@ -1,12 +1,12 @@
 package es.in2.issuer.domain.service;
 
-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import reactor.core.publisher.Mono;
 
 public interface CredentialOfferCacheStorageService {
 
-    Mono<String> saveCustomCredentialOffer(CustomCredentialOffer customCredentialOffer);
+    Mono<String> saveCustomCredentialOffer(CredentialOfferData credentialOfferData);
 
-    Mono<CustomCredentialOffer> getCustomCredentialOffer(String nonce);
+    Mono<CredentialOfferData> getCustomCredentialOffer(String nonce);
 
 }
diff --git a/src/main/java/es/in2/issuer/domain/service/CredentialOfferService.java b/src/main/java/es/in2/issuer/domain/service/CredentialOfferService.java
@@ -1,10 +1,10 @@
 package es.in2.issuer.domain.service;
 
-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.model.dto.Grant;
 import reactor.core.publisher.Mono;
 
 public interface CredentialOfferService {
-    Mono<CustomCredentialOffer> buildCustomCredentialOffer(String credentialType, Grant grant);
+    Mono<CredentialOfferData> buildCustomCredentialOffer(String credentialType, Grant grant, String employeeEmail, String pin);
     Mono<String> createCredentialOfferUri(String nonce);
 }
diff --git a/src/main/java/es/in2/issuer/domain/service/impl/CredentialOfferCacheStorageServiceImpl.java b/src/main/java/es/in2/issuer/domain/service/impl/CredentialOfferCacheStorageServiceImpl.java
@@ -1,7 +1,7 @@
 package es.in2.issuer.domain.service.impl;
 
 import es.in2.issuer.domain.exception.CustomCredentialOfferNotFoundException;
-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.service.CredentialOfferCacheStorageService;
 import es.in2.issuer.infrastructure.repository.CacheStore;
 import lombok.RequiredArgsConstructor;
@@ -16,15 +16,15 @@
 @RequiredArgsConstructor
 public class CredentialOfferCacheStorageServiceImpl implements CredentialOfferCacheStorageService {
 
-    private final CacheStore<CustomCredentialOffer> cacheStore;
+    private final CacheStore<CredentialOfferData> cacheStore;
 
     @Override
-    public Mono<String> saveCustomCredentialOffer(CustomCredentialOffer customCredentialOffer) {
-        return generateCustomNonce().flatMap(nonce -> cacheStore.add(nonce, customCredentialOffer));
+    public Mono<String> saveCustomCredentialOffer(CredentialOfferData credentialOfferData) {
+        return generateCustomNonce().flatMap(nonce -> cacheStore.add(nonce, credentialOfferData));
     }
 
     @Override
-    public Mono<CustomCredentialOffer> getCustomCredentialOffer(String nonce) {
+    public Mono<CredentialOfferData> getCustomCredentialOffer(String nonce) {
         return cacheStore.get(nonce)
                 .doOnSuccess(customCredentialOffer -> {
                     if (customCredentialOffer != null) {
diff --git a/src/main/java/es/in2/issuer/domain/service/impl/CredentialOfferServiceImpl.java b/src/main/java/es/in2/issuer/domain/service/impl/CredentialOfferServiceImpl.java
@@ -1,5 +1,6 @@
 package es.in2.issuer.domain.service.impl;
 
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
 import es.in2.issuer.domain.model.dto.Grant;
 import es.in2.issuer.domain.service.CredentialOfferService;
@@ -27,17 +28,24 @@ public class CredentialOfferServiceImpl implements CredentialOfferService {
     private final AppConfig appConfig;
 
     @Override
-    public Mono<CustomCredentialOffer> buildCustomCredentialOffer(String credentialType, Grant grant) {
-        return Mono.just(CustomCredentialOffer.builder()
-                .credentialIssuer(appConfig.getIssuerApiExternalDomain())
-                .credentials(List.of(CustomCredentialOffer.Credential.builder()
-                        .format(JWT_VC_JSON)
-                        .types(List.of(credentialType))
-                        .build()
-                ))
-                .credentialConfigurationIds(List.of(LEAR_CREDENTIAL_EMPLOYEE))
-                .grants(Map.of(GRANT_TYPE, grant))
-                .build());
+    public Mono<CredentialOfferData> buildCustomCredentialOffer(String credentialType, Grant grant, String employeeEmail, String pin) {
+        return Mono.just(
+
+                CredentialOfferData.builder()
+                        .credentialOffer(CustomCredentialOffer.builder()
+                                        .credentialIssuer(appConfig.getIssuerApiExternalDomain())
+                                        .credentials(List.of(CustomCredentialOffer.Credential.builder()
+                                                .format(JWT_VC_JSON)
+                                                .types(List.of(credentialType))
+                                                .build()
+                                        ))
+                                        .credentialConfigurationIds(List.of(LEAR_CREDENTIAL_EMPLOYEE))
+                                        .grants(Map.of(GRANT_TYPE, grant))
+                                .build()
+                        )
+                        .employeeEmail(employeeEmail)
+                        .pin(pin)
+                        .build());
     }
 
     @Override
diff --git a/src/main/java/es/in2/issuer/infrastructure/config/CacheStoreConfig.java b/src/main/java/es/in2/issuer/infrastructure/config/CacheStoreConfig.java
@@ -1,6 +1,6 @@
 package es.in2.issuer.infrastructure.config;
 
-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.model.dto.VerifiableCredentialJWT;
 import es.in2.issuer.infrastructure.repository.CacheStore;
 import lombok.RequiredArgsConstructor;
@@ -31,7 +31,7 @@ public CacheStore<VerifiableCredentialJWT> cacheStoreForVerifiableCredentialJwt(
     }
 
     @Bean
-    public CacheStore<CustomCredentialOffer> cacheStoreForCredentialOffer() {
+    public CacheStore<CredentialOfferData> cacheStoreForCredentialOffer() {
         return new CacheStore<>(appConfig.getCacheLifetimeForCredentialOffer(), TimeUnit.MINUTES);
     }
 
diff --git a/src/test/java/es/in2/issuer/application/workflow/impl/CredentialOfferIssuanceWorkflowImplTest.java b/src/test/java/es/in2/issuer/application/workflow/impl/CredentialOfferIssuanceWorkflowImplTest.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
 import es.in2.issuer.domain.model.dto.Grant;
 import es.in2.issuer.domain.model.dto.PreAuthCodeResponse;
@@ -21,9 +22,6 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import java.util.List;
-import java.util.Map;
-
 import static es.in2.issuer.domain.util.Constants.CONTENT_TYPE;
 import static es.in2.issuer.domain.util.Constants.CONTENT_TYPE_APPLICATION_JSON;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -65,8 +63,17 @@ class CredentialOfferIssuanceWorkflowImplTest {
     @Test
     void testGetCredentialOffer() {
         String id = "dummyId";
+        String email = "example@example.com";
+        String pin = "1234";
         CustomCredentialOffer credentialOffer = CustomCredentialOffer.builder().build();
-        when(credentialOfferCacheStorageService.getCustomCredentialOffer(id)).thenReturn(Mono.just(credentialOffer));
+        CredentialOfferData credentialOfferData = CredentialOfferData.builder()
+                .credentialOffer(credentialOffer)
+                .pin(pin)
+                .employeeEmail(email)
+                .build();
+
+        when(credentialOfferCacheStorageService.getCustomCredentialOffer(id)).thenReturn(Mono.just(credentialOfferData));
+        when(emailService.sendPin(credentialOfferData.employeeEmail(),"Pin Code", credentialOfferData.pin())).thenReturn(Mono.empty());
 
         Mono<CustomCredentialOffer> result = credentialOfferIssuanceService.getCustomCredentialOffer(id);
         assertEquals(credentialOffer, result.block());
@@ -92,12 +99,14 @@ void testBuildCredentialOfferUri() throws JsonProcessingException {
                         .build()
                 )
                 .build();
-        CustomCredentialOffer credentialOffer = CustomCredentialOffer.builder()
-                .credentialConfigurationIds(List.of(credentialType))
-                .credentialIssuer("https://issuer.com")
-                .grants(Map.of( "pre-authorized_code",preAuthCodeResponse.grant()))
+
+        CredentialOfferData credentialOfferData = CredentialOfferData.builder()
+                .credentialOffer(CustomCredentialOffer.builder().build())
+                .pin("1234")
+                .employeeEmail(mail)
                 .build();
 
+
         when(deferredCredentialMetadataService.validateTransactionCode(transactionCode)).thenReturn(Mono.empty());
         when(deferredCredentialMetadataService.getProcedureIdByTransactionCode(transactionCode)).thenReturn(Mono.just(procedureId));
         when(credentialProcedureService.getCredentialTypeByProcedureId(procedureId)).thenReturn(Mono.just(credentialType));
@@ -121,13 +130,12 @@ void testBuildCredentialOfferUri() throws JsonProcessingException {
         when(objectMapper.readValue("PreAuthorizedCode", PreAuthCodeResponse.class)).thenReturn(preAuthCodeResponse);
         when(deferredCredentialMetadataService.updateAuthServerNonceByTransactionCode(transactionCode,preAuthCodeResponse.grant().preAuthorizedCode()))
                 .thenReturn(Mono.empty());
-        when(credentialOfferService.buildCustomCredentialOffer(credentialType,preAuthCodeResponse.grant())).thenReturn(Mono.just(credentialOffer));
-        when(credentialOfferCacheStorageService.saveCustomCredentialOffer(credentialOffer)).thenReturn(Mono.just(nonce));
-
-        when(credentialOfferService.createCredentialOfferUri(nonce)).thenReturn(Mono.just(credentialOfferUri));
         when(credentialProcedureService.getMandateeEmailFromDecodedCredentialByProcedureId(procedureId)).thenReturn(Mono.just(mail));
+        when(credentialOfferService.buildCustomCredentialOffer(credentialType,preAuthCodeResponse.grant(), mail, preAuthCodeResponse.pin())).thenReturn(Mono.just(credentialOfferData));
 
-        when(emailService.sendPin(mail,"Pin Code", preAuthCodeResponse.pin())).thenReturn(Mono.empty());
+        when(credentialOfferCacheStorageService.saveCustomCredentialOffer(credentialOfferData)).thenReturn(Mono.just(nonce));
+
+        when(credentialOfferService.createCredentialOfferUri(nonce)).thenReturn(Mono.just(credentialOfferUri));
 
         StepVerifier.create(credentialOfferIssuanceService.buildCredentialOfferUri(processId,transactionCode))
                 .expectNext(credentialOfferUri)
diff --git a/src/test/java/es/in2/issuer/domain/service/CredentialOfferCacheStorageServiceImplTest.java b/src/test/java/es/in2/issuer/domain/service/CredentialOfferCacheStorageServiceImplTest.java
@@ -1,7 +1,7 @@
 package es.in2.issuer.domain.service;
 
 import es.in2.issuer.domain.exception.CustomCredentialOfferNotFoundException;
-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.service.impl.CredentialOfferCacheStorageServiceImpl;
 import es.in2.issuer.infrastructure.repository.CacheStore;
 import org.junit.jupiter.api.Test;
@@ -21,35 +21,35 @@
 class CredentialOfferCacheStorageServiceImplTest {
 
     @Mock
-    private CacheStore<CustomCredentialOffer> cacheStore;
+    private CacheStore<CredentialOfferData> cacheStore;
 
     @InjectMocks
     private CredentialOfferCacheStorageServiceImpl service;
 
     @Test
     void testSaveCustomCredentialOffer() {
-        CustomCredentialOffer offer = CustomCredentialOffer.builder().build(); // You should populate it as necessary
+        CredentialOfferData credentialOfferData = CredentialOfferData.builder().build(); // You should populate it as necessary
         String expectedNonce = "testNonce";
 
-        when(cacheStore.add(any(String.class), eq(offer))).thenReturn(Mono.just(expectedNonce));
+        when(cacheStore.add(any(String.class), eq(credentialOfferData))).thenReturn(Mono.just(expectedNonce));
 
-        StepVerifier.create(service.saveCustomCredentialOffer(offer))
+        StepVerifier.create(service.saveCustomCredentialOffer(credentialOfferData))
                 .expectNext(expectedNonce)
                 .verifyComplete();
 
-        verify(cacheStore, times(1)).add(any(String.class), eq(offer));
+        verify(cacheStore, times(1)).add(any(String.class), eq(credentialOfferData));
     }
 
     @Test
     void testGetCustomCredentialOffer() {
         String nonce = "testNonce";
-        CustomCredentialOffer offer = CustomCredentialOffer.builder().build(); // Populate this object as necessary
+        CredentialOfferData credentialOfferData = CredentialOfferData.builder().build(); // You should populate it as necessary
 
-        when(cacheStore.get(nonce)).thenReturn(Mono.just(offer));
+        when(cacheStore.get(nonce)).thenReturn(Mono.just(credentialOfferData));
         when(cacheStore.delete(nonce)).thenReturn(Mono.empty());
 
         StepVerifier.create(service.getCustomCredentialOffer(nonce))
-                .expectNextMatches(retrievedOffer -> retrievedOffer.equals(offer))
+                .expectNextMatches(retrievedOffer -> retrievedOffer.equals(credentialOfferData))
                 .verifyComplete();
 
         verify(cacheStore, times(1)).delete(nonce);
diff --git a/src/test/java/es/in2/issuer/domain/service/CredentialOfferServiceImplTest.java b/src/test/java/es/in2/issuer/domain/service/CredentialOfferServiceImplTest.java
@@ -36,16 +36,18 @@ void setUp() {
     void testBuildCustomCredentialOffer() {
         String credentialType = "type1";
         String preAuthCode = "code123";
+        String email = "example@exmple.com";
+        String pin = "1234";
         Grant grant = Grant.builder().preAuthorizedCode(preAuthCode).txCode(Grant.TxCode.builder().length(4).build()).build();
         when(appConfig.getIssuerApiExternalDomain()).thenReturn("https://example.com");
-        StepVerifier.create(credentialOfferService.buildCustomCredentialOffer(credentialType, grant))
+        StepVerifier.create(credentialOfferService.buildCustomCredentialOffer(credentialType, grant, email, pin))
                 .expectNextMatches(offer ->
-                        offer.credentialIssuer().equals("https://example.com") &&
-                                offer.credentials().size() == 1 &&
-                                offer.credentialConfigurationIds().equals(List.of(LEAR_CREDENTIAL_EMPLOYEE)) &&
-                                offer.grants().containsKey(GRANT_TYPE) &&
-                                offer.grants().get(GRANT_TYPE).preAuthorizedCode().equals(preAuthCode) &&
-                                offer.grants().get(GRANT_TYPE).txCode().length() == 4
+                        offer.credentialOffer().credentialIssuer().equals("https://example.com") &&
+                                offer.credentialOffer().credentials().size() == 1 &&
+                                offer.credentialOffer().credentialConfigurationIds().equals(List.of(LEAR_CREDENTIAL_EMPLOYEE)) &&
+                                offer.credentialOffer().grants().containsKey(GRANT_TYPE) &&
+                                offer.credentialOffer().grants().get(GRANT_TYPE).preAuthorizedCode().equals(preAuthCode) &&
+                                offer.credentialOffer().grants().get(GRANT_TYPE).txCode().length() == 4
                 )
                 .verifyComplete();
     }
diff --git a/src/test/java/es/in2/issuer/infrastructure/config/CacheStoreConfigTest.java b/src/test/java/es/in2/issuer/infrastructure/config/CacheStoreConfigTest.java
@@ -1,6 +1,6 @@
 package es.in2.issuer.infrastructure.config;
 
-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;
+import es.in2.issuer.domain.model.dto.CredentialOfferData;
 import es.in2.issuer.domain.model.dto.VerifiableCredentialJWT;
 import es.in2.issuer.infrastructure.repository.CacheStore;
 import org.junit.jupiter.api.BeforeEach;
@@ -51,7 +51,7 @@ void testCacheStoreForCredentialOffer() {
         long cacheLifetime = 60;
         when(appConfig.getCacheLifetimeForCredentialOffer()).thenReturn(cacheLifetime);
 
-        CacheStore<CustomCredentialOffer> customCredentialOfferCacheStore = cacheStoreConfig.cacheStoreForCredentialOffer();
+        CacheStore<CredentialOfferData> customCredentialOfferCacheStore = cacheStoreConfig.cacheStoreForCredentialOffer();
         assertNotNull(customCredentialOfferCacheStore);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ plugins {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`group = 'es.in2'`
`14`		`-version = '1.1.1'`
	`14`	`+version = '1.1.2'`
`15`	`15`
`16`	`16`	`java {`
`17`	`17`	`sourceCompatibility = '17'`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package es.in2.issuer.infrastructure.config;`
`2`	`2`
`3`		`-import es.in2.issuer.domain.model.dto.CustomCredentialOffer;`
	`3`	`+import es.in2.issuer.domain.model.dto.CredentialOfferData;`
`4`	`4`	`import es.in2.issuer.domain.model.dto.VerifiableCredentialJWT;`
`5`	`5`	`import es.in2.issuer.infrastructure.repository.CacheStore;`
`6`	`6`	`import lombok.RequiredArgsConstructor;`
`@@ -31,7 +31,7 @@ public CacheStore<VerifiableCredentialJWT> cacheStoreForVerifiableCredentialJwt(`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Bean`
`34`		`- public CacheStore<CustomCredentialOffer> cacheStoreForCredentialOffer() {`
	`34`	`+ public CacheStore<CredentialOfferData> cacheStoreForCredentialOffer() {`
`35`	`35`	`return new CacheStore<>(appConfig.getCacheLifetimeForCredentialOffer(), TimeUnit.MINUTES);`
`36`	`36`	`}`
`37`	`37`