From 5319d5565eb2fb455cd5e91043562aa9a83c0391 Mon Sep 17 00:00:00 2001 From: amentis Date: Wed, 5 Jun 2024 16:38:27 +0300 Subject: [PATCH] notification template file changes --- .../src/main/resources/config/permissions.yml | 8 ++++---- .../filetransformer/FileTransformerServiceImpl.java | 4 ++-- .../src/main/resources/config/permissions.yml | 10 +++++----- .../contactsupport/email/subject.en.txt | 2 +- .../descriptionfinalised/email/subject.en.txt | 2 +- .../descriptionfinalised/inapp/subject.en.txt | 2 +- .../descriptionmodified/email/subject.en.txt | 2 +- .../descriptionmodified/inapp/subject.en.txt | 2 +- .../descriptiontemplateinvitation/email/subject.en.txt | 2 +- .../descriptiontemplateinvitation/inapp/subject.en.txt | 2 +- .../mergeacountconfirmation/email/subject.en.txt | 2 +- .../mergeacountconfirmation/inapp/subject.en.txt | 2 +- .../plandeposit/email/subject.en.txt | 2 +- .../plandeposit/inapp/subject.en.txt | 2 +- .../planfinalised/email/subject.en.txt | 2 +- .../planfinalised/inapp/subject.en.txt | 2 +- .../planinvitationexistinguser/email/subject.en.txt | 2 +- .../planinvitationexistinguser/inapp/subject.en.txt | 2 +- .../planinvitationexternaluser/email/subject.en.txt | 2 +- .../planmodified/email/subject.en.txt | 2 +- .../planmodified/inapp/subject.en.txt | 2 +- .../publiccontactsupport/email/subject.en.txt | 2 +- .../removecredentialconfirmation/email/subject.en.txt | 2 +- .../removecredentialconfirmation/inapp/subject.en.txt | 2 +- 24 files changed, 32 insertions(+), 32 deletions(-) diff --git a/annotation-service/annotation-web/src/main/resources/config/permissions.yml b/annotation-service/annotation-web/src/main/resources/config/permissions.yml index a7b23b9e9..37cb3d25e 100644 --- a/annotation-service/annotation-web/src/main/resources/config/permissions.yml +++ b/annotation-service/annotation-web/src/main/resources/config/permissions.yml @@ -39,7 +39,7 @@ permissions: roles: - Admin clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false EditUser: roles: [ ] @@ -59,7 +59,7 @@ permissions: - TenantAdmin entityAffiliated: true clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false NewAnnotation: roles: @@ -67,14 +67,14 @@ permissions: - TenantAdmin entityAffiliated: true clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false EditAnnotation: roles: - Admin - TenantAdmin clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false DeleteAnnotation: roles: diff --git a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java index f9129176b..82487afb1 100644 --- a/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java +++ b/backend/core/src/main/java/org/opencdmp/service/filetransformer/FileTransformerServiceImpl.java @@ -235,7 +235,7 @@ public class FileTransformerServiceImpl implements FileTransformerService { @Override public org.opencdmp.model.file.FileEnvelope exportDmp(UUID dmpId, String repositoryId, String format) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, InvalidApplicationException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { - this.authorizationService.authorizeForce(Permission.EditDmp); + this.authorizationService.authorizeForce(Permission.ExportDmp); //GK: First get the right client FileTransformerRepository repository = this.getRepository(repositoryId); if (repository == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{format, FileTransformerRepository.class.getSimpleName()}, LocaleContextHolder.getLocale())); @@ -255,7 +255,7 @@ public class FileTransformerServiceImpl implements FileTransformerService { @Override public org.opencdmp.model.file.FileEnvelope exportDescription(UUID descriptionId, String repositoryId, String format) throws InvalidAlgorithmParameterException, NoSuchPaddingException, IllegalBlockSizeException, InvalidApplicationException, NoSuchAlgorithmException, BadPaddingException, InvalidKeyException { - this.authorizationService.authorizeForce(Permission.EditDmp); + this.authorizationService.authorizeForce(Permission.ExportDescription); //GK: First get the right client FileTransformerRepository repository = this.getRepository(repositoryId); if (repository == null) throw new MyNotFoundException(this.messageSource.getMessage("General_ItemNotFound", new Object[]{format, FileTransformerRepository.class.getSimpleName()}, LocaleContextHolder.getLocale())); diff --git a/notification-service/notification-web/src/main/resources/config/permissions.yml b/notification-service/notification-web/src/main/resources/config/permissions.yml index 2e8452a4a..bd754c750 100644 --- a/notification-service/notification-web/src/main/resources/config/permissions.yml +++ b/notification-service/notification-web/src/main/resources/config/permissions.yml @@ -32,7 +32,7 @@ permissions: roles: - Admin clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false EditUser: roles: [] @@ -51,7 +51,7 @@ permissions: - Admin - InstallationAdmin clients: [ "opencdmp-api-dev" ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false EditUserContactInfo: roles: @@ -73,13 +73,13 @@ permissions: roles: - Admin clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false EditNotification: roles: - Admin clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false DeleteNotification: roles: @@ -115,7 +115,7 @@ permissions: roles: - Admin clients: [ ] - allowAnonymous: true + allowAnonymous: false allowAuthenticated: false EditUserNotificationPreference: roles: diff --git a/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt index 052f2db8c..9140c4034 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/contactsupport/email/subject.en.txt @@ -1 +1 @@ -ARGOS - {subject} \ No newline at end of file +OpenCDMP - {subject} \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/email/subject.en.txt index 76e26cfec..4809b12c1 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Description Finalised \ No newline at end of file +OpenCDMP - Description Finalised \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/inapp/subject.en.txt index 76e26cfec..4809b12c1 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/descriptionfinalised/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Description Finalised \ No newline at end of file +OpenCDMP - Description Finalised \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt index 440dc3c4f..a40529163 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Description Modified \ No newline at end of file +OpenCDMP - Description Modified \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt index 440dc3c4f..a40529163 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/descriptionmodified/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Description Modified \ No newline at end of file +OpenCDMP - Description Modified \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt index f634a5493..61ecc7bfd 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Description Template Invite \ No newline at end of file +OpenCDMP - Description Template Invite \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt index f634a5493..61ecc7bfd 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/descriptiontemplateinvitation/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Description Template Invite \ No newline at end of file +OpenCDMP - Description Template Invite \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt index 3c52e9249..3c94ab18d 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Merge Account Confirmation \ No newline at end of file +OpenCDMP - Merge Account Confirmation \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt index 3c52e9249..3c94ab18d 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/mergeacountconfirmation/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Merge Account Confirmation \ No newline at end of file +OpenCDMP - Merge Account Confirmation \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/email/subject.en.txt index 9ec5544a9..a9831981b 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Plan Deposit \ No newline at end of file +OpenCDMP - Plan Deposit \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/inapp/subject.en.txt index 9ec5544a9..a9831981b 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/plandeposit/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Plan Deposit \ No newline at end of file +OpenCDMP - Plan Deposit \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/email/subject.en.txt index c7de831d7..0f3ce0f3e 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Plan Finalised \ No newline at end of file +OpenCDMP - Plan Finalised \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/inapp/subject.en.txt index c7de831d7..0f3ce0f3e 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planfinalised/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Plan Finalised \ No newline at end of file +OpenCDMP - Plan Finalised \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/email/subject.en.txt index 2c36d1524..54de9f6b1 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Data Management Plan Invite \ No newline at end of file +OpenCDMP - Plan Invite \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/inapp/subject.en.txt index 2c36d1524..54de9f6b1 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexistinguser/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Data Management Plan Invite \ No newline at end of file +OpenCDMP - Plan Invite \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexternaluser/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexternaluser/email/subject.en.txt index 2c36d1524..54de9f6b1 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexternaluser/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planinvitationexternaluser/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Data Management Plan Invite \ No newline at end of file +OpenCDMP - Plan Invite \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planmodified/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planmodified/email/subject.en.txt index 0c011a7d4..df045f3ca 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planmodified/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planmodified/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Plan Modified \ No newline at end of file +OpenCDMP - Plan Modified \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/planmodified/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/planmodified/inapp/subject.en.txt index 0c011a7d4..df045f3ca 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/planmodified/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/planmodified/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Plan Modified \ No newline at end of file +OpenCDMP - Plan Modified \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt index 052f2db8c..9140c4034 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/publiccontactsupport/email/subject.en.txt @@ -1 +1 @@ -ARGOS - {subject} \ No newline at end of file +OpenCDMP - {subject} \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt index e957d468f..d942b4dbe 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/email/subject.en.txt @@ -1 +1 @@ -ARGOS - Unlink Email Confirmation \ No newline at end of file +OpenCDMP - Unlink Email Confirmation \ No newline at end of file diff --git a/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt index e957d468f..d942b4dbe 100644 --- a/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt +++ b/notification-service/notification-web/src/main/resources/notification_templates/removecredentialconfirmation/inapp/subject.en.txt @@ -1 +1 @@ -ARGOS - Unlink Email Confirmation \ No newline at end of file +OpenCDMP - Unlink Email Confirmation \ No newline at end of file