getting closer

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")
+	//user_id := c.GetInt("user-id")
-	/*
+
-		if val, ok := c.Get("user-id"); !ok {
+	if val, ok := c.Get("user-id"); !ok {
-			c.JSON(http.StatusBadRequest, gin.H{"error": "error determining user"})
+		c.JSON(http.StatusBadRequest, gin.H{"error": "error determining user"})
-			return
+		return
-		} else {
+	} else {
-			user_id = val.(int)
+		user_id = val.(int)
-		}
+	}
-	*/
+
 	log.Printf("user_id: %v\n", user_id)
 
 	// Populate fields

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")