fix-2775

routers/routes/routes.go

@@ -417,8 +417,6 @@ func RegisterRoutes(m *macaron.Macaron) {
 		}, openIDSignInEnabled)
 		m.Get("/sign_up", user.SignUp)
 		m.Post("/sign_up", bindIgnErr(auth.RegisterForm{}), user.SignUpPost)
-		m.Post("/sign_up/update_email", bindIgnErr(auth.UpdateEmailForm{}), user.UpdateEmailPost)
-		m.Post("/sign_up/resend_email", user.ResendEmailPost)
 		m.Group("/oauth2", func() {
 			m.Get("/:provider", user.SignInOAuth)
 			m.Get("/:provider/callback", user.SignInOAuthCallback)
@@ -520,6 +518,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
 		m.Any("/activate", user.Activate, reqSignIn)
 		m.Any("/activate_email", user.ActivateEmail)
+		m.Post("/update_email", reqSignIn, bindIgnErr(auth.UpdateEmailForm{}), user.UpdateEmailPost)
 		m.Get("/avatar/:username/:size", user.Avatar)
 		m.Get("/email2user", user.Email2User)
 		m.Get("/recover_account", user.ResetPasswd)

routers/user/auth.go

@@ -1413,6 +1413,7 @@ func SignUpPost(ctx *context.Context, cpt *captcha.Captcha, form auth.RegisterFo
 	handleSignInFull(ctx, u, false, true)
 }
 
+//update user emailAddress
 func UpdateEmailPost(ctx *context.Context, form auth.UpdateEmailForm) {
 	newEmailAddress := form.NewEmail
 	if used, err := models.IsEmailUsed(newEmailAddress); used {
@@ -1425,7 +1426,12 @@ func UpdateEmailPost(ctx *context.Context, form auth.UpdateEmailForm) {
 		ctx.ServerError("GetEmailAddressByIDAndEmail failed", err)
 		return
 	}
-	email.UpdateEmailAddress(newEmailAddress)
+	err = email.UpdateEmailAddress(newEmailAddress)
+	if err != nil {
+		ctx.ServerError("UpdateEmailAddress failed", err)
+		return
+	}
+	Activate(ctx)
 }
 
 // Activate render activate user page