From d88de07b9d0083ef5e7a5d9479d245475aa38838 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 31 May 2019 23:12:03 -0700 Subject: [PATCH] Preventing bad email configuration from failing personal access token creation. (#11027) --- app/session.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/session.go b/app/session.go index fb1fdf6255..d8a5159a37 100644 --- a/app/session.go +++ b/app/session.go @@ -256,8 +256,11 @@ func (a *App) CreateUserAccessToken(token *model.UserAccessToken) (*model.UserAc } token = result.Data.(*model.UserAccessToken) - if err := a.SendUserAccessTokenAddedEmail(user.Email, user.Locale, a.GetSiteURL()); err != nil { - return nil, err + // Don't send emails to bot users. + if !user.IsBot { + if err := a.SendUserAccessTokenAddedEmail(user.Email, user.Locale, a.GetSiteURL()); err != nil { + a.Log.Error("Unable to send user access token added email", mlog.Err(err), mlog.String("user_id", user.Id)) + } } return token, nil