aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-rw-r--r--pkg/database/repository/user.go5
-rw-r--r--pkg/database/sql/user.go28
-rw-r--r--pkg/service/auth.go58
-rw-r--r--pkg/service/main_test.go13
-rw-r--r--pkg/view/settings.go99
5 files changed, 188 insertions, 15 deletions
diff --git a/pkg/database/repository/user.go b/pkg/database/repository/user.go
index 3589007..5b2e386 100644
--- a/pkg/database/repository/user.go
+++ b/pkg/database/repository/user.go
@@ -14,7 +14,8 @@ type (
UpdateUser struct {
Username string
Name string
- Password string
+ IsAdmin bool
+ Path string
}
CreateUser struct {
@@ -31,6 +32,8 @@ type (
List(ctx context.Context) ([]*User, error)
Create(ctx context.Context, createUser *CreateUser) (uint, error)
Update(ctx context.Context, id uint, updateUser *UpdateUser) error
+ Delete(ctx context.Context, id uint) error
+ UpdatePassword(ctx context.Context, id uint, password []byte) error
Any(ctx context.Context) (bool, error)
}
)
diff --git a/pkg/database/sql/user.go b/pkg/database/sql/user.go
index 15dbe72..6b1cf0f 100644
--- a/pkg/database/sql/user.go
+++ b/pkg/database/sql/user.go
@@ -27,6 +27,7 @@ type (
)
var _ repository.UserRepository = &UserRepository{}
+
var _ repository.AuthRepository = &UserRepository{}
func NewUserRepository(db *gorm.DB) *UserRepository {
@@ -141,6 +142,7 @@ func (self *UserRepository) Create(ctx context.Context, createUser *repository.C
Username: createUser.Username,
Name: createUser.Name,
Path: createUser.Path,
+ IsAdmin: createUser.IsAdmin,
Password: string(createUser.Password),
}
@@ -161,11 +163,14 @@ func (self *UserRepository) Update(ctx context.Context, id uint, update *reposit
},
Username: update.Username,
Name: update.Name,
+ IsAdmin: update.IsAdmin,
+ Path: update.Path,
}
result := self.db.
WithContext(ctx).
- Save(user)
+ Omit("password").
+ Updates(user)
if result.Error != nil {
return result.Error
}
@@ -174,14 +179,15 @@ func (self *UserRepository) Update(ctx context.Context, id uint, update *reposit
}
func (self *UserRepository) Delete(ctx context.Context, id uint) error {
- userID := struct {
- ID uint
- }{
- ID: id,
+ user := &User{
+ Model: gorm.Model{
+ ID: id,
+ },
}
+
result := self.db.
WithContext(ctx).
- Delete(userID)
+ Delete(user)
if result.Error != nil {
return result.Error
}
@@ -219,3 +225,13 @@ func (u *UserRepository) GetPathFromUserID(ctx context.Context, id uint) (string
return userPath, nil
}
+
+func (u *UserRepository) UpdatePassword(ctx context.Context, id uint, password []byte) error {
+ result := u.db.
+ WithContext(ctx).
+ Model(&User{}).
+ Where("id = ?", id).
+ Update("password", password)
+
+ return result.Error
+}
diff --git a/pkg/service/auth.go b/pkg/service/auth.go
index 1966e70..f27cf88 100644
--- a/pkg/service/auth.go
+++ b/pkg/service/auth.go
@@ -82,6 +82,64 @@ func (c *AuthController) InitialRegister(ctx context.Context, username, password
return err
}
+func (u *AuthController) List(ctx context.Context) ([]*repository.User, error) {
+ return u.userRepository.List(ctx)
+}
+
+func (u *AuthController) Get(ctx context.Context, id uint) (*repository.User, error) {
+ return u.userRepository.Get(ctx, id)
+}
+
+func (u *AuthController) Delete(ctx context.Context, id uint) error {
+ return u.userRepository.Delete(ctx, id)
+}
+
+func (u *AuthController) Upsert(
+ ctx context.Context,
+ id *uint,
+ username string,
+ name string,
+ password []byte,
+ isAdmin bool,
+ path string,
+) error {
+ if id != nil {
+ if err := u.userRepository.Update(ctx, *id, &repository.UpdateUser{
+ Username: string(username),
+ Name: name,
+ IsAdmin: isAdmin,
+ Path: path,
+ }); err != nil {
+ return err
+ }
+
+ if len(password) > 0 {
+ hash, err := bcrypt.GenerateFromPassword(password, bcrypt.MinCost)
+ if err != nil {
+ return err
+ }
+
+ return u.userRepository.UpdatePassword(ctx, *id, hash)
+ }
+ return nil
+ }
+
+ hash, err := bcrypt.GenerateFromPassword(password, bcrypt.MinCost)
+ if err != nil {
+ return err
+ }
+
+ _, err = u.userRepository.Create(ctx, &repository.CreateUser{
+ Username: username,
+ Name: name,
+ Password: hash,
+ IsAdmin: isAdmin,
+ Path: path,
+ })
+
+ return err
+}
+
type Token struct {
UserID uint
Username string
diff --git a/pkg/service/main_test.go b/pkg/service/main_test.go
index e1214dc..8cef985 100644
--- a/pkg/service/main_test.go
+++ b/pkg/service/main_test.go
@@ -28,6 +28,7 @@ type (
)
var _ repository.UserRepository = &UserRepository{}
+
var _ repository.AuthRepository = &UserRepository{}
func NewUserRepository() *UserRepository {
@@ -86,10 +87,6 @@ func (u *UserRepository) Update(_ context.Context, id uint, updateUser *reposito
user.Name = updateUser.Name
user.Username = updateUser.Username
- if updateUser.Password != "" {
- user.Password = []byte(updateUser.Password)
- }
-
return nil
}
@@ -127,3 +124,11 @@ func (u *UserRepository) GetPathFromUserID(ctx context.Context, id uint) (string
return "", errors.New("Not Found")
}
+
+func (u *UserRepository) UpdatePassword(ctx context.Context, id uint, password []byte) error {
+ panic("not implemented") // TODO: Implement
+}
+
+func (u *UserRepository) Delete(ctx context.Context, id uint) error {
+ panic("not implemented") // TODO: Implement
+}
diff --git a/pkg/view/settings.go b/pkg/view/settings.go
index ffce86b..5131362 100644
--- a/pkg/view/settings.go
+++ b/pkg/view/settings.go
@@ -1,10 +1,13 @@
package view
import (
+ "strconv"
+
"github.com/valyala/fasthttp"
"git.sr.ht/~gabrielgio/img/pkg/database/repository"
"git.sr.ht/~gabrielgio/img/pkg/ext"
+ "git.sr.ht/~gabrielgio/img/pkg/service"
"git.sr.ht/~gabrielgio/img/templates"
)
@@ -12,17 +15,17 @@ type (
SettingsView struct {
// there is not need to create a controller for this
settingsRepository repository.SettingsRepository
- userRepository repository.UserRepository
+ userController *service.AuthController
}
)
func NewSettingsView(
settingsRespository repository.SettingsRepository,
- userRepository repository.UserRepository,
+ userController *service.AuthController,
) *SettingsView {
return &SettingsView{
settingsRepository: settingsRespository,
- userRepository: userRepository,
+ userController: userController,
}
}
@@ -32,7 +35,7 @@ func (self *SettingsView) Index(ctx *fasthttp.RequestCtx) error {
return err
}
- users, err := self.userRepository.List(ctx)
+ users, err := self.userController.List(ctx)
if err != nil {
return err
}
@@ -45,6 +48,76 @@ func (self *SettingsView) Index(ctx *fasthttp.RequestCtx) error {
return nil
}
+func (self *SettingsView) User(ctx *fasthttp.RequestCtx) error {
+ id := string(ctx.FormValue("userId"))
+ idValue, err := ParseUint(id)
+ if err != nil {
+ return err
+ }
+
+ if idValue == nil {
+ templates.WritePageTemplate(ctx, &templates.UserPage{})
+ } else {
+ user, err := self.userController.Get(ctx, *idValue)
+ if err != nil {
+ return err
+ }
+
+ templates.WritePageTemplate(ctx, &templates.UserPage{
+ ID: idValue,
+ Username: user.Username,
+ Path: user.Path,
+ IsAdmin: user.IsAdmin,
+ })
+ }
+
+ return nil
+}
+
+func (self *SettingsView) UpsertUser(ctx *fasthttp.RequestCtx) error {
+ var (
+ username = string(ctx.FormValue("username"))
+ password = ctx.FormValue("password")
+ path = string(ctx.FormValue("path"))
+ isAdmin = string(ctx.FormValue("isAdmin")) == "on"
+ id = string(ctx.FormValue("userId"))
+ )
+
+ idValue, err := ParseUint(id)
+ if err != nil {
+ return err
+ }
+
+ err = self.userController.Upsert(ctx, idValue, username, "", password, isAdmin, path)
+ if err != nil {
+ return err
+ }
+
+ ctx.Redirect("/settings", 307)
+ return nil
+}
+
+func (self *SettingsView) Delete(ctx *fasthttp.RequestCtx) error {
+ var (
+ id = string(ctx.FormValue("userId"))
+ )
+
+ idValue, err := ParseUint(id)
+ if err != nil {
+ return err
+ }
+
+ if idValue != nil {
+ err = self.userController.Delete(ctx, *idValue)
+ if err != nil {
+ return err
+ }
+ }
+
+ ctx.Redirect("/settings", 307)
+ return nil
+}
+
func (self *SettingsView) Save(ctx *fasthttp.RequestCtx) error {
var (
showMode = string(ctx.FormValue("showMode")) == "on"
@@ -67,4 +140,22 @@ func (self *SettingsView) Save(ctx *fasthttp.RequestCtx) error {
func (self *SettingsView) SetMyselfIn(r *ext.Router) {
r.GET("/settings/", self.Index)
r.POST("/settings/", self.Save)
+
+ r.GET("/users/", self.User)
+ r.GET("/users/delete", self.Delete)
+ r.POST("/users/", self.UpsertUser)
+}
+
+func ParseUint(id string) (*uint, error) {
+ var idValue *uint
+ if id != "" {
+ v, err := strconv.Atoi(id)
+ if err != nil {
+ return nil, err
+ }
+
+ u := uint(v)
+ idValue = &u
+ }
+ return idValue, nil
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 16:36:21 +0000