Explorar o código

check for user role after decoding

Abhishek Kondur hai 1 ano
pai
achega
5c878eac22
Modificáronse 1 ficheiros con 9 adicións e 10 borrados
  1. 9 10
      controllers/user.go

+ 9 - 10
controllers/user.go

@@ -62,6 +62,15 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 		return
 	}
 
+	decoder := json.NewDecoder(request.Body)
+	decoderErr := decoder.Decode(&authRequest)
+	defer request.Body.Close()
+	if decoderErr != nil {
+		logger.Log(0, "error decoding request body: ",
+			decoderErr.Error())
+		logic.ReturnErrorResponse(response, request, errorResponse)
+		return
+	}
 	if val := request.Header.Get("From-Ui"); val == "true" {
 		// request came from UI, if normal user block Login
 		user, err := logic.GetUser(authRequest.UserName)
@@ -76,16 +85,6 @@ func authenticateUser(response http.ResponseWriter, request *http.Request) {
 			return
 		}
 	}
-
-	decoder := json.NewDecoder(request.Body)
-	decoderErr := decoder.Decode(&authRequest)
-	defer request.Body.Close()
-	if decoderErr != nil {
-		logger.Log(0, "error decoding request body: ",
-			decoderErr.Error())
-		logic.ReturnErrorResponse(response, request, errorResponse)
-		return
-	}
 	username := authRequest.UserName
 	jwt, err := logic.VerifyAuthRequest(authRequest)
 	if err != nil {