From 17fc1f2e66d04a2c374d6237cd0ba45c65e4c24c Mon Sep 17 00:00:00 2001
From: Nathan Coad <nathan@thecoads.com>
Date: Tue, 9 Jan 2024 11:40:26 +1100
Subject: [PATCH] re-test

---
 middlewares/middlewares.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/middlewares/middlewares.go b/middlewares/middlewares.go
index 6f3335e..fd2e4eb 100644
--- a/middlewares/middlewares.go
+++ b/middlewares/middlewares.go
@@ -59,7 +59,15 @@ func JwtAuthAdminMiddleware() gin.HandlerFunc {
 			log.Printf("JwtAuthAdminMiddleware determined user id as '%v'\n", user_id)
 		*/
 
-		user_id := c.GetInt("user-id")
+		//user_id := c.GetInt("user-id")
+		var user_id int
+		if val, ok := c.Get("user-id"); !ok {
+			log.Printf("JwtAuthAdminMiddleware : user-id not in context. Keys : '%+v'\n", c.Keys)
+			c.JSON(http.StatusBadRequest, gin.H{"error": "error determining user id"})
+			return
+		} else {
+			user_id = val.(int)
+		}
 
 		if user_id == 0 {
 			errString := "could not extract user ID from context"