From cfabbfb5a02772dfb603fd570046b1267e9e4655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2=20Maximillian?= =?UTF-8?q?=20=D0=90=D0=BD=D1=82=D0=BE=D0=BD?= Date: Thu, 1 Oct 2026 15:29:12 +0300 Subject: [PATCH] refactor(service): UserService accept PasswordHasher now --- backend/cmd/server/main.go | 4 +++- backend/internal/service/user.go | 20 ++++---------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/backend/cmd/server/main.go b/backend/cmd/server/main.go index 4ca897a6..515d7165 100644 --- a/backend/cmd/server/main.go +++ b/backend/cmd/server/main.go @@ -22,7 +22,9 @@ func main() { store := memory.New() - userSvc := service.NewUserService(store.Users()) + hasher := service.NewArgon2idHasher() + + userSvc := service.NewUserService(store.Users(), hasher) chatSvc := service.NewChatService(store.Chats(), store.Users()) messageSvc := service.NewMessageService(store.Messages(), store.Chats()) diff --git a/backend/internal/service/user.go b/backend/internal/service/user.go index 2fa8a87e..ef5e9bad 100644 --- a/backend/internal/service/user.go +++ b/backend/internal/service/user.go @@ -2,7 +2,6 @@ package service import ( "context" - "errors" "regexp" "strings" "time" @@ -16,11 +15,12 @@ import ( var usernamePattern = regexp.MustCompile(`^[a-z0-9_]{3,32}$`) type UserService struct { - users domain.UserRepository + users domain.UserRepository + hasher PasswordHasher } -func NewUserService(users domain.UserRepository) *UserService { - return &UserService{users: users} +func NewUserService(users domain.UserRepository, hasher PasswordHasher) *UserService { + return &UserService{users: users, hasher: hasher} } func (s *UserService) Create(ctx context.Context, username, displayName string) (*domain.User, error) { @@ -43,18 +43,6 @@ func (s *UserService) Create(ctx context.Context, username, displayName string) } } - _, err := s.users.GetByUsername(ctx, username) - if err == nil { - return nil, &domain.AlreadyExistsError{ - Entity: "user", - Field: "username", - Value: username, - } - } - if !errors.Is(err, domain.ErrNotFound) { - return nil, err - } - u := &domain.User{ ID: uuid.NewString(), Username: username,