mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-05 11:51:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve the notification logs when the user has no email address

Browse Source
This commit is contained in:
Roman Perekhod
2023-07-21 11:07:27 +02:00
parent bed8c77892
commit f3484c3cdd
4 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
changelog/unreleased/improve-notification-logs.md Normal file
View File

@@ -0,0 +1,6 @@
Enhancement: Improve the notification logs
Improve the notification logs when the user has no email address
https://github.com/owncloud/ocis/pull/6862
https://github.com/owncloud/ocis/issues/6855

20
services/notifications/pkg/service/service.go
View File

@@ -8,6 +8,7 @@ import (
"os"
"os/signal"
"path"
"strings"
"syscall"
gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1"
@@ -126,6 +127,17 @@ func (s eventsNotifier) send(ctx context.Context, recipientList []*channels.Mess
}
}
func (s eventsNotifier) ensureGranteeList(ctx context.Context, executant, u *user.UserId, g *group.GroupId) []*user.User {
granteeList, err := s.getGranteeList(ctx, executant, u, g)
if err != nil {
s.logger.Error().Err(err).Str("event", "ensureGranteeList").Msg("Could not get grantee list")
return nil
} else if len(granteeList) == 0 {
return nil
}
return granteeList
}
func (s eventsNotifier) getGranteeList(ctx context.Context, executant, u *user.UserId, g *group.GroupId) ([]*user.User, error) {
switch {
case u != nil:
@@ -136,6 +148,10 @@ func (s eventsNotifier) getGranteeList(ctx context.Context, executant, u *user.U
if err != nil {
return nil, err
}
if strings.TrimSpace(usr.GetMail()) == "" {
s.logger.Debug().Str("event", "getGranteeList").Msgf("User %s has no email, skipped", usr.GetUsername())
return nil, nil
}
return []*user.User{usr}, nil
case g != nil:
gatewayClient, err := s.gatewaySelector.Next()
@@ -165,6 +181,10 @@ func (s eventsNotifier) getGranteeList(ctx context.Context, executant, u *user.U
if err != nil {
return nil, err
}
if strings.TrimSpace(usr.GetMail()) == "" {
s.logger.Debug().Str("event", "getGranteeList").Msgf("User %s has no email, skipped", usr.GetUsername())
continue
}
userList = append(userList, usr)
}
return userList, nil

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

@@ -41,9 +41,8 @@ func (s eventsNotifier) handleShareCreated(e events.ShareCreated) {
return
}
granteeList, err := s.getGranteeList(ownerCtx, owner.GetId(), e.GranteeUserID, e.GranteeGroupID)
if err != nil {
s.logger.Error().Err(err).Str("event", "ShareCreated").Msg("Could not get grantee list")
granteeList := s.ensureGranteeList(ownerCtx, owner.GetId(), e.GranteeUserID, e.GranteeGroupID)
if granteeList == nil {
return
}
@@ -88,9 +87,8 @@ func (s eventsNotifier) handleShareExpired(e events.ShareExpired) {
return
}
granteeList, err := s.getGranteeList(ownerCtx, owner.GetId(), e.GranteeUserID, e.GranteeGroupID)
if err != nil {
s.logger.Error().Err(err).Str("event", "ShareExpired").Msg("Could not get grantee name")
granteeList := s.ensureGranteeList(ownerCtx, owner.GetId(), e.GranteeUserID, e.GranteeGroupID)
if granteeList == nil {
return
}

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

@@ -54,9 +54,8 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
// Note: We're using the 'executantCtx' (authenticated as the share executant) here for requesting
// the Grantees of the shares. Ideally the notfication service would use some kind of service
// user for this.
spaceGrantee, err := s.getGranteeList(executantCtx, executant.GetId(), e.GranteeUserID, e.GranteeGroupID)
if err != nil {
logger.Error().Err(err).Str("event", "SpaceGrantee").Msg("Could not get grantee list")
granteeList := s.ensureGranteeList(executantCtx, executant.GetId(), e.GranteeUserID, e.GranteeGroupID)
if granteeList == nil {
return
}
@@ -67,7 +66,7 @@ func (s eventsNotifier) handleSpaceShared(e events.SpaceShared) {
"SpaceSharer": sharerDisplayName,
"SpaceName": resourceInfo.GetSpace().GetName(),
"ShareLink": shareLink,
}, spaceGrantee, sharerDisplayName)
}, granteeList, sharerDisplayName)
if err != nil {
s.logger.Error().Err(err).Str("event", "SharedSpace").Msg("could not get render the email")
return
@@ -120,9 +119,8 @@ func (s eventsNotifier) handleSpaceUnshared(e events.SpaceUnshared) {
// Note: We're using the 'executantCtx' (authenticated as the share executant) here for requesting
// the Grantees of the shares. Ideally the notfication service would use some kind of service
// user for this.
spaceGrantee, err := s.getGranteeList(executantCtx, executant.GetId(), e.GranteeUserID, e.GranteeGroupID)
if err != nil {
logger.Error().Err(err).Str("event", "SpaceGrantee").Msg("Could not get grantee list")
granteeList := s.ensureGranteeList(executantCtx, executant.GetId(), e.GranteeUserID, e.GranteeGroupID)
if granteeList == nil {
return
}
@@ -133,7 +131,7 @@ func (s eventsNotifier) handleSpaceUnshared(e events.SpaceUnshared) {
"SpaceSharer": sharerDisplayName,
"SpaceName": resourceInfo.GetSpace().Name,
"ShareLink": shareLink,
}, spaceGrantee, sharerDisplayName)
}, granteeList, sharerDisplayName)
if err != nil {
s.logger.Error().Err(err).Str("event", "UnsharedSpace").Msg("Could not get render the email")
return
@@ -159,9 +157,8 @@ func (s eventsNotifier) handleSpaceMembershipExpired(e events.SpaceMembershipExp
return
}
granteeList, err := s.getGranteeList(ownerCtx, owner.GetId(), e.GranteeUserID, e.GranteeGroupID)
if err != nil {
s.logger.Error().Err(err).Str("event", "SpaceUnshared").Msg("Could not get grantee list")
granteeList := s.ensureGranteeList(ownerCtx, owner.GetId(), e.GranteeUserID, e.GranteeGroupID)
if granteeList == nil {
return
}