paadi/access-handler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add relational table request

Browse Source
This commit is contained in:
Adrian Zürcher
2025-11-27 07:53:22 +01:00
parent 8156fea488
commit 21daaf1819
6 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
handlers/login.go
View File

@@ -241,7 +241,8 @@ func (aH *AccessHandler) getUserFromDB(c *gin.Context, userName string) (user mo
hasError = true
// Fetch user record from DB
var dbRecord []models.User
err := aH.dbHandler.GetByKey(&dbRecord, "Role", "user_name", userName, false)
err := aH.dbHandler.GetByKey(&dbRecord, "user_name", userName, false, "Role")
if err != nil {
aH.logger.Error("Login", err)
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))

2
handlers/middleware.go
View File

@@ -132,7 +132,7 @@ func (aH *AccessHandler) AuthorizeRole(suffix string, exeptions ...string) gin.H
// Fetch roles and associated permissions from the database or store
var roles []models.Role
err := aH.dbHandler.GetByKey(&roles, "", "role", role, false)
err := aH.dbHandler.GetByKey(&roles, "role", role, false)
if err != nil {
aH.logger.Error("AuthorizeRole", err)
c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"message": http.StatusInternalServerError})

14
handlers/role.go
View File

@@ -17,7 +17,7 @@ func (aH *AccessHandler) AddDefaultRole() (err error) {
role := "admin"
// Check if a role with this name already exists
if aH.dbHandler.Exists(&models.Role{}, "", "role", role, false) {
if aH.dbHandler.Exists(&models.Role{}, "role", role, false) {
// Found a role → skip creation
aH.logger.Debug("AddDefaultRole", "role "+role+" exists already")
return nil
@@ -52,7 +52,7 @@ func (aH *AccessHandler) AddRole(c *gin.Context) {
}
// Check if a role with this name already exists
if aH.dbHandler.Exists(&models.Role{}, "", "role", role.Role, false) {
if aH.dbHandler.Exists(&models.Role{}, "role", role.Role, false) {
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)))
return
@@ -78,7 +78,7 @@ func (aH *AccessHandler) GetRole(c *gin.Context) {
id := c.Query("id")
if role != "" {
err = aH.dbHandler.GetByKey(&roles, "", "role", role, false)
err = aH.dbHandler.GetByKey(&roles, "role", role, false)
} else if id != "" {
i, err = strconv.Atoi(id)
if err != nil {
@@ -87,9 +87,9 @@ func (aH *AccessHandler) GetRole(c *gin.Context) {
})
return
}
err = aH.dbHandler.GetById(&roles, "", uint(i))
err = aH.dbHandler.GetById(&roles, uint(i))
} else {
err = aH.dbHandler.GetById(&roles, "", 0)
err = aH.dbHandler.GetById(&roles, 0)
}
@@ -110,7 +110,7 @@ func (aH *AccessHandler) UpdateRole(c *gin.Context) {
}
if role.Id != 0 {
err := aH.dbHandler.UpdateValuesById(&role, "", role.Id)
err := aH.dbHandler.UpdateValuesById(&role, role.Id)
if err != nil {
aH.logger.Error("UpdateRole", err)
c.JSON(http.StatusInternalServerError, nil)
@@ -160,7 +160,7 @@ func (aH *AccessHandler) DeleteRole(c *gin.Context) {
ownRole = role
continue
}
err = aH.dbHandler.DeleteByKey(&models.Role{}, "", "role", role, false)
err = aH.dbHandler.DeleteByKey(&models.Role{}, "role", role, false)
if err != nil {
aH.logger.Error("DeleteRole", err)
c.JSON(http.StatusInternalServerError, nil)

18
handlers/user.go
View File

@@ -29,7 +29,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) {
}
// Check if a user with this email already exists
if aH.dbHandler.Exists(&models.User{}, "", "email", user.Email, false) {
if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
aH.logger.Debug("AddDefaultUser", "user email "+user.Email+" exists already")
// Found a user → skip create
return nil
@@ -42,7 +42,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) {
}
role := &models.Role{}
if err := aH.dbHandler.GetByKey(role, "", "role", "admin", false); err != nil {
if err := aH.dbHandler.GetByKey(role, "role", "admin", false); err != nil {
return err
}
return aH.dbHandler.AddRelation(user, role, "Role")
@@ -64,7 +64,7 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
}
// Check if a user with this email already exists
if aH.dbHandler.Exists(&models.User{}, "", "email", user.Email, false) {
if aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
// Found a user → skip create
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)))
@@ -91,13 +91,13 @@ func (aH *AccessHandler) AddUser(c *gin.Context) {
aH.logger.Debug("AddUser", "add new user "+user.Name+" with role "+user.Role.Role)
if user.Role.Id != 0 {
if err := aH.dbHandler.GetById(&user.Role, "", user.Role.Id); err != nil {
if err := aH.dbHandler.GetById(&user.Role, user.Role.Id); err != nil {
aH.logger.Error("AddUser", err)
c.JSON(http.StatusInternalServerError, nil)
return
}
} else {
if err := aH.dbHandler.GetByKey(&user.Role, "", "role", user.Role.Role, false); err != nil {
if err := aH.dbHandler.GetByKey(&user.Role, "role", user.Role.Role, false); err != nil {
aH.logger.Error("AddUser", err)
c.JSON(http.StatusInternalServerError, nil)
return
@@ -128,7 +128,7 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
// get user to check ChangePassword
var dbRecord models.User
err = aH.dbHandler.GetById(&dbRecord, "Role", user.Id)
err = aH.dbHandler.GetById(&dbRecord, user.Id, "Role")
if err != nil {
aH.logger.Error("ChangePassword", err)
c.JSON(http.StatusInternalServerError, nil)
@@ -154,7 +154,7 @@ func (aH *AccessHandler) ChangePassword(c *gin.Context) {
aH.logger.Debug("ChangePassword", "change user "+user.Name+" password")
// Update user
aH.dbHandler.UpdateValuesById(&user, "Role", user.Id)
aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
c.JSON(http.StatusOK, gin.H{
"message": fmt.Sprintf("password of user '%s' changed", user.Name),
@@ -178,7 +178,7 @@ func (aH *AccessHandler) GetUser(c *gin.Context) {
}
var users []models.User
err = aH.dbHandler.GetById(&users, "Role", uint(i))
err = aH.dbHandler.GetById(&users, uint(i), "Role")
if err != nil {
aH.logger.Error("GetUser", err)
c.JSON(http.StatusInternalServerError, nil)
@@ -194,7 +194,7 @@ func (aH *AccessHandler) UpdateUser(c *gin.Context) {
c.JSON(http.StatusInternalServerError, nil)
return
}
err := aH.dbHandler.UpdateValuesById(&user, "Role", user.Id)
err := aH.dbHandler.UpdateValuesById(&user, user.Id, "Role")
if err != nil {
aH.logger.Error("UpdateUser", err)
c.JSON(http.StatusInternalServerError, nil)