From d448597b82b19f7fb5b99e34e3e6569d463a236b Mon Sep 17 00:00:00 2001
From: Toan Nguyen <toanguyen@zendesk.com>
Date: Thu, 2 Jul 2020 10:04:59 +1000
Subject: [PATCH] Ensure we break early for failure conditions

---
 .../Zendesk/controllers/Adminhtml/ZendeskController.php        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
index fc897661..d7c72331 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
@@ -135,6 +135,7 @@ public function authenticateAction()
         if(!Mage::getStoreConfig('zendesk/sso/enabled')) {
             Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Single sign-on disabled.'));
             $this->_redirect(Mage::getSingleton('admin/session')->getUser()->getStartupPageUrl());
+            return $this;
         }
 
         $domain = Mage::getStoreConfig('zendesk/general/domain');
@@ -144,11 +145,13 @@ public function authenticateAction()
         if(!Zend_Validate::is($domain, 'NotEmpty')) {
             Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Zendesk domain not set. Please add this to the settings page.'));
             $this->_redirect(Mage::getSingleton('admin/session')->getUser()->getStartupPageUrl());
+            return $this;
         }
 
         if(!Zend_Validate::is($token, 'NotEmpty')) {
             Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Zendesk SSO token not set. Please add this to the settings page.'));
             $this->_redirect(Mage::getSingleton('admin/session')->getUser()->getStartupPageUrl());
+            return $this;
         }
 
         $now = time();