Authentication(Success|Failure)Handler can now return null

Olivier Dolbeau · Olivier Dolbeau · commit ed9c34822b71 · 2012-01-24T17:57:22.000+01:00
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationFailureHandlerInterface.php
@@ -33,7 +33,7 @@ interface AuthenticationFailureHandlerInterface
      * @param Request                 $request
      * @param AuthenticationException $exception
      *
-     * @return Response the response to return
+     * @return Response|null the response to return
      */
     function onAuthenticationFailure(Request $request, AuthenticationException $exception);
 }
diff --git a/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php b/src/Symfony/Component/Security/Http/Authentication/AuthenticationSuccessHandlerInterface.php
@@ -33,7 +33,7 @@ interface AuthenticationSuccessHandlerInterface
      * @param Request        $request
      * @param TokenInterface $token
      *
-     * @return Response the response to return
+     * @return Response|null the response to return
      */
     function onAuthenticationSuccess(Request $request, TokenInterface $token);
 }
diff --git a/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php b/src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
@@ -192,7 +192,9 @@ private function onFailure(GetResponseEvent $event, Request $request, Authentica
         $this->securityContext->setToken(null);
 
         if (null !== $this->failureHandler) {
-            return $this->failureHandler->onAuthenticationFailure($request, $failed);
+            if (null !== $response = $this->failureHandler->onAuthenticationFailure($request, $failed)) {
+                return $response;
+            }
         }
 
         if (null === $this->options['failure_path']) {
@@ -236,9 +238,11 @@ private function onSuccess(GetResponseEvent $event, Request $request, TokenInter
             $this->dispatcher->dispatch(SecurityEvents::INTERACTIVE_LOGIN, $loginEvent);
         }
 
+        $response = null;
         if (null !== $this->successHandler) {
             $response = $this->successHandler->onAuthenticationSuccess($request, $token);
-        } else {
+        }
+        if (null === $response) {
             $response = $this->httpUtils->createRedirectResponse($request, $this->determineTargetUrl($request));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ interface AuthenticationFailureHandlerInterface`
`33`	`33`	`* @param Request $request`
`34`	`34`	`* @param AuthenticationException $exception`
`35`	`35`	`*`
`36`		`- * @return Response the response to return`
	`36`	`+ * @return Response\|null the response to return`
`37`	`37`	`*/`
`38`	`38`	`function onAuthenticationFailure(Request $request, AuthenticationException $exception);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,9 @@ private function onFailure(GetResponseEvent $event, Request $request, Authentica`
`192`	`192`	`$this->securityContext->setToken(null);`
`193`	`193`
`194`	`194`	`if (null !== $this->failureHandler) {`
`195`		`- return $this->failureHandler->onAuthenticationFailure($request, $failed);`
	`195`	`+ if (null !== $response = $this->failureHandler->onAuthenticationFailure($request, $failed)) {`
	`196`	`+ return $response;`
	`197`	`+ }`
`196`	`198`	`}`
`197`	`199`
`198`	`200`	`if (null === $this->options['failure_path']) {`
`@@ -236,9 +238,11 @@ private function onSuccess(GetResponseEvent $event, Request $request, TokenInter`
`236`	`238`	`$this->dispatcher->dispatch(SecurityEvents::INTERACTIVE_LOGIN, $loginEvent);`
`237`	`239`	`}`
`238`	`240`
	`241`	`+ $response = null;`
`239`	`242`	`if (null !== $this->successHandler) {`
`240`	`243`	`$response = $this->successHandler->onAuthenticationSuccess($request, $token);`
`241`		`- } else {`
	`244`	`+ }`
	`245`	`+ if (null === $response) {`
`242`	`246`	`$response = $this->httpUtils->createRedirectResponse($request, $this->determineTargetUrl($request));`
`243`	`247`	`}`
`244`	`248`