Merge branch '4.4' into 5.1

chalasr · chalasr · commit a7521556cd91 · 2021-01-17T11:37:09.000+01:00
* 4.4:
  [Security] Replace message data in JSON security error response
  [DI] Skip deprecated definitions in CheckTypeDeclarationsPass
  [DoctrineBridge] Take into account that indexBy="person_id" could be a db column name, for a referenced entity
diff --git a/Firewall/UsernamePasswordJsonAuthenticationListener.php b/Firewall/UsernamePasswordJsonAuthenticationListener.php
@@ -182,7 +182,9 @@ private function onFailure(Request $request, AuthenticationException $failed): R
         }
 
         if (!$this->failureHandler) {
-            return new JsonResponse(['error' => $failed->getMessageKey()], 401);
+            $errorMessage = strtr($failed->getMessageKey(), $failed->getMessageData());
+
+            return new JsonResponse(['error' => $errorMessage], 401);
         }
 
         $response = $this->failureHandler->onAuthenticationFailure($request, $failed);

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,9 @@ private function onFailure(Request $request, AuthenticationException $failed): R`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`if (!$this->failureHandler) {`
`185`		`- return new JsonResponse(['error' => $failed->getMessageKey()], 401);`
	`185`	`+ $errorMessage = strtr($failed->getMessageKey(), $failed->getMessageData());`
	`186`	`+`
	`187`	`+ return new JsonResponse(['error' => $errorMessage], 401);`
`186`	`188`	`}`
`187`	`189`
`188`	`190`	`$response = $this->failureHandler->onAuthenticationFailure($request, $failed);`