This commit is contained in:
@@ -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()
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user