nathan/smt
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

re-arrange checks
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-11 18:02:25 +11:00
parent 62606cbee5
commit d087492c31
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
controllers/controlGroups.go
View File

@@ -59,19 +59,6 @@ func AddGroupHandler(c *gin.Context) {
//remove leading/trailing spaces in groupname
g.GroupName = html.EscapeString(strings.TrimSpace(g.GroupName))
// Check if group already exists
testGroup, _ := models.GroupGetByName(g.GroupName)
log.Printf("AddGroupHandler checking if group '%s' already exists\n", g.GroupName)
if (models.Group{} == testGroup) {
log.Printf("AddGroupHandler confirmed no existing group name\n")
} else {
errorString := fmt.Sprintf("attempt to register conflicting groupname '%s'", g.GroupName)
log.Printf("AddGroupHandler error : '%s'\n", errorString)
c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
return
}
// Check if there is already an LDAP group with the same Dn
if g.LdapGroup {
// TODO check for existing LDAP group
@@ -87,6 +74,19 @@ func AddGroupHandler(c *gin.Context) {
}
}
// Check if group already exists with same name
testGroup, _ := models.GroupGetByName(g.GroupName)
log.Printf("AddGroupHandler checking if group '%s' already exists\n", g.GroupName)
if (models.Group{} == testGroup) {
log.Printf("AddGroupHandler confirmed no existing group name\n")
} else {
errorString := fmt.Sprintf("attempt to register conflicting groupname '%s'", g.GroupName)
log.Printf("AddGroupHandler error : '%s'\n", errorString)
c.JSON(http.StatusBadRequest, gin.H{"error": errorString})
return
}
// Verification checks passed, return group
group, err := g.GroupAdd()