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

fix typo
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-01-08 15:16:41 +11:00
parent 0c232178db
commit d1857f2db1
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
models/user.go
View File

@@ -358,7 +358,14 @@ func UserGetSafesAllowed(userId int) ([]UserSafe, error) {
var results []UserSafe var results []UserSafe
// join users, groups and permissions // join users, groups and permissions
rows, err := db.Queryx("SELECT users.UserId, users.GroupId, users.Admin as AdminUser, groups.Admin as AdminGroup, permissions.SafeId, safe.SafeName FROM users INNER JOIN groups ON users.GroupId = groups.GroupId INNER JOIN permissions ON groups.GroupId = permissions.GroupId INNER JOIN safes on permissions.SafeId = safes.SafeId WHERE users.UserId=?", userId) rows, err := db.Queryx(`
SELECT users.UserId, users.GroupId, users.Admin as AdminUser, groups.Admin as AdminGroup,
permissions.SafeId, safes.SafeName FROM users
INNER JOIN groups ON users.GroupId = groups.GroupId
INNER JOIN permissions ON groups.GroupId = permissions.GroupId
INNER JOIN safes on permissions.SafeId = safes.SafeId
WHERE users.UserId=?"
`, userId)
if err != nil { if err != nil {
log.Printf("UserGetSafesAllowed error executing sql record : '%s'\n", err) log.Printf("UserGetSafesAllowed error executing sql record : '%s'\n", err)
return results, err return results, err

2
utils/token/token.go
View File

@@ -52,7 +52,7 @@ func ExtractToken(c *gin.Context) string {
return token return token
} }
bearerToken := c.Request.Header.Get("Authorization") bearerToken := c.Request.Header.Get("Authorization")
log.Printf("ExtractToken extracted token '%v'\n", bearerToken) //log.Printf("ExtractToken extracted token '%v'\n", bearerToken)
if len(strings.Split(bearerToken, " ")) == 2 { if len(strings.Split(bearerToken, " ")) == 2 {
return strings.Split(bearerToken, " ")[1] return strings.Split(bearerToken, " ")[1]