Skip to content

Change signup confirmation behaviour #2112

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change signup confirmation behaviour #2112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions internal/api/signup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func (a *API) Signup(w http.ResponseWriter, r *http.Request) error {
err = db.Transaction(func(tx *storage.Connection) error {
var terr error
if user != nil {
if (params.Provider == "email" && user.IsConfirmed()) || (params.Provider == "phone" && user.IsPhoneConfirmed()) {
if params.Provider == "email" || params.Provider == "phone" {
return UserExistsError
}
// do not update the user because we can't be sure of their claimed identity
Expand Down Expand Up @@ -225,7 +225,7 @@ func (a *API) Signup(w http.ResponseWriter, r *http.Request) error {
}
user.Identities = []models.Identity{*identity}

if params.Provider == "email" && !user.IsConfirmed() {
if params.Provider == "email" {
if config.Mailer.Autoconfirm {
if terr = models.NewAuditLogEntry(config.AuditLog, r, tx, user, models.UserSignedUpAction, "", map[string]interface{}{
"provider": params.Provider,
Expand All @@ -251,7 +251,7 @@ func (a *API) Signup(w http.ResponseWriter, r *http.Request) error {
return terr
}
}
} else if params.Provider == "phone" && !user.IsPhoneConfirmed() {
} else if params.Provider == "phone" {
if config.Sms.Autoconfirm {
if terr = models.NewAuditLogEntry(config.AuditLog, r, tx, user, models.UserSignedUpAction, "", map[string]interface{}{
"provider": params.Provider,
Expand Down
Loading