Merge pull request #53 from max-mi/master

The JWT payload must be sent to Zendesk subdomain using the https protocol

Author: Jason Smale

src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php

@@ -24,7 +24,11 @@ public function __construct()
     }
 
     public function getSubmitAction() {
-        $url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode("http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new")));
+        if (!$return_url = Mage::getStoreConfig('zendesk/sso_frontend/new')) {
+            $return_url = "http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new";
+        }
+        $url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode($return_url)));
+
         return $url;
     }
 }

src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php

@@ -119,7 +119,7 @@ public function authenticateAction()
         $jwt = JWT::encode($payload, $token);
         $return = $return_url ? "&return_to=".$return_url : "";
 
-        $url = "http://".$domain."/access/jwt?jwt=" . $jwt . $return;
+        $url = "https://".$domain."/access/jwt?jwt=" . $jwt . $return;
 
         Mage::log('Admin URL: ' . $url, null, 'zendesk.log');
 
@@ -202,7 +202,7 @@ public function launchAction()
         $sso = Mage::getStoreConfig('zendesk/sso/enabled');
 
         if (!$sso) {
-            $url = "http://".$domain;
+            $url = "https://".$domain;
         } elseif(Mage::helper('zendesk')->isSSOAdminUsersEnabled()) {
             $url = Mage::helper('zendesk')->getSSOAuthUrlAdminUsers();
         } else {

src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php

@@ -80,7 +80,7 @@ public function loginAction()
         $jwt = JWT::encode($payload, $token);
         $return_url = $return_url ? "&return_to=".$return_url : "";
 
-        $url = "http://".$domain."/access/jwt?jwt=" . $jwt.$return_url;
+        $url = "https://".$domain."/access/jwt?jwt=" . $jwt.$return_url;
 
         Mage::log('End-user URL: ' . $url, null, 'zendesk.log');
 

src/app/code/community/Zendesk/Zendesk/etc/system.xml

@@ -170,6 +170,15 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </token>
+                        <new translate="label comment">
+                            <label>New Ticket Link</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>3</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[ https://yourdomain.zendesk.com/requests/new will be used by default]]></comment>
+                        </new>
                     </fields>
                 </sso_frontend>
                 <frontend_features translate="label comment">

src/app/locale/en_US/Zendesk_Zendesk.csv

@@ -110,3 +110,4 @@
 "Show "All" tab on dashboard","Show "All" tab on dashboard"
 "Generate New Token","Generate New Token"
 "Token cannot be empty","Token cannot be empty"
+"New Ticket Link","New Ticket Link"