From 175e371da908d517bd64483e1ec51476c47742f6 Mon Sep 17 00:00:00 2001
From: Anish Mukherjee <anish.mukherjee1996@gmail.com>
Date: Fri, 20 Jan 2023 18:42:18 +0530
Subject: [PATCH] use host id in jwt claims

---
 controllers/node.go | 18 ++----------------
 logic/jwts.go       |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/controllers/node.go b/controllers/node.go
index 4af5526b..d87744a4 100644
--- a/controllers/node.go
+++ b/controllers/node.go
@@ -53,7 +53,6 @@ func nodeHandlers(r *mux.Router) {
 func authenticate(response http.ResponseWriter, request *http.Request) {
 
 	var authRequest models.AuthParams
-	var result models.Node
 	var errorResponse = models.ErrorResponse{
 		Code: http.StatusInternalServerError, Message: "W1R3: It's not you it's me.",
 	}
@@ -82,20 +81,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 		logic.ReturnErrorResponse(response, request, errorResponse)
 		return
 	}
-	var err error
-	result, err = logic.GetNodeByID(authRequest.ID)
-	if err != nil {
-		result, err = logic.GetDeletedNodeByID(authRequest.ID)
-		if err != nil {
-			errorResponse.Code = http.StatusBadRequest
-			errorResponse.Message = err.Error()
-			logger.Log(0, request.Header.Get("user"),
-				fmt.Sprintf("failed to get node info [%s]: %v", authRequest.ID, err))
-			logic.ReturnErrorResponse(response, request, errorResponse)
-			return
-		}
-	}
-	host, err := logic.GetHost(result.HostID.String())
+	host, err := logic.GetHost(authRequest.ID)
 	if err != nil {
 		errorResponse.Code = http.StatusBadRequest
 		errorResponse.Message = err.Error()
@@ -114,7 +100,7 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 		return
 	}
 
-	tokenString, err := logic.CreateJWT(authRequest.ID, authRequest.MacAddress, result.Network)
+	tokenString, err := logic.CreateJWT(authRequest.ID, authRequest.MacAddress, mux.Vars(request)["network"])
 	if tokenString == "" {
 		errorResponse.Code = http.StatusBadRequest
 		errorResponse.Message = "Could not create Token"
diff --git a/logic/jwts.go b/logic/jwts.go
index 8afe8c3b..0e1716da 100644
--- a/logic/jwts.go
+++ b/logic/jwts.go
@@ -130,7 +130,7 @@ func VerifyUserToken(tokenString string) (username string, networks []string, is
 }
 
 // VerifyToken - [nodes] Only
-func VerifyToken(tokenString string) (nodeID string, mac string, network string, err error) {
+func VerifyToken(tokenString string) (hostID string, mac string, network string, err error) {
 	claims := &models.Claims{}
 
 	// this may be a stupid way of serving up a master key