opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-10-29 18:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Decouple emailservice from app package (#17827)

Browse Source 
* decouple emailservice from app package

* fix some escaped errors

* move email package under app directory

* fix i18n

* reflect review comments
This commit is contained in:
Ibrahim Serdar Acikgoz
2021-07-19 23:26:06 +08:00
committed by GitHub
parent a78a7c7b54
commit 41dc05a6bd
35 changed files with 1156 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api4/cloud.go
+2 -2
View File
@@ -435,8 +435,8 @@ func handleCWSWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if appErr := c.App.Srv().EmailService.SendCloudWelcomeEmail(user.Email, user.Locale, team.InviteId, subscription.GetWorkSpaceNameFromDNS(), subscription.DNS, *c.App.Config().ServiceSettings.SiteURL); appErr != nil {
c.Err = appErr
if err := c.App.Srv().EmailService.SendCloudWelcomeEmail(user.Email, user.Locale, team.InviteId, subscription.GetWorkSpaceNameFromDNS(), subscription.DNS, *c.App.Config().ServiceSettings.SiteURL); err != nil {
c.Err = model.NewAppError("SendCloudWelcomeEmail", "api.user.send_cloud_welcome_email.error", nil, err.Error(), http.StatusInternalServerError)
return
}
case model.EventTypeTrialWillEnd: