Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e15a94184c |
2
go.mod
2
go.mod
@@ -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.1.4
|
gitea.tecamino.com/paadi/dbHandler v1.1.5
|
||||||
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
4
go.sum
@@ -1,5 +1,5 @@
|
|||||||
gitea.tecamino.com/paadi/dbHandler v1.1.4 h1:/yBwhRzBp823mF7Y0z68uxLEWCoIFeFd4aGdYYPk+Sc=
|
gitea.tecamino.com/paadi/dbHandler v1.1.5 h1:dxRfe095qlvaH/fiLQ1+/qwzX2zwN3PXlmd1UxC5Mc4=
|
||||||
gitea.tecamino.com/paadi/dbHandler v1.1.4/go.mod h1:y/xn/POJg1DO++67uKvnO23lJQgh+XFQq7HZCS9Getw=
|
gitea.tecamino.com/paadi/dbHandler v1.1.5/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=
|
||||||
|
|||||||
@@ -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 aH.dbHandler.Exists(&models.Role{}, "role", role, false) {
|
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 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))
|
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)))
|
||||||
return
|
return
|
||||||
@@ -160,7 +160,7 @@ func (aH *AccessHandler) DeleteRole(c *gin.Context) {
|
|||||||
ownRole = role
|
ownRole = role
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
err = aH.dbHandler.DeleteByKey(&models.Role{}, "role", role, false)
|
err = aH.dbHandler.DeleteByKey(&models.Role{}, "", "role", role, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("DeleteRole", err)
|
aH.logger.Error("DeleteRole", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ func (aH *AccessHandler) AddDefaultUser() (err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if a user with this email already exists
|
// 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")
|
aH.logger.Debug("AddDefaultUser", "user email "+user.Email+" exists already")
|
||||||
// Found a user → skip create
|
// Found a user → skip create
|
||||||
return nil
|
return nil
|
||||||
@@ -64,7 +64,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 aH.dbHandler.Exists(&models.User{}, "email", user.Email, false) {
|
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)))
|
||||||
@@ -252,7 +252,7 @@ func (aH *AccessHandler) DeleteUser(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = aH.dbHandler.DeleteById(&models.User{}, removeIds...)
|
err = aH.dbHandler.DeleteById(&models.User{}, "", removeIds...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
aH.logger.Error("DeleteUser", err)
|
aH.logger.Error("DeleteUser", err)
|
||||||
c.JSON(http.StatusInternalServerError, nil)
|
c.JSON(http.StatusInternalServerError, nil)
|
||||||
|
|||||||
Reference in New Issue
Block a user