fix: fix minor bugs

Author: hirale

app/code/core/Mage/Api2/Model/Auth/Adapter/Oauth2.php

@@ -52,7 +52,7 @@ public function getUserParams(Mage_Api2_Model_Request $request)
      * Validate the OAuth2 token
      *
      * @param Mage_Api2_Model_Request $request
-     * @return Mage_Oauth2_Model_Token
+     * @return Mage_Oauth2_Model_AccessToken
      * @throws Exception
      */
     protected function _validateToken(Mage_Api2_Model_Request $request)

app/code/core/Mage/Oauth2/Block/Adminhtml/Client/Edit/Form.php

@@ -65,7 +65,7 @@ protected function _prepareForm()
             'required' => true
         ]);
 
-        $form->setAction($this->getUrl('*/*/save'));
+        $form->setAction($this->getUrl('*/*/save', ['id' => $this->getModel()->getId()]));
         $form->setUseContainer(true);
         $this->setForm($form);
         return parent::_prepareForm();

app/code/core/Mage/Oauth2/Block/Adminhtml/Device.php

@@ -17,16 +17,14 @@ public function generateClientSecret($length = 40)
     /**
      * Generate a token
      *
-     * @param string $clientId The client ID
      * @param int $length The length of the token (default: 40)
      * @return string The generated token
      * @throws Exception if unable to generate random bytes
      */
-    public function generateToken($clientId, $length = 40)
+    public function generateToken($length = 40)
     {
-        $randomPart = $this->generateRandomString($length - 8);
-        $clientPart = substr(hash('crc32b', $clientId), 0, 8);
-        return $randomPart . $clientPart;
+        return $this->generateRandomString($length);
+        ;
     }
 
     /**

app/code/core/Mage/Oauth2/Helper/Data.php

@@ -2,8 +2,8 @@
 
 class Mage_Oauth2_Model_AccessToken extends Mage_Core_Model_Abstract
 {
-    const USER_TYPE_ADMIN = 'admin';
-    const USER_TYPE_CUSTOMER = 'customer';
+    public const USER_TYPE_ADMIN = 'admin';
+    public const USER_TYPE_CUSTOMER = 'customer';
 
     protected function _construct()
     {
@@ -13,7 +13,7 @@ protected function _construct()
     /**
      * Get user type associated with the token
      *
-     * @return string
+     * @return string|null
      * @throws Mage_Core_Exception
      */
     public function getUserType()

app/code/core/Mage/Oauth2/Model/AccessToken.php

@@ -10,4 +10,4 @@ protected function _construct()
         $this->_init('oauth2/access_token', 'access_token');
         $this->_isPkAutoIncrement = false;
     }
-}
+}

app/code/core/Mage/Oauth2/Model/Resource/AccessToken.php

@@ -9,4 +9,4 @@ protected function _construct()
     {
         $this->_init('oauth2/access_token');
     }
-}
+}

app/code/core/Mage/Oauth2/Model/Resource/AccessToken/Collection.php

@@ -10,4 +10,4 @@ protected function _construct()
         $this->_init('oauth2/auth_code', 'authorization_code');
         $this->_isPkAutoIncrement = false;
     }
-}
+}

app/code/core/Mage/Oauth2/Model/Resource/AuthCode.php

@@ -9,4 +9,4 @@ protected function _construct()
     {
         $this->_init('oauth2/client');
     }
-}
+}

app/code/core/Mage/Oauth2/Model/Resource/Client/Collection.php

@@ -72,13 +72,13 @@ public function newAction()
     {
         $model = $this->_initClientModel();
         $formData = $this->_getFormData();
-        
+
         if ($formData) {
             $model->addData($formData);
         } else {
             $model->setSecret(Mage::helper('oauth2')->generateClientSecret());
         }
-        
+
         $this->_setFormData($formData ?: $model->getData());
         Mage::register('current_oauth2_client', $model);
 
@@ -198,11 +198,11 @@ protected function _filter(array $data)
         foreach ($fieldsToRemove as $field) {
             unset($data[$field]);
         }
-        
+
         if (isset($data['grant_types'])) {
             $data['grant_types'] = implode(',', $data['grant_types']);
         }
-        
+
         return $data;
     }
 
@@ -230,7 +230,7 @@ private function _loadModelById($model, $id)
             $this->_redirect('*/*/index');
             return false;
         }
-        
+
         $model->load($id);
 
         if (!$model->getId()) {
@@ -257,7 +257,7 @@ private function _handleSaveException($e, $data = null)
         $message = $e instanceof Mage_Core_Exception ? Mage::helper('core')->escapeHtml($e->getMessage()) : $this->__('An error occurred on saving client data.');
         $this->_getSession()->addError($message);
         $this->getRequest()->setParam('back', 'edit');
-        
+
         if ($e instanceof Exception && !($e instanceof Mage_Core_Exception)) {
             Mage::logException($e);
         }
@@ -276,4 +276,4 @@ private function _redirectAfterSave($model)
             $this->_redirect('*/*/index');
         }
     }
-}
+}

app/code/core/Mage/Oauth2/controllers/Adminhtml/Oauth2/ClientController.php

@@ -138,7 +138,7 @@ protected function _getCustomerId($params)
      */
     protected function _authorizeClient($client, $customerId, $redirectUri)
     {
-        $authorizationCode = $this->_getOauth2Helper()->generateToken($client->getId());
+        $authorizationCode = $this->_getOauth2Helper()->generateToken();
         $model = Mage::getModel('oauth2/authCode');
         $model->setAuthorizationCode($authorizationCode)
             ->setClientId($client->getId())