From cbe709025efe56a92bfc0fba5936e561ada711c8 Mon Sep 17 00:00:00 2001
From: sentriz <senan@senan.xyz>
Date: Thu, 11 Jul 2019 10:22:20 +0100
Subject: [PATCH] use GetUserFromName in handlers

---
 server/handler/handler_admin.go | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/server/handler/handler_admin.go b/server/handler/handler_admin.go
index 2f77b96..50aafa8 100644
--- a/server/handler/handler_admin.go
+++ b/server/handler/handler_admin.go
@@ -38,7 +38,7 @@ func (c *Controller) ServeLoginDo(w http.ResponseWriter, r *http.Request) {
 	}
 	// put the user name into the session. future endpoints after this one
 	// are wrapped with WithUserSession() which will get the name from the
-	// session and put the row into the request context.
+	// session and put the row into the request context
 	session.Values["user"] = user.Name
 	sessLogSave(w, r, session)
 	http.Redirect(w, r, "/admin/home", http.StatusSeeOther)
@@ -150,12 +150,8 @@ func (c *Controller) ServeChangePassword(w http.ResponseWriter, r *http.Request)
 		http.Error(w, "please provide a username", 400)
 		return
 	}
-	user := &model.User{}
-	err := c.DB.
-		Where("name = ?", username).
-		First(user).
-		Error
-	if gorm.IsRecordNotFoundError(err) {
+	user := c.DB.GetUserFromName(username)
+	if user == nil {
 		http.Error(w, "couldn't find a user with that name", 400)
 		return
 	}
@@ -167,10 +163,6 @@ func (c *Controller) ServeChangePassword(w http.ResponseWriter, r *http.Request)
 func (c *Controller) ServeChangePasswordDo(w http.ResponseWriter, r *http.Request) {
 	session := r.Context().Value(contextSessionKey).(*sessions.Session)
 	username := r.URL.Query().Get("user")
-	user := &model.User{}
-	c.DB.
-		Where("name = ?", username).
-		First(user)
 	passwordOne := r.FormValue("password_one")
 	passwordTwo := r.FormValue("password_two")
 	err := validatePasswords(passwordOne, passwordTwo)
@@ -180,6 +172,7 @@ func (c *Controller) ServeChangePasswordDo(w http.ResponseWriter, r *http.Reques
 		http.Redirect(w, r, r.Header.Get("Referer"), http.StatusSeeOther)
 		return
 	}
+	user := c.DB.GetUserFromName(username)
 	user.Password = passwordOne
 	c.DB.Save(user)
 	http.Redirect(w, r, "/admin/home", http.StatusSeeOther)
@@ -191,12 +184,8 @@ func (c *Controller) ServeDeleteUser(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "please provide a username", 400)
 		return
 	}
-	user := &model.User{}
-	err := c.DB.
-		Where("name = ?", username).
-		First(user).
-		Error
-	if gorm.IsRecordNotFoundError(err) {
+	user := c.DB.GetUserFromName(username)
+	if user == nil {
 		http.Error(w, "couldn't find a user with that name", 400)
 		return
 	}
@@ -207,10 +196,7 @@ func (c *Controller) ServeDeleteUser(w http.ResponseWriter, r *http.Request) {
 
 func (c *Controller) ServeDeleteUserDo(w http.ResponseWriter, r *http.Request) {
 	username := r.URL.Query().Get("user")
-	user := &model.User{}
-	c.DB.
-		Where("name = ?", username).
-		First(user)
+	user := c.DB.GetUserFromName(username)
 	c.DB.Delete(user)
 	http.Redirect(w, r, "/admin/home", http.StatusSeeOther)
 }