Feature/2.1.0 (#180)

* udpate version

* feat(CredentialIssuanceWorkflowImpl): send vc offer email to credential_owner_email

* feat: for LEARCredentialMachine issuance, use credential owner email if present

* add log

* fix(CredentialIssuanceWorkflowImpl): send encoded credential to response uri, instead of decoded

* test

* update changelog

* fix(CredentialIssuanceWorkflow): get encoded credential from udpated procedure

Author: rogermiretin2

CHANGELOG.md

@@ -4,6 +4,13 @@ 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).
 
+## [v2.1.0](https://github.com/in2workspace/in2-issuer-api/releases/tag/v2.1.0)
+### Changed
+- If LEARCredentialMachine issuance presubmitted data contains credential_owner_email, use it to send the credential offer, instead of mandator email.
+
+### Fixed
+- When sending Label Credential to VC URI, send it encoded.
+
 ## [v2.0.0](https://github.com/in2workspace/in2-issuer-api/releases/tag/v2.0.0)
 ### Added
 - Label credential issuance.

build.gradle

@@ -12,7 +12,7 @@ plugins {
 
 group = 'es.in2'
 
-version = '2.0.0'
+version = '2.1.0'
 
 java {
     sourceCompatibility = '17'

src/main/java/es/in2/issuer/backend/shared/application/workflow/impl/CredentialIssuanceWorkflowImpl.java

@@ -118,7 +118,13 @@ private CredentialOfferEmailNotificationInfo extractCredentialOfferEmailInfo(Pre
                 yield new CredentialOfferEmailNotificationInfo(email, user, org);
             }
             case LEAR_CREDENTIAL_MACHINE -> {
-                String email = payload.get(MANDATOR).get(EMAIL).asText();
+                String email;
+                if(preSubmittedCredentialDataRequest.credentialOwnerEmail() == null || preSubmittedCredentialDataRequest.credentialOwnerEmail().isBlank()) {
+                    email = payload.get(MANDATOR).get(EMAIL).asText();
+                    log.debug("No credential owner email found in presubmitted data. Using mandator email: {}", payload.get(MANDATOR).get(EMAIL).asText());
+                } else {
+                    email = preSubmittedCredentialDataRequest.credentialOwnerEmail();
+                }
                 String org = payload.get(MANDATOR).get(ORGANIZATION).asText();
                 String name = payload.get(MANDATOR).get(COMMON_NAME).asText();
                 yield new CredentialOfferEmailNotificationInfo(email, name, org);
@@ -264,15 +270,24 @@ private Mono<CredentialResponse> handleOperationMode(
                                 Mono<Void> upd = !CredentialStatusEnum.PEND_SIGNATURE.toString().equals(status)
                                         ? credentialProcedureService.updateCredentialProcedureCredentialStatusToValidByProcedureId(id)
                                         : Mono.empty();
-                                return upd.then(credentialProcedureService.getDecodedCredentialByProcedureId(id));
+                                return upd.then(credentialProcedureService.getDecodedCredentialByProcedureId(id)
+                                        .zipWith(credentialProcedureService.getCredentialProcedureById(id)));
                             })
-                            .flatMap(decoded -> {
+                            .flatMap(tuple -> {
+                                String decoded = tuple.getT1();
+                                CredentialProcedure updatedCredentialProcedure = tuple.getT2();
+
                                 CredentialType typeEnum = CredentialType.valueOf(credentialProcedure.getCredentialType());
                                 if (typeEnum == CredentialType.LEAR_CREDENTIAL_EMPLOYEE) {
                                     return getMandatorOrganizationIdentifier(processId, decoded);
                                 }
 
                                 if (deferred.getResponseUri() != null && !deferred.getResponseUri().isBlank()) {
+                                    String encodedCredential = updatedCredentialProcedure.getCredentialEncoded();
+                                    if (encodedCredential == null || encodedCredential.isBlank()) {
+                                        return Mono.error(new IllegalStateException("Encoded credential not found for procedureId: " + updatedCredentialProcedure.getProcedureId()));
+                                    }
+
                                     log.info("Sending VC to response URI: {}", deferred.getResponseUri());
                                     return credentialProcedureService.getCredentialId(credentialProcedure)
                                             .doOnNext(credentialId -> log.debug("Using credentialId for delivery: {}", credentialId))
@@ -281,7 +296,7 @@ private Mono<CredentialResponse> handleOperationMode(
                                                             .flatMap(tokenResponse ->
                                                                     credentialDeliveryService.sendVcToResponseUri(
                                                                             deferred.getResponseUri(),
-                                                                            decoded,
+                                                                            encodedCredential,
                                                                             credentialId,
                                                                             credentialProcedure.getOwnerEmail(),
                                                                             tokenResponse.accessToken()