magic admin php update and adding tests

Author: itprodev

.editorconfig

@@ -4,7 +4,7 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Fortmatic Inc.
+Copyright (c) 2020 Magic Labs Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -41,27 +41,27 @@ If you use Composer, these dependencies should be handled automatically. If you
 Simple usage for login:
 
 ```php
-  $did_token = \MagicAdmin\Util\parse_authorization_header_value(
-    $authorization
-  );
-
-  if ($did_token == null) {
-    throw new \MagicAdmin\Exception\BadRequestException(
-      'Authorization header is missing or header value is invalid'
-    );
-  }
+$did_token = \MagicAdmin\Util\parse_authorization_header_value(
+  $authorization
+);
 
-  $magic = new \MagicAdmin\Magic('YOUR_SECRET_API_KEY');
-  
-  try {
-    $magic->token->validate($did_token);
-    $issuer = $magic->token->get_issuer($did_token);
-    $user_meta = $magic->user->get_metadata_by_issuer($issuer);
-  } catch (Exception $e) {
-    throw new \MagicAdmin\Exception\DIDTokenException(
-      'DID Token is invalid: ' . $e->getMessage()
-    ); 
-  }
+if ($did_token == null) {
+  throw new \MagicAdmin\Exception\BadRequestException(
+    'Authorization header is missing or header value is invalid'
+  );
+}
+
+$magic = new \MagicAdmin\Magic('YOUR_SECRET_API_KEY');
+
+try {
+  $magic->token->validate($did_token);
+  $issuer = $magic->token->get_issuer($did_token);
+  $user_meta = $magic->user->get_metadata_by_issuer($issuer);
+} catch (Exception $e) {
+  throw new \MagicAdmin\Exception\DIDTokenException(
+    'DID Token is invalid: ' . $e->getMessage()
+  ); 
+}
   # Call your appilication logic to load the user.
   /**
   $user_info = $logic->user->load_by($email)
@@ -72,41 +72,41 @@ Simple usage for login:
 
   echo $user_info;
   **/
-```
+  ```
 
 Simple usage for logout:
 
 ```php
-  $did_token = \MagicAdmin\Util\parse_authorization_header_value(
-    $authorization
+$did_token = \MagicAdmin\Util\parse_authorization_header_value(
+  $authorization
+);
+
+if ($did_token == null) {
+  throw new \MagicAdmin\Exception\BadRequestException(
+    'Authorization header is missing or header value is invalid'
   );
+}
 
-  if ($did_token == null) {
-    throw new \MagicAdmin\Exception\BadRequestException(
-      'Authorization header is missing or header value is invalid'
-    );
-  }
+$magic = new \MagicAdmin\Magic('YOUR_SECRET_API_KEY');
 
-  $magic = new \MagicAdmin\Magic('YOUR_SECRET_API_KEY');
-  
-  try {
-    $magic->token->validate($did_token);
-    $issuer = $magic->token->get_issuer($did_token);
-    $user_meta = $magic->user->get_metadata_by_issuer($issuer);
-  } catch (Exception $e) {
-    throw new \MagicAdmin\Exception\DIDTokenException(
-      'DID Token is invalid: ' . $e->getMessage()
-    ); 
-  }
+try {
+  $magic->token->validate($did_token);
+  $issuer = $magic->token->get_issuer($did_token);
+  $user_meta = $magic->user->get_metadata_by_issuer($issuer);
+} catch (Exception $e) {
+  throw new \MagicAdmin\Exception\DIDTokenException(
+    'DID Token is invalid: ' . $e->getMessage()
+  ); 
+}
 
 
-  # Call your appilication logic to load the user.
-  /**
-  $user_info = $logic->user->load_by($email)
-    
-  if ($user_info->issuer != $issuer) {
-    throw new \MagicAdmin\Exception\UnAuthorizedError('UnAuthorized user login');
-  }
-  **/
+# Call your appilication logic to load the user.
+/**
+$user_info = $logic->user->load_by($email)
+
+if ($user_info->issuer != $issuer) {
+  throw new \MagicAdmin\Exception\UnAuthorizedError('UnAuthorized user login');
+}
+**/
 ```
 

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.0

composer.json

@@ -19,7 +19,10 @@
     "ext-curl": "*",
     "ext-gmp": "*",
     "digitaldonkey/ecverify": "^1.0"
-  }, 
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^7.3"
+  },
   "autoload": {
     "psr-4": {
       "MagicAdmin\\": "/"

init.php

@@ -1,4 +1,9 @@
-<?php 
+<?php
+
+// Define package root path
+if (!defined('MAGIC_ADMIN_PHP_PATH')) {
+	define('MAGIC_ADMIN_PHP_PATH', __dir__);
+}
 
 // Magic
 require( __dir__ . '/lib/Magic.php' );

lib/Exception/ApiConnectionException.php

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

lib/Exception/ApiException.php

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

lib/Exception/AuthenticationException.php

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

lib/Exception/BadRequestException.php

@@ -7,6 +7,4 @@
  * authorization header is missing or header value is invalid.
  */
 
-class BadRequestException extends RequestException {} 
-
- 
+class BadRequestException extends RequestException {}  

lib/Exception/DidTokenException.php

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

lib/Exception/ForbiddenException.php

@@ -7,6 +7,4 @@
  * the SDK request is not allowed to access to server.
  */
 
-class ForbiddenException extends RequestException {} 
-
- 
+class ForbiddenException extends RequestException {}  

lib/Exception/MagicException.php

@@ -8,19 +8,18 @@
 
 class MagicException extends \Exception  {
 
-    public $_message = "";
+  public $_message = "";
 
-    public function __construct($message=null) {
-        parent::__construct($message);
-        $this->_message = $message;
-    }
+  public function __construct($message=null) {
+    parent::__construct($message);
+    $this->_message = $message;
+  }
 
-    public function getErrorMessage() {
-        return $this->_message;
-    }
-
-    public function getRepr() {
-        return __class__ . '(message=' . $this->_message . ')';
-    }
-}    
+  public function getErrorMessage() {
+    return $this->_message;
+  }
 
+  public function getRepr() {
+    return __class__ . '(message=' . $this->_message . ')';
+  }
+}

lib/Exception/RateLimitException.php

@@ -7,5 +7,4 @@
  * 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

@@ -9,43 +9,41 @@
 
 class RequestException extends MagicException {
 
-    public $http_status;
-    public $http_code;
-    public $http_resp_data;
-    public $http_message;
-    public $http_error_code;
-    public $http_request_params;
-    public $http_request_data;
-    public $http_method;
-
-    public function __construct(
-        $message=null,
-        $http_status=null,
-        $http_code=null,
-        $http_resp_data=null,
-        $http_message=null,
-        $http_error_code=null,
-        $http_request_params=null,
-        $http_request_data=null,
-        $http_method=null
-    ) {
-        parent::__construct($message);
-        $this->http_status = $http_status;
-        $this->http_code = $http_code;
-        $this->http_resp_data = $http_resp_data;
-        $this->http_message = $http_message;
-        $this->http_error_code = $http_error_code;
-        $this->http_request_params = $http_request_params;
-        $this->http_request_data = $http_request_data;
-        $this->http_method = $http_method;
-    }
-
-    public function getRepr() {
-
-        return __class__ . 
-            '(message=' . $this->_message .
-            ', http_error_code=' . $this->http_error_code . 
-            ', http_code=' . $this->http_code . ')';
-    }
-
-}
+  public $http_status;
+  public $http_code;
+  public $http_resp_data;
+  public $http_message;
+  public $http_error_code;
+  public $http_request_params;
+  public $http_request_data;
+  public $http_method;
+
+  public function __construct(
+    $message=null,
+    $http_status=null,
+    $http_code=null,
+    $http_resp_data=null,
+    $http_message=null,
+    $http_error_code=null,
+    $http_request_params=null,
+    $http_request_data=null,
+    $http_method=null
+  ) {
+    parent::__construct($message);
+    $this->http_status = $http_status;
+    $this->http_code = $http_code;
+    $this->http_resp_data = $http_resp_data;
+    $this->http_message = $http_message;
+    $this->http_error_code = $http_error_code;
+    $this->http_request_params = $http_request_params;
+    $this->http_request_data = $http_request_data;
+    $this->http_method = $http_method;
+  }
+
+  public function getRepr() {
+    return __class__ . 
+    '(message=' . $this->_message .
+    ', http_error_code=' . $this->http_error_code . 
+    ', http_code=' . $this->http_code . ')';
+  } 
+}