Method for activating email addresses through verification email

diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index 6c73e7e58ffcc65750fab34988f2fd3f5896e4bc..21f33b17e8e4d0e8cfc405629ece8794d0882bc2 100644 (file)
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -21,6 +21,7 @@ import (
 
 const (
        AUTH_ACTIVE           base.TplName = "mail/auth/active"
+       AUTH_ACTIVATE_EMAIL   base.TplName = "mail/auth/activate_email"
        AUTH_REGISTER_SUCCESS base.TplName = "mail/auth/register_success"
        AUTH_RESET_PASSWORD   base.TplName = "mail/auth/reset_passwd"
 
@@ -64,6 +65,17 @@ func CreateUserActiveCode(u *models.User, startInf interface{}) string {
        return code
 }
 
+// create a time limit code for user active
+func CreateUserEmailActivateCode(u *models.User, e *models.EmailAddress, startInf interface{}) string {
+       minutes := setting.Service.ActiveCodeLives
+       data := com.ToStr(u.Id) + e.Email + u.LowerName + u.Passwd + u.Rands
+       code := base.CreateTimeLimitCode(data, minutes, startInf)
+
+       // add tail hex username
+       code += hex.EncodeToString([]byte(u.LowerName))
+       return code
+}
+
 // Send user register mail with active code
 func SendRegisterMail(r macaron.Render, u *models.User) {
        code := CreateUserActiveCode(u, nil)
@@ -103,6 +115,27 @@ func SendActiveMail(r macaron.Render, u *models.User) {
        SendAsync(&msg)
 }
 
+// Send email to verify secondary email.
+func SendActivateEmail(r macaron.Render, user *models.User, email *models.EmailAddress) {
+       code := CreateUserEmailActivateCode(user, email, nil)
+
+       subject := "Verify your e-mail address"
+
+       data := GetMailTmplData(user)
+       data["Code"] = code
+       data["Email"] = email.Email
+       body, err := r.HTMLString(string(AUTH_ACTIVATE_EMAIL), data)
+       if err != nil {
+               log.Error(4, "mail.SendActiveMail(fail to render): %v", err)
+               return
+       }
+
+       msg := NewMailMessage([]string{email.Email}, subject, body)
+       msg.Info = fmt.Sprintf("UID: %d, send activate email to %s", user.Id, email.Email)
+
+       SendAsync(&msg)
+}
+
 // Send reset password email.
 func SendResetPasswdMail(r macaron.Render, u *models.User) {
        code := CreateUserActiveCode(u, nil)

diff --git a/routers/user/auth.go b/routers/user/auth.go
index c695f929a7fff20403ca9f99d1fab7087b987361..a5b27453ec5cd27b9672f16a8f498a70037fe23c 100644 (file)
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -343,6 +343,27 @@ func Activate(ctx *middleware.Context) {
        ctx.HTML(200, ACTIVATE)
 }
 
+func ActivateEmail(ctx *middleware.Context) {
+       code := ctx.Query("code")
+       email_string := ctx.Query("email")
+
+       // Verify code.
+       if email := models.VerifyActiveEmailCode(code, email_string); email != nil {
+               err := email.Activate()
+               if err != nil {
+                       ctx.Handle(500, "ActivateEmail", err)
+               }
+
+               log.Trace("Email activated: %s", email.Email)
+
+               ctx.Flash.Success(ctx.Tr("settings.activate_email_success"))
+
+       }
+
+       ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
+       return
+}
+
 func ForgotPasswd(ctx *middleware.Context) {
        ctx.Data["Title"] = ctx.Tr("auth.forgot_password")