From c4ce55f0b769b7bdf5fc14460031ab764a945333 Mon Sep 17 00:00:00 2001 From: Hossein Ahmadian-Yazdi Date: Tue, 21 Jan 2020 09:14:14 -0500 Subject: [PATCH] [MM-21373] Don't send verification (#13637) * Don't send welcome email if verificaiton is off * update code to send email but not include verification link * Update code to not send welcome email if email notifications is off * update failure clause --- app/email.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/email.go b/app/email.go index 5ff5e455dc..d13a5f9fde 100644 --- a/app/email.go +++ b/app/email.go @@ -170,6 +170,10 @@ func (a *App) SendSignInChangeEmail(email, method, locale, siteURL string) *mode } func (a *App) SendWelcomeEmail(userId string, email string, verified bool, locale, siteURL string) *model.AppError { + if !*a.Config().EmailSettings.SendEmailNotifications && !*a.Config().EmailSettings.RequireEmailVerification { + return model.NewAppError("SendWelcomeEmail", "api.user.send_welcome_email_and_forget.failed.error", nil, "Send Email Notifications and Require Email Verification is disabled in the system console", http.StatusInternalServerError) + } + T := utils.GetUserTranslations(locale) serverURL := condenseSiteURL(siteURL) @@ -192,7 +196,7 @@ func (a *App) SendWelcomeEmail(userId string, email string, verified bool, local bodyPage.Props["AppDownloadLink"] = *a.Config().NativeAppSettings.AppDownloadLink } - if !verified { + if !verified && *a.Config().EmailSettings.RequireEmailVerification { token, err := a.CreateVerifyEmailToken(userId, email) if err != nil { return err