Request Details as auth

Author: bajb

src/ApiRequest.php

@@ -29,6 +29,11 @@ class ApiRequest implements IApiRequest
    */
   private $_requestDetail;
 
+  /**
+   * @var IApiEndpoint
+   */
+  protected $_endpoint;
+
   /**
    * @param IApiRequestDetail $requestDetail
    *
@@ -59,9 +64,31 @@ public function getRawResult()
     {
       if($this->hasConnection())
       {
-        $this->setRawResult(
-          $this->_getConnection()->load($this)->getRawResult()
-        );
+        if($this->_requestDetail->requiresAuth())
+        {
+          $this->_getConnection()->setToken($this->_endpoint->getToken());
+          try
+          {
+            $result = $this->_getConnection()->load($this);
+          }
+          catch(\Exception $e)
+          {
+            if($e->getCode() == 403 && stristr($e->getMessage(), 'token'))
+            {
+              $result = $this->_getConnection()->load($this);
+            }
+            else
+            {
+              throw $e;
+            }
+          }
+        }
+        else
+        {
+          $result = $this->_getConnection()->load($this);
+        }
+
+        $this->setRawResult($result->getRawResult());
       }
       else
       {

src/ApiRequestDetail.php

@@ -11,6 +11,7 @@ class ApiRequestDetail implements IApiRequestDetail
   protected $_body = '';
   protected $_method = 'GET';
   protected $_isAsync = false;
+  protected $_requireAuth = true;
 
   /**
    * @inheritDoc
@@ -230,4 +231,23 @@ public function setAsync($isAsync)
     return $this;
   }
 
+  /**
+   * @param boolean $requireAuth
+   *
+   * @return ApiRequestDetail
+   */
+  public function setRequireAuth($requireAuth)
+  {
+    $this->_requireAuth = $requireAuth;
+    return $this;
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function requiresAuth()
+  {
+    return (bool)$this->_requireAuth;
+  }
+
 }

src/IApiEndpoint.php

@@ -5,15 +5,15 @@
 
 interface IApiEndpoint extends IApiConnectionAware
 {
-  public function setApiDefinition(IApiDefinition $definition);
-
   /**
-   * @return IApiDefinition
+   * @param IApiDefinition $definition
+   *
+   * @return IApiEndpoint|static
    */
-  public function getApiDefinition();
+  public function setApiDefinition(IApiDefinition $definition);
 
   /**
-   * @return bool
+   * @return OAuth\Tokens\IToken|null
    */
-  public function hasConnection();
+  public function getToken();
 }

src/IApiRequestDetail.php

@@ -58,4 +58,9 @@ public function getMethod();
    * @return bool
    */
   public function isAync();
+
+  /**
+   * @return bool
+   */
+  public function requiresAuth();
 }