From a2a9e2b788b77ec2d8333fd9c59ae757658022d2 Mon Sep 17 00:00:00 2001
From: afeiszli <alex.feiszli@gmail.com>
Date: Mon, 23 May 2022 10:57:42 -0400
Subject: [PATCH] changing auth params to ID from MacAddress

---
 controllers/node.go | 31 +++++++------------------------
 models/structs.go   |  4 ++--
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/controllers/node.go b/controllers/node.go
index 249e3ae0..ac1ce0d5 100644
--- a/controllers/node.go
+++ b/controllers/node.go
@@ -38,9 +38,6 @@ func nodeHandlers(r *mux.Router) {
 
 func authenticate(response http.ResponseWriter, request *http.Request) {
 
-	var params = mux.Vars(request)
-	networkname := params["network"]
-
 	var authRequest models.AuthParams
 	var result models.Node
 	var errorResponse = models.ErrorResponse{
@@ -58,8 +55,8 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 		return
 	} else {
 		errorResponse.Code = http.StatusBadRequest
-		if authRequest.MacAddress == "" {
-			errorResponse.Message = "W1R3: MacAddress can't be empty"
+		if authRequest.ID == "" {
+			errorResponse.Message = "W1R3: ID can't be empty"
 			returnErrorResponse(response, request, errorResponse)
 			return
 		} else if authRequest.Password == "" {
@@ -67,22 +64,8 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 			returnErrorResponse(response, request, errorResponse)
 			return
 		} else {
-
-			collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
-			if err != nil {
-				errorResponse.Code = http.StatusBadRequest
-				errorResponse.Message = err.Error()
-				returnErrorResponse(response, request, errorResponse)
-				return
-			}
-			for _, value := range collection {
-				if err := json.Unmarshal([]byte(value), &result); err != nil {
-					continue
-				}
-				if (result.ID == authRequest.ID || result.MacAddress == authRequest.MacAddress) && result.IsPending != "yes" && result.Network == networkname {
-					break
-				}
-			}
+			var err error
+			result, err = logic.GetNodeByID(authRequest.ID)
 
 			if err != nil {
 				errorResponse.Code = http.StatusBadRequest
@@ -109,10 +92,10 @@ func authenticate(response http.ResponseWriter, request *http.Request) {
 
 				var successResponse = models.SuccessResponse{
 					Code:    http.StatusOK,
-					Message: "W1R3: Device " + authRequest.MacAddress + " Authorized",
+					Message: "W1R3: Device " + authRequest.ID + " Authorized",
 					Response: models.SuccessfulLoginResponse{
-						AuthToken:  tokenString,
-						MacAddress: authRequest.MacAddress,
+						AuthToken: tokenString,
+						ID:        authRequest.ID,
 					},
 				}
 				successJSONResponse, jsonError := json.Marshal(successResponse)
diff --git a/models/structs.go b/models/structs.go
index 5ddb6133..63cd3f31 100644
--- a/models/structs.go
+++ b/models/structs.go
@@ -61,8 +61,8 @@ type Claims struct {
 
 // SuccessfulLoginResponse is struct to send the request response
 type SuccessfulLoginResponse struct {
-	MacAddress string
-	AuthToken  string
+	ID        string
+	AuthToken string
 }
 
 // ErrorResponse is struct for error