upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[MM-61509] Fix errcheck issues in server/channels/app/user.go (#29154)

Browse source 
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
This commit is contained in:
Ivy Gesare 2024-11-15 13:13:15 +03:00 committed by GitHub
parent d83156027a
commit 9b15c50418
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/.golangci.yml
View file

@ -146,7 +146,6 @@ issues:
channels/app/team_test.go|\
channels/app/upload.go|\
channels/app/upload_test.go|\
channels/app/user.go|\
channels/app/user_test.go|\
channels/app/web_broadcast_hooks_test.go|\
channels/app/webhook_test.go|\

36
server/channels/app/user.go
View file

@ -53,7 +53,9 @@ func (a *App) CreateUserWithToken(c request.CTX, user *model.User, token *model.
}
if model.GetMillis()-token.CreateAt >= InvitationExpiryTime {
a.DeleteToken(token)
if appErr := a.DeleteToken(token); appErr != nil {
c.Logger().Warn("Error while deleting expired signup-invite token", mlog.Err(appErr))
}
return nil, model.NewAppError("CreateUserWithToken", "api.user.create_user.signup_link_expired.app_error", nil, "", http.StatusBadRequest)
}
@ -106,7 +108,9 @@ func (a *App) CreateUserWithToken(c request.CTX, user *model.User, token *model.
return nil, err
}
a.AddDirectChannels(c, team.Id, ruser)
if appErr := a.AddDirectChannels(c, team.Id, ruser); appErr != nil {
return nil, appErr
}
if token.Type == TokenTypeGuestInvitation || (token.Type == TokenTypeTeamInvitation && len(channels) > 0) {
for _, channel := range channels {
@ -159,7 +163,9 @@ func (a *App) CreateUserWithInviteId(c request.CTX, user *model.User, inviteId,
return nil, err
}
a.AddDirectChannels(c, team.Id, ruser)
if appErr := a.AddDirectChannels(c, team.Id, ruser); appErr != nil {
return nil, appErr
}
if err := a.Srv().EmailService.SendWelcomeEmail(ruser.Id, ruser.Email, ruser.EmailVerified, ruser.DisableWelcomeEmail, ruser.Locale, a.GetSiteURL(), redirect); err != nil {
c.Logger().Warn("Failed to send welcome email on create user with inviteId", mlog.Err(err))
@ -960,11 +966,15 @@ func (a *App) userDeactivated(c request.CTX, userID string) *model.AppError {
// bots the user owns. Only notify once, when the user is the owner, not the
// owners bots
if !user.IsBot {
a.notifySysadminsBotOwnerDeactivated(c, userID)
if appErr := a.notifySysadminsBotOwnerDeactivated(c, userID); appErr != nil {
c.Logger().Warn("Error while notifying the system admin that the owner of bot accounts got disabled", mlog.Err(appErr))
}
}
if *a.Config().ServiceSettings.DisableBotsWhenOwnerIsDeactivated {
a.disableUserBots(c, userID)
if appErr := a.disableUserBots(c, userID); appErr != nil {
c.Logger().Warn("Error while disabling all bots owned by the deactivated user", mlog.Err(appErr))
}
}
if nErr := a.Srv().Store().OAuth().RemoveAuthDataByUserId(userID); nErr != nil {
@ -1040,7 +1050,9 @@ func (a *App) UpdateActive(c request.CTX, user *model.User, active bool) (*model
}
}
a.invalidateUserChannelMembersCaches(c, user.Id)
if appErr := a.invalidateUserChannelMembersCaches(c, user.Id); appErr != nil {
c.Logger().Warn("Error while invalidating user channel members caches", mlog.Err(appErr))
}
a.InvalidateCacheForUser(user.Id)
a.sendUpdatedUserEvent(ruser)
@ -1899,7 +1911,9 @@ func (a *App) PermanentDeleteAllUsers(c request.CTX) *model.AppError {
return model.NewAppError("PermanentDeleteAllUsers", "app.user.get.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
}
for _, user := range users {
a.PermanentDeleteUser(c, user)
if appErr := a.PermanentDeleteUser(c, user); appErr != nil {
c.Logger().Warn("Error while deleting user", mlog.Err(appErr))
}
}
return nil
@ -2425,7 +2439,9 @@ func (a *App) PromoteGuestToUser(c request.CTX, user *model.User, requestorId st
}
for _, member := range teamMembers {
a.sendUpdatedTeamMemberEvent(member)
if appErr := a.sendUpdatedTeamMemberEvent(member); appErr != nil {
c.Logger().Warn("Error while sending updated team member event", mlog.Err(appErr))
}
channelMembers, appErr := a.GetChannelMembersForUser(c, member.TeamId, user.Id)
if appErr != nil {
@ -2469,7 +2485,9 @@ func (a *App) DemoteUserToGuest(c request.CTX, user *model.User) *model.AppError
}
for _, member := range teamMembers {
a.sendUpdatedTeamMemberEvent(member)
if appErr := a.sendUpdatedTeamMemberEvent(member); appErr != nil {
c.Logger().Warn("Error while sending updated team member event", mlog.Err(appErr))
}
channelMembers, appErr := a.GetChannelMembersForUser(c, member.TeamId, user.Id)
if appErr != nil {