From fdfc1f138ec498332e8e4715524e07fce058ac64 Mon Sep 17 00:00:00 2001
From: Toan Nguyen <toanguyen@zendesk.com>
Date: Tue, 30 Jun 2020 16:32:44 +1000
Subject: [PATCH] Redirect to default un-authorized zendesk url when SSO is
 disabled

---
 .../community/Zendesk/Zendesk/controllers/SsoController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php b/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
index 516c4d53..57bd7464 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
@@ -27,13 +27,13 @@ public function loginAction()
     {
         $return_url = Mage::helper('core')->urlDecode($this->getRequest()->getParam('return_url', ""));
         if(!Mage::getStoreConfig('zendesk/sso_frontend/enabled')) {
-            $this->_redirectUrl($return_url ? $return_url : Mage::helper('zendesk')->getZendeskUnauthUrl());
+            $this->_redirectUrl(Mage::helper('zendesk')->getZendeskUnauthUrl());
             return $this;
         }
 
         $domain = Mage::getStoreConfig('zendesk/general/domain');
         $token = Mage::getStoreConfig('zendesk/sso_frontend/token');
-        
+
         if(!Zend_Validate::is($domain, 'NotEmpty')) {
             Mage::log(Mage::helper('zendesk')->__('Zendesk domain not set. Please add this to the settings page.'), null, 'zendesk.log');
             $this->_redirect('/');
@@ -77,7 +77,7 @@ public function loginAction()
 
         $jwt = JWT::encode($payload, $token);
         $return_url = $return_url ? "&return_to=".$return_url : "";
-        
+
         $url = "https://".$domain."/access/jwt?jwt=" . $jwt.$return_url;
 
         Mage::log('End-user URL: ' . $url, null, 'zendesk.log');