update file structure and ecrecover module

Author: itprodev

.editorconfig

@@ -0,0 +1,20 @@
+; https://editorconfig.org/
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+charset = utf-8
+
+[*.{json,yml}]
+indent_size = 2
+
+[*.neon]
+indent_style = tab
+
+[Makefile]
+indent_style = tab

.gitignore

@@ -0,0 +1,31 @@
+# Ignore build files
+build/*
+
+# Mac OS X dumps these all over the place.
+.DS_Store
+
+# Ignore the SimpleTest library if it is installed to /test/.
+/test/simpletest/
+
+# Ignore the /vendor/ directory for people using composer
+/vendor/
+
+# If the vendor directory isn't being commited the composer.lock file should also be ignored
+composer.lock
+
+# Ignore PHPUnit coverage file
+clover.xml
+
+# Ignore IDE's configuration files
+.idea
+
+# Ignore PHP CS Fixer local config and cache
+.php_cs
+.php_cs.cache
+
+# Ignore PHPStan local config
+.phpstan.neon
+
+# Ignore phpDocumentor's local config and artifacts
+.phpdoc/*
+phpdoc.xml

testing/magic-admin-php/php-ecrecover/vendor/kornrunner/keccak/LICENSE renamed to LICENSE

@@ -1,6 +1,6 @@
-MIT License
+The MIT License (MIT)
 
-Copyright (c) 2018 Boris Momčilović
+Copyright (c) 2020 Fortmatic 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

@@ -24,7 +24,7 @@ require_once('vendor/autoload.php');
 If you do not wish to use Composer, you can download the [latest release](https://github.com/magiclabs/magic-admin-php). Then, to use the bindings, include the `magic-init.php` file.
 
 ```php
-require_once('/path/to/magic-admin-php/magic-init.php');
+require_once('/path/to/magic-admin-php/init.php');
 ```
 
 ## Dependencies
@@ -41,36 +41,33 @@ If you use Composer, these dependencies should be handled automatically. If you
 Simple usage for login:
 
 ```php
-  $did_token = parse_authorization_header_value(
+  $did_token = \MagicAdmin\Util\parse_authorization_header_value(
     $authorization
   );
 
   if ($did_token == null) {
-    $badRequestError = new BadRequestError(
+    throw new \MagicAdmin\Exception\BadRequestException(
       'Authorization header is missing or header value is invalid'
     );
-    echo $badRequestError->getErrorMessage();
   }
 
-  $magic = new 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) {
-    $didTokenError = new DIDTokenError(
+    throw new \MagicAdmin\Exception\DIDTokenException(
       'DID Token is invalid: ' . $e->getMessage()
-    );
-    echo $didTokenError->getErrorMessage();
+    ); 
   }
   # Call your appilication logic to load the user.
   /**
   $user_info = $logic->user->load_by($email)
 
   if ($user_info->issuer != $issuer) {
-    $unAuthorizedError = new UnAuthorizedError('UnAuthorized user login');
-    echo $unAuthorizedError->getErrorMessage();
+    throw new \MagicAdmin\Exception\UnAuthorizedException('UnAuthorized user login');
   }
 
   echo $user_info;
@@ -80,28 +77,26 @@ Simple usage for login:
 Simple usage for logout:
 
 ```php
-  $did_token = parse_authorization_header_value(
+  $did_token = \MagicAdmin\Util\parse_authorization_header_value(
     $authorization
   );
 
   if ($did_token == null) {
-    $badRequestError = new BadRequestError(
+    throw new \MagicAdmin\Exception\BadRequestException(
       'Authorization header is missing or header value is invalid'
     );
-    echo $badRequestError->getErrorMessage();
   }
 
-  $magic = new 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) {
-    $didTokenError = new DIDTokenError(
+    throw new \MagicAdmin\Exception\DIDTokenException(
       'DID Token is invalid: ' . $e->getMessage()
-    );
-    echo $didTokenError->getErrorMessage();
+    ); 
   }
 
 
@@ -110,8 +105,7 @@ Simple usage for logout:
   $user_info = $logic->user->load_by($email)
 
   if ($user_info->issuer != $issuer) {
-    $unAuthorizedError = new UnAuthorizedError('UnAuthorized user login');
-    echo $unAuthorizedError->getErrorMessage();
+    throw new \MagicAdmin\Exception\UnAuthorizedError('UnAuthorized user login');
   }
   **/
 ```

VERSION

@@ -0,0 +1 @@
+1.0.0

composer.json

@@ -6,18 +6,19 @@
     "admin",
     "link"
   ],
-  "homepage": "https://magic.link/",
+  "homepage": "https://magic.link",
   "license": "MIT",
   "authors": [
     {
-      "name": "",
-      "homepage": ""
+      "name": "Wanjiu Jin",
+      "email": "[email protected]"
     }
   ],
   "require": {
     "php": ">=5.6.0",
     "ext-curl": "*",
-    "ext-gmt": "*"
+    "ext-gmp": "*",
+    "digitaldonkey/ecverify": "^1.0"
   }, 
   "autoload": {
     "psr-4": {

config.php

@@ -0,0 +1,30 @@
+<?php 
+
+// Magic
+require( __dir__ . '/lib/Magic.php' );
+
+// Resources
+require( __dir__ . '/lib/Resource/Token.php' );
+require( __dir__ . '/lib/Resource/User.php' );
+
+// HttpClient
+require( __dir__ . '/lib/HttpClient.php' );
+
+// Response
+require( __dir__ . '/lib/Response.php' );
+
+// Utilities
+require( __dir__ . '/lib/Util/DidToken.php' );
+require( __dir__ . '/lib/Util/Http.php' );
+require( __dir__ . '/lib/Util/Time.php' );
+
+// Exceptions
+require( __dir__ . '/lib/Exception/MagicException.php' );
+require( __dir__ . '/lib/Exception/DidTokenException.php' );
+require( __dir__ . '/lib/Exception/ApiConnectionException.php' );
+require( __dir__ . '/lib/Exception/RequestException.php' );
+require( __dir__ . '/lib/Exception/RateLimitException.php' );
+require( __dir__ . '/lib/Exception/BadRequestException.php' );
+require( __dir__ . '/lib/Exception/AuthenticationException.php' );
+require( __dir__ . '/lib/Exception/ForbiddenException.php' );
+require( __dir__ . '/lib/Exception/ApiException.php' );

init.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * ApiConnectionException is thrown in the event that 
+ * the SDK can't connect to Magic's servers.
+ */
+
+class ApiConnectionException extends MagicException {} 

lib/Exception/ApiConnectionException.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace MagicAdmin\Exception;
+
+/**
+ * Other api request exception
+ */ 
+
+class ApiException extends RequestException {} 

lib/Exception/ApiException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * AuthenticationException is thrown in the event that 
+ * the API secret key is missing.
+ */
+
+class AuthenticationException extends RequestException {} 

lib/Exception/AuthenticationException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * BadRequestException is thrown in the event that 
+ * authorization header is missing or header value is invalid.
+ */
+
+class BadRequestException extends RequestException {} 
+
+
+    

lib/Exception/BadRequestException.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * DIDTokenException is thrown in the event that DID token is missing, 
+ * DID token is malformed, given DID token has expired or 
+ * signature mismatch between "proof" and "claim".
+ */
+
+class DIDTokenException extends MagicException {} 

lib/Exception/DidTokenException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * ForbiddenException is thrown in the event that 
+ * the SDK request is not allowed to access to server.
+ */
+
+class ForbiddenException extends RequestException {} 
+
+
+    

lib/Exception/ForbiddenException.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * Magic custom exception 
+ */
+
+class MagicException extends \Exception  {
+
+    public $_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 . ')';
+    }
+}    

lib/Exception/MagicException.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace MagicAdmin\Exception; 
+
+/**
+ * RateLimitException is thrown in the event that 
+ * the SDK has sent too many requests to server in a given amount of time.
+ */
+
+class RateLimitException extends RequestException {}