From e8049e3d64d731a9a5bb6bbf231e5563741b1674 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Fri, 2 Dec 2016 10:04:42 -0800 Subject: updating errors to log, getting domain from cold db rather than cache to avoid issues with installations which were started from existing dbs --- system/admin/handlers.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'system/admin') diff --git a/system/admin/handlers.go b/system/admin/handlers.go index b6b271a..82f8ae0 100644 --- a/system/admin/handlers.go +++ b/system/admin/handlers.go @@ -556,20 +556,20 @@ func forgotPasswordHandler(res http.ResponseWriter, req *http.Request) { email := strings.ToLower(req.FormValue("email")) if email == "" { res.WriteHeader(http.StatusBadRequest) - fmt.Println("Email was empty.") + log.Println("Failed account recovery. No email address submitted.") return } _, err = db.User(email) if err == db.ErrNoUserExists { res.WriteHeader(http.StatusBadRequest) - fmt.Println("No user exists.") + log.Println("No user exists.", err) return } if err != db.ErrNoUserExists && err != nil { res.WriteHeader(http.StatusInternalServerError) - fmt.Println("Error:", err) + log.Println("Error:", err) return } @@ -577,11 +577,17 @@ func forgotPasswordHandler(res http.ResponseWriter, req *http.Request) { key, err := db.SetRecoveryKey(email) if err != nil { res.WriteHeader(http.StatusInternalServerError) - fmt.Println("Failed to set key.", err) + log.Println("Failed to set account recovery key.", err) + return + } + + domain, err := db.Config("domain") + if err != nil { + res.WriteHeader(http.StatusInternalServerError) + log.Println("Failed to get domain from configuration.", err) return } - domain := db.ConfigCache("domain") body := fmt.Sprintf(` There has been an account recovery request made for the user with email: %s -- cgit v1.2.3