From c071212df5edbdf1122f1f451a4ef5e2fe352c07 Mon Sep 17 00:00:00 2001 From: James Tombleson Date: Mon, 1 Apr 2024 17:48:54 -0700 Subject: [PATCH] when a user is made, the default scope is now defined --- api/repositories/users.go | 4 ++-- api/repositories/users_test.go | 3 ++- api/services/userService.go | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/repositories/users.go b/api/repositories/users.go index 05f9cf0..a1e17a1 100644 --- a/api/repositories/users.go +++ b/api/repositories/users.go @@ -18,7 +18,7 @@ const ( type IUserTable interface { GetByName(name string) (domain.UserEntity, error) - Create(name, password string) (int64, error) + Create(name, password, scope string) (int64, error) Update(id int, entity domain.UserEntity) error UpdatePassword(name, password string) error CheckUserHash(name, password string) error @@ -56,7 +56,7 @@ func (ur UserRepository) GetByName(name string) (domain.UserEntity, error) { return data[0], nil } -func (ur UserRepository) Create(name, password string) (int64, error) { +func (ur UserRepository) Create(name, password, scope string) (int64, error) { passwordBytes := []byte(password) hash, err := bcrypt.GenerateFromPassword(passwordBytes, bcrypt.DefaultCost) if err != nil { diff --git a/api/repositories/users_test.go b/api/repositories/users_test.go index 120b53b..66b1dd3 100644 --- a/api/repositories/users_test.go +++ b/api/repositories/users_test.go @@ -2,6 +2,7 @@ package repositories_test import ( "database/sql" + "go-cook/api/domain" "go-cook/api/repositories" "log" "testing" @@ -20,7 +21,7 @@ func TestCanCreateNewUser(t *testing.T) { defer db.Close() repo := repositories.NewUserRepository(db) - updated, err := repo.Create("testing", "NotSecure") + updated, err := repo.Create("testing", "NotSecure", domain.ScopeRecipeRead) if err != nil { log.Println(err) t.FailNow() diff --git a/api/services/userService.go b/api/services/userService.go index 79d95a6..aca994a 100644 --- a/api/services/userService.go +++ b/api/services/userService.go @@ -53,13 +53,13 @@ func (us UserService) GetUser(username string) (domain.UserEntity, error) { return us.repo.GetByName(username) } -func (us UserService) CreateNewUser(name, password string) (domain.UserEntity, error) { +func (us UserService) CreateNewUser(name, password, scope string) (domain.UserEntity, error) { err := us.CheckPasswordForRequirements(password) if err != nil { return domain.UserEntity{}, err } - us.repo.Create(name, password) + us.repo.Create(name, password, domain.ScopeRecipeRead) return domain.UserEntity{}, nil }