cleanup: Avoid fetching group membership when not needed
Use the new GetUserNoGroups helper to lookup users without resolving groupmemberships where possible. Closes: #1005
This commit is contained in:
@@ -26,7 +26,7 @@ func (s eventsNotifier) handleScienceMeshInviteTokenGenerated(e events.ScienceMe
|
||||
return
|
||||
}
|
||||
|
||||
owner, err := utils.GetUserWithContext(ctx, e.Sharer, gatewayClient)
|
||||
owner, err := utils.GetUserNoGroups(ctx, e.Sharer, gatewayClient)
|
||||
if err != nil {
|
||||
logger.Error().Err(err).Msg("unable to get user")
|
||||
return
|
||||
|
||||
@@ -79,7 +79,7 @@ func (s eventsNotifier) prepareShareCreated(logger zerolog.Logger, e events.Shar
|
||||
return owner, shareFolder, shareLink, ctx, err
|
||||
}
|
||||
|
||||
owner, err = utils.GetUserWithContext(ctx, e.Sharer, gatewayClient)
|
||||
owner, err = utils.GetUserNoGroups(ctx, e.Sharer, gatewayClient)
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
@@ -108,7 +108,7 @@ func (s eventsNotifier) handleShareExpired(e events.ShareExpired, eventId string
|
||||
return
|
||||
}
|
||||
|
||||
owner, err := utils.GetUserWithContext(ctx, e.ShareOwner, gatewayClient)
|
||||
owner, err := utils.GetUserNoGroups(ctx, e.ShareOwner, gatewayClient)
|
||||
if err != nil {
|
||||
logger.Error().Err(err).Msg("Could not get user")
|
||||
return
|
||||
|
||||
@@ -61,7 +61,7 @@ func (s eventsNotifier) prepareSpaceShared(logger zerolog.Logger, e events.Space
|
||||
return executant, spaceName, shareLink, ctx, err
|
||||
}
|
||||
|
||||
executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient)
|
||||
executant, err = utils.GetUserNoGroups(ctx, e.Executant, gatewayClient)
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
@@ -146,7 +146,7 @@ func (s eventsNotifier) prepareSpaceUnshared(logger zerolog.Logger, e events.Spa
|
||||
return executant, spaceName, shareLink, ctx, err
|
||||
}
|
||||
|
||||
executant, err = utils.GetUserWithContext(ctx, e.Executant, gatewayClient)
|
||||
executant, err = utils.GetUserNoGroups(ctx, e.Executant, gatewayClient)
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
@@ -199,7 +199,7 @@ func (s eventsNotifier) handleSpaceMembershipExpired(e events.SpaceMembershipExp
|
||||
return
|
||||
}
|
||||
|
||||
owner, err := utils.GetUser(e.SpaceOwner, gatewayClient)
|
||||
owner, err := utils.GetUserNoGroups(ctx, e.SpaceOwner, gatewayClient)
|
||||
if err != nil {
|
||||
logger.Error().
|
||||
Err(err).
|
||||
|
||||
Reference in New Issue
Block a user