test

models/secret.go

@@ -111,7 +111,7 @@ func SecretsSearchAllSafes(s *Secret) ([]Secret, error) {
 }
 
 // SecretsGetMultipleSafes queries the specified safes for matching secrets
-func SecretsGetMultipleSafes(s *Secret, adminRole bool, safeIds []int) ([]Secret, error) {
+func SecretsGetMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
 	var err error
 	var secretResults []Secret
 
@@ -130,25 +130,19 @@ func SecretsGetMultipleSafes(s *Secret, adminRole bool, safeIds []int) ([]Secret
 
 	args := []interface{}{}
 	var query string
-	if adminRole {
-		log.Printf("SecretsGetMultipleSafes using admin role so not limiting to specific safes\n")
-		// No need to limit query to any safe
-		query = "SELECT * FROM secrets WHERE 1=1 "
-	} else {
-		// Generate placeholders for the IN clause to match multiple SafeId values
-		placeholders := make([]string, len(safeIds))
-		for i := range safeIds {
-			placeholders[i] = "?"
-		}
-		placeholderStr := strings.Join(placeholders, ",")
+	// Generate placeholders for the IN clause to match multiple SafeId values
+	placeholders := make([]string, len(safeIds))
+	for i := range safeIds {
+		placeholders[i] = "?"
+	}
+	placeholderStr := strings.Join(placeholders, ",")
 
-		// Create query with the necessary placeholders
-		query = fmt.Sprintf("SELECT * FROM secrets WHERE SafeId IN (%s) ", placeholderStr)
+	// Create query with the necessary placeholders
+	query = fmt.Sprintf("SELECT * FROM secrets WHERE SafeId IN (%s) ", placeholderStr)
 
-		// Add the Safe Ids to the arguments list
-		for _, g := range safeIds {
-			args = append(args, g)
-		}
+	// Add the Safe Ids to the arguments list
+	for _, g := range safeIds {
+		args = append(args, g)
 	}
 
 	// Add any other arguments to the query if they were specified