IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-55606]: add the request context to all public methods in server/channels/app/brand.go (#25542)

Browse Source 
Co-authored-by: Sudheer Tripathi <sudheer@clearglass.com>
This commit is contained in:
Sudheer Tripathi 2023-11-29 21:37:16 +05:30 committed by GitHub
parent 18c6d37551
commit 6e3f0ab928
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/channels/api4/brand.go
View File

@ -20,7 +20,7 @@ func (api *API) InitBrand() {
func getBrandImage(c *Context, w http.ResponseWriter, r *http.Request) {
// No permission check required
img, err := c.App.GetBrandImage()
img, err := c.App.GetBrandImage(c.AppContext)
if err != nil {
w.WriteHeader(http.StatusNotFound)
w.Write(nil)
@ -65,7 +65,7 @@ func uploadBrandImage(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if err := c.App.SaveBrandImage(imageArray[0]); err != nil {
if err := c.App.SaveBrandImage(c.AppContext, imageArray[0]); err != nil {
c.Err = err
return
}
@ -86,7 +86,7 @@ func deleteBrandImage(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if err := c.App.DeleteBrandImage(); err != nil {
if err := c.App.DeleteBrandImage(c.AppContext); err != nil {
c.Err = err
return
}

6
server/channels/app/app_iface.go
View File

@ -520,7 +520,7 @@ type AppIface interface {
DeleteAcknowledgementForPost(c request.CTX, postID, userID string) *model.AppError
DeleteAllExpiredPluginKeys() *model.AppError
DeleteAllKeysForPlugin(pluginID string) *model.AppError
DeleteBrandImage() *model.AppError
DeleteBrandImage(rctx request.CTX) *model.AppError
DeleteChannel(c request.CTX, channel *model.Channel, userID string) *model.AppError
DeleteCommand(commandID string) *model.AppError
DeleteDraft(rctx request.CTX, userID, channelID, rootID, connectionID string) (*model.Draft, *model.AppError)
@ -600,7 +600,7 @@ type AppIface interface {
GetAuditsPage(rctx request.CTX, userID string, page int, perPage int) (model.Audits, *model.AppError)
GetAuthorizationCode(c request.CTX, w http.ResponseWriter, r *http.Request, service string, props map[string]string, loginHint string) (string, *model.AppError)
GetAuthorizedAppsForUser(userID string, page, perPage int) ([]*model.OAuthApp, *model.AppError)
GetBrandImage() ([]byte, *model.AppError)
GetBrandImage(rctx request.CTX) ([]byte, *model.AppError)
GetBulkReactionsForPosts(postIDs []string) (map[string][]*model.Reaction, *model.AppError)
GetChannel(c request.CTX, channelID string) (*model.Channel, *model.AppError)
GetChannelByName(c request.CTX, channelName, teamID string, includeDeleted bool) (*model.Channel, *model.AppError)
@ -1007,7 +1007,7 @@ type AppIface interface {
SaveAcknowledgementForPost(c request.CTX, postID, userID string) (*model.PostAcknowledgement, *model.AppError)
SaveAdminNotification(userId string, notifyData *model.NotifyAdminToUpgradeRequest) *model.AppError
SaveAdminNotifyData(data *model.NotifyAdminData) (*model.NotifyAdminData, *model.AppError)
SaveBrandImage(imageData *multipart.FileHeader) *model.AppError
SaveBrandImage(rctx request.CTX, imageData *multipart.FileHeader) *model.AppError
SaveComplianceReport(rctx request.CTX, job *model.Compliance) (*model.Compliance, *model.AppError)
SaveReactionForPost(c request.CTX, reaction *model.Reaction) (*model.Reaction, *model.AppError)
SaveSharedChannel(c request.CTX, sc *model.SharedChannel) (*model.SharedChannel, error)

7
server/channels/app/brand.go
View File

@ -10,6 +10,7 @@ import (
"time"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/request"
)
const (
@ -17,7 +18,7 @@ const (
BrandFileName = "image.png"
)
func (a *App) SaveBrandImage(imageData *multipart.FileHeader) *model.AppError {
func (a *App) SaveBrandImage(rctx request.CTX, imageData *multipart.FileHeader) *model.AppError {
if *a.Config().FileSettings.DriverName == "" {
return model.NewAppError("SaveBrandImage", "api.admin.upload_brand_image.storage.app_error", nil, "", http.StatusNotImplemented)
}
@ -53,7 +54,7 @@ func (a *App) SaveBrandImage(imageData *multipart.FileHeader) *model.AppError {
return nil
}
func (a *App) GetBrandImage() ([]byte, *model.AppError) {
func (a *App) GetBrandImage(rctx request.CTX) ([]byte, *model.AppError) {
if *a.Config().FileSettings.DriverName == "" {
return nil, model.NewAppError("GetBrandImage", "api.admin.get_brand_image.storage.app_error", nil, "", http.StatusNotImplemented)
}
@ -66,7 +67,7 @@ func (a *App) GetBrandImage() ([]byte, *model.AppError) {
return img, nil
}
func (a *App) DeleteBrandImage() *model.AppError {
func (a *App) DeleteBrandImage(rctx request.CTX) *model.AppError {
filePath := BrandFilePath + BrandFileName
fileExists, err := a.FileExists(filePath)

12
server/channels/app/opentracing/opentracing_layer.go
View File

@ -2961,7 +2961,7 @@ func (a *OpenTracingAppLayer) DeleteAllKeysForPlugin(pluginID string) *model.App
return resultVar0
}
func (a *OpenTracingAppLayer) DeleteBrandImage() *model.AppError {
func (a *OpenTracingAppLayer) DeleteBrandImage(rctx request.CTX) *model.AppError {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.DeleteBrandImage")
@ -2973,7 +2973,7 @@ func (a *OpenTracingAppLayer) DeleteBrandImage() *model.AppError {
}()
defer span.Finish()
resultVar0 := a.app.DeleteBrandImage()
resultVar0 := a.app.DeleteBrandImage(rctx)
if resultVar0 != nil {
span.LogFields(spanlog.Error(resultVar0))
@ -5123,7 +5123,7 @@ func (a *OpenTracingAppLayer) GetBots(options *model.BotGetOptions) (model.BotLi
return resultVar0, resultVar1
}
func (a *OpenTracingAppLayer) GetBrandImage() ([]byte, *model.AppError) {
func (a *OpenTracingAppLayer) GetBrandImage(rctx request.CTX) ([]byte, *model.AppError) {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.GetBrandImage")
@ -5135,7 +5135,7 @@ func (a *OpenTracingAppLayer) GetBrandImage() ([]byte, *model.AppError) {
}()
defer span.Finish()
resultVar0, resultVar1 := a.app.GetBrandImage()
resultVar0, resultVar1 := a.app.GetBrandImage(rctx)
if resultVar1 != nil {
span.LogFields(spanlog.Error(resultVar1))
@ -14716,7 +14716,7 @@ func (a *OpenTracingAppLayer) SaveAdminNotifyData(data *model.NotifyAdminData) (
return resultVar0, resultVar1
}
func (a *OpenTracingAppLayer) SaveBrandImage(imageData *multipart.FileHeader) *model.AppError {
func (a *OpenTracingAppLayer) SaveBrandImage(rctx request.CTX, imageData *multipart.FileHeader) *model.AppError {
origCtx := a.ctx
span, newCtx := tracing.StartSpanWithParentByContext(a.ctx, "app.SaveBrandImage")
@ -14728,7 +14728,7 @@ func (a *OpenTracingAppLayer) SaveBrandImage(imageData *multipart.FileHeader) *m
}()
defer span.Finish()
resultVar0 := a.app.SaveBrandImage(imageData)
resultVar0 := a.app.SaveBrandImage(rctx, imageData)
if resultVar0 != nil {
span.LogFields(spanlog.Error(resultVar0))