1.2.1

Author: baumic

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "addressix/addressixapi-client-php",
     "type": "library",
-    "version": "1.1.1",
+    "version": "1.2.1",
     "description": "Client library for Addressix API",
     "keywords": ["addressix","api","php"],
     "homepage": "https://github.com/addressix/addressixapi-client-php",

src/App/Auth/User.php

@@ -1,7 +1,9 @@
 <?php
 namespace AddressixAPI\App\Auth;
 
-class User extends \AddressixAPI\App\Resource
+use AddressixAPI\App\Resource
+
+class User extends Resource
 {
   protected $resource_uri = '/users';
 

src/App/Files.php

@@ -1,6 +1,8 @@
 <?php
 namespace AddressixAPI\App;
 
+use AddressixAPI\App\Files\Appdata;
+
 class Files extends \AddressixAPI\App
 {
   protected $app_base = '/aixfs/v1';
@@ -9,4 +11,10 @@ public function __construct(\AddressixAPI\Client $client)
   {
     parent::__construct($client);    
   }
+
+  public function getAppdata()
+  {
+    $appdata = new Appdata($this);
+    return $appdata;
+  }
 }

src/App/Files/Appdata.php

@@ -17,6 +17,13 @@ public function __construct($app)
 
   function get() {
     $this->request('get');
-    parent::set($this->data);
+    $this->set($this->data);
+  }
+
+  function getByPath($path) {
+    if (!$this->id) {
+      $this->get();
+    }
+    return parent::getByPath($path);
   }
 }

src/App/Files/File.php

@@ -39,7 +39,12 @@ public function __construct($app)
       array(
 	'method' => 'POST',
 	'uri' => '/files/:id/acls'
-	);    
+	);  
+    $this->functions['download'] = 
+      array(
+	'method' => 'GET',
+	'uri' => '/files/:id/content'
+	);  
   }
 
   function set($data) {
@@ -74,6 +79,12 @@ function create($parentid, $filename, $content, $params = array()) {
     return $this->get($this->data->itemid);
   }
 
+  function getContent()
+  {
+    $this->request('download', array('id' => $this->id));
+    return $this->data;
+  }
+
   function addPermission($addressixid,$organisationid,$role,$type='user', array $params = array())
   {
     $params['id'] = $this->id;

src/App/Resource.php

@@ -1,6 +1,10 @@
 <?php
 namespace AddressixAPI\App;
 
+use AddressixAPI\Exception\Exception AS APIException;
+use AddressixAPI\Exception\AuthException;
+use AddressixAPI\Exception\NotFoundException;
+
 class Resource
 {
   protected $app;
@@ -25,7 +29,7 @@ public function __construct($app)
   public function request($name, $params = array(), $headers = array(), $form_type = 1)
   {
     if (!isset($this->functions[$name])) {
-      throw new \AddressixAPI\Exception('Function '.$name.' is not defined for this resource');
+      throw new APIException('Function '.$name.' is not defined for this resource');
     }
 
     // prepare url with params
@@ -51,10 +55,13 @@ public function request($name, $params = array(), $headers = array(), $form_type
       $this->data = $response->body;
     } else {
       if ($response->code==401) {
-	throw new \AddressixAPI\AuthException('Authorization failed: ' . $response->code . '. URI was: ' . $this->app->getBaseURI(). $req_url);
+	throw new AuthException('Authorization failed: ' . $response->code . '. URI was: ' . $this->app->getBaseURI(). $req_url);
+      }
+      else if ($response->code==404) {
+	throw new NotFoundException('Resource not found: ' . $response->code . '. URI was: ' . $this->app->getBaseURI(). $req_url);
       }
       else {
-	throw new \AddressixAPI\Exception('Request to resource failed: ' . $response->code . '. URI was: ' . $this->app->getBaseURI(). $req_url, $response->code);
+	throw new APIException('Request to resource failed: ' . $response->code . '. URI was: ' . $this->app->getBaseURI(). $req_url, $response->code);
       }
     }
   }

src/Auth/OAuth2.php

@@ -1,6 +1,10 @@
 <?php
 namespace AddressixAPI\Auth;
 
+use AddressixAPI\Exception\Exception AS APIException;
+use AddressixAPI\Exception\AuthException;
+use AddressixAPI\Exception\NotFoundException;
+
 class OAuth2
 {
   const OAUTH2_REVOKE_URI = 'https://www.addressix.com/oauth2/v1/revoke';
@@ -93,10 +97,25 @@ public function fetchAccessToken($grant_type, array $parameters, array $extra_he
     }
 
     if (!isset($parameters['delegation'])) {
-      return $this->client->getRequest()->request(self::OAUTH2_TOKEN_URI, 'POST', $parameters, $http_headers, 1);
+      $response = $this->client->getRequest()->request(self::OAUTH2_TOKEN_URI, 'POST', $parameters, $http_headers, 1);
+    } else {
+      $response = $this->client->getRequest()->request(self::OAUTH2_DELEGATED_TOKEN_URI, 'POST', $parameters, $http_headers, 1);      
+    }
+
+    if ($response->code==200) {
+      $accesstoken = $response->body;
     } else {
-      return $this->client->getRequest()->request(self::OAUTH2_DELEGATED_TOKEN_URI, 'POST', $parameters, $http_headers, 1);
+      if ($response->code==401) {
+	throw new AuthException('Authorization failed: ' . $response->code . '.', 401);
+      }
+      else if ($response->code==404) {
+	throw new NotFoundException('User not found: ' . $response->code . '.', 404);
+      }
+      else {
+	throw new APIException('Request to resource failed: ' . $response->code . '.', $response->code);
+      }
     }
+    return $accesstoken;
   }
 
   public function setAccessToken($token)
@@ -130,7 +149,7 @@ public function authenticate($code)
       return $this->access_token;
     }
     else {
-      throw new \AddressixAPI\Exception('Authentication failed: ' .$response->code);
+      throw new APIException('Authentication failed: ' .$response->code);
     }
   }
 }

src/AuthException.php src/Exception/AuthException.phpsrc/AuthException.php renamed to src/Exception/AuthException.php

@@ -1,5 +1,5 @@
 <?php
-namespace AddressixAPI;
+namespace AddressixAPI\Exception;
 
 class AuthException extends Exception
 {

src/Exception.php src/Exception/Exception.phpsrc/Exception.php renamed to src/Exception/Exception.php

@@ -1,5 +1,5 @@
 <?php
-namespace AddressixAPI;
+namespace AddressixAPI\Exception;
 
 class Exception extends \Exception
 {

src/Exception/NotFoundException.php

@@ -0,0 +1,7 @@
+<?php
+namespace AddressixAPI\Exception;
+
+class NotFoundException extends Exception
+{
+	
+}