From a4a25164d0faffa495ae96ac19b093ba7434ba38 Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 11:49:59 +1100
Subject: [PATCH] getting closer

---
 controllers/store_secrets.go | 20 ++++++++++----------
 middlewares/middlewares.go   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/controllers/store_secrets.go b/controllers/store_secrets.go
index fae5500..787d36f 100644
--- a/controllers/store_secrets.go
+++ b/controllers/store_secrets.go
@@ -191,7 +191,7 @@ func CheckUpdateSecretAllowed(s *models.Secret, user_id int) (int, error) {
 func UpdateSecret(c *gin.Context) {
 	var err error
 	var input StoreInput
-	//var user_id int
+	var user_id int
 
 	if err := c.ShouldBindJSON(&input); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "UpdateSecret error binding to input JSON : " + err.Error()})
@@ -218,15 +218,15 @@ func UpdateSecret(c *gin.Context) {
 		}
 	*/
 	log.Printf("c.Keys: %v\n", c.Keys)
-	user_id := c.GetInt("user-id")
-	/*
-		if val, ok := c.Get("user-id"); !ok {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "error determining user"})
-			return
-		} else {
-			user_id = val.(int)
-		}
-	*/
+	//user_id := c.GetInt("user-id")
+
+	if val, ok := c.Get("user-id"); !ok {
+		c.JSON(http.StatusBadRequest, gin.H{"error": "error determining user"})
+		return
+	} else {
+		user_id = val.(int)
+	}
+
 	log.Printf("user_id: %v\n", user_id)
 
 	// Populate fields
diff --git a/middlewares/middlewares.go b/middlewares/middlewares.go
index a0c7b60..1c115f3 100644
--- a/middlewares/middlewares.go
+++ b/middlewares/middlewares.go
@@ -30,7 +30,7 @@ func JwtAuthMiddleware() gin.HandlerFunc {
 		}
 		// Store user id in context for accessing later
 		//log.Printf("JwtAuthMiddleware storing user-id '%d'\n", user_id)
-		c.Set("user-id", user_id)
+		c.Set("user-id", int(user_id))
 
 		c.Next()
 	}
@@ -57,7 +57,7 @@ func JwtAuthAdminMiddleware() gin.HandlerFunc {
 			return
 		}
 		//log.Printf("JwtAuthAdminMiddleware determined user id as '%v'\n", user_id)
-		c.Set("user-id", user_id)
+		c.Set("user-id", int(user_id))
 
 		/*
 			//user_id := c.GetInt("user-id")