Added user registration

handlers/login.go

@@ -16,17 +16,17 @@ import (
 
 // Validates the username matches a user in the database and the password
 // is correct. Returns the corresponding user
-func validateLogin(conn *sql.DB, r *http.Request) (db.User, error) {
+func validateLogin(conn *sql.DB, r *http.Request) (*db.User, error) {
 	formUsername := r.FormValue("username")
 	formPassword := r.FormValue("password")
 	user, err := db.GetUserFromUsername(conn, formUsername)
 	if err != nil {
-		return db.User{}, errors.Wrap(err, "db.GetUserFromUsername")
+		return nil, errors.Wrap(err, "db.GetUserFromUsername")
 	}
 
 	err = user.CheckPassword(formPassword)
 	if err != nil {
-		return db.User{}, errors.New("Username or password incorrect")
+		return nil, errors.New("Username or password incorrect")
 	}
 	return user, nil
 }
@@ -54,17 +54,19 @@ func HandleLoginRequest(
 			r.ParseForm()
 			user, err := validateLogin(conn, r)
 			if err != nil {
-				form.LoginForm(err.Error()).Render(r.Context(), w)
 				if err.Error() != "Username or password incorrect" {
 					logger.Warn().Caller().Err(err).Msg("Login request failed")
+					w.WriteHeader(http.StatusInternalServerError)
+				} else {
+					form.LoginForm(err.Error()).Render(r.Context(), w)
 				}
 				return
 			}
 
 			rememberMe := checkRememberMe(r)
-			err = cookies.SetTokenCookies(w, r, config, &user, true, rememberMe)
+			err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
 			if err != nil {
-				form.LoginForm(err.Error()).Render(r.Context(), w)
+				w.WriteHeader(http.StatusInternalServerError)
 				logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
 			}
 

handlers/register.go

@@ -0,0 +1,81 @@
+package handlers
+
+import (
+	"database/sql"
+	"net/http"
+
+	"projectreshoot/config"
+	"projectreshoot/cookies"
+	"projectreshoot/db"
+	"projectreshoot/view/component/form"
+	"projectreshoot/view/page"
+
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog"
+)
+
+func validateRegistration(conn *sql.DB, r *http.Request) (*db.User, error) {
+	formUsername := r.FormValue("username")
+	formPassword := r.FormValue("password")
+	formConfirmPassword := r.FormValue("confirm-password")
+	unique, err := db.CheckUsernameUnique(conn, formUsername)
+	if err != nil {
+		return nil, errors.Wrap(err, "db.CheckUsernameUnique")
+	}
+	if !unique {
+		return nil, errors.New("Username is taken")
+	}
+	if formPassword != formConfirmPassword {
+		return nil, errors.New("Passwords do not match")
+	}
+	user, err := db.CreateNewUser(conn, formUsername, formPassword)
+	if err != nil {
+		return nil, errors.Wrap(err, "db.CreateNewUser")
+	}
+
+	return user, nil
+}
+
+func HandleRegisterRequest(
+	config *config.Config,
+	logger *zerolog.Logger,
+	conn *sql.DB,
+) http.Handler {
+	return http.HandlerFunc(
+		func(w http.ResponseWriter, r *http.Request) {
+			r.ParseForm()
+			user, err := validateRegistration(conn, r)
+			if err != nil {
+				if err.Error() != "Username is taken" &&
+					err.Error() != "Passwords do not match" {
+					logger.Warn().Caller().Err(err).Msg("Registration request failed")
+					w.WriteHeader(http.StatusInternalServerError)
+				} else {
+					form.RegisterForm(err.Error()).Render(r.Context(), w)
+				}
+				return
+			}
+
+			rememberMe := checkRememberMe(r)
+			err = cookies.SetTokenCookies(w, r, config, user, true, rememberMe)
+			if err != nil {
+				w.WriteHeader(http.StatusInternalServerError)
+				logger.Warn().Caller().Err(err).Msg("Failed to set token cookies")
+			}
+
+			pageFrom := cookies.CheckPageFrom(w, r)
+			w.Header().Set("HX-Redirect", pageFrom)
+		},
+	)
+}
+
+// Handles a request to view the login page. Will attempt to set "pagefrom"
+// cookie so a successful login can redirect the user to the page they came
+func HandleRegisterPage(trustedHost string) http.Handler {
+	return http.HandlerFunc(
+		func(w http.ResponseWriter, r *http.Request) {
+			cookies.SetPageFrom(w, r, trustedHost)
+			page.Register().Render(r.Context(), w)
+		},
+	)
+}