This commit is contained in:
@@ -168,44 +168,45 @@ func RegisterUser(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"message": "user registration success"})
|
||||
}
|
||||
|
||||
func AddRole(c *gin.Context) {
|
||||
var input AddRoleInput
|
||||
/*
|
||||
func AddRole(c *gin.Context) {
|
||||
var input AddRoleInput
|
||||
|
||||
if err := c.ShouldBindJSON(&input); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
if err := c.ShouldBindJSON(&input); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
// define the new role properties
|
||||
r := models.Role{}
|
||||
r.RoleName = input.RoleName
|
||||
r.ReadOnly = input.ReadOnly
|
||||
r.Admin = input.Admin
|
||||
r.LdapGroup = input.LdapGroup
|
||||
|
||||
// Check if role already exists
|
||||
testRole, _ := models.GetRoleByName(r.RoleName)
|
||||
log.Printf("AddRole checking if role '%s' already exists\n", r.RoleName)
|
||||
|
||||
if (models.Role{} == testRole) {
|
||||
log.Printf("AddRole confirmed no existing rolename\n")
|
||||
} else {
|
||||
errorString := fmt.Sprintf("attempt to register conflicting rolename '%s'", r.RoleName)
|
||||
log.Printf("Register error : '%s'\n", errorString)
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
|
||||
return
|
||||
}
|
||||
|
||||
_, err := r.AddRole()
|
||||
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"Error creating role": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "role creation success"})
|
||||
}
|
||||
|
||||
// define the new role properties
|
||||
r := models.Role{}
|
||||
r.RoleName = input.RoleName
|
||||
r.ReadOnly = input.ReadOnly
|
||||
r.Admin = input.Admin
|
||||
r.LdapGroup = input.LdapGroup
|
||||
|
||||
// Check if role already exists
|
||||
testRole, _ := models.GetRoleByName(r.RoleName)
|
||||
log.Printf("AddRole checking if role '%s' already exists\n", r.RoleName)
|
||||
|
||||
if (models.Role{} == testRole) {
|
||||
log.Printf("AddRole confirmed no existing rolename\n")
|
||||
} else {
|
||||
errorString := fmt.Sprintf("attempt to register conflicting rolename '%s'", r.RoleName)
|
||||
log.Printf("Register error : '%s'\n", errorString)
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
|
||||
return
|
||||
}
|
||||
|
||||
_, err := r.AddRole()
|
||||
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"Error creating role": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "role creation success"})
|
||||
}
|
||||
|
||||
*/
|
||||
func Login(c *gin.Context) {
|
||||
|
||||
var input LoginInput
|
||||
@@ -254,17 +255,18 @@ func CurrentUser(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, gin.H{"message": "success", "data": u})
|
||||
}
|
||||
|
||||
func GetRoles(c *gin.Context) {
|
||||
roles, err := models.QueryRoles()
|
||||
/*
|
||||
func GetRoles(c *gin.Context) {
|
||||
roles, err := models.QueryRoles()
|
||||
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "success", "data": roles})
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "success", "data": roles})
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
func GetUsers(c *gin.Context) {
|
||||
users, err := models.UserList()
|
||||
|
Reference in New Issue
Block a user