From bc3591a6904d135c260111b04fb8f5a4c9f8ae0f Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Tue, 9 Jan 2024 11:04:40 +1100 Subject: [PATCH] fix query --- middlewares/middlewares.go | 2 +- models/secret.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/middlewares/middlewares.go b/middlewares/middlewares.go index 3ffbcdc..2267826 100644 --- a/middlewares/middlewares.go +++ b/middlewares/middlewares.go @@ -29,7 +29,7 @@ func JwtAuthMiddleware() gin.HandlerFunc { return } // 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.Next() diff --git a/models/secret.go b/models/secret.go index 4359283..5de1da4 100644 --- a/models/secret.go +++ b/models/secret.go @@ -60,7 +60,12 @@ func SecretsGetAllowedForGroup(s *Secret, userId int) ([]UserSecret, error) { var secretResults []UserSecret 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) // Make sure at least one parameter was specified