Added the properties for notification changes of add delegate (#7271)

* Added the properties for notification changes of add delegate

* More props changes

* Templates fixes for notification

* More fixes for sending notification

Author: Camelia-Orcid

orcid-core/src/main/java/org/orcid/core/manager/v3/impl/NotificationManagerImpl.java

@@ -347,11 +347,11 @@ public void sendNotificationToUserGrantingPermission(String userGrantingPermissi
     public void sendRevokeNotificationToUserGrantingPermission(String userGrantingPermission, String userReceivingPermission) {
         ProfileEntity userGrantingProfileEntity = profileEntityCacheManager.retrieve(userGrantingPermission);
         String emailName = recordNameManagerV3.deriveEmailFriendlyName(userGrantingPermission);
-
+        String emailNameForDelegate = recordNameManagerV3.deriveEmailFriendlyName(userReceivingPermission);
         Locale userLocale = getUserLocaleFromProfileEntity(userGrantingProfileEntity);
 
-        String subject = messages.getMessage("email.subject.delegate.revoked", new String[] { emailName }, userLocale); 
-        String emailNameForDelegate = recordNameManagerV3.deriveEmailFriendlyName(userReceivingPermission);
+        String subject = messages.getMessage("email.subject.delegate.revoked", new String[] { emailNameForDelegate }, userLocale); 
+        
 
         org.orcid.jaxb.model.v3.release.record.Email primaryEmail = emailManager.findPrimaryEmail(userGrantingPermission);
         String grantingOrcidEmail = primaryEmail.getEmail();

orcid-core/src/main/resources/i18n/email_added_as_delegate_en.properties

@@ -6,7 +6,8 @@
 # You have been made an Account Delegate by ${grantingOrcidName} with the ORCID iD
 # ${baseUri}/${grantingOrcidValue}. Being made an Account Delegate means
 # that this user has included you in their trusted relationships. As a result you
-# may update and make additions to ${grantingOrcidName}'s ORCID Record.
+# may update and make additions to ${grantingOrcidName}'s ORCID Record.  You can revoke your account delegate 
+# access to their record at any time from the Trusted Parties section of your ORCID account.
 #
 email.added_as_delegate.you_have.1=You have been made an Account Delegate by
 # ${grantingOrcidName}
@@ -16,7 +17,9 @@ email.added_as_delegate.you_have.3=. Being made an Account Delegate means\n\
                           that this user has included you in their trusted relationships. As a result you\n\
                           may update and make additions to 
 #${grantingOrcidName}
-email.added_as_delegate.you_have.4='s ORCID Record.\n
+email.added_as_delegate.you_have.4='s ORCID Record. You can revoke your account delegate access to their record at any time from the
+email.added_as_delegate.you_have.5=Trusted Parties
+email.added_as_delegate.you_have.6=section of your ORCID account
 
 email.added_as_delegate.for_a_tutorial=For a tutorial on the functions that you can perform as an Account Delegate please\n\
                                        view https://support.orcid.org/hc/articles/360006973613.\n

orcid-core/src/main/resources/i18n/email_added_as_delegate_lr.properties

@@ -2,6 +2,8 @@ email.added_as_delegate.you_have.1=LR
 email.added_as_delegate.you_have.2=LR
 email.added_as_delegate.you_have.3=LR
 email.added_as_delegate.you_have.4=LR
+email.added_as_delegate.you_have.5=LR
+email.added_as_delegate.you_have.6=LR
 email.added_as_delegate.for_a_tutorial=LR
 email.added_as_delegate.if_you_have.1=LR
 email.added_as_delegate.if_you_have.2=LR

orcid-core/src/main/resources/i18n/email_added_as_delegate_rl.properties

@@ -2,6 +2,8 @@ email.added_as_delegate.you_have.1=RL
 email.added_as_delegate.you_have.2=RL
 email.added_as_delegate.you_have.3=RL
 email.added_as_delegate.you_have.4=RL
+email.added_as_delegate.you_have.5=RL
+email.added_as_delegate.you_have.6=RL
 email.added_as_delegate.for_a_tutorial=RL
 email.added_as_delegate.if_you_have.1=RL
 email.added_as_delegate.if_you_have.2=RL

orcid-core/src/main/resources/i18n/email_added_as_delegate_xx.properties

@@ -2,6 +2,8 @@ email.added_as_delegate.you_have.1=X
 email.added_as_delegate.you_have.2=X
 email.added_as_delegate.you_have.3=X
 email.added_as_delegate.you_have.4=X
+email.added_as_delegate.you_have.5=X
+email.added_as_delegate.you_have.6=X
 email.added_as_delegate.for_a_tutorial=X
 email.added_as_delegate.if_you_have.1=X
 email.added_as_delegate.if_you_have.2=X

orcid-core/src/main/resources/i18n/email_subject_en.properties

@@ -21,4 +21,4 @@ email.subject.reactivatingAccount=[ORCID] Reactivating your ORCID account
 email.subject.register.welcome=[ORCID] Welcome to ORCID - verify your email address
 email.subject.delegate.recipient=[ORCID] You've made an Account Delegate!
 email.subject.add_works=[ORCID] Add Research Outputs to your ORCID record
-email.subject.delegate.revoked=[ORCID] {0} has revoked their Account Delegate access to your record
+email.subject.delegate.revoked={0} has revoked their Account Delegate access to your record

orcid-core/src/main/resources/i18n/notification_delegate_en.properties

@@ -8,6 +8,9 @@ notification.delegate.receipt.trustedIndividual=has made you an Account Delegate
 notification.delegate.receipt.accountDelegate=You have been made an Account Delegate by
 notification.delegate.receipt.accountDelegateMeans=Being made an Account Delegate means that this user has included you in their trusted relationships. As a trusted individual you can change
 notification.delegate.receipt.orcidRecord=ORCID record.
+notification.delegate.receipt.revokeAnytime=You can revoke your account delegate access to their record at any time from the
+notification.delegate.receipt.trustedParties=Trusted parties
+notification.delegate.receipt.sectionOf=section of your ORCID account.
 notification.delegate.receipt.tutorial=For a tutorial on the functions that you can perform as an Account Delegate please view
 notification.delegate.receipt.questions=If you have questions or concerns about being an Account Delegate, please contact
 notification.delegate.receipt.helpDesk=or the ORCID Help Desk at

orcid-core/src/main/resources/i18n/notification_delegate_lr.properties

@@ -10,6 +10,9 @@ notification.delegate.receipt.trustedIndividual=LR
 notification.delegate.receipt.accountDelegate=LR
 notification.delegate.receipt.accountDelegateMeans=LR
 notification.delegate.receipt.orcidRecord=LR
+notification.delegate.receipt.revokeAnytime=LR
+notification.delegate.receipt.trustedParties=LR
+notification.delegate.receipt.sectionOf=LR
 notification.delegate.receipt.tutorial=LR
 notification.delegate.receipt.questions=LR
 notification.delegate.receipt.helpDesk=LR

orcid-core/src/main/resources/i18n/notification_delegate_rl.properties

@@ -10,6 +10,9 @@ notification.delegate.receipt.trustedIndividual=RL
 notification.delegate.receipt.accountDelegate=RL
 notification.delegate.receipt.accountDelegateMeans=RL
 notification.delegate.receipt.orcidRecord=RL
+notification.delegate.receipt.revokeAnytime=RL
+notification.delegate.receipt.trustedParties=RL
+notification.delegate.receipt.sectionOf=RL
 notification.delegate.receipt.tutorial=RL
 notification.delegate.receipt.questions=RL
 notification.delegate.receipt.helpDesk=RL

orcid-core/src/main/resources/i18n/notification_delegate_xx.properties

@@ -10,6 +10,9 @@ notification.delegate.receipt.trustedIndividual=XX
 notification.delegate.receipt.accountDelegate=XX
 notification.delegate.receipt.accountDelegateMeans=XX
 notification.delegate.receipt.orcidRecord=XX
+notification.delegate.receipt.revokeAnytime=XX
+notification.delegate.receipt.trustedParties=XX
+notification.delegate.receipt.sectionOf=XX
 notification.delegate.receipt.tutorial=XX
 notification.delegate.receipt.questions=XX
 notification.delegate.receipt.helpDesk=XX

orcid-core/src/main/resources/org/orcid/core/template/added_as_delegate_email.ftl

@@ -2,6 +2,7 @@
 <@emailMacros.msg "email.common.dear" /> ${emailNameForDelegate}<@emailMacros.msg "email.common.dear.comma" />
 
 <@emailMacros.msg "email.added_as_delegate.you_have.1" /><@emailMacros.space />${grantingOrcidName}<@emailMacros.space /><@emailMacros.msg "email.added_as_delegate.you_have.2" />${baseUri}/${grantingOrcidValue}?lang=${locale}<@emailMacros.msg "email.added_as_delegate.you_have.3" /><@emailMacros.space />${grantingOrcidName}<@emailMacros.msg "email.added_as_delegate.you_have.4" />
+<@emailMacros.space /><@emailMacros.space /><a style="text-decoration: underline;color: #085c77;display: inline-block;" href="${baseUri}/trusted-parties" target="_blank"><@emailMacros.msg "email.added_as_delegate.you_have.5" /></a><@emailMacros.space /><@emailMacros.msg "email.added_as_delegate.you_have.6" />
 
 <@emailMacros.msg "email.added_as_delegate.for_a_tutorial" />
 

orcid-core/src/main/resources/org/orcid/core/template/added_as_delegate_email_html.ftl

@@ -14,6 +14,7 @@
 		    </span>
 		    <p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
                 <@emailMacros.msg "email.added_as_delegate.you_have.1" /><@emailMacros.space />${grantingOrcidName}<@emailMacros.space /><@emailMacros.msg "email.added_as_delegate.you_have.2" /><a href="${baseUri}/${grantingOrcidValue}?lang=${locale}" rel="noopener noreferrer" target="orcid.blank">${baseUri}/${grantingOrcidValue}</a><@emailMacros.msg "email.added_as_delegate.you_have.3" />${grantingOrcidName}<@emailMacros.msg "email.added_as_delegate.you_have.4" />
+		        <@emailMacros.space /><@emailMacros.space /><a style="text-decoration: underline;color: #085c77;display: inline-block;" href="${baseUri}/trusted-parties" target="_blank"><@emailMacros.msg "email.added_as_delegate.you_have.5" /></a><@emailMacros.space /><@emailMacros.msg "email.added_as_delegate.you_have.6" />
 		    </p>
 		    <p style="font-family: arial, helvetica, sans-serif; font-size: 15px; color: #494A4C;">
                 <@emailMacros.msg "email.added_as_delegate.for_a_tutorial" />

orcid-core/src/main/resources/org/orcid/core/template/delegate_recipient_notification.ftl

@@ -7,7 +7,7 @@ ${emailNameGrantingPermission}<@emailMacros.space /><@emailMacros.msg "notificat
 
 <@emailMacros.msg "notification.delegate.receipt.accountDelegate" /><@emailMacros.space />${emailNameGrantingPermission}<@emailMacros.space /><@emailMacros.msg "notification.delegate.asTrustedIndividual" />
 
-<@emailMacros.msg "notification.delegate.receipt.accountDelegateMeans" /><@emailMacros.space />${emailNameGrantingPermission}<@emailMacros.space /><@emailMacros.msg "notification.delegate.receipt.orcidRecord" />
+<@emailMacros.msg "notification.delegate.receipt.accountDelegateMeans" /><@emailMacros.space />${emailNameGrantingPermission}<@emailMacros.space /><@emailMacros.msg "notification.delegate.receipt.orcidRecord" /><@emailMacros.space /><@emailMacros.msg "notification.delegate.receipt.revokeAnytime" /><@emailMacros.space /><a style="text-decoration: underline;color: #085c77;display: inline-block;" href="${baseUri}/trusted-parties" target="_blank"><@emailMacros.msg "notification.delegate.receipt.trustedParties" /></a><@emailMacros.space /><@emailMacros.msg "notification.delegate.receipt.sectionOf" />
 
 <@emailMacros.msg "notification.delegate.receipt.tutorial" /><@emailMacros.space />https://support.orcid.org/hc/articles/360006973613.
 

orcid-core/src/main/resources/org/orcid/core/template/delegate_recipient_notification_html.ftl

@@ -19,6 +19,7 @@
             <@emailMacros.msg "notification.delegate.receipt.accountDelegateMeans" />
             <@emailMacros.space />${emailNameGrantingPermissionWithApostrophe}
             <@emailMacros.msg "notification.delegate.receipt.orcidRecord" />
+            <@emailMacros.space /><@emailMacros.msg "notification.delegate.receipt.revokeAnytime" /><@emailMacros.space /><a style="text-decoration: underline;color: #085c77;display: inline-block;" href="${baseUri}/trusted-parties" target="_blank"><@emailMacros.msg "notification.delegate.receipt.trustedParties" /></a><@emailMacros.space /><@emailMacros.msg "notification.delegate.receipt.sectionOf" />
         </p>
         <p>
             <@emailMacros.msg "notification.delegate.receipt.tutorial" /><@emailMacros.space />

orcid-core/src/main/resources/org/orcid/core/template/delegate_revoke_notification_html.ftl

@@ -6,8 +6,6 @@
         <title>${subject}</title>
     </head>
     <body>
-    <#include "notification_header_html.ftl"/>
-            <p>
                 <b>${emailNameForDelegate}</b>
                 <@emailMacros.space />
             <a style="text-decoration: underline;color: #085c77;display: inline-block;" href="${baseUri}/${orcidValueForDelegate}" target="_blank">
@@ -21,7 +19,6 @@
                 <@emailMacros.msg "notification.delegate.receipt.trustedIndividuals" />
             </a>
             </p>
-            <#include "notification_footer_html.ftl"/>
         </body>
  </html>
  </#escape>

orcid-scheduler-web/src/main/java/org/orcid/scheduler/email/cli/manager/EmailMessageSenderImpl.java

@@ -197,13 +197,13 @@ public EmailMessage createDigest(String orcid, Collection<Notification> notifica
             if (notification instanceof NotificationAdministrative) {
                 NotificationAdministrative notificationAdministrative = (NotificationAdministrative) notification;
                 subjectDelegate = notificationAdministrative.getSubject();
-                if (subjectDelegate.endsWith("has made you an Account Delegate for their ORCID record")) {
+                if (subjectDelegate.endsWith("has made you an Account Delegate for their ORCID record") || subjectDelegate.endsWith("has revoked their Account Delegate access to your record")) {
                     bodyHtmlDelegateRecipient = getHtmlBody(notificationAdministrative);
                 } else if (subjectDelegate.endsWith("has been added as a Trusted Individual")) {
                     bodyHtmlDelegate = getHtmlBody(notificationAdministrative);
                 } else if (subjectDelegate != null && subjectDelegate.startsWith("[ORCID] Trusting")) {
                     bodyHtmlAdminDelegate = getHtmlBody(notificationAdministrative);
-                }
+                } 
             }
             digestEmail.addNotification(notification);
             if (notification.getSource() == null) {