Merge pull request #85 from SURFnet/bugfix/null-second-factor-id

Don't attempt to fetch second factor when id is null
OpenConext · Sep 30, 2015 · 5d42ed6 · 5d42ed6
2 parents ac3bdb2 + 49c88ad
commit 5d42ed6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Surfnet/StepupGateway/GatewayBundle/EventListener/SecondFactorLocaleListener.php b/src/Surfnet/StepupGateway/GatewayBundle/EventListener/SecondFactorLocaleListener.php
@@ -45,8 +45,11 @@ public function __construct(ResponseContext $responseContext, SecondFactorServic
     public function setRequestLocale(GetResponseEvent $event)
     {
         $secondFactorId = $this->responseContext->getSelectedSecondFactor();
-        $secondFactor = $this->secondFactorService->findByUuid($secondFactorId);
+        if (!$secondFactorId) {
+            return;
+        }
 
+        $secondFactor = $this->secondFactorService->findByUuid($secondFactorId);
         if (!$secondFactor) {
             return;
         }