MM-45193 Use context for channel logging (#20575)

api4/resolver.go

@@ -80,7 +80,7 @@ func (r *resolver) Channels(ctx context.Context, args struct {
 	}
 
 	// TODO: convert this to a streaming API.
-	channels, appErr := c.App.GetChannelsForTeamForUserWithCursor(args.TeamID, args.UserID, &model.ChannelSearchOpts{
+	channels, appErr := c.App.GetChannelsForTeamForUserWithCursor(c.AppContext, args.TeamID, args.UserID, &model.ChannelSearchOpts{
 		IncludeDeleted: args.IncludeDeleted,
 		LastDeleteAt:   int(args.LastDeleteAt),
 		LastUpdateAt:   int(args.LastUpdateAt),
@@ -90,7 +90,7 @@ func (r *resolver) Channels(ctx context.Context, args struct {
 		return nil, appErr
 	}
 
-	appErr = c.App.FillInChannelsProps(channels)
+	appErr = c.App.FillInChannelsProps(c.AppContext, channels)
 	if appErr != nil {
 		return nil, appErr
 	}
@@ -236,12 +236,14 @@ func (*resolver) ChannelMembers(ctx context.Context, args struct {
 
 	// If it's a single channel
 	if args.ChannelID != "" {
-		if !c.App.SessionHasPermissionToChannel(*c.AppContext.Session(), args.ChannelID, model.PermissionReadChannel) {
+		if !c.App.SessionHasPermissionToChannel(c.AppContext, *c.AppContext.Session(), args.ChannelID, model.PermissionReadChannel) {
 			c.SetPermissionError(model.PermissionReadChannel)
 			return nil, c.Err
 		}
 
-		member, appErr := c.App.GetChannelMember(app.WithMaster(context.Background()), args.ChannelID, args.UserID)
+		ctx := c.AppContext
+		ctx.SetContext(app.WithMaster(ctx.Context()))
+		member, appErr := c.App.GetChannelMember(ctx, args.ChannelID, args.UserID)
 		if appErr != nil {
 			return nil, appErr
 		}
@@ -345,7 +347,7 @@ func (*resolver) SidebarCategories(ctx context.Context, args struct {
 	var categories *model.OrderedSidebarCategories
 	var appErr *model.AppError
 	if !args.ExcludeTeam {
-		categories, appErr = c.App.GetSidebarCategoriesForTeamForUser(args.UserID, args.TeamID)
+		categories, appErr = c.App.GetSidebarCategoriesForTeamForUser(c.AppContext, args.UserID, args.TeamID)
 		if appErr != nil {
 			return nil, appErr
 		}
@@ -354,7 +356,7 @@ func (*resolver) SidebarCategories(ctx context.Context, args struct {
 			TeamID:      args.TeamID,
 			ExcludeTeam: args.ExcludeTeam,
 		}
-		categories, appErr = c.App.GetSidebarCategories(args.UserID, opts)
+		categories, appErr = c.App.GetSidebarCategories(c.AppContext, args.UserID, opts)
 		if appErr != nil {
 			return nil, appErr
 		}