try to improve ListSecrets

controllers/retrieve_secrets.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"fmt"
 	"log"
 	"net/http"
 	"smt/models"
@@ -221,7 +222,7 @@ func ListSecrets(c *gin.Context) {
 	var UserId int
 	var output []ListSecret
 
-	var results []models.Secret
+	//var results []models.Secret
 	s := models.Secret{}
 
 	// Get userId that we stored in the context earlier
@@ -232,6 +233,20 @@ func ListSecrets(c *gin.Context) {
 		UserId = val.(int)
 	}
 
+	secretList, err := models.SecretsGetAllowed(&s, UserId)
+	if err != nil {
+		errString := fmt.Sprintf("error getting allowed secrets : '%s'", err)
+		log.Printf("ListSecrets %s\n", errString)
+		c.JSON(http.StatusBadRequest, gin.H{"error": errString})
+		return
+	}
+
+	// Extract the normal secret fields from the allowed list
+	for _, secret := range secretList {
+		output = append(output, ListSecret(secret.Secret))
+	}
+
+	/*
 		// Work out which safe to query for this user if the safe was not specified
 		safeList, err := models.UserGetSafesAllowed(int(UserId))
 
@@ -267,6 +282,7 @@ func ListSecrets(c *gin.Context) {
 		for _, v := range results {
 			output = append(output, ListSecret(v))
 		}
+	*/
 
 	// output results as json
 	c.JSON(http.StatusOK, gin.H{"message": "success", "data": output})

controllers/store_secrets.go

@@ -336,7 +336,7 @@ func UpdateSecret(c *gin.Context) {
 func DeleteSecret(c *gin.Context) {
 	var err error
 	var input SecretInput
-	var user_id int
+	var UserId int
 
 	if err := c.ShouldBindJSON(&input); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "DeleteSecret error binding to input JSON : " + err.Error()})
@@ -350,7 +350,7 @@ func DeleteSecret(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "error determining user"})
 		return
 	} else {
-		user_id = val.(int)
+		UserId = val.(int)
 		//log.Printf("user_id: %v\n", user_id)
 	}
 
@@ -361,7 +361,7 @@ func DeleteSecret(c *gin.Context) {
 	s.DeviceName = input.DeviceName
 	s.DeviceCategory = input.DeviceCategory
 
-	secretList, err := models.SecretsGetAllowed(&s, user_id)
+	secretList, err := models.SecretsGetAllowed(&s, UserId)
 	if err != nil {
 		errString := fmt.Sprintf("error getting allowed secrets : '%s'", err)
 		log.Printf("DeleteSecret %s\n", errString)