Update Auth.php

Author: rgodiyal

src/Auth.php

@@ -2,44 +2,36 @@
 
 namespace RahulGodiyal\PhpUpsApiWrapper;
 
+use RahulGodiyal\PhpUpsApiWrapper\Utils\HttpClient;
+
 class Auth
 {
-    private $_mode;
-    private $_dev_api_base_url;
-    private $_prod_api_base_url;
+    private const DEV_API_BASE_URL = 'https://wwwcie.ups.com';
+    private const PROD_API_BASE_URL = 'https://onlinetools.ups.com';
+
+    private string $mode = 'DEV';
 
-    public function __construct()
+    public function setMode(string $mode): self
     {
-        $this->_mode = 'DEV';
-        $this->_dev_api_base_url = 'https://wwwcie.ups.com';
-        $this->_prod_api_base_url = 'https://onlinetools.ups.com';
+        if ($mode === 'PROD') {
+            $this->mode = $mode;
+        }
+
+        return $this;
     }
 
-    /**
-     * Authenticate User
-     * @param string $client_id
-     * @param string $client_secret
-     * @return string $access_token
-     */
-    public function authenticate(String $client_id, String $client_secret)
+    public function authenticate(string $client_id, string $client_secret): array
     {
-        $curl = curl_init();
-
-        curl_setopt_array($curl, [
-            CURLOPT_HTTPHEADER => [
-                "Content-Type: application/x-www-form-urlencoded",
-                "x-merchant-id: string",
-                "Authorization: Basic " . base64_encode($client_id . ":" . $client_secret)
-            ],
-            CURLOPT_POSTFIELDS => $this->_getPayload(),
-            CURLOPT_URL => $this->_getAPIBaseURL() . "/security/v1/oauth/token",
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_CUSTOMREQUEST => "POST",
+        $httpClient = new HttpClient();
+        $httpClient->setHeader([
+            "Content-Type: application/x-www-form-urlencoded",
+            "x-merchant-id: string",
+            "Authorization: Basic " . base64_encode($client_id . ":" . $client_secret)
         ]);
-
-        $response = curl_exec($curl);
-        curl_close($curl);
-        $res = json_decode($response);
+        $httpClient->setPayload("grant_type=client_credentials");
+        $httpClient->setUrl($this->_getAPIBaseURL() . "/security/v1/oauth/token");
+        $httpClient->setMethod("POST");
+        $res = $httpClient->fetch();
 
         if (!isset($res->access_token)) {
             if (isset($res->response)) {
@@ -51,43 +43,16 @@ public function authenticate(String $client_id, String $client_secret)
         }
 
         $access_token = $res->access_token;
-        return ['status' => 'success', 'access_token' => $access_token];
-    }
 
-    /**
-     * Get Payload
-     * @return string
-     */
-    private function _getPayload()
-    {
-        return "grant_type=client_credentials";
-    }
-
-    /**
-     * Set Mode
-     * @param string DEV|PROD
-     */
-    public function setMode(String $mode)
-    {
-        if ($mode === 'PROD') {
-            $this->_mode = $mode;
-            return $mode;
-        }
-
-        $this->_mode = 'DEV';
-        return $mode;
+        return ['status' => 'success', 'access_token' => $access_token];
     }
 
-    /**
-     * Get Api Base URL
-     * @return string url
-     */
-    protected function _getAPIBaseURL()
+    protected function _getAPIBaseURL(): string
     {
-        if ($this->_mode === 'PROD') {
-            return $this->_prod_api_base_url;
+        if ($this->mode === 'PROD') {
+            return self::PROD_API_BASE_URL;
         }
 
-        return $this->_dev_api_base_url;
+        return self::DEV_API_BASE_URL;
     }
 }