split tenant specific notification to external and exiting user

notification-service/notification-web/src/main/resources/config/notification-devel.yml

@@ -48,9 +48,12 @@ notification:
       - #publicContactSupportType
         type: B542B606-ACC6-4629-ADEF-4D8EE2F01222
         contacts: [ email ]
-      - #tenantSpecificInvitationUserType
+      - #tenantSpecificInvitationExternalUserType
         type: 497dada5-eccc-4bc0-9e0b-63e22b4eb0be
         contacts: [ email ]
+      - #tenantSpecificInvitationExistingUserType
+        type: b3809c17-d1e4-420a-919c-828564114191
+        contacts: [ inapp, email ]
   message:
     email:
       flows:
@@ -389,18 +392,45 @@ notification:
           bcc-mode: 0
           allow-attachments: false
           cipher-fields: [ ]
-        - #tenantSpecificInvitationUserType
+        - #tenantSpecificInvitationExternalUserType
           key: 497dada5-eccc-4bc0-9e0b-63e22b4eb0be
-          subject-path: classpath:notification_templates/tenantspecificinvitationuser/email/subject.{language}.txt
+          subject-path: classpath:notification_templates/tenantspecificinvitationexternaluser/email/subject.{language}.txt
           subject-field-options:
             mandatory: [ ]
             optional: [ ]
-          body-path: classpath:notification_templates/tenantspecificinvitationuser/email/body.{language}.html
+          body-path: classpath:notification_templates/tenantspecificinvitationexternaluser/email/body.{language}.html
           body-field-options:
-            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}", "{tenantName}" ]
+            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
             optional:
               - key: "{expiration_time}"
                 value: ---
+              - key: "{tenantName}"
+                value: OpenCDMP
+            formatting:
+              '[{userName}]': null
+              '[{tenantName}]': null
+              '[{installation-url}]': null
+              '[{expiration_time}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
+        - #tenantSpecificInvitationExistingUserType
+          key: b3809c17-d1e4-420a-919c-828564114191
+          subject-path: classpath:notification_templates/tenantspecificinvitationexistinguser/email/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/tenantspecificinvitationexistinguser/email/body.{language}.html
+          body-field-options:
+            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
+            optional:
+              - key: "{expiration_time}"
+                value: ---
+              - key: "{tenantName}"
+                value: OpenCDMP
             formatting:
               '[{userName}]': null
               '[{tenantName}]': null
@@ -668,6 +698,31 @@ notification:
               '[{tenant-url-path}]': null
           priority-key: null
           cipher-fields: [ ]
+        - #tenantSpecificInvitationExistingUserType
+          key: b3809c17-d1e4-420a-919c-828564114191
+          subject-path: classpath:notification_templates/tenantspecificinvitationexistinguser/inapp/subject.{language}.txt
+          subject-field-options:
+            mandatory: [ ]
+            optional: [ ]
+          body-path: classpath:notification_templates/tenantspecificinvitationexistinguser/inapp/body.{language}.html
+          body-field-options:
+            mandatory: [ "{userName}", "{installation-url}", "{confirmationToken}" ]
+            optional:
+              - key: "{expiration_time}"
+                value: ---
+              - key: "{tenantName}"
+                value: OpenCDMP
+            formatting:
+              '[{userName}]': null
+              '[{tenantName}]': null
+              '[{installation-url}]': null
+              '[{expiration_time}]': null
+          cc: [ ]
+          cc-mode: 0
+          bcc: [ ]
+          bcc-mode: 0
+          allow-attachments: false
+          cipher-fields: [ ]
       template-cache:
         prefix: ${CACHE_DISAMBIGUATION}
         key-pattern: "{prefix}:Notification_Message_InApp_Template:{key}:v0"

notification-service/notification-web/src/main/resources/notification_templates/tenantspecificinvitationexistinguser/email/body.en.html

@@ -271,7 +271,7 @@
                                                     <table border="0" cellpadding="0" cellspacing="0">
                                                         <tbody>
                                                         <tr>
-                                                            <td> <a href="{installation-url}/login/tenant/confirmation/{confirmationToken}" target="_blank">Confirm Tenant Invitation</a> </td>
+                                                            <td> <a href="{installation-url}/login/invitation/confirmation/{confirmationToken}" target="_blank">Confirm Invitation</a> </td>
                                                         </tr>
                                                         </tbody>
                                                     </table>

notification-service/notification-web/src/main/resources/notification_templates/tenantspecificinvitationexistinguser/email/subject.en.txt

@@ -0,0 +1 @@
+OpenCDMP - Invitation

notification-service/notification-web/src/main/resources/notification_templates/tenantspecificinvitationexistinguser/inapp/subject.en.txt

@@ -0,0 +1 @@
+OpenCDMP - Invitation

notification-service/notification-web/src/main/resources/notification_templates/tenantspecificinvitationexternaluser/email/subject.en.txt

@@ -0,0 +1 @@
+OpenCDMP - Invitation

notification-service/notification-web/src/main/resources/notification_templates/tenantspecificinvitationuser/email/subject.en.txt

@@ -1 +0,0 @@
-OpenCDMP - Tenant Invitation