From a2f162a6a622a13a57793c82e4077c878612ce8a Mon Sep 17 00:00:00 2001 From: jkoberg Date: Fri, 24 Mar 2023 15:10:39 +0100 Subject: [PATCH] add missing messageRichParameters Signed-off-by: jkoberg --- changelog/unreleased/add-parameters.md | 5 +++++ services/userlog/pkg/service/conversion.go | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 changelog/unreleased/add-parameters.md diff --git a/changelog/unreleased/add-parameters.md b/changelog/unreleased/add-parameters.md new file mode 100644 index 0000000000..fcf4c49dfb --- /dev/null +++ b/changelog/unreleased/add-parameters.md @@ -0,0 +1,5 @@ +Enhancement: Add MessageRichParameters + +Adds the messageRichParameters to virus and policies notifications + +https://github.com/owncloud/ocis/pull/5927 diff --git a/services/userlog/pkg/service/conversion.go b/services/userlog/pkg/service/conversion.go index 2848ce239e..c2cd6081a9 100644 --- a/services/userlog/pkg/service/conversion.go +++ b/services/userlog/pkg/service/conversion.go @@ -249,6 +249,16 @@ func (c *Converter) virusMessage(eventid string, nt NotificationTemplate, execut return OC10Notification{}, err } + dets := map[string]interface{}{ + "resource": map[string]string{ + "name": filename, + }, + "virus": map[string]interface{}{ + "name": virus, + "scandate": ts, + }, + } + return OC10Notification{ EventID: eventid, Service: c.serviceName, @@ -260,7 +270,7 @@ func (c *Converter) virusMessage(eventid string, nt NotificationTemplate, execut SubjectRaw: subjraw, Message: msg, MessageRaw: msgraw, - MessageDetails: generateDetails(nil, nil, nil, nil), + MessageDetails: dets, }, nil } @@ -272,6 +282,12 @@ func (c *Converter) policiesMessage(eventid string, nt NotificationTemplate, exe return OC10Notification{}, err } + dets := map[string]interface{}{ + "resource": map[string]string{ + "name": filename, + }, + } + return OC10Notification{ EventID: eventid, Service: c.serviceName, @@ -282,7 +298,7 @@ func (c *Converter) policiesMessage(eventid string, nt NotificationTemplate, exe SubjectRaw: subjraw, Message: msg, MessageRaw: msgraw, - MessageDetails: generateDetails(nil, nil, nil, nil), + MessageDetails: dets, }, nil }