From 5b5f53d5a70597cdeb85ab70314b8382268d2590 Mon Sep 17 00:00:00 2001
From: Max Gor <maxweb4u@gmail.com>
Date: Sun, 23 Sep 2018 16:04:47 +0300
Subject: [PATCH] fixed verifying email and reseting password

---
 controllers/user.go | 21 +++++++++++----------
 routers/router.go   |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/controllers/user.go b/controllers/user.go
index 7fc04b0..ebfae96 100644
--- a/controllers/user.go
+++ b/controllers/user.go
@@ -87,14 +87,14 @@ func (this *MainController) Login() {
 		m["username"] = email
 		m["timestamp"] = time.Now()
 		this.SetSession("bftx-public", m)
-		this.Redirect("/"+back, 302)
+		this.Redirect("/", 302)
 	}
 }
 
 func (this *MainController) Logout() {
 	this.activeContent("logout")
 	this.DelSession("bftx-public")
-	this.Redirect("/home", 302)
+	this.Redirect("/", 302)
 }
 
 type user1 struct {
@@ -161,18 +161,17 @@ func (this *MainController) Register() {
 
 func sendVerification(email, u string, domainname string) bool {
 	link := "http://" + domainname + "/user/verify/" + u
-	//host := "smtp.gmail.com"
-	//port := 587
-	host := "melbourne.digital"
-	port := 465
+	host := "mail.blockfreight.com"
+	user := "signup@blockfreight.com"
+	pass := "kisskiss"
+	port := 587
 	msg := gomail.NewMessage()
 	msg.SetAddressHeader("From", "signup@blockfreight.com", "Blockfreight Inc.")
 	msg.SetHeader("To", email)
 	msg.SetHeader("Subject", "Account Verification for Blockfreight Inc.")
 	msg.SetBody("text/html", "To verify your account, please click on the link: <a href=\""+link+
 		"\">"+link+"</a><br><br>Best Regards,<br>Blockfreight Inc.")
-	//m := gomail.NewMailer(host, "youraccount@gmail.com", "YourPassword", port)
-	m := gomail.NewMailer(host, "signup@blockfreight.com", "kisskiss", port)
+	m := gomail.NewMailer(host, user, pass, port)
 	if err := m.Send(msg); err != nil {
 		return false
 	}
@@ -423,7 +422,9 @@ func (this *MainController) Forgot() {
 
 func sendRequestReset(email, u string, domainname string) bool {
 	link := "http://" + domainname + "/user/reset/" + u
-	host := "smtp.gmail.com"
+	host := "mail.blockfreight.com"
+	user := "signup@blockfreight.com"
+	pass := "kisskiss"
 	port := 587
 	msg := gomail.NewMessage()
 	msg.SetAddressHeader("From", "support@blockfreight.com", "Blockfreight Inc.")
@@ -431,7 +432,7 @@ func sendRequestReset(email, u string, domainname string) bool {
 	msg.SetHeader("Subject", "Request Password Reset for Blockfreight Inc.")
 	msg.SetBody("text/html", "To reset your password, please click on the link: <a href=\""+link+
 		"\">"+link+"</a><br><br>Best Regards,<br>Blockfreight Inc.")
-	m := gomail.NewMailer(host, "youraccount@gmail.com", "YourPassword", port)
+	m := gomail.NewMailer(host, user, pass, port)
 	if err := m.Send(msg); err != nil {
 		return false
 	}
diff --git a/routers/router.go b/routers/router.go
index d57d060..71d765f 100644
--- a/routers/router.go
+++ b/routers/router.go
@@ -18,10 +18,10 @@ func init() {
 	beego.Router("/user/logout", &controllers.MainController{}, "get:Logout")
 	beego.Router("/user/register", &controllers.MainController{}, "get,post:Register")
 	beego.Router("/user/profile", &controllers.MainController{}, "get,post:Profile")
-	beego.Router("/user/verify/:uuid({[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}})", &controllers.MainController{}, "get:Verify")
+	beego.Router("/user/verify/:uuid([a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12})", &controllers.MainController{}, "get:Verify")
 	beego.Router("/user/remove", &controllers.MainController{}, "get,post:Remove")
 	beego.Router("/user/forgot", &controllers.MainController{}, "get,post:Forgot")
-	beego.Router("/user/reset/:uuid({[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}})", &controllers.MainController{}, "get,post:Reset")
+	beego.Router("/user/reset/:uuid([a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12})", &controllers.MainController{}, "get,post:Reset")
 	beego.Router("/notice", &controllers.MainController{}, "get:Notice")
 	beego.Router("/appadmin/index/:parms", &controllers.AdminController{}, "get,post:Index")
 	beego.Router("/appadmin/add/:parms", &controllers.AdminController{}, "get,post:Add")