Refactor Store into SessionStore; move domain SQL onto User/Question/Answer.

internal/web/auth.go

@@ -43,7 +43,7 @@ func (s *Server) handleLogin(w http.ResponseWriter, r *http.Request) {
 	username := strings.TrimSpace(r.PostFormValue("username"))
 	password := r.PostFormValue("password")
 	next := safeNext(r.PostFormValue("next"))
-	u, err := s.store.UserByUsername(r.Context(), username)
+	u, err := store.UserByUsername(r.Context(), s.db, username)
 	if err != nil || bcrypt.CompareHashAndPassword([]byte(u.PasswordHash), []byte(password)) != nil {
 		w.WriteHeader(http.StatusUnauthorized)
 		s.exec(w, "login", authPage{
@@ -90,7 +90,7 @@ func (s *Server) handleRegister(w http.ResponseWriter, r *http.Request) {
 	}
 	role := store.RoleUser
 	if s.cfg.AdminUsername != "" && store.NormalizeUsername(username) == store.NormalizeUsername(s.cfg.AdminUsername) {
-		n, err := s.store.CountAdmins(r.Context())
+		n, err := store.CountAdmins(r.Context(), s.db)
 		if err != nil {
 			http.Error(w, "could not create account", http.StatusInternalServerError)
 			return
@@ -99,12 +99,11 @@ func (s *Server) handleRegister(w http.ResponseWriter, r *http.Request) {
 			role = store.RoleAdmin
 		}
 	}
-	u, err := s.store.CreateUser(r.Context(), store.NewUser{
-		Username:     username,
-		PasswordHash: string(hash),
-		Role:         role,
-	})
-	if err != nil {
+	u := store.NewUser(s.db)
+	u.Username = username
+	u.PasswordHash = string(hash)
+	u.Role = role
+	if err := u.Create(r.Context()); err != nil {
 		p.Error = "That username is taken."
 		s.exec(w, "register", p)
 		return