From 3780887629455e9947bd80a7d5644e5327406c51 Mon Sep 17 00:00:00 2001 From: Kyrillos Isaac Date: Mon, 4 Nov 2024 15:27:07 +0300 Subject: [PATCH] [MM-61106] fix server/channels/app/desktop_login.go errcheck issues (#28818) Co-authored-by: Ben Schumacher --- server/.golangci.yml | 1 - server/channels/app/desktop_login.go | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index decb04f764..19db2f0ce8 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -93,7 +93,6 @@ issues: channels/app/channel_bookmark_test.go|\ channels/app/channel_test.go|\ channels/app/config_test.go|\ - channels/app/desktop_login.go|\ channels/app/export.go|\ channels/app/export_test.go|\ channels/app/file.go|\ diff --git a/server/channels/app/desktop_login.go b/server/channels/app/desktop_login.go index 70504853ec..aff30ca3f1 100644 --- a/server/channels/app/desktop_login.go +++ b/server/channels/app/desktop_login.go @@ -7,6 +7,7 @@ import ( "net/http" "github.com/mattermost/mattermost/server/public/model" + "github.com/mattermost/mattermost/server/public/shared/mlog" ) func (a *App) GenerateAndSaveDesktopToken(createAt int64, user *model.User) (*string, *model.AppError) { @@ -14,8 +15,9 @@ func (a *App) GenerateAndSaveDesktopToken(createAt int64, user *model.User) (*st err := a.Srv().Store().DesktopTokens().Insert(token, createAt, user.Id) if err != nil { // Delete any other related tokens if there's an error - a.Srv().Store().DesktopTokens().DeleteByUserId(user.Id) - + if deleteErr := a.Srv().Store().DesktopTokens().DeleteByUserId(user.Id); deleteErr != nil { + a.Log().Error("Unable to delete desktop token", mlog.Err(deleteErr)) + } return nil, model.NewAppError("GenerateAndSaveDesktopToken", "app.desktop_token.generateServerToken.invalid_or_expired", nil, "", http.StatusBadRequest).Wrap(err) } @@ -27,8 +29,9 @@ func (a *App) ValidateDesktopToken(token string, expiryTime int64) (*model.User, userId, err := a.Srv().Store().DesktopTokens().GetUserId(token, expiryTime) if err != nil { // Delete the token if it is expired or invalid - a.Srv().Store().DesktopTokens().Delete(token) - + if deleteErr := a.Srv().Store().DesktopTokens().Delete(token); deleteErr != nil { + a.Log().Error("Unable to delete desktop token", mlog.Err(deleteErr)) + } return nil, model.NewAppError("ValidateDesktopToken", "app.desktop_token.validate.invalid", nil, "", http.StatusUnauthorized).Wrap(err) } @@ -36,13 +39,16 @@ func (a *App) ValidateDesktopToken(token string, expiryTime int64) (*model.User, user, userErr := a.GetUser(*userId) if userErr != nil { // Delete the token if the user is invalid somehow - a.Srv().Store().DesktopTokens().Delete(token) - + if deleteErr := a.Srv().Store().DesktopTokens().Delete(token); deleteErr != nil { + a.Log().Error("Unable to delete desktop token", mlog.Err(deleteErr)) + } return nil, model.NewAppError("ValidateDesktopToken", "app.desktop_token.validate.no_user", nil, "", http.StatusInternalServerError).Wrap(userErr) } // Clean up other tokens if they exist - a.Srv().Store().DesktopTokens().DeleteByUserId(*userId) + if deleteErr := a.Srv().Store().DesktopTokens().DeleteByUserId(*userId); deleteErr != nil { + a.Log().Error("Unable to delete desktop token", mlog.Err(deleteErr)) + } return user, nil }