mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-05 19:48:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Missing return statement after error on getting service user context

Browse Source
This commit is contained in:
Bastian Beier
2025-01-09 16:01:48 +01:00
parent 6c2ab07955
commit 8e89a34958
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/notifications/pkg/email/templates.go
View File

@@ -149,6 +149,7 @@ type MessageTemplate struct {
CallToAction string
}
// GroupedMessageTemplate is the data structure for the email
type GroupedMessageTemplate struct {
// textTemplate represent the path to text plain .tmpl file
textTemplate string

2
services/notifications/pkg/service/shares.go
View File

@@ -58,6 +58,7 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar
ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
if err != nil {
logger.Error().Err(err).Msg("could not get service user context")
return
}
resourceInfo, err := s.getResourceInfo(ctx, e.ItemID, &fieldmaskpb.FieldMask{Paths: []string{"name"}})
@@ -145,6 +146,7 @@ func (s eventsNotifier) prepareShareExpired(logger zerolog.Logger, e events.Shar
ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
if err != nil {
logger.Error().Err(err).Msg("could not get service user context")
return
}
resourceInfo, err := s.getResourceInfo(ctx, e.ItemID, &fieldmaskpb.FieldMask{Paths: []string{"name"}})

2
services/notifications/pkg/service/spaces.go
View File

@@ -57,6 +57,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space
ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
if err != nil {
logger.Error().Err(err).Msg("could not get service user context")
return
}
executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient)
@@ -141,6 +142,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa
ctx, err = utils.GetServiceUserContextWithContext(context.Background(), gatewayClient, s.serviceAccountID, s.serviceAccountSecret)
if err != nil {
logger.Error().Err(err).Msg("could not get service user context")
return
}
executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient)

5
services/notifications/pkg/service/splitter.go
View File

@@ -12,9 +12,8 @@ import (
)
type intervalSplitter struct {
log log.Logger
valueClient settingssvc.ValueService
persistenceService userEventStore
log log.Logger
valueClient settingssvc.ValueService
}
func newIntervalSplitter(l log.Logger, vc settingssvc.ValueService) *intervalSplitter {