coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finish new auth e-mails

This commit is contained in:
Unknwon 2015-09-17 14:57:24 -04:00
parent 923873db85
commit 9d36fc6986
13 changed files with 145 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/locale/locale_en-US.ini
View File

@ -161,9 +161,10 @@ reset_password_helper = Click here to reset your password
password_too_short = Password length cannot be less then 6. password_too_short = Password length cannot be less then 6.
[mail] [mail]
register_success = Register success, Welcome
activate_account = Please activate your account activate_account = Please activate your account
activate_email = Verify your e-mail address activate_email = Verify your e-mail address
reset_password = Reset your password
register_success = Register success, Welcome
[modal] [modal]
yes = Yes yes = Yes
@ -281,7 +282,7 @@ email_deletion_desc = Delete this e-mail address will remove related information
email_deletion_success = E-mail has been deleted successfully! email_deletion_success = E-mail has been deleted successfully!
add_new_email = Add new e-mail address add_new_email = Add new e-mail address
add_email = Add e-mail add_email = Add e-mail
add_email_confirmation_sent = A new confirmation e-mail has been sent to <b>%s</b>, please check your inbox within the next %d hours to complete the confirmation process. add_email_confirmation_sent = A new confirmation e-mail has been sent to '%s', please check your inbox within the next %d hours to complete the confirmation process.
add_email_success = Your new E-mail address was successfully added. add_email_success = Your new E-mail address was successfully added.
manage_ssh_keys = Manage SSH Keys manage_ssh_keys = Manage SSH Keys

34
modules/bindata/bindata.go
View File

File diff suppressed because one or more lines are too long

26
modules/mailer/mail.go
View File

@ -18,10 +18,10 @@ import (
) )
const ( const (
AUTH_REGISTER_SUCCESS base.TplName = "mail/auth/register_success"
AUTH_ACTIVATE base.TplName = "mail/auth/activate" AUTH_ACTIVATE base.TplName = "mail/auth/activate"
AUTH_ACTIVATE_EMAIL base.TplName = "mail/auth/activate_email" AUTH_ACTIVATE_EMAIL base.TplName = "mail/auth/activate_email"
AUTH_RESET_PASSWORD base.TplName = "mail/auth/reset_passwd" AUTH_RESET_PASSWORD base.TplName = "mail/auth/reset_passwd"
AUTH_REGISTER_SUCCESS base.TplName = "mail/auth/register_success"
NOTIFY_COLLABORATOR base.TplName = "mail/notify/collaborator" NOTIFY_COLLABORATOR base.TplName = "mail/notify/collaborator"
NOTIFY_MENTION base.TplName = "mail/notify/mention" NOTIFY_MENTION base.TplName = "mail/notify/mention"
@ -67,27 +67,23 @@ func SendActivateEmailMail(c *macaron.Context, u *models.User, email *models.Ema
} }
msg := NewMessage([]string{email.Email}, c.Tr("mail.activate_email"), body) msg := NewMessage([]string{email.Email}, c.Tr("mail.activate_email"), body)
msg.Info = fmt.Sprintf("UID: %d, activate email: %s", u.Id, email.Email) msg.Info = fmt.Sprintf("UID: %d, activate email", u.Id)
SendAsync(msg) SendAsync(msg)
} }
// Send reset password email. // SendResetPasswordMail sends reset password e-mail.
func SendResetPasswdMail(r macaron.Render, u *models.User) { func SendResetPasswordMail(c *macaron.Context, u *models.User) {
code := u.GenerateActivateCode()
subject := "Reset your password"
data := ComposeTplData(u) data := ComposeTplData(u)
data["Code"] = code data["Code"] = u.GenerateActivateCode()
body, err := r.HTMLString(string(AUTH_RESET_PASSWORD), data) body, err := c.HTMLString(string(AUTH_RESET_PASSWORD), data)
if err != nil { if err != nil {
log.Error(4, "mail.SendResetPasswdMail(fail to render): %v", err) log.Error(4, "HTMLString: %v", err)
return return
} }
msg := NewMessage([]string{u.Email}, subject, body) msg := NewMessage([]string{u.Email}, c.Tr("mail.reset_password"), body)
msg.Info = fmt.Sprintf("UID: %d, send reset password email", u.Id) msg.Info = fmt.Sprintf("UID: %d, reset password", u.Id)
SendAsync(msg) SendAsync(msg)
} }
@ -120,7 +116,7 @@ func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue *
content := fmt.Sprintf("%s<br>-<br> <a href=\"%s%s/%s/issues/%d\">View it on Gogs</a>.", content := fmt.Sprintf("%s<br>-<br> <a href=\"%s%s/%s/issues/%d\">View it on Gogs</a>.",
base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name), base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name),
setting.AppUrl, owner.Name, repo.Name, issue.Index) setting.AppUrl, owner.Name, repo.Name, issue.Index)
msg := NewMessageFrom(tos, u.Email, subject, content) msg := NewMessage(tos, subject, content)
msg.Info = fmt.Sprintf("Subject: %s, send issue notify emails", subject) msg.Info = fmt.Sprintf("Subject: %s, send issue notify emails", subject)
SendAsync(msg) SendAsync(msg)
return tos, nil return tos, nil
@ -145,7 +141,7 @@ func SendIssueMentionMail(r macaron.Render, u, owner *models.User,
return fmt.Errorf("mail.SendIssueMentionMail(fail to render): %v", err) return fmt.Errorf("mail.SendIssueMentionMail(fail to render): %v", err)
} }
msg := NewMessageFrom(tos, u.Email, subject, body) msg := NewMessage(tos, subject, body)
msg.Info = fmt.Sprintf("Subject: %s, send issue mention emails", subject) msg.Info = fmt.Sprintf("Subject: %s, send issue mention emails", subject)
SendAsync(msg) SendAsync(msg)
return nil return nil

2
public/css/gogs.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
public/less/_form.less
View File

@ -47,8 +47,10 @@
} }
.user.activate, .user.activate,
.signin, .user.forgot.password,
.signup { .user.reset.password,
.user.signin,
.user.signup {
@input-padding: 200px!important; @input-padding: 200px!important;
#create-page-form; #create-page-form;
form { form {

9
routers/user/auth.go
View File

@ -327,7 +327,7 @@ func ActivateEmail(ctx *middleware.Context) {
} }
log.Trace("Email activated: %s", email.Email) log.Trace("Email activated: %s", email.Email)
ctx.Flash.Success(ctx.Tr("settings.activate_email_success")) ctx.Flash.Success(ctx.Tr("settings.add_email_successs"))
} }
ctx.Redirect(setting.AppSubUrl + "/user/settings/email") ctx.Redirect(setting.AppSubUrl + "/user/settings/email")
@ -351,12 +351,14 @@ func ForgotPasswdPost(ctx *middleware.Context) {
ctx.Data["Title"] = ctx.Tr("auth.forgot_password") ctx.Data["Title"] = ctx.Tr("auth.forgot_password")
if setting.MailService == nil { if setting.MailService == nil {
ctx.Handle(403, "user.ForgotPasswdPost", nil) ctx.Handle(403, "ForgotPasswdPost", nil)
return return
} }
ctx.Data["IsResetRequest"] = true ctx.Data["IsResetRequest"] = true
email := ctx.Query("email") email := ctx.Query("email")
ctx.Data["Email"] = email
u, err := models.GetUserByEmail(email) u, err := models.GetUserByEmail(email)
if err != nil { if err != nil {
if models.IsErrUserNotExist(err) { if models.IsErrUserNotExist(err) {
@ -374,12 +376,11 @@ func ForgotPasswdPost(ctx *middleware.Context) {
return return
} }
mailer.SendResetPasswdMail(ctx.Render, u) mailer.SendResetPasswordMail(ctx.Context, u)
if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil { if err = ctx.Cache.Put("MailResendLimit_"+u.LowerName, u.LowerName, 180); err != nil {
log.Error(4, "Set cache(MailResendLimit) fail: %v", err) log.Error(4, "Set cache(MailResendLimit) fail: %v", err)
} }
ctx.Data["Email"] = email
ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60 ctx.Data["Hours"] = setting.Service.ActiveCodeLives / 60
ctx.Data["IsResetSent"] = true ctx.Data["IsResetSent"] = true
ctx.HTML(200, FORGOT_PASSWORD) ctx.HTML(200, FORGOT_PASSWORD)

37
templates/mail/auth/activate_email.tmpl
View File

@ -1,30 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{{.User.Name}}, please activate your e-mail address</title> <title>{{.User.Name}}, please verify your e-mail address</title>
</head> </head>
<body style="background:#eee;">
<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;"> <body>
<div style="width:600px;margin:0 auto; padding:40px 0 20px;"> <p>Hi <b>{{.User.Name}}</b>,</p>
<div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);"> <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p>
<div style="padding: 20px 15px;"> <p><a href="{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a></p>
<h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1> <p>Not working? Try copying and pasting it to your browser.</p>
<div style="padding:40px 15px;"> <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
<div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,
</div>
<div style="font-size:14px; padding:0 15px;">
<p style="margin:0;padding:0 0 9px 0;">Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>.</p>
<p style="margin:0;padding:0 0 9px 0;">
<a href="{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}">{{.AppUrl}}user/activate_email?code={{.Code}}&email={{.Email}}</a>
</p>
<p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
</div>
</div>
</div>
</div>
<div style="color:#aaa;padding:10px;text-align:center;">
© 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a>
</div>
</div>
</div>
</body> </body>
</html> </html>

34
templates/mail/auth/reset_passwd.tmpl
View File

@ -2,32 +2,14 @@
<html> <html>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>{{.User.Name}}, please reset your password</title> <title>{{.User.Name}}, you have requested to reset your password</title>
</head> </head>
<body style="background:#eee;">
<div style="color:#333; font:12px/1.5 Tahoma,Arial,sans-serif;; text-shadow:1px 1px #fff; padding:0; margin:0;"> <body>
<div style="width:600px;margin:0 auto; padding:40px 0 20px;"> <p>Hi <b>{{.User.Name}}</b>,</p>
<div style="border:1px solid #d9d9d9;border-radius:3px; background:#fff; box-shadow: 0px 2px 5px rgba(0, 0, 0,.05); -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0,.05);"> <p>Please click the following link to verify your e-mail address within <b>{{.ActiveCodeLives}} hours</b>:</p>
<div style="padding: 20px 15px;"> <p><a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a></p>
<h1 style="font-size:20px; padding:10px 0 20px; margin:0; border-bottom:1px solid #ddd;"><img src="{{.AppUrl}}/img/favicon.png" style="height: 32px; margin-bottom: -10px;"> <a style="color:#333;text-decoration:none;" target="_blank" href="{{.AppUrl}}">{{.AppName}}</a></h1> <p>Not working? Try copying and pasting it to your browser.</p>
<div style="padding:40px 15px;"> <p>© 2015 <a target="_blank" href="http://gogs.io">Gogs: Go Git Service</a></p>
<div style="font-size:16px; padding-bottom:30px; font-weight:bold;">
Hi <span style="color: #00BFFF;">{{.User.Name}}</span>,
</div>
<div style="font-size:14px; padding:0 15px;">
<p style="margin:0;padding:0 0 9px 0;">Please click the following link to reset your password within <b>{{.ActiveCodeLives}} hours</b>.</p>
<p style="margin:0;padding:0 0 9px 0;">
<a href="{{.AppUrl}}user/reset_password?code={{.Code}}">{{.AppUrl}}user/reset_password?code={{.Code}}</a>
</p>
<p style="margin:0;padding:0 0 9px 0;">Not working? Try copying and pasting it to your browser.</p>
</div>
</div>
</div>
</div>
<div style="color:#aaa;padding:10px;text-align:center;">
© 2014 <a style="color:#888;text-decoration:none;" target="_blank" href="http://gogits.org">Gogs: Go Git Service</a>
</div>
</div>
</div>
</body> </body>
</html> </html>

7
templates/user/auth/activate.tmpl
View File

@ -8,11 +8,12 @@
{{.i18n.Tr "auth.active_your_account"}} {{.i18n.Tr "auth.active_your_account"}}
</h2> </h2>
<div class="ui attached segment"> <div class="ui attached segment">
{{template "base/alert" .}}
{{if .IsActivatePage}} {{if .IsActivatePage}}
{{if .ServiceNotEnabled}} {{if .ServiceNotEnabled}}
<p>{{.i18n.Tr "auth.disable_register_mail"}}</p> <p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p>
{{else if .ResendLimited}} {{else if .ResendLimited}}
<p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p> <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
{{else}} {{else}}
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p> <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .SignedUser.Email .Hours | Str2html}}</p>
<div class="ui divider"></div> <div class="ui divider"></div>
@ -33,7 +34,7 @@
<p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p> <p>{{.i18n.Tr "auth.has_unconfirmed_mail" .SignedUser.Name .SignedUser.Email | Str2html}}</p>
<div class="ui divider"></div> <div class="ui divider"></div>
<div class="text right"> <div class="text right">
<button class="ui blue button" href="http://{{Mail2Domain .SignedUser.Email}}">{{.i18n.Tr "auth.resend_mail"}}</button> <button class="ui blue button">{{.i18n.Tr "auth.resend_mail"}}</button>
</div> </div>
{{end}} {{end}}
{{end}} {{end}}

48
templates/user/auth/forgot_passwd.tmpl
View File

@ -1,32 +1,38 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="user forgot password">
<div id="sign-wrapper"> <div class="ui middle very relaxed page grid">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/forget_password" method="post"> <div class="column">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <h2 class="ui top attached header">
<h2>{{.i18n.Tr "auth.forgot_password"}}</h2> {{.i18n.Tr "auth.forgot_password"}}
</div> </h2>
<div class="panel-content"> <div class="ui attached segment">
{{template "ng/base/alert" .}} {{template "base/alert" .}}
{{if .IsResetSent}} {{if .IsResetSent}}
<p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p> <p>{{.i18n.Tr "auth.confirmation_mail_sent_prompt" .Email .Hours | Str2html}}</p>
<hr/> <div class="ui divider"></div>
<label></label> <div class="text right">
<a class="btn btn-green btn-large btn-link btn-radius" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_email"}}</a> <a class="ui green button" href="http://{{Mail2Domain .Email}}">{{.i18n.Tr "auth.sign_in_to_account"}}</a>
{{else if .IsResetRequest}}
<div class="field">
<label class="req" for="email">{{.i18n.Tr "email"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}"required/>
</div> </div>
<hr/> {{else if .IsResetRequest}}
<div class="required inline field {{if .Err_Email}}error{{end}}">
<label for="email">{{.i18n.Tr "email"}}</label>
<input id="email" name="email" type="email" value="{{.Email}}" autofocus required>
</div>
<div class="ui divider"></div>
<div class="inline field">
<label></label> <label></label>
<button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.send_reset_mail"}}</button> <button class="ui blue button">{{.i18n.Tr "auth.send_reset_mail"}}</button>
</div>
{{else if .IsResetDisable}} {{else if .IsResetDisable}}
<p>{{.i18n.Tr "auth.disable_register_mail"}}</p> <p class="center">{{.i18n.Tr "auth.disable_register_mail"}}</p>
{{else if .ResendLimited}} {{else if .ResendLimited}}
<p>{{.i18n.Tr "auth.resent_limit_prompt"}}</p> <p class="center">{{.i18n.Tr "auth.resent_limit_prompt"}}</p>
{{end}} {{end}}
</div> </div>
</form> </form>
</div> </div>
{{template "ng/base/footer" .}} </div>
</div>
{{template "base/footer" .}}

38
templates/user/auth/reset_passwd.tmpl
View File

@ -1,25 +1,31 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="user reset password">
<div id="sign-wrapper"> <div class="ui middle very relaxed page grid">
<form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/user/reset_password?code={{.Code}}" method="post"> <div class="column">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="panel-header"> <input name="code" type="hidden" value="{{.Code}}">
<h2>{{.i18n.Tr "auth.reset_password"}}</h2> <h2 class="ui top attached header">
</div> {{.i18n.Tr "auth.reset_password"}}
<div class="panel-content"> </h2>
{{template "ng/base/alert" .}} <div class="ui attached segment">
{{template "base/alert" .}}
{{if .IsResetForm}} {{if .IsResetForm}}
<div class="field"> <div class="required inline field {{if .Err_Password}}error{{end}}">
<label class="req" for="password">{{.i18n.Tr "password"}}</label> <label for="password">{{.i18n.Tr "password"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/> <input id="password" name="password" type="password" value="{{.password}}" autofocus required>
</div> </div>
<hr/> <div class="ui divider"></div>
<div class="inline field">
<label></label> <label></label>
<button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.reset_password_helper"}}</button> <button class="ui blue button">{{.i18n.Tr "auth.reset_password_helper"}}</button>
</div>
{{else}} {{else}}
<p>{{.i18n.Tr "auth.invalid_code"}}</p> <p class="center">{{.i18n.Tr "auth.invalid_code"}}</p>
{{end}} {{end}}
</div> </div>
</form> </form>
</div> </div>
{{template "ng/base/footer" .}} </div>
</div>
{{template "base/footer" .}}

2
templates/user/auth/signin.tmpl
View File

@ -1,5 +1,5 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="signin"> <div class="user signin">
<div class="ui middle very relaxed page grid"> <div class="ui middle very relaxed page grid">
<div class="column"> <div class="column">
<form class="ui form" action="{{.Link}}" method="post"> <form class="ui form" action="{{.Link}}" method="post">

2
templates/user/auth/signup.tmpl
View File

@ -1,5 +1,5 @@
{{template "base/head" .}} {{template "base/head" .}}
<div class="signup"> <div class="user signup">
<div class="ui middle very relaxed page grid"> <div class="ui middle very relaxed page grid">
<div class="column"> <div class="column">
<form class="ui form" action="{{.Link}}" method="post"> <form class="ui form" action="{{.Link}}" method="post">