try again

controllers/store_secrets.go

@@ -191,6 +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
 
 	if err := c.ShouldBindJSON(&input); err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "UpdateSecret error binding to input JSON : " + err.Error()})
@@ -216,7 +217,13 @@ func UpdateSecret(c *gin.Context) {
 			return
 		}
 	*/
-	user_id := c.GetInt("user-id")
+	//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

middlewares/middlewares.go

@@ -38,7 +38,7 @@ func JwtAuthMiddleware() gin.HandlerFunc {
 
 func JwtAuthAdminMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
-
+		/*
 			err := token.TokenValid(c)
 			if err != nil {
 				log.Printf("JwtAuthAdminMiddleware token is not valid : '%s'\n", err)
@@ -57,11 +57,22 @@ func JwtAuthAdminMiddleware() gin.HandlerFunc {
 				return
 			}
 			log.Printf("JwtAuthAdminMiddleware determined user id as '%v'\n", user_id)
+		*/
+
+		user_id := c.GetInt("user-id")
+
+		if user_id == 0 {
+			errString := "could not extract user ID from context"
+			log.Printf("JwtAuthAdminMiddleware '%s'\n", errString)
+			c.JSON(http.StatusBadRequest, gin.H{"error": errString})
+			c.Abort()
+			return
+		}
 
 		// TODO determine user role
 
 		//ur, err := models.GetUserRoleByID(user_id)
-		ug, err := models.UserGetGroupByID(user_id)
+		ug, err := models.UserGetGroupByID(uint(user_id))
 
 		if err != nil {
 			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})