Backport changes from 0.4 version

glena · Nov 15, 2014 · a614cb1 · a614cb1
1 parent 25b60de
commit a614cb1
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 Changelog
 =========
 
-## 0.3.7 (2014-06-xx)
+## 0.3.7 (2014-11-15)
 * Fix: `SessionStorage::save()` could throw php error,
-* Fix: `OAuthToken::isExpired()` always returned `false`
+* Fix: `OAuthToken::isExpired()` always returned `false`,
+* Fix: `FoursquareResourceOwner`, `TwitchResourceOwner`, `SensioConnectResourceOwner`
+  not working with bearer header,
+* Fix: Don't use deprecated fields in `FacebookResourceOwner`,
+* Fix: `FOSUBUserProvider::refreshUser()` always returning old user,
 
 ## 0.3.6 (2014-06-02)
 * Fix: `InstagramResourceOwner` regression while getting user details,

diff --git a/OAuth/ResourceOwner/FacebookResourceOwner.php b/OAuth/ResourceOwner/FacebookResourceOwner.php
@@ -27,7 +27,7 @@ class FacebookResourceOwner extends GenericOAuth2ResourceOwner
      */
     protected $paths = array(
         'identifier' => 'id',
-        'nickname'   => 'username',
+        'nickname'   => 'name',
         'realname'   => 'name',
         'email'      => 'email',
     );

diff --git a/OAuth/ResourceOwner/FoursquareResourceOwner.php b/OAuth/ResourceOwner/FoursquareResourceOwner.php
@@ -82,12 +82,14 @@ protected function configureOptions(OptionsResolverInterface $resolver)
         parent::configureOptions($resolver);
 
         $resolver->setDefaults(array(
-            'authorization_url' => 'https://foursquare.com/oauth2/authorize',
-            'access_token_url'  => 'https://foursquare.com/oauth2/access_token',
-            'infos_url'         => 'https://api.foursquare.com/v2/users/self',
+            'authorization_url'        => 'https://foursquare.com/oauth2/authenticate',
+            'access_token_url'         => 'https://foursquare.com/oauth2/access_token',
+            'infos_url'                => 'https://api.foursquare.com/v2/users/self',
 
             // @link https://developer.foursquare.com/overview/versioning
-            'version'           => '20121206',
+            'version'                  => '20121206',
+
+            'use_bearer_authorization' => false,
         ));
     }
 }
diff --git a/OAuth/ResourceOwner/SensioConnectResourceOwner.php b/OAuth/ResourceOwner/SensioConnectResourceOwner.php
@@ -45,13 +45,15 @@ protected function configureOptions(OptionsResolverInterface $resolver)
         parent::configureOptions($resolver);
 
         $resolver->setDefaults(array(
-            'authorization_url'   => 'https://connect.sensiolabs.com/oauth/authorize',
-            'access_token_url'    => 'https://connect.sensiolabs.com/oauth/access_token',
-            'infos_url'           => 'https://connect.sensiolabs.com/api',
+            'authorization_url'        => 'https://connect.sensiolabs.com/oauth/authorize',
+            'access_token_url'         => 'https://connect.sensiolabs.com/oauth/access_token',
+            'infos_url'                => 'https://connect.sensiolabs.com/api',
 
-            'user_response_class' => '\HWI\Bundle\OAuthBundle\OAuth\Response\SensioConnectUserResponse',
+            'user_response_class'      => '\HWI\Bundle\OAuthBundle\OAuth\Response\SensioConnectUserResponse',
 
-            'response_type'       => 'code',
+            'response_type'            => 'code',
+
+            'use_bearer_authorization' => false,
         ));
     }
 }
diff --git a/OAuth/ResourceOwner/TwitchResourceOwner.php b/OAuth/ResourceOwner/TwitchResourceOwner.php
@@ -57,9 +57,10 @@ protected function configureOptions(OptionsResolverInterface $resolver)
         parent::configureOptions($resolver);
 
         $resolver->setDefaults(array(
-            'authorization_url' => 'https://api.twitch.tv/kraken/oauth2/authorize',
-            'access_token_url'  => 'https://api.twitch.tv/kraken/oauth2/token',
-            'infos_url'         => 'https://api.twitch.tv/kraken/user',
+            'authorization_url'        => 'https://api.twitch.tv/kraken/oauth2/authorize',
+            'access_token_url'         => 'https://api.twitch.tv/kraken/oauth2/token',
+            'infos_url'                => 'https://api.twitch.tv/kraken/user',
+            'use_bearer_authorization' => false,
         ));
     }
 }
diff --git a/OAuth/ResourceOwner/TwitterResourceOwner.php b/OAuth/ResourceOwner/TwitterResourceOwner.php
@@ -24,9 +24,10 @@ class TwitterResourceOwner extends GenericOAuth1ResourceOwner
      * {@inheritDoc}
      */
     protected $paths = array(
-        'identifier' => 'id_str',
-        'nickname'   => 'screen_name',
-        'realname'   => 'name',
+        'identifier'     => 'id_str',
+        'nickname'       => 'screen_name',
+        'realname'       => 'name',
+        'profilepicture' => 'profile_image_url_https',
     );
 
     /**

diff --git a/Resources/doc/internals/response_object_and_paths.md b/Resources/doc/internals/response_object_and_paths.md
@@ -25,7 +25,7 @@ hwi_oauth:
             client_id:     <client_id>
             client_secret: <client_secret>
             scope:         "email"
-            infos_url:     "https://graph.facebook.com/me?fields=username,name,email,picture.type(square)"
+            infos_url:     "https://graph.facebook.com/me?fields=id,name,email,picture.type(square)"
             paths:
                 email:          email
                 profilepicture: picture.data.url

diff --git a/Resources/doc/resource_owners/amazon.md b/Resources/doc/resource_owners/amazon.md
@@ -21,5 +21,5 @@ hwi_oauth:
 When you're done. Continue by configuring the security layer or go back to
 setup more resource owners.
 
-- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](2-configuring_resource_owners.md)
-- [Step 3: Configuring the security layer](3-configuring_the_security_layer.md).
+- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](../2-configuring_resource_owners.md)
+- [Step 3: Configuring the security layer](../3-configuring_the_security_layer.md).
diff --git a/Resources/doc/resource_owners/eventbrite.md b/Resources/doc/resource_owners/eventbrite.md
@@ -20,5 +20,5 @@ hwi_oauth:
 When you're done. Continue by configuring the security layer or go back to
 setup more resource owners.
 
-- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](2-configuring_resource_owners.md)
-- [Step 3: Configuring the security layer](3-configuring_the_security_layer.md).
+- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](../2-configuring_resource_owners.md)
+- [Step 3: Configuring the security layer](../3-configuring_the_security_layer.md).
diff --git a/Resources/doc/resource_owners/salesforce.md b/Resources/doc/resource_owners/salesforce.md
@@ -22,5 +22,5 @@ hwi_oauth:
 When you're done. Continue by configuring the security layer or go back to
 setup more resource owners.
 
-- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](2-configuring_resource_owners.md)
-- [Step 3: Configuring the security layer](3-configuring_the_security_layer.md).
+- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](../2-configuring_resource_owners.md)
+- [Step 3: Configuring the security layer](../3-configuring_the_security_layer.md).
diff --git a/Resources/doc/resource_owners/trello.md b/Resources/doc/resource_owners/trello.md
@@ -3,7 +3,7 @@ Step 2x: Setup Trello
 First you will have to register your application on Trello. Check out the
 documentation for more information: https://trello.com/docs/gettingstarted/authorize.html.
 
-Next configure a resource owner of type `amazon` with appropriate
+Next configure a resource owner of type `trello` with appropriate
 `client_id`, `client_secret` and `scope`.
 
 ```yaml
@@ -20,5 +20,5 @@ hwi_oauth:
 When you're done. Continue by configuring the security layer or go back to
 setup more resource owners.
 
-- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](2-configuring_resource_owners.md)
-- [Step 3: Configuring the security layer](3-configuring_the_security_layer.md).
+- [Step 2: Configuring resource owners (Facebook, GitHub, Google, Windows Live and others](../2-configuring_resource_owners.md)
+- [Step 3: Configuring the security layer](../3-configuring_the_security_layer.md).
diff --git a/Resources/doc/resource_owners/vkontakte.md b/Resources/doc/resource_owners/vkontakte.md
@@ -1,11 +1,11 @@
 Step 2x: Setup Vkontakte
 ========================
 First you will have to register your application on Vkontakte. Check out the
-documentation for more information: http://vk.com/developers.php.
+documentation for more information: https://vk.com/dev.
 
 Next configure a resource owner of type `vkontakte` with appropriate
 `client_id`, `client_secret` and `scope`. Refer to the Vkontakte documentation
-for the available [scopes](http://vk.com/developers.php?oid=-17680044&p=Application_Access_Rights).
+for the available [scopes](https://vk.com/dev/permissions).
 
 ```yaml
 # app/config/config.yml

diff --git a/Resources/translations/HWIOAuthBundle.fr.yml b/Resources/translations/HWIOAuthBundle.fr.yml
@@ -1,7 +1,7 @@
 header:
     connecting: Connexion en cours
     success: Connexion réussie avec le compte '%name%' !
-    register: S'incrire avec le compte '%name%'
+    register: S'inscrire avec le compte '%name%'
     registration_success: Enregistrement et connexion du compte '%username%' réussis !
 
 connect:

diff --git a/Security/Core/User/FOSUBUserProvider.php b/Security/Core/User/FOSUBUserProvider.php
@@ -139,7 +139,7 @@ public function refreshUser(UserInterface $user)
             throw new UsernameNotFoundException(sprintf('User with ID "%d" could not be reloaded.', $userId));
         }
 
-        return $user;
+        return $reloadedUser;
     }
 
     /**

diff --git a/Tests/OAuth/ResourceOwner/GenericOAuth2ResourceOwnerTest.php b/Tests/OAuth/ResourceOwner/GenericOAuth2ResourceOwnerTest.php
@@ -42,7 +42,7 @@ class GenericOAuth2ResourceOwnerTest extends \PHPUnit_Framework_TestCase
 
     protected $userResponse = <<<json
 {
-    "id":  "1"
+    "id":  "1",
     "foo": "bar"
 }
 json;
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,7 +139,7 @@ public function refreshUser(UserInterface $user) @@
                 throw new UsernameNotFoundException(sprintf('User with ID "%d" could not be reloaded.', $userId));
             }
-            return $user;
+            return $reloadedUser;
         }
         /**
@@ Expand Down @@