From f33f53ca762e975ea0d7f8c016bd2cf69de48e3b Mon Sep 17 00:00:00 2001 From: Florian Sylvain Date: Mon, 7 Aug 2023 12:31:29 +0200 Subject: [PATCH] feat: users & authentication implementation --- .../secondary/gateways/articleRepository.go | 20 ++- adapters/secondary/gateways/models/user.go | 16 +++ adapters/secondary/gateways/userRepository.go | 82 +++++++++++ api/auth.go | 133 ++++++++++++++++++ api/dependecyInjection.go | 30 +++- api/validator.go | 9 ++ cmd/main.go | 24 +++- domain/gateways/IUserRepository.go | 10 ++ domain/user/user.go | 42 ++++++ go.mod | 19 +++ go.sum | 93 +++++++++++- useCases/CreateUserUseCase.go | 27 ++++ useCases/GetUserByUsernameUseCase.go | 21 +++ useCases/GetUserUseCase.go | 21 +++ useCases/ListUsersUseCase.go | 21 +++ 15 files changed, 550 insertions(+), 18 deletions(-) create mode 100644 adapters/secondary/gateways/models/user.go create mode 100644 adapters/secondary/gateways/userRepository.go create mode 100644 api/auth.go create mode 100644 api/validator.go create mode 100644 domain/gateways/IUserRepository.go create mode 100644 domain/user/user.go create mode 100644 useCases/CreateUserUseCase.go create mode 100644 useCases/GetUserByUsernameUseCase.go create mode 100644 useCases/GetUserUseCase.go create mode 100644 useCases/ListUsersUseCase.go diff --git a/adapters/secondary/gateways/articleRepository.go b/adapters/secondary/gateways/articleRepository.go index b14dd7d..ab4f569 100644 --- a/adapters/secondary/gateways/articleRepository.go +++ b/adapters/secondary/gateways/articleRepository.go @@ -12,15 +12,18 @@ type ArticleRepository struct { } func NewArticleRepository(db *gorm.DB) *ArticleRepository { - a := ArticleRepository{db} - return &a + return &ArticleRepository{db} +} + +func mapArticleToDomain(article entity.Article) domain.Article { + return domain.FromDb(article.ID, article.Title, article.Body, article.CreatedAt, article.UpdatedAt) } func (a *ArticleRepository) Get(id uint32) (domain.Article, error) { - var article domain.Article + var article entity.Article err := a.db.Model(&entity.Article{}).First(&article, id).Error if err != nil { - return article, err + return domain.Article{}, err } return domain.FromDb(article.ID, article.Title, article.Body, article.CreatedAt, article.UpdatedAt), nil @@ -48,13 +51,18 @@ func (a *ArticleRepository) Create(article domain.Article) (domain.Article, erro } func (a *ArticleRepository) GetAll() []domain.Article { - var articles []domain.Article + var articles []entity.Article err := a.db.Model(&entity.Article{}).Find(&articles).Error if err != nil { return []domain.Article{} } - return articles + var domainArticles = make([]domain.Article, 0) + for _, article := range articles { + domainArticles = append(domainArticles, mapArticleToDomain(article)) + } + + return domainArticles } var _ IArticleRepository = &ArticleRepository{} diff --git a/adapters/secondary/gateways/models/user.go b/adapters/secondary/gateways/models/user.go new file mode 100644 index 0000000..693283b --- /dev/null +++ b/adapters/secondary/gateways/models/user.go @@ -0,0 +1,16 @@ +package models + +import ( + "gorm.io/gorm" + "time" +) + +type User struct { + gorm.Model + ID uint32 `gorm:"primaryKey;autoIncrement"` + Username string `gorm:"unique;not null"` + Password string `gorm:"not null"` + Email string `gorm:"unique;not null"` + CreatedAt time.Time `gorm:"autoCreateTime"` + UpdatedAt time.Time `gorm:"autoUpdateTime"` +} diff --git a/adapters/secondary/gateways/userRepository.go b/adapters/secondary/gateways/userRepository.go new file mode 100644 index 0000000..e89e3f8 --- /dev/null +++ b/adapters/secondary/gateways/userRepository.go @@ -0,0 +1,82 @@ +package gateways + +import ( + entity "GohCMS2/adapters/secondary/gateways/models" + . "GohCMS2/domain/gateways" + domain "GohCMS2/domain/user" + "fmt" + "golang.org/x/crypto/bcrypt" + "gorm.io/gorm" +) + +type UserRepository struct { + db *gorm.DB +} + +func NewUserRepository(db *gorm.DB) *UserRepository { + return &UserRepository{db} +} + +func mapUserToDomain(user entity.User) domain.User { + return domain.FromDb(user.ID, user.Username, user.Password, user.Email, user.CreatedAt, user.UpdatedAt) +} + +func (u *UserRepository) Get(id uint32) (domain.User, error) { + var user entity.User + err := u.db.Model(&entity.User{}).First(&user, id).Error + if err != nil { + return domain.User{}, err + } + + return mapUserToDomain(user), nil +} + +func (u *UserRepository) Create(user domain.User) (domain.User, error) { + hashedPassword, _ := bcrypt.GenerateFromPassword([]byte(user.Password), 14) + fmt.Println("hashedPassword at register: ", string(hashedPassword)) + + creationResult := u.db.Create(&entity.User{ + Username: user.Username, + Password: string(hashedPassword), + Email: user.Email, + }) + if creationResult.Error != nil { + return domain.User{}, creationResult.Error + } + + var createdUser entity.User + creationResult.Scan(&createdUser) + + return domain.FromDb( + createdUser.ID, + createdUser.Username, + createdUser.Password, + createdUser.Email, + createdUser.CreatedAt, + createdUser.UpdatedAt), + nil +} + +func (u *UserRepository) GetAll() []domain.User { + var users []entity.User + u.db.Model(&entity.User{}).Find(&users) + + var domainUsers []domain.User + for _, user := range users { + domainUsers = append(domainUsers, mapUserToDomain(user)) + } + + return domainUsers +} + +func (u *UserRepository) GetByUsername(username string) (domain.User, error) { + var user entity.User + err := u.db.Model(&entity.User{}).Where("username = ?", username).First(&user).Error + if err != nil { + return domain.User{}, err + } + + return mapUserToDomain(user), nil +} + +var _ IUserRepository = &UserRepository{} diff --git a/api/auth.go b/api/auth.go new file mode 100644 index 0000000..c2eba82 --- /dev/null +++ b/api/auth.go @@ -0,0 +1,133 @@ +package api + +import ( + "GohCMS2/useCases" + "encoding/json" + "github.com/go-chi/chi/v5" + "github.com/go-chi/jwtauth/v5" + "golang.org/x/crypto/bcrypt" + "net/http" + "time" +) + +type UserRegister struct { + Username string `json:"username" validate:"required,min=3,max=20"` + Password string `json:"password" validate:"required,min=8"` + Email string `json:"email" validate:"required,email"` +} + +type UserLogin struct { + Username string `json:"username" validate:"required,min=3,max=20"` + Password string `json:"password" validate:"required,min=8"` +} + +var TokenAuth *jwtauth.JWTAuth + +const logsErrorMessage = "Access to the requested resource is forbidden due to incorrect password and/or username." +const bodyErrorMessage = "The request cannot be processed due to a mismatch in the format of the body." + +func SetJwtCookie(w *http.ResponseWriter, userId uint32) error { + _, tokenString, err := TokenAuth.Encode(map[string]interface{}{"user_id": userId}) + if err != nil { + return err + } + http.SetCookie(*w, &http.Cookie{ + Name: "jwt", + Value: tokenString, + Expires: time.Now().Add(24 * time.Hour), + Secure: false, // TODO false in dev, true in prod + HttpOnly: true, + Path: "/v1/", + }) + return nil +} + +func isAllowedToCreateUser() bool { + users := container.ListUsersUseCase.ListUsers() + return len(users) == 0 +} + +func isLoggedIn(r *http.Request) bool { + token, err := jwtauth.VerifyRequest( + TokenAuth, + r, + jwtauth.TokenFromCookie, + jwtauth.TokenFromHeader, + jwtauth.TokenFromQuery) + return token != nil && err == nil +} + +func login(w http.ResponseWriter, r *http.Request) { + var user UserLogin + + err := json.NewDecoder(r.Body).Decode(&user) + if err != nil { + http.Error(w, bodyErrorMessage, http.StatusBadRequest) + return + } + + err = validate.Struct(user) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + dbUser, err := container.GetUserByUsernameUseCase.GetUserByUsername(user.Username) + if err != nil { + http.Error(w, logsErrorMessage, http.StatusForbidden) + return + } + + err = bcrypt.CompareHashAndPassword([]byte(dbUser.Password), []byte(user.Password)) + if err != nil { + http.Error(w, logsErrorMessage, http.StatusForbidden) + return + } + + _ = SetJwtCookie(&w, dbUser.ID) + + message, _ := json.Marshal(map[string]interface{}{"message": "User logged in! HTTPonly access_token cookie created"}) + _, _ = w.Write(message) +} + +func register(w http.ResponseWriter, r *http.Request) { + if !isLoggedIn(r) && !isAllowedToCreateUser() { + http.Error(w, "You are not allowed to create a user. Log in or reset database.", http.StatusForbidden) + return + } + + var user UserRegister + err := json.NewDecoder(r.Body).Decode(&user) + if err != nil { + http.Error(w, bodyErrorMessage, http.StatusBadRequest) + return + } + + err = validate.Struct(user) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + + createdUser, err := container.CreateUserUseCase.CreateUser(useCases.CreateUserCommand{ + Username: user.Username, + Password: user.Password, + Email: user.Email, + }) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + err = SetJwtCookie(&w, createdUser.ID) + + message, _ := json.Marshal(map[string]interface{}{"message": "User registered! HTTPonly access_token cookie created"}) + _, err = w.Write(message) +} + +func NewAuthRouter() http.Handler { + r := chi.NewRouter() + r.Post("/register", register) + r.Post("/login", login) + return r +} diff --git a/api/dependecyInjection.go b/api/dependecyInjection.go index b32f647..b098dd0 100644 --- a/api/dependecyInjection.go +++ b/api/dependecyInjection.go @@ -9,9 +9,13 @@ import ( ) type Container struct { - CreateArticleUseCase *CreateArticleUseCase - GetArticleUseCase *GetArticleUseCase - ListArticlesUseCase *ListArticlesUseCase + CreateArticleUseCase *CreateArticleUseCase + GetArticleUseCase *GetArticleUseCase + ListArticlesUseCase *ListArticlesUseCase + GetUserUseCase *GetUserUseCase + GetUserByUsernameUseCase *GetUserByUsernameUseCase + CreateUserUseCase *CreateUserUseCase + ListUsersUseCase *ListUsersUseCase } var container *Container @@ -20,11 +24,19 @@ func setContainer( createArticle *CreateArticleUseCase, getArticle *GetArticleUseCase, listArticle *ListArticlesUseCase, + getUser *GetUserUseCase, + getUserByUsername *GetUserByUsernameUseCase, + createUser *CreateUserUseCase, + listUsers *ListUsersUseCase, ) *Container { container = &Container{ - CreateArticleUseCase: createArticle, - GetArticleUseCase: getArticle, - ListArticlesUseCase: listArticle, + CreateArticleUseCase: createArticle, + GetArticleUseCase: getArticle, + ListArticlesUseCase: listArticle, + GetUserUseCase: getUser, + GetUserByUsernameUseCase: getUserByUsername, + CreateUserUseCase: createUser, + ListUsersUseCase: listUsers, } return container } @@ -40,13 +52,17 @@ func InitContainer() { if err != nil { panic(err) } - _ = db.AutoMigrate(&models.Article{}) + _ = db.AutoMigrate(&models.Article{}, &models.User{}) _ = digContainer.Provide(func() *gorm.DB { return db }) _ = digContainer.Provide(func(db *gorm.DB) *CreateArticleUseCase { return NewCreateArticleUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *GetArticleUseCase { return NewGetArticleUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *ListArticlesUseCase { return NewListArticlesUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *GetUserUseCase { return NewGetUserUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *GetUserByUsernameUseCase { return NewGetUserByUsernameUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *CreateUserUseCase { return NewCreateUserUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *ListUsersUseCase { return NewListUsersUseCase(db) }) _ = digContainer.Invoke(setContainer) } diff --git a/api/validator.go b/api/validator.go new file mode 100644 index 0000000..59741db --- /dev/null +++ b/api/validator.go @@ -0,0 +1,9 @@ +package api + +import "github.com/go-playground/validator/v10" + +var validate *validator.Validate + +func InitValidator() { + validate = validator.New() +} diff --git a/cmd/main.go b/cmd/main.go index f29df75..2e54dd7 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -6,6 +6,7 @@ import ( "fmt" "github.com/go-chi/chi/v5" "github.com/go-chi/httplog" + "github.com/go-chi/jwtauth/v5" "net/http" ) @@ -16,15 +17,30 @@ func jsonContentTypeMiddleware(next http.Handler) http.Handler { }) } +func initJwt() { + api.TokenAuth = jwtauth.New("HS256", []byte("secret"), nil) +} + +func getHelloWorld(w http.ResponseWriter, _ *http.Request) { + msg, _ := json.Marshal(map[string]string{"message": "Hello World"}) + _, _ = w.Write(msg) +} + func main() { api.InitContainer() + api.InitValidator() + initJwt() r := chi.NewRouter() - r.Get("/", func(w http.ResponseWriter, r *http.Request) { - msg, _ := json.Marshal(map[string]string{"message": "Hello World"}) - _, _ = w.Write(msg) + r.Get("/", getHelloWorld) + + r.Group(func(r chi.Router) { + r.Use(jwtauth.Verifier(api.TokenAuth)) + r.Use(jwtauth.Authenticator) + r.Mount("/article", api.NewArticleRouter()) }) - r.Mount("/article", api.NewArticleRouter()) + + r.Mount("/auth", api.NewAuthRouter()) apiRouter := chi.NewRouter() apiRouter.Use(httplog.RequestLogger(httplog.NewLogger("GohCMS2"))) diff --git a/domain/gateways/IUserRepository.go b/domain/gateways/IUserRepository.go new file mode 100644 index 0000000..eab1917 --- /dev/null +++ b/domain/gateways/IUserRepository.go @@ -0,0 +1,10 @@ +package gateways + +import . "GohCMS2/domain/user" + +type IUserRepository interface { + Get(id uint32) (User, error) + GetByUsername(username string) (User, error) + GetAll() []User + Create(user User) (User, error) +} diff --git a/domain/user/user.go b/domain/user/user.go new file mode 100644 index 0000000..24f06c1 --- /dev/null +++ b/domain/user/user.go @@ -0,0 +1,42 @@ +package user + +import "time" + +type User struct { + ID uint32 `json:"id"` + Username string `json:"username"` + Password string `json:"password"` + Email string `json:"email"` + CreatedAt time.Time `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` +} + +func FromApi( + username string, + password string, + email string, +) User { + return User{ + Username: username, + Password: password, + Email: email, + } +} + +func FromDb( + id uint32, + username string, + password string, + email string, + createdAt time.Time, + updatedAt time.Time, +) User { + return User{ + ID: id, + Username: username, + Password: password, + Email: email, + CreatedAt: createdAt, + UpdatedAt: updatedAt, + } +} diff --git a/go.mod b/go.mod index 8268f4e..c87ae79 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,36 @@ go 1.20 require ( github.com/glebarez/sqlite v1.9.0 github.com/go-chi/httplog v0.3.1 + github.com/go-chi/jwtauth/v5 v5.1.1 go.uber.org/dig v1.17.0 + golang.org/x/crypto v0.10.0 gorm.io/gorm v1.25.2 ) require ( + github.com/ajg/form v1.5.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect + github.com/gabriel-vasile/mimetype v1.4.2 // indirect github.com/glebarez/go-sqlite v1.21.2 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.15.0 // indirect + github.com/goccy/go-json v0.10.2 // indirect github.com/google/uuid v1.3.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/leodido/go-urn v1.2.4 // indirect + github.com/lestrrat-go/blackmagic v1.0.1 // indirect + github.com/lestrrat-go/httpcc v1.0.1 // indirect + github.com/lestrrat-go/httprc v1.0.4 // indirect + github.com/lestrrat-go/iter v1.0.2 // indirect + github.com/lestrrat-go/jwx/v2 v2.0.11 // indirect + github.com/lestrrat-go/option v1.0.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect + github.com/segmentio/asm v1.2.0 // indirect + golang.org/x/net v0.10.0 // indirect + golang.org/x/text v0.10.0 // indirect modernc.org/libc v1.24.1 // indirect modernc.org/mathutil v1.5.0 // indirect modernc.org/memory v1.6.0 // indirect diff --git a/go.sum b/go.sum index 01ee92a..961e06c 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,16 @@ +github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= github.com/glebarez/sqlite v1.9.0 h1:Aj6bPA12ZEx5GbSF6XADmCkYXlljPNUY+Zf1EQxynXs= @@ -11,6 +20,18 @@ github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk= github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/httplog v0.3.1 h1:uC3IUWCZagtbCinb3ypFh36SEcgd6StWw2Bu0XSXRtg= github.com/go-chi/httplog v0.3.1/go.mod h1:UoiQQ/MTZH5V6JbNB2FzF0DynTh5okpXxlhsyxoP5m8= +github.com/go-chi/jwtauth/v5 v5.1.1 h1:Pjixqu5YkjE9sCLpzE01L0Q4sQzJIPdo7uz9r8ftp/c= +github.com/go-chi/jwtauth/v5 v5.1.1/go.mod h1:CYP1WSbzD4MPuKCr537EM3kfFhSQgpUEtMJFuYJjqWU= +github.com/go-chi/render v1.0.3 h1:AsXqd2a1/INaIfUSKq3G5uA8weYx20FOsM7uSoCyyt4= +github.com/go-chi/render v1.0.3/go.mod h1:/gr3hVkmYR0YlEy3LxCuVRFzEu9Ruok+gFqbIofjao0= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.15.0 h1:nDU5XeOKtB3GEa+uB7GNYwhVKsgjAR7VgKoNB6ryXfw= +github.com/go-playground/validator/v10 v10.15.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -19,6 +40,21 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= +github.com/lestrrat-go/blackmagic v1.0.1 h1:lS5Zts+5HIC/8og6cGHb0uCcNCa3OUt1ygh3Qz2Fe80= +github.com/lestrrat-go/blackmagic v1.0.1/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU= +github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= +github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= +github.com/lestrrat-go/httprc v1.0.4 h1:bAZymwoZQb+Oq8MEbyipag7iSq6YIga8Wj6GOiJGdI8= +github.com/lestrrat-go/httprc v1.0.4/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= +github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= +github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= +github.com/lestrrat-go/jwx/v2 v2.0.11 h1:ViHMnaMeaO0qV16RZWBHM7GTrAnX2aFLVKofc7FuKLQ= +github.com/lestrrat-go/jwx/v2 v2.0.11/go.mod h1:ZtPtMFlrfDrH2Y0iwfa3dRFn8VzwBrB+cyrm3IBWdDg= +github.com/lestrrat-go/option v1.0.0/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= +github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= +github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -28,22 +64,77 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= +github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI= go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= +golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= +golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58= +golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho= gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM= diff --git a/useCases/CreateUserUseCase.go b/useCases/CreateUserUseCase.go new file mode 100644 index 0000000..d405b7e --- /dev/null +++ b/useCases/CreateUserUseCase.go @@ -0,0 +1,27 @@ +package useCases + +import ( + . "GohCMS2/adapters/secondary/gateways" + . "GohCMS2/domain/user" + "gorm.io/gorm" +) + +type CreateUserUseCase struct { + userRepository UserRepository +} + +type CreateUserCommand struct { + Username string + Password string + Email string +} + +func NewCreateUserUseCase(db *gorm.DB) *CreateUserUseCase { + return &CreateUserUseCase{ + userRepository: *NewUserRepository(db), + } +} + +func (g *CreateUserUseCase) CreateUser(user CreateUserCommand) (User, error) { + return g.userRepository.Create(FromApi(user.Username, user.Password, user.Email)) +} diff --git a/useCases/GetUserByUsernameUseCase.go b/useCases/GetUserByUsernameUseCase.go new file mode 100644 index 0000000..6fbd5a5 --- /dev/null +++ b/useCases/GetUserByUsernameUseCase.go @@ -0,0 +1,21 @@ +package useCases + +import ( + . "GohCMS2/adapters/secondary/gateways" + . "GohCMS2/domain/user" + "gorm.io/gorm" +) + +type GetUserByUsernameUseCase struct { + userRepository UserRepository +} + +func NewGetUserByUsernameUseCase(db *gorm.DB) *GetUserByUsernameUseCase { + return &GetUserByUsernameUseCase{ + userRepository: *NewUserRepository(db), + } +} + +func (g *GetUserByUsernameUseCase) GetUserByUsername(username string) (User, error) { + return g.userRepository.GetByUsername(username) +} diff --git a/useCases/GetUserUseCase.go b/useCases/GetUserUseCase.go new file mode 100644 index 0000000..ad5d6dc --- /dev/null +++ b/useCases/GetUserUseCase.go @@ -0,0 +1,21 @@ +package useCases + +import ( + . "GohCMS2/adapters/secondary/gateways" + . "GohCMS2/domain/user" + "gorm.io/gorm" +) + +type GetUserUseCase struct { + userRepository UserRepository +} + +func NewGetUserUseCase(db *gorm.DB) *GetUserUseCase { + return &GetUserUseCase{ + userRepository: *NewUserRepository(db), + } +} + +func (g *GetUserUseCase) GetUser(id uint32) (User, error) { + return g.userRepository.Get(id) +} diff --git a/useCases/ListUsersUseCase.go b/useCases/ListUsersUseCase.go new file mode 100644 index 0000000..2904c0d --- /dev/null +++ b/useCases/ListUsersUseCase.go @@ -0,0 +1,21 @@ +package useCases + +import ( + . "GohCMS2/adapters/secondary/gateways" + . "GohCMS2/domain/user" + "gorm.io/gorm" +) + +type ListUsersUseCase struct { + userRepository UserRepository +} + +func NewListUsersUseCase(db *gorm.DB) *ListUsersUseCase { + return &ListUsersUseCase{ + userRepository: *NewUserRepository(db), + } +} + +func (g *ListUsersUseCase) ListUsers() []User { + return g.userRepository.GetAll() +}