chore: remove get/set provision token from API authorize

Author: rsbowers

src/app/code/community/Zendesk/Zendesk/Helper/Data.php

@@ -154,29 +154,6 @@ public function setApiToken($token = null)
         return $token;
     }
 
-    public function getProvisionToken($generate = false)
-    {
-        $token = Mage::getStoreConfig('zendesk/hidden/provision_token', 0);
-
-        if( (!$token || strlen(trim($token)) == 0) && $generate) {
-            $token = $this->setProvisionToken();
-        }
-
-        return $token;
-    }
-
-    public function setProvisionToken($token = null)
-    {
-        if(!$token) {
-            $token = hash('sha256', Mage::helper('oauth')->generateToken());
-        }
-
-        Mage::getModel('core/config')->saveConfig('zendesk/hidden/provision_token', $token, 'default');
-        Mage::getConfig()->removeCache();
-
-        return $token;
-    }
-
     public function getOrderDetail($order)
     {
         // if the admin site has a custom URL, use it

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

@@ -67,45 +67,39 @@ public function _authorise()
         }
 
         $apiToken = Mage::helper('zendesk')->getApiToken(false);
-        $provisionToken = Mage::helper('zendesk')->getProvisionToken(false);
-
-        // Provisioning tokens are always accepted, hence why they are deleted after the initial process
-        if(!$provisionToken || $token != $provisionToken) {
-            // Use of the provisioning token "overrides" the configuration for the API, so we check this after
-            // confirming the provisioning token has not been sent
-            if(!Mage::getStoreConfig('zendesk/api/enabled')) {
-                $this->getResponse()
-                    ->setBody(json_encode(array('success' => false, 'message' => 'API access disabled')))
-                    ->setHttpResponseCode(403)
-                    ->setHeader('Content-type', 'application/json', true);
+        
+        if(!Mage::getStoreConfig('zendesk/api/enabled')) {
+            $this->getResponse()
+                ->setBody(json_encode(array('success' => false, 'message' => 'API access disabled')))
+                ->setHttpResponseCode(403)
+                ->setHeader('Content-type', 'application/json', true);
 
-                Mage::log('API access disabled.', null, 'zendesk.log');
+            Mage::log('API access disabled.', null, 'zendesk.log');
 
-                return false;
-            }
+            return false;
+        }
 
-            // If the API is enabled then check the token
-            if(!$token) {
-                $this->getResponse()
-                    ->setBody(json_encode(array('success' => false, 'message' => 'No authorisation token provided')))
-                    ->setHttpResponseCode(401)
-                    ->setHeader('Content-type', 'application/json', true);
+        // If the API is enabled then check the token
+        if(!$token) {
+            $this->getResponse()
+                ->setBody(json_encode(array('success' => false, 'message' => 'No authorisation token provided')))
+                ->setHttpResponseCode(401)
+                ->setHeader('Content-type', 'application/json', true);
 
-                Mage::log('No authorisation token provided.', null, 'zendesk.log');
+            Mage::log('No authorisation token provided.', null, 'zendesk.log');
 
-                return false;
-            }
+            return false;
+        }
 
-            if($token != $apiToken) {
-                $this->getResponse()
-                    ->setBody(json_encode(array('success' => false, 'message' => 'Not authorised')))
-                    ->setHttpResponseCode(401)
-                    ->setHeader('Content-type', 'application/json', true);
+        if($token != $apiToken) {
+            $this->getResponse()
+                ->setBody(json_encode(array('success' => false, 'message' => 'Not authorised')))
+                ->setHttpResponseCode(401)
+                ->setHeader('Content-type', 'application/json', true);
 
-                Mage::log('Not authorised.', null, 'zendesk.log');
+            Mage::log('Not authorised.', null, 'zendesk.log');
 
-                return false;
-            }
+            return false;
         }
 
         return true;