Guzzle (#10)

* Guzzle Upgrade

* Packaged API Version

* Fortifi Grants

* Resource owner

* Latest API

.gitignore

@@ -0,0 +1,2 @@
+composer.lock
+/vendor

composer.json

@@ -4,12 +4,13 @@
   "homepage": "http://fortifi.co",
   "license": "BSD-3-Clause",
   "require": {
-    "fortifi/fortifi-api": "^7",
-    "league/oauth2-client": "~0.11",
-    "packaged/helpers": "~1.7"
+    "fortifi/fortifi-api": "~7.20",
+    "league/oauth2-client": "~2.2",
+    "packaged/helpers": "~1.7",
+    "packaged/api": "1.0.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.8"
+    "phpunit/phpunit": "~6.3"
   },
   "autoload": {
     "psr-4": {
@@ -20,6 +21,10 @@
     {
       "type": "vcs",
       "url": "git@github.com:fortifi/fortifi-api.git"
+    },
+    {
+      "type": "vcs",
+      "url": "git@github.com:packaged/api.git"
     }
   ]
 }

src/Fortifi.php

@@ -68,7 +68,7 @@ public static function setEnvironment($env = self::ENV_STAGE)
       $prefix = 's';
     }
 
-    static::$apiHost = $prefix . 'api.fortifi.co';
+    static::$apiHost = $prefix . 'api.fortifi.io';
   }
 
   public static function getInstance(
@@ -102,7 +102,7 @@ public static function getInstance(
 
   public function getApi()
   {
-    $this->_api->setAccessToken($this->getToken()->accessToken);
+    $this->_api->setAccessToken($this->getToken()->getToken());
     return $this->_api;
   }
 
@@ -147,7 +147,7 @@ public function getRequestClientIp()
       'HTTP_X_CLUSTER_CLIENT_IP',
       'HTTP_FORWARDED_FOR',
       'HTTP_FORWARDED',
-      'REMOTE_ADDR'
+      'REMOTE_ADDR',
     ];
     if($ip === null)
     {

src/Models/FortifiModel.php

@@ -27,7 +27,7 @@ public static function processRequest(
     catch(AccessDeniedException $e)
     {
       $token = $fortifi->getToken(true);
-      $fortifi->getApi()->setAccessToken($token->accessToken);
+      $fortifi->getApi()->setAccessToken($token->getToken());
       return $request->get();
     }
   }

src/OAuth/FortifiAccessToken.php

@@ -14,6 +14,10 @@ class FortifiAccessToken extends AccessToken
    */
   public function __construct(array $options = null)
   {
+    if(isset($options['uid']) && !isset($options['resource_owner_id']))
+    {
+      $options['resource_owner_id'] = $options['uid'];
+    }
     parent::__construct($options);
 
     if(isset($options['session_secret']))

src/OAuth/FortifiGrant.php

@@ -0,0 +1,7 @@
+<?php
+namespace Fortifi\Sdk\OAuth;
+
+interface FortifiGrant
+{
+  public function handleResponse($response = []);
+}