Merge branch 'release/0.5.1'

CHANGELOG.md

@@ -3,6 +3,13 @@ Change Log
 
 All library changes, in descending order.
 
+Version 0.5.1
+-------------
+
+**Released on Dec 21, 2016.**
+
+- Update JWT Code for Core SDK Updates
+
 Version 0.5.0
 -------------
 

docs/changelog.rst

@@ -5,6 +5,13 @@ Change Log
 
 All library changes, in descending order. something
 
+Version 0.5.1
+-------------
+
+**Released on Dec 21, 2016.**
+
+- Update JWT Code for Core SDK Updates
+
 Version 0.5.0
 -------------
 

docs/upgrading.rst

@@ -7,6 +7,11 @@ This page contains specific upgrading instructions to help you migrate between
 Stormpath-Laravel releases.
 
 
+Version 0.5.0 -> Version 0.5.1
+------------------------------
+If you are relying on the JWT package from this, you will need to update your use to use the new namespace,
+Firebase\JWT\JWT.
+
 Version 0.4.2 -> Version 0.5.0
 ------------------------------
 No Changes Needed

src/Http/Controllers/MeController.php

@@ -80,9 +80,9 @@ private function getPropertyValue($account, $prop)
 
     private function getAccountFromAccessToken($accessToken)
     {
-        \JWT::$leeway = 10;
+        \Firebase\JWT\JWT::$leeway = 10;
 
-        $jwt = \JWT::decode($accessToken, config('stormpath.client.apiKey.secret'), ['HS256']);
+        $jwt = \Firebase\JWT\JWT::decode($accessToken, config('stormpath.client.apiKey.secret'), ['HS256']);
 
         $expandsArray = [];
         $expands = config('stormpath.web.me.expand');

src/Http/Helpers/IdSiteSessionHelper.php

@@ -28,7 +28,7 @@ public function create(\Stormpath\Resource\Account $account)
         $refreshTokenCookieConfig = config('stormpath.web.refreshTokenCookie');
         $application = app('stormpath.application');
         try {
-            $jwt = \JWT::encode([
+            $jwt = \Firebase\JWT\JWT::encode([
                 'sub' => $account->href,
                 'iat' => time()-1,
                 'status' => 'AUTHENTICATED',