Hotfix/cross browser compat email template (#62)

* make activate credential email template with tables so it is compatible with all browsers

* Changing environment variable for wallet knowledge redirection to email.

* chenge register

* update version

* update version

* update enum credential status for pol changes

* changes in qr image mail

* change img to base64

* update ci-image

* update wallet-url

* temporary comment

* Change in version

---------

Co-authored-by: roger <[email protected]>

Author: DanielaIn2

CHANGELOG.md

@@ -4,6 +4,11 @@ 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.2.5](https://github.com/in2workspace/in2-issuer-api/releases/tag/v1.2.5)
+### Changed
+- Changing environment variable for wallet knowledge redirection to email.
+- Changed email template implementation for better compatibility.
+
 ## [v1.2.4](https://github.com/in2workspace/in2-issuer-api/releases/tag/v1.2.3)
 ### Changed
 - Fix a problem with a cors endpoint.

build.gradle

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = 'es.in2'
-version = '1.2.4'
+version = '1.2.5'
 
 java {
     sourceCompatibility = '17'

src/main/java/es/in2/issuer/application/workflow/impl/VerifiableCredentialIssuanceWorkflowImpl.java

@@ -80,7 +80,7 @@ private Mono<Void> sendCredentialOfferEmail(String transactionCode, IssuanceRequ
         String email = issuanceRequest.payload().get(MANDATEE).get(EMAIL).asText();
         String user = issuanceRequest.payload().get(MANDATEE).get(FIRST_NAME).asText() + " " + issuanceRequest.payload().get(MANDATEE).get(LAST_NAME).asText();
         String organization = issuanceRequest.payload().get(MANDATOR).get(ORGANIZATION).asText();
-        return emailService.sendTransactionCodeForCredentialOffer(email, "Activate your new credential", appConfig.getIssuerUiExternalDomain() + "/credential-offer?transaction_code=" + transactionCode, appConfig.getKnowledgebaseUrl(), user, organization);
+        return emailService.sendTransactionCodeForCredentialOffer(email, "Activate your new credential", appConfig.getIssuerUiExternalDomain() + "/credential-offer?transaction_code=" + transactionCode, appConfig.getKnowledgebaseWalletUrl(), user, organization);
     }
 
     private Mono<Void> sendVcToResponseUri(IssuanceRequest issuanceRequest, String encodedVc, String token) {

src/main/java/es/in2/issuer/domain/model/enums/CredentialStatus.java

@@ -5,6 +5,7 @@ public enum CredentialStatus {
     DRAFT,
     ISSUED,
     PEND_DOWNLOAD,
+    PEND_SIGNATURE,
     VALID,
     REVOKED,
     EXPIRED

src/main/java/es/in2/issuer/domain/service/EmailService.java

@@ -4,7 +4,7 @@
 
 public interface EmailService {
     Mono<Void> sendPin(String to, String subject, String pin);
-    Mono<Void> sendTransactionCodeForCredentialOffer(String to, String subject, String link, String knowledgebaseUrl, String user, String organization);
+    Mono<Void> sendTransactionCodeForCredentialOffer(String to, String subject, String link, String knowledgebaseWalletUrl, String user, String organization);
     Mono<Void> sendPendingCredentialNotification(String to, String subject);
     Mono<Void> sendCredentialSignedNotification(String to, String subject, String name);
     Mono<Void> sendResponseUriFailed(String to, String productId, String guideUrl);

src/main/java/es/in2/issuer/domain/service/impl/EmailServiceImpl.java

@@ -49,7 +49,7 @@ public Mono<Void> sendPin(String to, String subject, String pin) {
     }
 
     @Override
-    public Mono<Void> sendTransactionCodeForCredentialOffer(String to, String subject, String link, String knowledgebaseUrl, String user, String organization) {
+    public Mono<Void> sendTransactionCodeForCredentialOffer(String to, String subject, String link, String knowledgebaseWalletUrl, String user, String organization) {
         return Mono.fromCallable(() -> {
             MimeMessage mimeMessage = javaMailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, UTF_8);
@@ -67,7 +67,7 @@ public Mono<Void> sendTransactionCodeForCredentialOffer(String to, String subjec
             context.setVariable("link", link);
             context.setVariable("user", user);
             context.setVariable("organization", organization);
-            context.setVariable("knowledgebaseUrl", knowledgebaseUrl);
+            context.setVariable("knowledgebaseWalletUrl", knowledgebaseWalletUrl);
             context.setVariable("imageResourceName", "cid:" + imageResourceName);
 
             String htmlContent = templateEngine.process("activate-credential-email", context);

src/main/java/es/in2/issuer/domain/service/impl/NotificationServiceImpl.java

@@ -38,7 +38,7 @@ public Mono<Void> sendNotification(String processId, String procedureId) {
                                                         email,
                                                         "Activate your new credential",
                                                         appConfig.getIssuerUiExternalDomain() + "/credential-offer?transaction_code=" + newTransactionCode,
-                                                        appConfig.getKnowledgebaseUrl(),
+                                                        appConfig.getKnowledgebaseWalletUrl(),
                                                         completeName,
                                                         organization
                                                 ));

src/main/java/es/in2/issuer/infrastructure/config/AppConfig.java

@@ -41,8 +41,8 @@ public String getIssuerUiExternalDomain() {
         return configAdapter.getConfiguration(issuerUiProperties.externalDomain());
     }
 
-    public String getKnowledgebaseUrl() {
-        return configAdapter.getConfiguration(knowledgeBaseProperties.url());
+    public String getKnowledgebaseWalletUrl() {
+        return configAdapter.getConfiguration(knowledgeBaseProperties.walletUrl());
     }
 
     public String getKnowledgeBaseUploadCertificationGuideUrl() {

src/main/java/es/in2/issuer/infrastructure/config/properties/KnowledgeBaseProperties.java

@@ -7,7 +7,7 @@
 @ConfigurationProperties(prefix = "knowledge-base")
 @Validated
 public record KnowledgeBaseProperties(
-        @NotNull String url,
+        @NotNull String walletUrl,
         @NotNull String uploadCertificationGuideUrl
 ) {
 }

src/main/resources/application-dev.yml

@@ -144,7 +144,7 @@ trust-framework:
 
 knowledge-base:
   upload-certification-guide-url: "https://knowledgebase.dome-marketplace-prd.org"
-  url: "https://knowledgebase.dome-marketplace-prd.org"
+  wallet-url: "https://knowledgebase.dome-marketplace-prd.org/books/dome-digital-wallet-user-guide"
 
 cors:
   default-allowed-origins: "https://issuer.dome-marketplace-sbx.org"