more tidy up

models/secret.go

@@ -154,19 +154,6 @@ func SecretsGetFromMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
 	var err error
 	var secretResults []Secret
 
-	/*
-		// First use an "In Query" to expand the list of safe Ids to query
-		// As per https://jmoiron.github.io/sqlx/#inQueries
-
-		query, args, _ := sqlx.In("SELECT * FROM secrets WHERE DeviceName LIKE ? AND DeviceCategory LIKE ? AND UserName = ? and SafeId IN (?);", s.DeviceName, s.DeviceCategory, s.UserName, safeIds)
-
-		// sqlx.In returns queries with the `?` bindvar, we can rebind it for our backend
-		query = db.Rebind(query)
-		rows, err := db.Queryx(query, args)
-	*/
-
-	// TODO use SecretsSearchAllSafes for adminRole of true
-
 	args := []interface{}{}
 	var query string
 	// Generate placeholders for the IN clause to match multiple SafeId values
@@ -201,7 +188,7 @@ func SecretsGetFromMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
 	}
 
 	// Execute the query
-	log.Printf("SecretsGetMultipleSafes query string : '%s'\n%+v\n", query, args)
+	log.Printf("SecretsGetMultipleSafes query string :\n'%s'\nQuery Args : %+v\n", query, args)
 	rows, err := db.Queryx(query, args...)
 
 	if err != nil {
@@ -220,7 +207,6 @@ func SecretsGetFromMultipleSafes(s *Secret, safeIds []int) ([]Secret, error) {
 			// Decrypt the secret
 			_, err = r.DecryptSecret()
 			if err != nil {
-				//log.Printf("GetSecret unable to decrypt stored secret '%v' : '%s'\n", r.Secret, err)
 				log.Printf("SecretsGetMultipleSafes unable to decrypt stored secret : '%s'\n", err)
 				rows.Close()
 				return secretResults, err