From ddbd2ce152a7443076e3000fc1723f4589611ca8 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 19 Mar 2014 10:46:48 -0400 Subject: [PATCH] Add register mail tpl --- modules/auth/mail.go | 58 --------------------- modules/base/conf.go | 1 + modules/base/tool.go | 19 ------- modules/mailer/mail.go | 61 ++++++++++++++++++++++- routers/user/user.go | 11 +++- templates/mail/auth/active_email.html | 25 ++++++++++ templates/mail/auth/register_success.tmpl | 33 ++++++++++++ templates/mail/auth/reset_password.html | 25 ++++++++++ templates/mail/base.html | 29 +++++++++++ templates/user/active.tmpl | 26 ++++++---- 10 files changed, 196 insertions(+), 92 deletions(-) delete mode 100644 modules/auth/mail.go create mode 100644 templates/mail/auth/active_email.html create mode 100644 templates/mail/auth/register_success.tmpl create mode 100644 templates/mail/auth/reset_password.html create mode 100644 templates/mail/base.html diff --git a/modules/auth/mail.go b/modules/auth/mail.go deleted file mode 100644 index 3de18b677b..0000000000 --- a/modules/auth/mail.go +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package auth - -import ( - "encoding/hex" - "fmt" - - "github.com/gogits/gogs/models" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/mailer" -) - -// create a time limit code for user active -func CreateUserActiveCode(user *models.User, startInf interface{}) string { - hours := base.Service.ActiveCodeLives / 60 - data := base.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands - code := base.CreateTimeLimitCode(data, hours, startInf) - - // add tail hex username - code += hex.EncodeToString([]byte(user.LowerName)) - return code -} - -// Send user register mail with active code -func SendRegisterMail(user *models.User) { - code := CreateUserActiveCode(user, nil) - subject := "Register success, Welcome" - - data := mailer.GetMailTmplData(user) - data["Code"] = code - body := base.RenderTemplate("mail/auth/register_success.html", data) - - msg := mailer.NewMailMessage([]string{user.Email}, subject, body) - msg.Info = fmt.Sprintf("UID: %d, send register mail", user.Id) - - // async send mail - mailer.SendAsync(msg) -} - -// Send email verify active email. -func SendActiveMail(user *models.User) { - code := CreateUserActiveCode(user, nil) - - subject := "Verify your email address" - - data := mailer.GetMailTmplData(user) - data["Code"] = code - body := base.RenderTemplate("mail/auth/active_email.html", data) - - msg := mailer.NewMailMessage([]string{user.Email}, subject, body) - msg.Info = fmt.Sprintf("UID: %d, send email verify mail", user.Id) - - // async send mail - mailer.SendAsync(msg) -} diff --git a/modules/base/conf.go b/modules/base/conf.go index 24ee1d7f06..64c97028b9 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -174,6 +174,7 @@ func init() { SecretKey = Cfg.MustValue("security", "SECRET_KEY") // Extensions. + newService() newLogService() newMailService() newRegisterService() diff --git a/modules/base/tool.go b/modules/base/tool.go index fc3b4c45b8..d0b6bfbfda 100644 --- a/modules/base/tool.go +++ b/modules/base/tool.go @@ -67,25 +67,6 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string return code } -// TODO: -func RenderTemplate(TplNames string, Data map[interface{}]interface{}) string { - // if beego.RunMode == "dev" { - // beego.BuildTemplate(beego.ViewsPath) - // } - - // ibytes := bytes.NewBufferString("") - // if _, ok := beego.BeeTemplates[TplNames]; !ok { - // panic("can't find templatefile in the path:" + TplNames) - // } - // err := beego.BeeTemplates[TplNames].ExecuteTemplate(ibytes, TplNames, Data) - // if err != nil { - // beego.Trace("template Execute err:", err) - // } - // icontent, _ := ioutil.ReadAll(ibytes) - // return string(icontent) - return "not implement yet" -} - // AvatarLink returns avatar link by given e-mail. func AvatarLink(email string) string { return "http://1.gravatar.com/avatar/" + EncodeMd5(email) diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index cc4fd6d059..de4f24a47d 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -5,8 +5,13 @@ package mailer import ( + "encoding/hex" + "fmt" + "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" + "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/middleware" ) // Create New mail message use MailFrom and MailUser @@ -22,10 +27,62 @@ func GetMailTmplData(user *models.User) map[interface{}]interface{} { data["AppVer"] = base.AppVer data["AppUrl"] = base.AppUrl data["AppLogo"] = base.AppLogo - data["ActiveCodeLives"] = base.Service.ActiveCodeLives - data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives + data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60 + data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60 if user != nil { data["User"] = user } return data } + +// create a time limit code for user active +func CreateUserActiveCode(user *models.User, startInf interface{}) string { + hours := base.Service.ActiveCodeLives / 60 + data := base.ToStr(user.Id) + user.Email + user.LowerName + user.Passwd + user.Rands + code := base.CreateTimeLimitCode(data, hours, startInf) + + // add tail hex username + code += hex.EncodeToString([]byte(user.LowerName)) + return code +} + +// Send user register mail with active code +func SendRegisterMail(r *middleware.Render, user *models.User) { + code := CreateUserActiveCode(user, nil) + subject := "Register success, Welcome" + + data := GetMailTmplData(user) + data["Code"] = code + body, err := r.HTMLString("mail/auth/register_success", data) + if err != nil { + log.Error("mail.SendRegisterMail(fail to render): %v", err) + return + } + + msg := NewMailMessage([]string{user.Email}, subject, body) + msg.Info = fmt.Sprintf("UID: %d, send register mail", user.Id) + + // async send mail + SendAsync(msg) +} + +// Send email verify active email. +func SendActiveMail(r *middleware.Render, user *models.User) { + code := CreateUserActiveCode(user, nil) + + subject := "Verify your email address" + + data := GetMailTmplData(user) + data["Code"] = code + body, err := r.HTMLString("mail/auth/active_email.html", data) + if err != nil { + log.Error("mail.SendActiveMail(fail to render): %v", err) + return + } + + msg := NewMailMessage([]string{user.Email}, subject, body) + msg.Info = fmt.Sprintf("UID: %d, send email verify mail", user.Id) + + // async send mail + SendAsync(msg) +} diff --git a/routers/user/user.go b/routers/user/user.go index 42030076d2..52b75f661d 100644 --- a/routers/user/user.go +++ b/routers/user/user.go @@ -14,6 +14,7 @@ import ( "github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/log" + "github.com/gogits/gogs/modules/mailer" "github.com/gogits/gogs/modules/middleware" ) @@ -152,7 +153,12 @@ func SignUp(ctx *middleware.Context, form auth.RegisterForm) { // Send confirmation e-mail. if base.Service.RegisterEmailConfirm { - auth.SendRegisterMail(u) + mailer.SendRegisterMail(ctx.Render, u) + ctx.Data["IsSendRegisterMail"] = true + ctx.Data["Email"] = u.Email + ctx.Data["Hours"] = base.Service.ActiveCodeLives / 60 + ctx.Render.HTML(200, "user/active", ctx.Data) + return } ctx.Redirect("/user/login") } @@ -228,7 +234,8 @@ func Activate(ctx *middleware.Context) { ctx.Data["IsActivatePage"] = true // Resend confirmation e-mail. if base.Service.RegisterEmailConfirm { - auth.SendRegisterMail(ctx.User) + ctx.Data["Hours"] = base.Service.ActiveCodeLives / 60 + mailer.SendActiveMail(ctx.Render, ctx.User) } else { ctx.Data["ServiceNotEnabled"] = true } diff --git a/templates/mail/auth/active_email.html b/templates/mail/auth/active_email.html new file mode 100644 index 0000000000..ccb1202680 --- /dev/null +++ b/templates/mail/auth/active_email.html @@ -0,0 +1,25 @@ +{{template "mail/base.html" .}} +{{define "title"}} + {{if eq .Lang "zh-CN"}} + {{.User.NickName}}，激活你的账户 + {{end}} + {{if eq .Lang "en-US"}} + {{.User.NickName}}, please active your account + {{end}} +{{end}} +{{define "body"}} + {{if eq .Lang "zh-CN"}} +

点击链接验证email，{{.ActiveCodeLives}} 分钟内有效

+

+ {{.AppUrl}}active/{{.Code}} +

+

如果链接点击无反应，请复制到浏览器打开。

+ {{end}} + {{if eq .Lang "en-US"}} +

Please click following link to verify your e-mail in {{.ActiveCodeLives}} hours

+

+ {{.AppUrl}}active/{{.Code}} +

+

Copy and paste it to your browser if it's not working.

+ {{end}} +{{end}} \ No newline at end of file diff --git a/templates/mail/auth/register_success.tmpl b/templates/mail/auth/register_success.tmpl new file mode 100644 index 0000000000..83c0855051 --- /dev/null +++ b/templates/mail/auth/register_success.tmpl @@ -0,0 +1,33 @@ + + + + +{{.User.Name}}, welcome to {{.AppName}} + + +
+
+
+
+

{{.AppName}}

+
+
+ {{.User.Name}}, welcome to {{.AppName}} +
+
+

Please click following link to verify your e-mail in {{.ActiveCodeLives}} hours

+

+ {{.AppUrl}}active/{{.Code}} +

+

Copy and paste it to your browser if it's not working.

+
+
+
+
+
+ © 2014 {{AppName}} +
+
+
+ + \ No newline at end of file diff --git a/templates/mail/auth/reset_password.html b/templates/mail/auth/reset_password.html new file mode 100644 index 0000000000..40a9efa855 --- /dev/null +++ b/templates/mail/auth/reset_password.html @@ -0,0 +1,25 @@ +{{template "mail/base.html" .}} +{{define "title"}} + {{if eq .Lang "zh-CN"}} + {{.User.NickName}}，重置账户密码 + {{end}} + {{if eq .Lang "en-US"}} + {{.User.NickName}}, reset your password + {{end}} +{{end}} +{{define "body"}} + {{if eq .Lang "zh-CN"}} +

点击链接重置密码，{{.ResetPwdCodeLives}} 分钟内有效

+

+ {{.AppUrl}}reset/{{.Code}} +

+

如果链接点击无反应，请复制到浏览器打开。

+ {{end}} + {{if eq .Lang "en-US"}} +

Please click following link to reset your password in {{.ResetPwdCodeLives}} hours

+

+ {{.AppUrl}}reset/{{.Code}} +

+

Copy and paste it to your browser if it's not working.

+ {{end}} +{{end}} \ No newline at end of file diff --git a/templates/mail/base.html b/templates/mail/base.html new file mode 100644 index 0000000000..e86c2adfc2 --- /dev/null +++ b/templates/mail/base.html @@ -0,0 +1,29 @@ + + + + +{{.Title}} - {{AppName}} + + +
+
+
+
+

{{AppName}}

+
+
+ {{.Title}} +
+
+ {{template "body" .}} +
+
+
+
+
+ © 2014 {{AppName}} +
+
+
+ + \ No newline at end of file diff --git a/templates/user/active.tmpl b/templates/user/active.tmpl index 319db6cfa5..1ee723ee07 100644 --- a/templates/user/active.tmpl +++ b/templates/user/active.tmpl @@ -4,19 +4,23 @@

Activate Your Account

{{if .IsActivatePage}} - {{if .ServiceNotEnabled}} -

Sorry, Register Mail Confirmation has been disabled.

+ {{if .ServiceNotEnabled}} +

Sorry, Register Mail Confirmation has been disabled.

+ {{else}} +

New confirmation e-mail has been sent to {{.SignedUser.Email}}, please check your inbox within {{.Hours}} hours.

+ {{end}} {{else}} -

New confirmation e-mail has been sent to {{.SignedUser.Email}}, please check your inbox within 3 days.

- {{end}} - {{else}} -

Hi, {{.SignedUser.Name}}, you have an unconfirmed email address({{.SignedUser.Email}}). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.

-
-
-
- + {{if .IsSendRegisterMail}} +

A confirmation e-mail has been sent to {{.Email}}, please check your inbox within {{.Hours}} hours.

+ {{else}} +

Hi, {{.SignedUser.Name}}, you have an unconfirmed email address({{.SignedUser.Email}}). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.

+
+
+
+ +
-
+ {{end}} {{end}}