Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions internal/service/user/user_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"taskflow/internal/domain/user"
"taskflow/internal/dto"
"taskflow/internal/repository/gorm/gorm_user"
"taskflow/pkg"
"taskflow/pkg/jwt"
"taskflow/pkg/validator"

Expand All @@ -17,11 +16,12 @@ import (
)

type UserService struct {
repo gorm_user.UserRepositoryInterface
repo gorm_user.UserRepositoryInterface
jwtSecret []byte
}

func NewUserService(repo gorm_user.UserRepositoryInterface) *UserService {
return &UserService{repo: repo}
func NewUserService(repo gorm_user.UserRepositoryInterface, jwtSecret string) *UserService {
return &UserService{repo: repo, jwtSecret: []byte(jwtSecret)}
}

var _ UserServiceInterface = (*UserService)(nil)
Expand Down Expand Up @@ -80,7 +80,7 @@ func (s *UserService) AuthenticateUser(req *dto.AuthRequest) (*dto.AuthResponse,
return nil, errors.New("invalid credentials")
}

secretKey := []byte(pkg.GetEnv("JWT_SECRET", "secret-key"))
secretKey := s.jwtSecret
token, err := jwt.CreateToken(u.ID, u.Email, secretKey)
if err != nil {
return nil, fmt.Errorf("failed to create token: %w", err)
Expand Down
12 changes: 8 additions & 4 deletions internal/service/user/user_service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ func TestCreateUser(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mockRepo := new(gorm_user.MockUserRepository)
svc := NewUserService(mockRepo)
secretKey := []byte("secret")
svc := NewUserService(mockRepo, string(secretKey))

if tt.mockSetup != nil {
tt.mockSetup(mockRepo)
Expand Down Expand Up @@ -97,7 +98,8 @@ func TestAuthenticateUser(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mockRepo := new(gorm_user.MockUserRepository)
svc := NewUserService(mockRepo)
secretKey := []byte("secret")
svc := NewUserService(mockRepo, string(secretKey))

if tt.mockSetup != nil {
tt.mockSetup(mockRepo)
Expand Down Expand Up @@ -165,7 +167,8 @@ func TestUpdatePassword(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mockRepo := new(gorm_user.MockUserRepository)
svc := NewUserService(mockRepo)
secretKey := []byte("secret")
svc := NewUserService(mockRepo, string(secretKey))

if tt.mockSetup != nil {
tt.mockSetup(mockRepo)
Expand Down Expand Up @@ -209,7 +212,8 @@ func TestDeleteUser(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
mockRepo := new(gorm_user.MockUserRepository)
svc := NewUserService(mockRepo)
secretKey := []byte("secret")
svc := NewUserService(mockRepo, string(secretKey))

if tt.mockSetup != nil {
tt.mockSetup(mockRepo)
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func main() {
taskRepo := gorm_task.NewTaskRepository(db)
taskSvc := task_service.NewTaskService(taskRepo)
userRepo := gorm_user.NewUserRepository(db)
userSvc := user_service.NewUserService(userRepo)
userSvc := user_service.NewUserService(userRepo, string(secretKey))

userAuth := auth.NewUserAuth(string(secretKey), userRepo)

Expand Down