From 193d5929d7a92565947c98eb03ddbb461e8247d5 Mon Sep 17 00:00:00 2001
From: Lukasz Lopatowski <llopat@man.poznan.pl>
Date: Wed, 28 May 2025 11:41:52 +0200
Subject: [PATCH] Fix response of webhook update
---
.../nmaas/portal/service/WebhookEventService.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java b/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
index 1de9d5b90..2a0be60f5 100644
--- a/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
+++ b/src/main/java/net/geant/nmaas/portal/service/WebhookEventService.java
@@ -36,10 +36,13 @@ public class WebhookEventService {
}
public WebhookEventDto update(WebhookEventDto webhookEventDto) throws GeneralSecurityException {
- WebhookEvent webhookEvent = webhookRepository.findById(webhookEventDto.getId()).orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
+ WebhookEvent webhookEvent = webhookRepository.findById(webhookEventDto.getId())
+ .orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
setWebhookEvent(webhookEvent, webhookEventDto);
webhookEvent = webhookRepository.save(webhookEvent);
- return modelMapper.map(webhookEvent, WebhookEventDto.class);
+ WebhookEventDto dto = modelMapper.map(webhookEvent, WebhookEventDto.class);
+ dto.setTokenValue(webhookEvent.getTokenValue() == null ? null : encryptionService.decrypt(webhookEvent.getTokenValue()));
+ return dto;
}
private void setWebhookEvent(WebhookEvent webhookEvent, WebhookEventDto webhookEventDto) throws GeneralSecurityException {
@@ -51,7 +54,8 @@ public class WebhookEventService {
}
public void remove(Long id) {
- WebhookEvent webhookEvent = webhookRepository.findById(id).orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
+ WebhookEvent webhookEvent = webhookRepository.findById(id)
+ .orElseThrow(() -> new MissingElementException(WEBHOOK_EVENT_NOT_FOUND));
webhookRepository.delete(webhookEvent);
}
--
GitLab