3 Commits

Author SHA1 Message Date
Adrian Zürcher
296c2e001d fix delete function 2025-11-07 08:19:20 +01:00
Adrian Zürcher
0c37d014a9 fix exist check 2025-11-07 08:06:54 +01:00
Adrian Zürcher
1f60813589 add new default permission 2025-11-06 14:03:13 +01:00
6 changed files with 17 additions and 13 deletions

2
go.mod
View File

@@ -3,7 +3,7 @@ module gitea.tecamino.com/paadi/access-handler
go 1.24.5 go 1.24.5
require ( require (
gitea.tecamino.com/paadi/dbHandler v1.0.4 gitea.tecamino.com/paadi/dbHandler v1.0.8
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 gitea.tecamino.com/paadi/tecamino-logger v0.2.1
github.com/gin-gonic/gin v1.11.0 github.com/gin-gonic/gin v1.11.0
github.com/go-playground/assert/v2 v2.2.0 github.com/go-playground/assert/v2 v2.2.0

4
go.sum
View File

@@ -1,5 +1,5 @@
gitea.tecamino.com/paadi/dbHandler v1.0.4 h1:ctnaec0GDdtw3gRQdUISVDYLJ9x+vt50VW41OemfhD4= gitea.tecamino.com/paadi/dbHandler v1.0.8 h1:ZWSBM/KFtLwTv2cBqwK1mOxWAxAfL0BcWEC3kJ9JALU=
gitea.tecamino.com/paadi/dbHandler v1.0.4/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw= gitea.tecamino.com/paadi/dbHandler v1.0.8/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE= gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM= gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ=

View File

@@ -17,7 +17,7 @@ func (aH *AccessHandler) AddDefaultRole() (err error) {
role := "admin" role := "admin"
// Check if a role with this name already exists // Check if a role with this name already exists
if err := aH.dbHandler.Exists(&models.Role{}, "role", role, false); err == nil { if aH.dbHandler.Exists(&models.Role{}, "role", role, false) {
// Found a role → skip creation // Found a role → skip creation
aH.logger.Debug("AddDefaultRole", "role "+role+" exists already") aH.logger.Debug("AddDefaultRole", "role "+role+" exists already")
return nil return nil
@@ -52,7 +52,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) {
} }
// Check if a role with this name already exists // Check if a role with this name already exists
if err := aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false); err == nil { if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) {
aH.logger.Error("AddRole", fmt.Sprintf("role with name %s already exists", role.Role)) aH.logger.Error("AddRole", fmt.Sprintf("role with name %s already exists", role.Role))
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("role with name %s already exists", role.Role))) c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("role with name %s already exists", role.Role)))
} }

View File

@@ -21,7 +21,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) {
email := "zuercher@tecamino.ch" email := "zuercher@tecamino.ch"
// Check if a user with this email already exists // Check if a user with this email already exists
if err := aH.dbHandler.Exists(&models.User{}, "email", email, false); err == nil { if aH.dbHandler.Exists(&models.User{}, "email", email, false) {
aH.logger.Debug("AddDefaultUser", "user email "+email+" exists already") aH.logger.Debug("AddDefaultUser", "user email "+email+" exists already")
// Found a user → skip create // Found a user → skip create
return nil return nil
@@ -59,7 +59,7 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
} }
// Check if a user with this email already exists // Check if a user with this email already exists
if err := aH.dbHandler.Exists(&models.User{}, "email", user.Email, false); err == nil { if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
// Found a user → skip create // Found a user → skip create
aH.logger.Error("AddUser", "user with email "+user.Email+" already exists") aH.logger.Error("AddUser", "user with email "+user.Email+" already exists")
c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("user with email %s already exists", user.Email))) c.JSON(http.StatusBadRequest, models.NewJsonMessageResponse(fmt.Sprintf("user with email %s already exists", user.Email)))

View File

@@ -14,6 +14,7 @@ func (r *Permissions) DefaultPermissions() {
Permission{Name: "userSettings", Permission: 7}, Permission{Name: "userSettings", Permission: 7},
Permission{Name: "members", Permission: 7}, Permission{Name: "members", Permission: 7},
Permission{Name: "events", Permission: 7}, Permission{Name: "events", Permission: 7},
Permission{Name: "responsible", Permission: 7},
) )
} }

View File

@@ -1,12 +1,15 @@
package models package models
import "time"
type User struct { type User struct {
Id uint `gorm:"primaryKey" json:"id"` Id uint `gorm:"primaryKey" json:"id"`
Name string `gorm:"column:user_name" json:"user"` Name string `gorm:"column:user_name" json:"user"`
Email string `gorm:"column:email" json:"email"` Email string `gorm:"column:email" json:"email"`
Role string `gorm:"column:role" json:"role,omitempty"` Role string `gorm:"column:role" json:"role,omitempty"`
Password string `gorm:"column:password" json:"password"` Password string `gorm:"column:password" json:"password"`
Settings Settings `gorm:"type:json" json:"settings,omitempty"` Expiration *time.Time `gorm:"column:expiration" json:"expiration,omitempty"`
Settings Settings `gorm:"type:json" json:"settings"`
} }
func (u *User) IsValid() bool { func (u *User) IsValid() bool {