[MM-61106] fix server/channels/app/desktop_login.go errcheck issues (#28818)

Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Этот коммит содержится в:
Kyrillos Isaac
2024-11-04 15:27:07 +03:00
коммит произвёл GitHub
родитель dc5640f134
Коммит 3780887629
2 изменённых файлов: 13 добавлений и 8 удалений

Просмотреть файл

@@ -93,7 +93,6 @@ issues:
channels/app/channel_bookmark_test.go|\ channels/app/channel_bookmark_test.go|\
channels/app/channel_test.go|\ channels/app/channel_test.go|\
channels/app/config_test.go|\ channels/app/config_test.go|\
channels/app/desktop_login.go|\
channels/app/export.go|\ channels/app/export.go|\
channels/app/export_test.go|\ channels/app/export_test.go|\
channels/app/file.go|\ channels/app/file.go|\

Просмотреть файл

@@ -7,6 +7,7 @@ import (
"net/http" "net/http"
"github.com/mattermost/mattermost/server/public/model" "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) { 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) err := a.Srv().Store().DesktopTokens().Insert(token, createAt, user.Id)
if err != nil { if err != nil {
// Delete any other related tokens if there's an error // 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) 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) userId, err := a.Srv().Store().DesktopTokens().GetUserId(token, expiryTime)
if err != nil { if err != nil {
// Delete the token if it is expired or invalid // 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) 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) user, userErr := a.GetUser(*userId)
if userErr != nil { if userErr != nil {
// Delete the token if the user is invalid somehow // 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) return nil, model.NewAppError("ValidateDesktopToken", "app.desktop_token.validate.no_user", nil, "", http.StatusInternalServerError).Wrap(userErr)
} }
// Clean up other tokens if they exist // 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 return user, nil
} }