Author: Adam <git@apiote.tk>
show error description in signup
accounts/signup.go | 2 +- libamuse/signup.go | 8 ++++---- templates/signup.html | 2 +-
diff --git a/accounts/signup.go b/accounts/signup.go index 1a6f937b8017152b10364085d59fa2202b380353..c622a36960bf4f2331d36f3bfbebee75488df22d 100644 --- a/accounts/signup.go +++ b/accounts/signup.go @@ -22,7 +22,7 @@ if _, ok := err.(db.EmptyError); ok { err = nil } else if err == nil { err = AuthError{ - Err: errors.New("User exists"), + Err: errors.New("user_exists"), } } return gott.Tuple(args), err diff --git a/libamuse/signup.go b/libamuse/signup.go index 0d61856af34772eafecd13a6ef65fa60f56fec79..3836e2c41c2538aabac6f037c7707eca8a4f9c39 100644 --- a/libamuse/signup.go +++ b/libamuse/signup.go @@ -96,25 +96,25 @@ func DoSignup(username, password, passwordConfirm string, sfaEnabled bool, sfaSecret, sfa string) (string, error) { if password != passwordConfirm { return "", accounts.AuthError{ - Err: errors.New("Passwords don’t match"), + Err: errors.New("passwords_dont_match"), } } if sfaEnabled { if sfa == "" { return "", accounts.AuthError{ - Err: errors.New("Second factor authentication not confirmed"), + Err: errors.New("sfa_not_confirmed"), } } sfa = strings.ReplaceAll(sfa, " ", "") if !totp.Validate(sfa, sfaSecret) { return "", accounts.AuthError{ - Err: errors.New("Second factor code not correct"), + Err: errors.New("sfa_code_not_correct"), } } } if username == "" || password == "" || sfaSecret == "" { return "", accounts.AuthError{ - Err: errors.New("Required info missing"), + Err: errors.New("required_info_missing"), } } diff --git a/templates/signup.html b/templates/signup.html index cf10cac54d08072a77aa5dec329658e593de89dc..3019cedd950bdbbfd56ec264cdba5aa7484cfb73 100644 --- a/templates/signup.html +++ b/templates/signup.html @@ -21,7 +21,7 @@<div class="sans italic centre">Appare Vestigium!</div> <hr/> {{if .State.Error}} - <div class="sans bg-error centre bold margin-tb-1 padding-tb-1">Error</div> + <div class="sans bg-error centre bold margin-tb-1 padding-tb-1">Error: {{.State.Error.Err.Error}}</div> {{ end }} <form action="/signup" method="POST" class="clear-float"> <label for="username" class="sans block font-1 margin-top-1">Username</label>