Add global authentication

src/GW2Api.php

@@ -37,10 +37,11 @@
 use GW2Treasures\GW2Api\V2\Endpoint\World\WorldEndpoint;
 use GW2Treasures\GW2Api\V2\Endpoint\WvW\WvWEndpoint;
 use GW2Treasures\GW2Api\V2\IEndpoint;
+use GW2Treasures\GW2Api\V2\IParent;
 use GW2Treasures\GW2Api\V2\Localization\LocalizationHandler;
 use GW2Treasures\GW2Api\V2\Pagination\PaginationHandler;
 
-class GW2Api {
+class GW2Api implements IParent {
     /** @var string $apiUrl */
     protected $apiUrl = 'https://api.guildwars2.com/';
 
@@ -53,6 +54,9 @@ class GW2Api {
     /** @var array $handlers */
     protected $handlers = [];
 
+    /** @var string|null $apiKey */
+    protected $apiKey = null;
+
     function __construct( array $options = [] ) {
         $this->options = $this->getOptions( $options );
 
@@ -141,8 +145,8 @@ public function getClient() {
         return $this->client;
     }
 
-    public function account( $apiKey ) {
-        return new AccountEndpoint( $this, $apiKey );
+    public function account() {
+        return new AccountEndpoint( $this );
     }
 
     public function achievements() {
@@ -153,8 +157,8 @@ public function build() {
         return new BuildEndpoint( $this );
     }
 
-    public function characters( $apiKey ) {
-        return new CharacterEndpoint( $this, $apiKey );
+    public function characters() {
+        return new CharacterEndpoint( $this );
     }
 
     public function colors() {
@@ -237,8 +241,8 @@ public function specializations() {
         return new SpecializationEndpoint( $this );
     }
 
-    public function tokeninfo( $apiKey ) {
-        return new TokeninfoEndpoint( $this, $apiKey );
+    public function tokeninfo() {
+        return new TokeninfoEndpoint( $this );
     }
 
     public function traits() {
@@ -260,4 +264,29 @@ public function attachRegisteredHandlers( IEndpoint $endpoint ) {
             }
         }
     }
+
+    public function getApi() {
+        return $this;
+    }
+
+    public function getParent() {
+        return null;
+    }
+
+
+    /**
+     * Set the API key that should be used to request this endpoint.
+     *
+     * @param string $apiKey
+     * @return static
+     */
+    public function auth($apiKey) {
+        $this->apiKey = $apiKey;
+
+        return $this;
+    }
+
+    public function getApiKey() {
+        return $this->apiKey;
+    }
 }

src/V2/Authentication/AuthenticatedEndpoint.php

@@ -2,7 +2,20 @@
 
 namespace GW2Treasures\GW2Api\V2\Authentication;
 
+use GW2Treasures\GW2Api\GW2Api;
+use GW2Treasures\GW2Api\V2\IParent;
+
 trait AuthenticatedEndpoint {
+    /**
+     * @return GW2Api
+     */
+    protected abstract function getApi();
+
+    /**
+     * @return IParent
+     */
+    protected abstract function getParent();
+
     /** @var string $apiKey */
     protected $apiKey;
 
@@ -12,6 +25,28 @@ trait AuthenticatedEndpoint {
      * @return string
      */
     public function getApiKey() {
-        return $this->apiKey;
+        if(isset($this->apiKey)) {
+            return $this->apiKey;
+        }
+
+        $parent = $this->getParent();
+
+        while (!($parent instanceof IAuthenticatedEndpoint || $parent instanceof GW2Api)) {
+            $parent = $parent->getParent();
+        }
+
+        return $parent->getApiKey();
+    }
+
+    /**
+     * Set the API key that should be used to request this endpoint.
+     *
+     * @param string $apiKey
+     * @return static
+     */
+    public function auth($apiKey) {
+        $this->apiKey = $apiKey;
+
+        return $this;
     }
 }

src/V2/Authentication/AuthenticationHandler.php

@@ -25,7 +25,13 @@ function __construct( IAuthenticatedEndpoint $endpoint ) {
      * @return MessageInterface|RequestInterface
      */
     public function onRequest( RequestInterface $request ) {
-        return $request->withHeader( 'Authorization', 'Bearer ' . $this->getEndpoint()->getApiKey() );
+        $apiKey = $this->getEndpoint()->getApiKey();
+
+        if($apiKey) {
+            return $request->withHeader( 'Authorization', 'Bearer '.$apiKey );
+        }
+
+        return $request;
     }
 
     /**

src/V2/Authentication/IAuthenticatedEndpoint.php

@@ -11,4 +11,13 @@ interface IAuthenticatedEndpoint extends IEndpoint {
      * @return string
      */
     public function getApiKey();
+
+
+    /**
+     * Set the API key that should be used to request this endpoint.
+     *
+     * @param string $apiKey
+     * @return static
+     */
+    public function auth($apiKey);
 }

src/V2/Endpoint.php

@@ -13,20 +13,20 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
-abstract class Endpoint implements IEndpoint {
-    /** @var GW2Api $api */
-    protected $api;
+abstract class Endpoint implements IEndpoint, IParent {
+    /** @var GW2Api $parent */
+    protected $parent;
 
     /** @var ApiHandler[] */
     protected $handlers = [];
 
     /**
-     * @param GW2Api $api
+     * @param IParent $parent
      */
-    public function __construct( GW2Api $api ) {
-        $this->api = $api;
+    public function __construct( IParent $parent ) {
+        $this->parent = $parent;
 
-        $this->api->attachRegisteredHandlers( $this );
+        $this->getApi()->attachRegisteredHandlers( $this );
     }
 
     /**
@@ -36,11 +36,18 @@ protected function getClient() {
         return $this->getApi()->getClient();
     }
 
+    /**
+     * @return IParent
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+
     /**
      * @return GW2Api
      */
-    protected function getApi() {
-        return $this->api;
+    public function getApi() {
+        return $this->getParent()->getApi();
     }
 
     /**

src/V2/Endpoint/Account/AccountEndpoint.php

@@ -2,20 +2,13 @@
 
 namespace GW2Treasures\GW2Api\V2\Endpoint\Account;
 
-use GW2Treasures\GW2Api\GW2Api;
 use GW2Treasures\GW2Api\V2\Authentication\AuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Authentication\IAuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Endpoint;
 
 class AccountEndpoint extends Endpoint implements IAuthenticatedEndpoint {
     use AuthenticatedEndpoint;
 
-    public function __construct( GW2Api $api, $apiKey ) {
-        parent::__construct( $api );
-
-        $this->apiKey = $apiKey;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -38,7 +31,7 @@ public function get() {
      * @return AchievementEndpoint
      */
     public function achievements() {
-        return new AchievementEndpoint( $this->api, $this->apiKey );
+        return new AchievementEndpoint( $this->parent );
     }
 
     /**
@@ -47,7 +40,7 @@ public function achievements() {
      * @return BankEndpoint
      */
     public function bank() {
-        return new BankEndpoint( $this->api, $this->apiKey );
+        return new BankEndpoint( $this->parent );
     }
 
     /**
@@ -56,7 +49,7 @@ public function bank() {
      * @return DyeEndpoint
      */
     public function dyes() {
-        return new DyeEndpoint( $this->api, $this->apiKey );
+        return new DyeEndpoint( $this->parent );
     }
 
     /**
@@ -65,7 +58,7 @@ public function dyes() {
      * @return InventoryEndpoint
      */
     public function inventory() {
-        return new InventoryEndpoint( $this->api, $this->apiKey );
+        return new InventoryEndpoint( $this->parent );
     }
 
     /**
@@ -74,7 +67,7 @@ public function inventory() {
      * @return MaterialEndpoint
      */
     public function materials() {
-        return new MaterialEndpoint( $this->api, $this->apiKey );
+        return new MaterialEndpoint( $this->parent );
     }
 
     /**
@@ -83,7 +76,7 @@ public function materials() {
      * @return MiniEndpoint
      */
     public function minis() {
-        return new MiniEndpoint( $this->api, $this->apiKey );
+        return new MiniEndpoint( $this->parent );
     }
 
     /**
@@ -92,7 +85,7 @@ public function minis() {
      * @return SkinEndpoint
      */
     public function skins() {
-        return new SkinEndpoint( $this->api, $this->apiKey );
+        return new SkinEndpoint( $this->parent );
     }
 
     /**
@@ -101,6 +94,6 @@ public function skins() {
      * @return WalletEndpoint
      */
     public function wallet()  {
-        return new WalletEndpoint( $this->api, $this->apiKey );
+        return new WalletEndpoint( $this->parent );
     }
 }

src/V2/Endpoint/Account/AchievementEndpoint.php

@@ -2,20 +2,13 @@
 
 namespace GW2Treasures\GW2Api\V2\Endpoint\Account;
 
-use GW2Treasures\GW2Api\GW2Api;
 use GW2Treasures\GW2Api\V2\Authentication\AuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Authentication\IAuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Endpoint;
 
 class AchievementEndpoint extends Endpoint implements IAuthenticatedEndpoint {
     use AuthenticatedEndpoint;
 
-    public function __construct( GW2Api $api, $apiKey ) {
-        parent::__construct( $api );
-
-        $this->apiKey = $apiKey;
-    }
-
     /**
      * {@inheritdoc}
      */

src/V2/Endpoint/Account/BankEndpoint.php

@@ -2,20 +2,13 @@
 
 namespace GW2Treasures\GW2Api\V2\Endpoint\Account;
 
-use GW2Treasures\GW2Api\GW2Api;
 use GW2Treasures\GW2Api\V2\Authentication\AuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Authentication\IAuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Endpoint;
 
 class BankEndpoint extends Endpoint implements IAuthenticatedEndpoint {
     use AuthenticatedEndpoint;
 
-    public function __construct( GW2Api $api, $apiKey ) {
-        parent::__construct( $api );
-
-        $this->apiKey = $apiKey;
-    }
-
     /**
      * {@inheritdoc}
      */

src/V2/Endpoint/Account/DyeEndpoint.php

@@ -2,20 +2,13 @@
 
 namespace GW2Treasures\GW2Api\V2\Endpoint\Account;
 
-use GW2Treasures\GW2Api\GW2Api;
 use GW2Treasures\GW2Api\V2\Authentication\AuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Authentication\IAuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Endpoint;
 
 class DyeEndpoint extends Endpoint implements IAuthenticatedEndpoint {
     use AuthenticatedEndpoint;
 
-    public function __construct( GW2Api $api, $apiKey ) {
-        parent::__construct( $api );
-
-        $this->apiKey = $apiKey;
-    }
-
     /**
      * {@inheritdoc}
      */

src/V2/Endpoint/Account/InventoryEndpoint.php

@@ -2,20 +2,13 @@
 
 namespace GW2Treasures\GW2Api\V2\Endpoint\Account;
 
-use GW2Treasures\GW2Api\GW2Api;
 use GW2Treasures\GW2Api\V2\Authentication\AuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Authentication\IAuthenticatedEndpoint;
 use GW2Treasures\GW2Api\V2\Endpoint;
 
 class InventoryEndpoint extends Endpoint implements IAuthenticatedEndpoint {
     use AuthenticatedEndpoint;
 
-    public function __construct( GW2Api $api, $apiKey ) {
-        parent::__construct( $api );
-
-        $this->apiKey = $apiKey;
-    }
-
     /**
      * {@inheritdoc}
      */