test2

models/secret.go

@@ -103,13 +103,12 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 
 	// Query for group access
 	queryArgs := []interface{}{}
-	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly, safes.SafeName, 
+	query := `SELECT users.UserId, users.GroupId, permissions.ReadOnly,
 	secrets.SecretId, secrets.SafeId, secrets.DeviceName, secrets.DeviceCategory, secrets.UserName, secrets.Secret
 	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
+	INNER JOIN secrets on secrets.SafeId = permissions.SafeId
 	WHERE users.UserId = ? `
 	queryArgs = append(queryArgs, userId)