diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java index 1469eec..da7fa7d 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java @@ -204,7 +204,7 @@ public class TenantManagementService implements TenantProvider { log.info("Deleting tenant: {}", tenant.getTenantId()); log.info("Deleting search index for tenant: {}", tenant.getTenantId()); TenantContext.setTenantId(tenant.getTenantId()); - rabbitTemplate.convertAndSend(tenantExchangeName, "tenant.deleted", tenant); + rabbitTemplate.convertAndSend(tenantExchangeName, "tenant.delete", tenant); TenantContext.clear(); log.info("Dispatched delete index message for tenant: {}", tenant.getTenantId()); diff --git a/src/main/resources/application-clarifynd.yaml b/src/main/resources/application-clarifynd.yaml index 1fe4df0..019d053 100644 --- a/src/main/resources/application-clarifynd.yaml +++ b/src/main/resources/application-clarifynd.yaml @@ -42,6 +42,7 @@ fforesight: - 'fforesight-write-users' - 'fforesight-update-my-profile' - 'fforesight-create-tenant' + - 'fforesight-delete-tenant' - 'fforesight-get-tenants' - 'fforesight-deployment-info' - 'fforesight-read-smtp-configuration' diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 32dc6a6..211f9e5 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -23,6 +23,7 @@ fforesight: - 'fforesight-update-my-profile' - 'fforesight-create-tenant' - 'fforesight-get-tenants' + - 'fforesight-delete-tenant' - 'fforesight-update-tenant' - 'fforesight-deployment-info' - 'fforesight-read-smtp-configuration' diff --git a/src/main/resources/application-documine.yaml b/src/main/resources/application-documine.yaml index 78fb0ca..3e8c7ba 100644 --- a/src/main/resources/application-documine.yaml +++ b/src/main/resources/application-documine.yaml @@ -8,7 +8,7 @@ fforesight: default-theme: 'scm' valid-redirect-uris: [ '/api/*','/redaction-gateway-v1/*','/tenant-user-management/*','http://localhost:4200/*','/ui/*' ,'/auth/*' ] kc-role-mapping: - unmappedPermissions: [ "red-get-tables", "red-unarchive-dossier", "red-update-license", "fforesight-create-tenant", "fforesight-update-tenant", "red-experimental" ] + unmappedPermissions: [ "red-get-tables", "red-unarchive-dossier", "red-update-license", "fforesight-create-tenant", "fforesight-update-tenant","fforesight-delete-tenant", "red-experimental" ] compositeRoles: - name: RED_MANAGER composites: @@ -38,7 +38,7 @@ fforesight: "red-delete-report-template", "red-download-report-template", "red-get-report-templates", "fforesight-manage-user-preferences", "red-read-colors", "red-read-dictionary-types", "red-read-digital-signature", "red-read-dossier-attributes", "red-read-dossier-attributes-config", "red-read-dossier-templates", "red-read-file-attributes-config", "red-read-legal-basis", "red-read-license-report", "red-read-notification", "red-read-rules", "fforesight-read-smtp-configuration", "red-read-versions", "red-reindex", "red-search-audit-log", "red-update-notification", "red-upload-report-template", "red-write-colors", "red-write-digital-signature", "red-write-dossier-attributes-config", - "red-write-dossier-templates", "red-write-file-attributes-config", "fforesight-write-general-configuration", "red-write-legal-basis", "red-write-rules", "fforesight-write-smtp-configuration", "red-write-app-configuration", "red-manage-acl-permissions", "fforesight-create-tenant", "fforesight-get-tenants", "fforesight-update-tenant", "fforesight-deployment-info" ] + "red-write-dossier-templates", "red-write-file-attributes-config", "fforesight-write-general-configuration", "red-write-legal-basis", "red-write-rules", "fforesight-write-smtp-configuration", "red-write-app-configuration", "red-manage-acl-permissions","fforesight-delete-tenant", "fforesight-create-tenant", "fforesight-get-tenants", "fforesight-update-tenant", "fforesight-deployment-info" ] - name: RED_MANAGER set-by-default: false rank: 200 diff --git a/src/main/resources/application-redaction.yaml b/src/main/resources/application-redaction.yaml index 5838fba..5b961d9 100644 --- a/src/main/resources/application-redaction.yaml +++ b/src/main/resources/application-redaction.yaml @@ -8,7 +8,7 @@ fforesight: default-theme: 'redaction' valid-redirect-uris: [ '/api/*','/redaction-gateway-v1/*','/tenant-user-management/*','http://localhost:4200/*','/ui/*' ,'/auth/*'] kc-role-mapping: - unmappedPermissions: [ "red-unarchive-dossier", "red-update-license", "red-get-rss","fforesight-create-tenant", "fforesight-update-tenant", "red-experimental" ] + unmappedPermissions: [ "red-unarchive-dossier", "red-update-license", "red-get-rss","fforesight-create-tenant", "fforesight-update-tenant","fforesight-delete-tenant", "red-experimental" ] compositeRoles: - name: RED_MANAGER composites: @@ -40,7 +40,7 @@ fforesight: "red-read-legal-basis", "red-read-license-report", "red-read-notification", "red-read-rules", "fforesight-read-smtp-configuration", "red-read-versions", "red-read-watermark", "red-reindex", "red-search-audit-log", "red-update-notification", "red-upload-report-template", "red-write-colors", "red-write-digital-signature", "red-write-dossier-attributes-config", "red-write-dossier-templates", "red-write-file-attributes-config", "fforesight-write-general-configuration", "red-write-legal-basis", "red-write-rules", "fforesight-write-smtp-configuration", - "red-write-watermark", "red-write-app-configuration", "red-manage-acl-permissions", "fforesight-create-tenant", "fforesight-get-tenants", "fforesight-update-tenant", "fforesight-deployment-info" ] + "red-write-watermark", "red-write-app-configuration", "red-manage-acl-permissions", "fforesight-create-tenant", "fforesight-get-tenants", "fforesight-update-tenant","fforesight-delete-tenant", "fforesight-deployment-info" ] - name: RED_MANAGER set-by-default: false rank: 200