https://github.com/danieleteti/delphimvcframework/issues/667

danieleteti · Jun 21, 2023 · 17d9afc · 17d9afc
1 parent 0374d8f
commit 17d9afc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -233,6 +233,7 @@ Congratulations to Daniele Teti and all the staff for the excellent work!" -- Ma
 
 - Added support for dotEnv multiline keys - added dotEnv show case
 - 🐞 FIX [Issue 664](https://github.com/danieleteti/delphimvcframework/issues/664) Thanks to [MPannier](https://github.com/MPannier)
+- 🐞 FIX [Issue 667](https://github.com/danieleteti/delphimvcframework/issues/667)
 
 
 

diff --git a/samples/concurrency_speed_test/locusttest/run.bat b/samples/concurrency_speed_test/locusttest/run.bat
@@ -0,0 +1 @@
+locust --host http://localhost:8080 --autostart -u 200 -r 100
diff --git a/sources/MVCFramework.Middleware.JWT.pas b/sources/MVCFramework.Middleware.JWT.pas
@@ -372,7 +372,7 @@ procedure TMVCJWTAuthenticationMiddleware.OnBeforeRouting(AContext: TWebContext;
       LPassword := TNetEncoding.URL.Decode(AContext.Request.Headers[FPasswordHeaderName]);
 
       // read from content
-      if LUsername.IsEmpty then
+      if LUsername.IsEmpty and not SameText(AContext.Request.ContentMediaType, TMVCMediaType.APPLICATION_JSON) then
       begin
         LUsername := AContext.Request.ContentParam(FUserNameHeaderName);
         LPassword := AContext.Request.ContentParam(FPasswordHeaderName);
@@ -381,11 +381,7 @@ procedure TMVCJWTAuthenticationMiddleware.OnBeforeRouting(AContext: TWebContext;
       // read from json content
       if LUsername.IsEmpty then
       begin
-        lJObj := nil;
-        try
-          lJObj := TJsonBaseObject.Parse(AContext.Request.Body) as TJsonObject;
-        except
-        end;
+        lJObj := StrToJSONObject(AContext.Request.Body, False);
         try
           if Assigned(lJObj) then
           begin

diff --git a/sources/MVCFramework.Serializer.JsonDataObjects.pas b/sources/MVCFramework.Serializer.JsonDataObjects.pas
@@ -3673,7 +3673,11 @@ function StrToJSONObject(const AValue: string; ARaiseExceptionOnError: Boolean):
     on E: Exception do
     begin
       lJSON.Free;
-      raise EMVCDeserializationException.Create('Invalid JSON Object - ' + E.Message);
+      Result := nil;
+      if ARaiseExceptionOnError then
+      begin
+        raise EMVCDeserializationException.Create('Invalid JSON Object - ' + E.Message);
+      end;
     end;
   end;
 end;
@@ -3694,7 +3698,11 @@ function StrToJSONArray(const AValue: string; ARaiseExceptionOnError: Boolean):
     on E: Exception do
     begin
       lJSON.Free;
-      raise EMVCDeserializationException.Create('Invalid JSON Array - ' + E.Message);
+      Result := nil;
+      if ARaiseExceptionOnError then
+      begin
+        raise EMVCDeserializationException.Create('Invalid JSON Array - ' + E.Message);
+      end;
     end;
   end;
 end;