temp disable user union

models/secret.go

@@ -96,33 +96,34 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 		query += " AND secrets.UserName LIKE ? "
 		queryArgs = append(queryArgs, s.UserName)
 	}
+	/*
+		// Query for user access
+		query += `
+		UNION
+		SELECT users.UserId, users.GroupId, permissions.ReadOnly, safes.SafeName, secrets.*
+		FROM users
+		INNER JOIN permissions ON users.UserId = permissions.UserId
+		INNER JOIN safes on permissions.SafeId = safes.SafeId
+		INNER JOIN secrets on secrets.SafeId = safes.SafeId
+		WHERE users.UserId = ?`
+		queryArgs = append(queryArgs, userId)
 
-	// Query for user access
+		// Add any other arguments to the query if they were specified
-	query += `
+		if s.DeviceName != "" {
-	UNION
+			query += " AND DeviceName LIKE ? "
-	SELECT users.UserId, users.GroupId, permissions.ReadOnly, safes.SafeName, secrets.*
+			queryArgs = append(queryArgs, s.DeviceName)
-	FROM users
+		}
-	INNER JOIN permissions ON users.UserId = permissions.UserId
-	INNER JOIN safes on permissions.SafeId = safes.SafeId
-	INNER JOIN secrets on secrets.SafeId = safes.SafeId
-	WHERE users.UserId = ?`
-	queryArgs = append(queryArgs, userId)
 
-	// Add any other arguments to the query if they were specified
+		if s.DeviceCategory != "" {
-	if s.DeviceName != "" {
+			query += " AND DeviceCategory LIKE ? "
-		query += " AND DeviceName LIKE ? "
+			queryArgs = append(queryArgs, s.DeviceCategory)
-		queryArgs = append(queryArgs, s.DeviceName)
+		}
-	}
 
-	if s.DeviceCategory != "" {
+		if s.UserName != "" {
-		query += " AND DeviceCategory LIKE ? "
+			query += " AND secrets.UserName LIKE ? "
-		queryArgs = append(queryArgs, s.DeviceCategory)
+			queryArgs = append(queryArgs, s.UserName)
-	}
+		}
-
+	*/
-	if s.UserName != "" {
-		query += " AND secrets.UserName LIKE ? "
-		queryArgs = append(queryArgs, s.UserName)
-	}
 
 	// Execute the query
 	log.Printf("SecretsGetAllowedForGroup query string : '%s'\n%+v\n", query, queryArgs)
@@ -140,6 +141,7 @@ func SecretsGetAllowed(s *Secret, userId int) ([]UserSecret, error) {
 				log.Printf("SecretsGetAllowedForGroup error parsing sql record : '%s'\n", err)
 				return secretResults, err
 			}
+			log.Printf("r: %v\n", r)
 
 			/*
 				// Decrypt the secret