Skip to content

Disabling email validation when on testnet network #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kifen wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Disabling email validation when on testnet network #9

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d1b7583
adding feature to disable email validation when on testnet network
Kifen Aug 13, 2019
a65217d
disabling email verification and validation when on testnet network
Kifen Aug 13, 2019
431263c
merging if statement
Kifen Aug 13, 2019
14a581c
fixing merge conflicts
Kifen Aug 13, 2019
4c19855
enabling email verification over testnet
Kifen Aug 21, 2019
c613588
removing brackets from if condition
Kifen Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions controllers/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,7 @@ func (controller *MainController) LoginPost(c web.C, r *http.Request) (string, i

log.Infof("Login POST from %v, email %v", remoteIP, user.Email)

if user.EmailVerified == 0 {
if (user.EmailVerified == 0 && controller.getNetworkName() != "testnet") {
session.AddFlash("You must validate your email address", "loginError")
return controller.Login(c, r)
}
Expand Down Expand Up @@ -1760,12 +1760,14 @@ func (controller *MainController) RegisterPost(c web.C, r *http.Request) (string
return controller.Register(c, r)
}

err = controller.emailSender.Registration(email, controller.baseURL, remoteIP, token.String())
if err != nil {
session.AddFlash("Unable to send verification email", "registrationError")
log.Errorf("error sending verification email %v", err)
} else {
session.AddFlash("A verification email has been sent to "+email, "registrationSuccess")
if controller.getNetworkName() != "testnet" {
err = controller.emailSender.Registration(email, controller.baseURL, remoteIP, token.String())
if err != nil {
session.AddFlash("Unable to send verification email", "registrationError")
log.Errorf("error sending verification email %v", err)
} else {
session.AddFlash("A verification email has been sent to "+email, "registrationSuccess")
}
}

return controller.Register(c, r)
Expand Down