henry/Studia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: card component and login behavior

Browse Source
This commit is contained in:
hwinkel
2025-12-16 23:14:40 +01:00
parent 435ad8e6e6
commit f4eb2efb33
16 changed files with 361 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/cmd/cli/user/get.go
View File

@@ -33,7 +33,7 @@ var getCmd = &cobra.Command{
}
fmt.Printf("ID: %d\nEmail: %s\nName: %s\n",
user.ID, user.Email, user.Name)
user.ID, user.Email, user.Username)
return nil
},
}

4
backend/db/schema.sql
View File

@@ -7,10 +7,10 @@ CREATE TABLE IF NOT EXISTS public.users
(
id character varying(255) COLLATE pg_catalog."default" NOT NULL DEFAULT uuid_generate_v4(),
email character varying(255) COLLATE pg_catalog."default" NOT NULL,
name character varying(255) COLLATE pg_catalog."default" NOT NULL,
username character varying(255) COLLATE pg_catalog."default" NOT NULL,
password_hash character varying(255) COLLATE pg_catalog."default" NOT NULL,
created_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
updated_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP,
updated_at timestamp with time zone ,
CONSTRAINT users_pkey PRIMARY KEY (id),
CONSTRAINT users_email_key UNIQUE (email)
)

53
backend/internal/auth/handler.go
View File

@@ -2,7 +2,9 @@ package auth
import (
"database/sql"
"errors"
"net/http"
"studia/internal/logger"
"studia/internal/user"
"time"
@@ -11,70 +13,77 @@ import (
)
type LoginRequest struct {
Email string `json:"email"`
Password string `json:"password"`
Email string
Password string
}
type RegisterRequest struct {
Email string `json:"email"`
Password string `json:"password"`
Username string `json:"username"`
Email string
Password string
Username string
}
const defaultRole = "user"
var secret = []byte("secret")
func Login(c *gin.Context, db *sql.DB) {
func Login(c *gin.Context, db *sql.DB) error {
var req LoginRequest
if err := c.ShouldBindJSON(&req); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request"})
return
return err
}
if req.Email == "" || req.Password == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "Email and password are required"})
return
return errors.New("Email and password are required")
}
User, err := user.GetUserByEmail(db, req.Email)
if err != nil {
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid email or password"})
return
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid email "})
return err
}
logger.Log.Info().Msgf("User: %+v", User)
if !user.CheckPasswordHash(db, User.Email, req.Password) {
c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid email or password"})
return
err = user.CheckPasswordHash(db, User.Email, req.Password)
if err != nil {
return err
}
token, err := GenerateJWT(User.ID, User.Email, User.Role)
if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Could not generate token"})
return
return err
}
c.JSON(http.StatusOK, gin.H{"token": token})
return nil
}
func Register(c *gin.Context, db *sql.DB) {
func Register(c *gin.Context, db *sql.DB) error {
var req RegisterRequest
if err := c.ShouldBindJSON(&req); err != nil {
// Log the error for debugging purposes
logger.Log.Error().Err(err).Msg("Failed to bind JSON for registration")
// Respond with a bad request status and an error message
c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request"})
return
return errors.New("Invalid request")
}
logger.Log.Info().Msgf("Register Request: %+v", req)
if req.Email == "" || req.Password == "" || req.Username == "" {
c.JSON(http.StatusBadRequest, gin.H{"error": "Email and password are required"})
return
return errors.New("Email and password are required")
}
error := user.CreateUser(db, req.Email, req.Username, req.Password, []string{defaultRole})
if error != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": error.Error()})
return
err := user.CreateUser(db, req.Email, req.Username, req.Password, []string{defaultRole})
if err != nil {
logger.Log.Error().Err(err).Msg("Failed to create user")
c.JSON(http.StatusBadRequest, gin.H{"error": err})
return err
}
c.JSON(http.StatusOK, gin.H{"message": "User created successfully"})
return nil
}
func GenerateJWT(uuid string, email string, roles []string) (any, error) {

12
backend/internal/server/server.go
View File

@@ -24,6 +24,7 @@ func StartServer(cfg *config.Config) {
// Lokaler Fallback (wichtig für die Entwicklung)
allowedOrigins := []string{
"http://localhost:5173", // Gängiger Vite-Dev-Port
"http://127.0.0.1:5173",
}
if cfg.FrontendURL != "" {
@@ -50,11 +51,18 @@ func StartServer(cfg *config.Config) {
router.Use(cors.New(config))
router.POST("/login", func(c *gin.Context) {
auth.Login(c, db) // Pass the actual DB connection instead of nil
err := auth.Login(c, db)
if err != nil {
logger.Log.Error().Msg(err.Error())
}
})
router.POST("/register", func(c *gin.Context) {
auth.Register(c, db)
er := auth.Register(c, db)
if er != nil {
logger.Log.Error().Msg("register error")
}
})
router.Run(":" + cfg.Port)

32
backend/internal/user/model.go
View File

@@ -2,6 +2,7 @@ package user
import (
"database/sql"
"studia/internal/logger"
"time"
"golang.org/x/crypto/bcrypt"
@@ -10,7 +11,7 @@ import (
type User struct {
ID string `json:"id"`
Email string `json:"email"`
Name string `json:"name"`
Username string `json:"username"`
PasswordHash string `json:"-"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
@@ -28,26 +29,33 @@ type User struct {
// }
func GetUserByEmail(db *sql.DB, email string) (*User, error) {
row := db.QueryRow("SELECT id, email, password_hash, role FROM users WHERE email=$1", email)
row := db.QueryRow("SELECT id, email, username FROM users WHERE email=$1", email)
var user User
err := row.Scan(&user.ID, &user.Email, &user.PasswordHash, &user.Role)
err := row.Scan(&user.ID, &user.Email, &user.Username)
if err != nil {
return nil, err
}
return &user, nil
}
func CheckPasswordHash(db *sql.DB, email string, password string) bool {
func CheckPasswordHash(db *sql.DB, email string, password string) error {
row := db.QueryRow("SELECT password_hash FROM users WHERE email=$1", email)
var hash string
var hash []byte
if err := row.Scan(&hash); err != nil {
return false
return err
}
UserPasswordHash, error := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if error != nil {
return false
UserPasswordHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return err
}
return bcrypt.CompareHashAndPassword([]byte(hash), []byte(UserPasswordHash)) == nil
logger.Log.Info().Msgf("UserPasswordHash: %s", UserPasswordHash)
logger.Log.Info().Msgf("hash: %s", hash)
logger.Log.Info().Msgf("password: %s", []byte(password))
logger.Log.Info().Msgf("email: %s", []byte(email))
err = bcrypt.CompareHashAndPassword(hash, []byte(password))
return err
}
func CreateUser(db *sql.DB, email string, name string, password string, role []string) error {
@@ -56,7 +64,7 @@ func CreateUser(db *sql.DB, email string, name string, password string, role []s
return err
}
_, err = db.Exec("INSERT INTO users (email, name, password_hash, role, created_at, updated_at) VALUES ($1, $2, $3, $4, $5, $6)",
email, name, string(passwordHash), role, time.Now(), time.Now())
_, err = db.Exec("INSERT INTO users (email, username, password_hash) VALUES ($1, $2, $3)",
email, name, string(passwordHash))
return err
}