Merge pull request #160 from zendesk/PEGASUS-984-authenticate-sso-end…

…point-for-admin Ensure we break early for failure conditions
agnostack · Jul 2, 2020 · 79eff3a · 79eff3a
2 parents ebe4973 + d448597
commit 79eff3a
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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();