Updated middleware for username and session ID as context parameters

Author: PythonHacker24

api/middleware/middleware.go

@@ -5,8 +5,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/PythonHacker24/linux-acl-management-backend/internal/token"
 	"go.uber.org/zap"
+
+	"github.com/PythonHacker24/linux-acl-management-backend/internal/token"
 )
 
 /* logging middleware for http requests */
@@ -32,11 +33,14 @@ func LoggingMiddleware(next http.HandlerFunc) http.HandlerFunc {
 	})
 }
 
-/* authentication middleware for http requests */
+/* 
+	authentication middleware for http requests 
+	return username and sessionID with context
+*/
 func AuthenticationMiddleware(next http.HandlerFunc) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		/* authenticate the request through JWT */
-		username, err := token.ExtractUsernameFromRequest(r)
+		username, sessionID, err := token.ExtractDataFromRequest(r)
 		if err != nil {
 			zap.L().Error("Error during authentication",
 				zap.Error(err),
@@ -47,8 +51,9 @@ func AuthenticationMiddleware(next http.HandlerFunc) http.HandlerFunc {
 		/* set the header with the username */
 		r.Header.Set("X-User", username)
 
-		/* pass username as context */
-		ctx := context.WithValue(r.Context(), "username", username)
+		/* pass username and sessionID as context */
+		ctx := context.WithValue(r.Context(), ContextKeyUsername, username)
+		ctx = context.WithValue(ctx, ContextKeySessionID, sessionID)
 
 		/* return the handler */
 		next(w, r.WithContext(ctx))