brammie15/wijtransferen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix more stuff

Browse Source
This commit is contained in:
brammie15
2026-08-24 22:51:07 +02:00
parent 456962fe18
commit 581f5444fb
10 changed files with 226 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/auth/handler.go
+7 -3
View File
@@ -36,8 +36,12 @@ type credentialsRequest struct {
}
type profileRequest struct {
Email string `json:"email"`
Name string `json:"name"`
Email string `json:"email"`
Name string `json:"name"`
StudioName string `json:"studioName"`
Tagline string `json:"tagline"`
WebsiteURL string `json:"websiteUrl"`
InstagramURL string `json:"instagramUrl"`
}
type passwordRequest struct {
@@ -151,7 +155,7 @@ func (h *Handler) UpdateMe(c *gin.Context) {
if !decodeJSON(c, &request) {
return
}
updated, err := h.service.UpdateProfile(c.Request.Context(), user.ID, request.Email, request.Name)
updated, err := h.service.UpdateProfile(c.Request.Context(), user.ID, request.Email, request.Name, request.StudioName, request.Tagline, request.WebsiteURL, request.InstagramURL)
if err != nil {
if errors.Is(err, ErrEmailTaken) {
writeJSON(c, http.StatusConflict, map[string]string{"error": "email is already registered"})
backend/internal/auth/models.go
+7 -3
View File
@@ -3,9 +3,13 @@ package auth
import "github.com/google/uuid"
type User struct {
ID uuid.UUID `json:"id"`
Email string `json:"email"`
Name string `json:"name"`
ID uuid.UUID `json:"id"`
Email string `json:"email"`
Name string `json:"name"`
StudioName string `json:"studioName"`
Tagline string `json:"tagline"`
WebsiteURL string `json:"websiteUrl"`
InstagramURL string `json:"instagramUrl"`
}
type storedUser struct {
backend/internal/auth/repository.go
+10 -10
View File
@@ -38,10 +38,10 @@ func (r *Repository) CreateUser(ctx context.Context, email, passwordHash, name s
func (r *Repository) FindByEmail(ctx context.Context, email string) (storedUser, error) {
var user storedUser
err := r.db.QueryRowContext(ctx, `
SELECT id, email, name, password_hash
SELECT id, email, name, studio_name, tagline, website_url, instagram_url, password_hash
FROM users
WHERE lower(email) = lower($1)
`, strings.TrimSpace(email)).Scan(&user.ID, &user.Email, &user.Name, &user.PasswordHash)
`, strings.TrimSpace(email)).Scan(&user.ID, &user.Email, &user.Name, &user.StudioName, &user.Tagline, &user.WebsiteURL, &user.InstagramURL, &user.PasswordHash)
if errors.Is(err, sql.ErrNoRows) {
return storedUser{}, sql.ErrNoRows
}
@@ -54,10 +54,10 @@ func (r *Repository) FindByEmail(ctx context.Context, email string) (storedUser,
func (r *Repository) FindByID(ctx context.Context, id uuid.UUID) (User, error) {
var user User
err := r.db.QueryRowContext(ctx, `
SELECT id, email, name
SELECT id, email, name, studio_name, tagline, website_url, instagram_url
FROM users
WHERE id = $1
`, id).Scan(&user.ID, &user.Email, &user.Name)
`, id).Scan(&user.ID, &user.Email, &user.Name, &user.StudioName, &user.Tagline, &user.WebsiteURL, &user.InstagramURL)
if errors.Is(err, sql.ErrNoRows) {
return User{}, sql.ErrNoRows
}
@@ -70,10 +70,10 @@ func (r *Repository) FindByID(ctx context.Context, id uuid.UUID) (User, error) {
func (r *Repository) FindByIDWithPassword(ctx context.Context, id uuid.UUID) (storedUser, error) {
var user storedUser
err := r.db.QueryRowContext(ctx, `
SELECT id, email, name, password_hash
SELECT id, email, name, studio_name, tagline, website_url, instagram_url, password_hash
FROM users
WHERE id = $1
`, id).Scan(&user.ID, &user.Email, &user.Name, &user.PasswordHash)
`, id).Scan(&user.ID, &user.Email, &user.Name, &user.StudioName, &user.Tagline, &user.WebsiteURL, &user.InstagramURL, &user.PasswordHash)
if errors.Is(err, sql.ErrNoRows) {
return storedUser{}, sql.ErrNoRows
}
@@ -83,12 +83,12 @@ func (r *Repository) FindByIDWithPassword(ctx context.Context, id uuid.UUID) (st
return user, nil
}
func (r *Repository) UpdateUser(ctx context.Context, id uuid.UUID, email, name string) (User, error) {
func (r *Repository) UpdateUser(ctx context.Context, id uuid.UUID, email, name, studioName, tagline, websiteURL, instagramURL string) (User, error) {
_, err := r.db.ExecContext(ctx, `
UPDATE users
SET email = $1, name = $2, updated_at = CURRENT_TIMESTAMP
WHERE id = $3
`, strings.ToLower(strings.TrimSpace(email)), strings.TrimSpace(name), id)
SET email = $1, name = $2, studio_name = $3, tagline = $4, website_url = $5, instagram_url = $6, updated_at = CURRENT_TIMESTAMP
WHERE id = $7
`, strings.ToLower(strings.TrimSpace(email)), strings.TrimSpace(name), studioName, tagline, websiteURL, instagramURL, id)
if err != nil {
if strings.Contains(strings.ToLower(err.Error()), "unique") {
return User{}, ErrEmailTaken
backend/internal/auth/service.go
+2 -2
View File
@@ -80,7 +80,7 @@ func (s *Service) Login(ctx context.Context, email, password string) (User, erro
return user.User, nil
}
func (s *Service) UpdateProfile(ctx context.Context, userID uuid.UUID, email, name string) (User, error) {
func (s *Service) UpdateProfile(ctx context.Context, userID uuid.UUID, email, name, studioName, tagline, websiteURL, instagramURL string) (User, error) {
email = strings.ToLower(strings.TrimSpace(email))
name = strings.TrimSpace(name)
if !strings.Contains(email, "@") || len(email) > 254 {
@@ -89,7 +89,7 @@ func (s *Service) UpdateProfile(ctx context.Context, userID uuid.UUID, email, na
if name == "" || len(name) > 120 {
return User{}, fmt.Errorf("name is required")
}
return s.repository.UpdateUser(ctx, userID, email, name)
return s.repository.UpdateUser(ctx, userID, email, name, studioName, tagline, websiteURL, instagramURL)
}
func (s *Service) ChangePassword(ctx context.Context, userID uuid.UUID, currentPassword, newPassword string) error {