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

This commit is contained in:
2024-01-09 11:04:40 +11:00
parent 07fd43bf33
commit bc3591a690
2 changed files with 7 additions and 2 deletions

View File

@@ -29,7 +29,7 @@ func JwtAuthMiddleware() gin.HandlerFunc {
return return
} }
// Store user id in context for accessing later // Store user id in context for accessing later
log.Printf("JwtAuthMiddleware storing user-id '%d'\n", user_id) //log.Printf("JwtAuthMiddleware storing user-id '%d'\n", user_id)
c.Set("user-id", user_id) c.Set("user-id", user_id)
c.Next() c.Next()

View File

@@ -60,7 +60,12 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) {
var secretResults []UserSecret var secretResults []UserSecret
args := []interface{}{} args := []interface{}{}
query := "users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* 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 INNER JOIN secrets on secrets.SafeId = safes.SafeId WHERE users.UserId = ? " query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, permissions.SafeId, safes.SafeName, secrets.* 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
INNER JOIN secrets on secrets.SafeId = safes.SafeId
WHERE users.UserId = ?`
args = append(args, userId) args = append(args, userId)
// Make sure at least one parameter was specified // Make sure at least one parameter was specified