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

replace LdapDN with LdapDn
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-10 10:21:58 +11:00
parent 1c3307d43d
commit f8000b749e
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/controlGroups.go
View File

@@ -12,7 +12,7 @@ import (
type AddGroupInput struct {
GroupName string `db:"GroupName" json:"groupName"`
LdapGroup bool `db:"LdapGroup" json:"ldapGroup"`
LdapDn string `db:"LdapDN" json:"ldapDn"`
LdapDn string `db:"LdapDn" json:"ldapDn"`
Admin bool `db:"Admin" json:"admin"`
}

4
models/group.go
View File

@@ -9,7 +9,7 @@ type Group struct {
GroupId int `db:"GroupId" json:"groupId"`
GroupName string `db:"GroupName" json:"groupName"`
LdapGroup bool `db:"LdapGroup" json:"ldapGroup"`
LdapDn string `db:"LdapDN" json:"ldapDn"`
LdapDn string `db:"LdapDn" json:"ldapDn"`
Admin bool `db:"Admin" json:"admin"`
}
@@ -64,7 +64,7 @@ func (g *Group) GroupAdd() (*Group, error) {
if err != nil && err.Error() == "group not found" {
log.Printf("GroupAdd confirmed no existing group, continuing with creation of group '%s'\n", g.GroupName)
result, err := db.NamedExec(("INSERT INTO groups (GroupName, LdapGroup, LdapDN, Admin) VALUES (:GroupName, :LdapGroup, :LdapDn, :Admin);"), g)
result, err := db.NamedExec(("INSERT INTO groups (GroupName, LdapGroup, LdapDn, Admin) VALUES (:GroupName, :LdapGroup, :LdapDn, :Admin);"), g)
if err != nil {
log.Printf("GroupAdd error executing sql record : '%s'\n", err)

6
models/setup.go
View File

@@ -54,7 +54,7 @@ const createGroups string = `
GroupId INTEGER PRIMARY KEY AUTOINCREMENT,
GroupName VARCHAR,
LdapGroup BOOLEAN DEFAULT 0,
LdapDN VARCHAR DEFAULT '',
LdapDn VARCHAR DEFAULT '',
Admin BOOLEAN DEFAULT 0
);
`
@@ -408,9 +408,9 @@ func CreateTables() {
os.Exit(1)
}
_, err = db.Exec("ALTER TABLE users ADD COLUMN LdapDN VARCHAR DEFAULT '';")
_, err = db.Exec("ALTER TABLE users ADD COLUMN LdapDn VARCHAR DEFAULT '';")
if err != nil {
log.Printf("Error altering users table to add LdapDN column : '%s'\n", err)
log.Printf("Error altering users table to add LdapDn column : '%s'\n", err)
os.Exit(1)
}
}

10
models/user.go
View File

@@ -18,7 +18,7 @@ type User struct {
Password string `db:"Password" json:"-"`
LdapUser bool `db:"LdapUser" json:"ldapUser"`
Admin bool `db:"Admin"`
//LdapDn string `db:"LdapDN" json:"ldapDn"`
//LdapDn string `db:"LdapDn" json:"ldapDn"`
}
type UserRole struct {
@@ -32,7 +32,7 @@ type UserGroup struct {
User
GroupName string `db:"GroupName"`
LdapGroup bool `db:"LdapGroup"`
LdapDn string `db:"LdapDN"`
LdapDn string `db:"LdapDn"`
Admin bool `db:"Admin"`
}
@@ -303,7 +303,7 @@ func GetUserRoleByID(uid uint) (UserRole, error) {
// Query database for matching user object
log.Printf("GetUserRoleByID querying for userid '%d'\n", uid)
err := db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, users.LdapUser, users.LdapDN, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", uid).StructScan(&ur)
err := db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, users.LdapUser, users.LdapDn, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", uid).StructScan(&ur)
if err != nil {
log.Printf("GetUserRoleByID received error when querying database : '%s'\n", err)
return ur, errors.New("GetUserRoleByID user not found")
@@ -320,7 +320,7 @@ func UserGetGroupByID(uid uint) (UserGroup, error) {
// Query database for matching user object
log.Printf("UserGetGroupByID querying for userid '%d'\n", uid)
err := db.QueryRowx("SELECT users.UserId, users.GroupId, users.UserName, users.Password, users.LdapUser, groups.GroupName, groups.LdapGroup, groups.LdapDN, groups.Admin FROM users INNER JOIN groups ON users.GroupId = groups.GroupId WHERE users.UserId=?", uid).StructScan(&ug)
err := db.QueryRowx("SELECT users.UserId, users.GroupId, users.UserName, users.Password, users.LdapUser, groups.GroupName, groups.LdapGroup, groups.LdapDn, groups.Admin FROM users INNER JOIN groups ON users.GroupId = groups.GroupId WHERE users.UserId=?", uid).StructScan(&ug)
if err != nil {
log.Printf("UserGetGroupByID received error when querying database : '%s'\n", err)
return ug, errors.New("UserGetGroupByID user id not found")
@@ -343,7 +343,7 @@ func UserGetRoleFromToken(c *gin.Context) (UserRole, error) {
// Query database for matching user object
log.Printf("UserGetRoleFromToken querying for userid '%d'\n", user_id)
err = db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, users.LdapUser, users.LdapDN, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", user_id).StructScan(&ur)
err = db.QueryRowx("SELECT users.UserId, users.RoleId, users.UserName, users.Password, users.LdapUser, users.LdapDn, roles.RoleName, roles.ReadOnly, roles.Admin FROM users INNER JOIN roles ON users.RoleId = roles.RoleId WHERE users.UserId=?", user_id).StructScan(&ur)
if err != nil {
log.Printf("UserGetRoleFromToken received error when querying database : '%s'\n", err)
return ur, errors.New("UserGetRoleFromToken user not found")