updated file structure and code style

Author: itprodev

lib/Exception/ApiConnectionException.php

@@ -7,4 +7,5 @@
  * the SDK can't connect to Magic's servers.
  */
 
-class ApiConnectionException extends MagicException {} 
+class ApiConnectionException extends MagicException {}
+

lib/Exception/ApiException.php

@@ -6,4 +6,5 @@
  * Other api request exception
  */ 
 
-class ApiException extends RequestException {} 
+class ApiException extends RequestException {} 
+

lib/Exception/AuthenticationException.php

@@ -7,4 +7,5 @@
  * the API secret key is missing.
  */
 
-class AuthenticationException extends RequestException {} 
+class AuthenticationException extends RequestException {} 
+

lib/Exception/BadRequestException.php

@@ -9,5 +9,4 @@
 
 class BadRequestException extends RequestException {} 
 
-
-    
+ 

lib/Exception/DidTokenException.php

@@ -8,4 +8,5 @@
  * signature mismatch between "proof" and "claim".
  */
 
-class DIDTokenException extends MagicException {} 
+class DIDTokenException extends MagicException {} 
+

lib/Exception/ForbiddenException.php

@@ -9,5 +9,4 @@
 
 class ForbiddenException extends RequestException {} 
 
-
-    
+ 

lib/Exception/MagicException.php

@@ -22,4 +22,5 @@ public function getErrorMessage() {
     public function getRepr() {
         return __class__ . '(message=' . $this->_message . ')';
     }
-}    
+}    
+

lib/Exception/RateLimitException.php

@@ -7,4 +7,5 @@
  * the SDK has sent too many requests to server in a given amount of time.
  */
 
-class RateLimitException extends RequestException {} 
+class RateLimitException extends RequestException {} 
+

lib/Exception/RequestException.php

@@ -48,4 +48,4 @@ public function getRepr() {
             ', http_code=' . $this->http_code . ')';
     }
 
-} 
+}

lib/HttpClient.php

@@ -17,20 +17,16 @@
 
 class RequestsClient {
 
-    public $_retries;
     public $_timeout;
-    public $_backoff_factor;
     public $_base_url;
     public $_api_secret_key;
     public $ch;
 
-    public function __construct($api_secret_key, $retries, $timeout, $backoff_factor) {
+    public function __construct($api_secret_key, $timeout) {
 
         $this->_api_secret_key = $api_secret_key;
         $this->_base_url = API_MAGIC_BASE_URL;
-        $this->_retries = $retries;
         $this->_timeout = $timeout;
-        $this->_backoff_factor = $backoff_factor;
     }
 
     public function _setup_curl() {
@@ -182,10 +178,5 @@ public function _parse_and_convert_to_api_response($resp_content, $resp_info, $m
                 $method
             );
         } 
-    } 
-
-    public function _micro_time_count() {
-        list($usec, $sec) = explode(" ", microtime());
-        return ((float)$usec + (float)$sec);
     }
-}
+}

lib/Magic.php

@@ -5,9 +5,7 @@
 use MagicAdmin\Exception;
 use MagicAdmin\Resource;
 
-define("RETRIES", 3);
-define("TIMEOUT", 10);
-define("BACKOFF_FACTOR", 0.02);
+define("TIMEOUT", 10); 
 
 class Magic {
 
@@ -18,16 +16,10 @@ class Magic {
 
     public function __construct(
         $api_secret_key = null,
-        $retries = RETRIES,
         $timeout = TIMEOUT,
-        $backoff_factor = BACKOFF_FACTOR
-    ) {        
-        $this->_set_api_secret_key($api_secret_key);
-        $this->token = new \MagicAdmin\Resource\Token();
-        $this->user = new \MagicAdmin\Resource\User($this->api_secret_key, $retries, $timeout, $backoff_factor);
-    }
-
-    public function _set_api_secret_key($api_secret_key) {
+    ) {
         $this->api_secret_key = $api_secret_key;
-    }
-}
+        $this->token = new \MagicAdmin\Resource\Token();
+        $this->user = new \MagicAdmin\Resource\User($this->api_secret_key, $timeout);
+    } 
+}

lib/Resource/User.php

@@ -12,9 +12,9 @@ class User {
     public $request_client;
     public $token;
 
-    public function __construct($api_secret_key, $retries, $timeout, $backoff_factor) {
+    public function __construct($api_secret_key, $timeout) {
         $this->token = new Token();
-        $this->request_client = new \MagicAdmin\RequestsClient($api_secret_key, $retries, $timeout, $backoff_factor);
+        $this->request_client = new \MagicAdmin\RequestsClient($api_secret_key, $timeout);
     }
 
     public function get_metadata_by_issuer($issuer) {

lib/Response.php

@@ -12,4 +12,4 @@ public function __construct($content, $resp_data, $status_code) {
     $this->status_code = $status_code;
     $this->data = $resp_data;
   }
-}
+}