Merge pull request #112 from stormpath/hotfix/Release_1.12.1

Hotfix/release 1.12.1

Author: bretterer

CHANGES.md

@@ -1,8 +1,19 @@
 stormpath-sdk-php Changelog
 ===========================
 
+Version 1.12.1
+--------------
+
+Released on December 15, 2015
+
+ - Social Providers isNewAccount was always returning null.  This has been fixed (Fixes Issue #109)
+ - Handle ID Site would throw new exception if account was not valid, This prevented you from accessing state or any other properties
+ You can not access all properties, and account will just remain null. (Fixes Issue #110)
+ - Documentation issue on API Keys and Account for Request Authenticators. (Fixes Issue #105)
+ - Update the Base Test so it is not treated as a test. 
+
 Version 1.12.0
-------------------
+--------------
 
 Released on November 5, 2015
 

README.md

@@ -1834,10 +1834,10 @@ The `Authorization` header contains a base64 encoding of the API Key and Secret.
 $application = \Stormpath\Resource\Application::get("https://api.stormpath.com/v1/applications/24mp4us71ntza6lBwlu");
 
 $request = \Stormpath\Authc\Api\Request::createFromGlobals();
-$result = new ApiRequestAuthenticator($application)->authenticate($request);
+$result = (new ApiRequestAuthenticator($application))->authenticate($request);
 
-$account = $result->account;
-$apiKey = $result->apiKey;
+$account = $result->getApiKey()->account;
+$apiKey = $result->getApiKey();
 ```
 
 ##### Using `BasicRequestAuthenticator`
@@ -1846,10 +1846,10 @@ $apiKey = $result->apiKey;
 $application = \Stormpath\Resource\Application::get("https://api.stormpath.com/v1/applications/24mp4us71ntza6lBwlu");
 
 $request = \Stormpath\Authc\Api\Request::createFromGlobals();
-$result = new BasicRequestAuthenticator($application)->authenticate($request);
+$result = (new BasicRequestAuthenticator($application))->authenticate($request);
 
-$account = $result->account;
-$apiKey = $result->apiKey;
+$account = $result->getApiKey()->account;
+$apiKey = $result->getApiKey();
 ```
 
 ### OAuth Authentication
@@ -1908,10 +1908,10 @@ Host: api.trooperapp.com
 $application = \Stormpath\Resource\Application::get("https://api.stormpath.com/v1/applications/24mp4us71ntza6lBwlu");
 
 $request = \Stormpath\Authc\Api\Request::createFromGlobals();
-$result = new OAuthRequestAuthenticator($application)->authenticate($request);
+$result = (new OAuthRequestAuthenticator($application))->authenticate($request);
 
-$account = $result->account;
-$apiKey = $result->apiKey;
+$account = $result->getApiKey()->account;
+$apiKey = $result->getApiKey();
 ```
 
 You can also use the more specific `OAuthBearerRequestAuthenticator` to authenticate 

src/Resource/Application.php

@@ -406,10 +406,14 @@ public function handleIdSiteCallback($responseUri)
 
         $nonceStore->putNonce($jwt->irt);
 
+        $return = new \StdClass();
 
-        $account = $this->getDataStore()->getResource($jwt->sub, Stormpath::ACCOUNT);
+        try {
+            $account = $this->getDataStore()->getResource($jwt->sub, Stormpath::ACCOUNT);
+        } catch (\Stormpath\Resource\ResourceError $re) {
+            $account = null;
+        }
 
-        $return = new \StdClass();
 
         $return->account = $account;
         $return->state = $jwt->state;

src/Resource/ProviderAccountResult.php

@@ -23,7 +23,7 @@
 class ProviderAccountResult extends Resource
 {
     const ACCOUNT       = 'account';
-    const NEW_ACCOUNT   = 'newAccount';
+    const NEW_ACCOUNT   = 'isNewAccount';
 
     public function __construct($dataStore = null, \stdClass $properties = null, array $options = array())
     {

src/Util/Version.php

@@ -20,6 +20,6 @@
 
 class Version
 {
-    const SDK_VERSION = '1.12.0';
+    const SDK_VERSION = '1.12.1';
 
 }

tests/Authc/Api/ApiRequestAuthenticatorTest.php

@@ -3,9 +3,9 @@
 
 use Stormpath\Authc\Api\ApiRequestAuthenticator;
 use Stormpath\Authc\Api\Request;
-use Stormpath\Tests\BaseTest;
+use Stormpath\Tests\TestCase;
 
-class ApiRequestAuthenticatorTest extends BaseTest
+class ApiRequestAuthenticatorTest extends TestCase
 {
 
     public static $account;

tests/Authc/Api/BasicRequestAuthenticatorTest.php

@@ -3,9 +3,9 @@
 
 use Stormpath\Authc\Api\BasicRequestAuthenticator;
 use Stormpath\Authc\Api\Request;
-use Stormpath\Tests\BaseTest;
+use Stormpath\Tests\TestCase;
 
-class BasicRequestAuthenticatorTest extends BaseTest
+class BasicRequestAuthenticatorTest extends TestCase
 {
 
     public static $account;

tests/Authc/Api/OAuthBearerRequestAuthenticatorTest.php

@@ -5,9 +5,9 @@
 use Stormpath\Authc\Api\OAuthBearerRequestAuthenticator;
 use Stormpath\Authc\Api\OAuthClientCredentialsRequestAuthenticator;
 use Stormpath\Authc\Api\Request;
-use Stormpath\Tests\BaseTest;
+use Stormpath\Tests\TestCase;
 
-class OAuthBearerRequestAuthenticatorTest extends BaseTest
+class OAuthBearerRequestAuthenticatorTest extends TestCase
 {
 
     public static $account;

tests/Authc/Api/OAuthClientCredentialsAuthenticatorTest.php

@@ -4,9 +4,9 @@
 use Stormpath\Authc\Api\OAuthClientCredentialsRequestAuthenticator;
 use Stormpath\Authc\Api\Request;
 use Stormpath\Exceptions\RequestAuthenticatorException;
-use Stormpath\Tests\BaseTest;
+use Stormpath\Tests\TestCase;
 
-class OAuthClientCredentialsAuthenticationTest extends BaseTest
+class OAuthClientCredentialsAuthenticationTest extends TestCase
 {
 
     public static $account;

tests/Authc/Api/OAuthPasswordRequestAuthenticatorRequest.php

@@ -2,9 +2,9 @@
 namespace Stormpath\Tests\Authc\Api;
 
 use Stormpath\Authc\Api\OAuthPasswordRequestAuthenticator;
-use Stormpath\Tests\BaseTest;
+use Stormpath\Tests\TestCase;
 
-class OAuthPasswordAuthenticationResult extends BaseTest
+class OAuthPasswordAuthenticationResult extends TestCase
 {
     public static $account;