Added database support and update login to utilize db
This commit is contained in:
@@ -1,37 +1,32 @@
|
||||
package handlers
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"projectreshoot/cookies"
|
||||
"projectreshoot/db"
|
||||
"projectreshoot/view/component/form"
|
||||
"projectreshoot/view/page"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// TODO: here for testing only, move to database
|
||||
type User struct {
|
||||
id int
|
||||
username string
|
||||
password string
|
||||
}
|
||||
|
||||
// TODO: here for testing only, move to database
|
||||
func testUser() User {
|
||||
return User{id: 1, username: "Haelnorr", password: "test"}
|
||||
}
|
||||
|
||||
func validateLogin(r *http.Request) (int, error) {
|
||||
func validateLogin(conn *sql.DB, r *http.Request) (db.User, error) {
|
||||
formUsername := r.FormValue("username")
|
||||
formPassword := r.FormValue("password")
|
||||
// TODO: search database for username
|
||||
validUser := testUser()
|
||||
// TODO: check password is valid
|
||||
if formUsername != validUser.username || formPassword != validUser.password {
|
||||
return 0, errors.New("Username or password incorrect")
|
||||
|
||||
user, err := db.GetUserFromUsername(conn, formUsername)
|
||||
if err != nil {
|
||||
return db.User{}, errors.Wrap(err, "db.GetUserFromUsername")
|
||||
}
|
||||
// TODO: return the users ID
|
||||
return validUser.id, nil
|
||||
|
||||
err = user.CheckPassword(formPassword)
|
||||
if err != nil {
|
||||
return db.User{}, errors.New("Username or password incorrect")
|
||||
}
|
||||
return user, nil
|
||||
}
|
||||
|
||||
func checkRememberMe(r *http.Request) bool {
|
||||
@@ -43,21 +38,23 @@ func checkRememberMe(r *http.Request) bool {
|
||||
}
|
||||
}
|
||||
|
||||
func HandleLoginRequest() http.Handler {
|
||||
func HandleLoginRequest(conn *sql.DB) http.Handler {
|
||||
return http.HandlerFunc(
|
||||
func(w http.ResponseWriter, r *http.Request) {
|
||||
r.ParseForm()
|
||||
userID, err := validateLogin(r)
|
||||
user, err := validateLogin(conn, r)
|
||||
if err != nil {
|
||||
// TODO: add debug log
|
||||
fmt.Printf("Login failed: %s\n", err)
|
||||
form.LoginForm(err.Error()).Render(r.Context(), w)
|
||||
return
|
||||
}
|
||||
|
||||
// TODO: login success, use the userID to set the session
|
||||
rememberMe := checkRememberMe(r)
|
||||
fmt.Printf("Login success, user ID: %v - remember me?: %t\n", userID, rememberMe)
|
||||
fmt.Printf(
|
||||
"Login success, user: %v - remember me?: %t\n",
|
||||
user.Username,
|
||||
rememberMe,
|
||||
)
|
||||
|
||||
pageFrom := cookies.CheckPageFrom(w, r)
|
||||
w.Header().Set("HX-Redirect", pageFrom)
|
||||
|
||||
Reference in New Issue
Block a user