Merge pull request 'login refactor' (#9) from login-refactor into master

Reviewed-on: #9

api/handlers/authHandler.go

@@ -14,18 +14,14 @@ import (
 func Login(w http.ResponseWriter, r *http.Request) {
 	var u *types.LoginUser
 
-	isHtmx := r.Header.Get("HX-Request")
+	if r.Header.Get("HX-Request") == "true" {
-
+		u = handleHtmxLogin(r)
-	if isHtmx == "true" {
-		u = &types.LoginUser{
-			Email:    r.PostFormValue("email"),
-			Password: r.PostFormValue("password"),
-		}
 	} else {
-		if err := json.NewDecoder(r.Body).Decode(&u); err != nil {
+		u = handleHttpLogin(w, r, u)
-			InternalServerErrorHandler(w, err)
+	}
-			return
+
-		}
+	if u == nil {
+		return
 	}
 
 	User, err := query.GetLogin(context.Background(), u)
@@ -34,35 +30,41 @@ func Login(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if bcrypt.CheckPasswordHash(u.Password, User.Password) {
+	if !bcrypt.CheckPasswordHash(u.Password, User.Password) {
-
-		jwtToken := jwt.CreateUserJWT(User.Name, User.ID, string(User.Role))
-
-		if jwtToken != "" {
-
-			cookie := &http.Cookie{Name: "jwt",
-				Value: jwtToken,
-				//HttpOnly: true,
-				//Secure:   true,
-				SameSite: http.SameSiteLaxMode,
-				Expires:  time.Now().Add(24 * time.Hour),
-			}
-
-			http.SetCookie(w, cookie)
-
-			w.WriteHeader(http.StatusOK)
-			_, err = w.Write([]byte("login success"))
-			return
-		} else {
-			InternalServerErrorHandler(w, err)
-			return
-		}
-
-	} else {
 		UnauthorizedHandler(w)
-
+		return
-		println("unauthorized")
 	}
+
+	jwtToken := jwt.CreateUserJWT(User.Name, User.ID, string(User.Role))
+
+	cookie := &http.Cookie{
+		Name:     "jwt",
+		Value:    jwtToken,
+		HttpOnly: true,
+		Secure:   true,
+		SameSite: http.SameSiteLaxMode,
+		Expires:  time.Now().Add(24 * time.Hour),
+	}
+
+	http.SetCookie(w, cookie)
+
+	w.WriteHeader(http.StatusOK)
+	_, err = w.Write([]byte("login success"))
+}
+
+func handleHtmxLogin(r *http.Request) *types.LoginUser {
+	return &types.LoginUser{
+		Email:    r.PostFormValue("email"),
+		Password: r.PostFormValue("password"),
+	}
+}
+
+func handleHttpLogin(w http.ResponseWriter, r *http.Request, u *types.LoginUser) *types.LoginUser {
+	if err := json.NewDecoder(r.Body).Decode(&u); err != nil {
+		InternalServerErrorHandler(w, err)
+		return nil
+	}
+	return u
 }
 
 func CanEdit(w http.ResponseWriter, r *http.Request) {
@@ -71,14 +73,12 @@ func CanEdit(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte(""))
-		return
 	}
-	if audience == "owner" || audience == "visitor" {
+	if audience == "owner" || audience == "admin" {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte("<button class=\"button is-link\">Edit</button>"))
 	} else {
 		w.WriteHeader(http.StatusOK)
 		w.Write([]byte(""))
 	}
-	return
 }

api/handlers/errorHandlers.go

@@ -22,6 +22,7 @@ func UnprocessableEntityHandler(w http.ResponseWriter, err error) {
 }
 
 func UnauthorizedHandler(w http.ResponseWriter) {
+	log.Println("unauthorized")
 	setError(w, http.StatusUnauthorized, "Unauthorized")
 }
 

api/handlers/userHandler.go

@@ -15,11 +15,11 @@ func CreateUserHandler(w http.ResponseWriter, r *http.Request) {
 
 	var u *types.RegisterUser
 
-	isHtmx := r.Header.Get("HX-Request")
+	if r.Header.Get("HX-Request") == "true" {
-
-	if isHtmx == "true" {
 		u = &types.RegisterUser{
-			Name: r.PostFormValue("name"),
+			Name:     r.PostFormValue("name"),
+			Password: r.PostFormValue("password"),
+			Email:    r.PostFormValue("email"),
 			//Role: user.Role(r.PostFormValue("role")),
 		}
 	} else {
@@ -28,7 +28,6 @@ func CreateUserHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	u.Password = "123"
 	if !validate.UserIsValid(u) {
 		BadRequestHandler(w)
 		return

web/components/projectList.go

@@ -69,9 +69,5 @@ func EditProject(project *ent.Project) g.Node {
 		b.Content(
 			b.Textarea(project.Description, e.Name("project_description")),
 		),
-
-		//b.CardFooter(
-		//Save(),
-		//),
 	)
 }