omniauth-facebook 6.0.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3b8b67acd7d8c1557f82b621f96931ce962e50567c1c0c0fde99c073ed9d662
-  data.tar.gz: cff801f45a35bbb51d51729fc3e90ffc0a58bb9a175e59274755e7785256165c
+  metadata.gz: de07dc27eb8810abd1b2a688449e1ad0360f063a5c233c0c36f1902a721be927
+  data.tar.gz: f938ca12195ac5e3581e39802d5f54e82bae3fc22e71db51d1ce4a62b25750cd
 SHA512:
-  metadata.gz: badf485d3c8bdd1d6c3fa15de6e8524aa0421c365a571ce655f66c34d61270580fb9669c297652eb51c94c03111a52310a8a70813a6de88d95ea4e749a01c118
-  data.tar.gz: 0a064f3fc5060dfef9bee851e5188ba02c31fb62d3b07b4292699d8922059c5cf371825d94699f1b489a1a5c19c36a18024d92bdb5d79baa9b37d086c6e161b9
+  metadata.gz: 90f607d371c1e1b73cfb854d9fb1e0f7abb5e65d8e08d2043de57f20079ac4bcff5461f3bd3c536c47506ec174029a49cb500d536485649e4ac044cf5009ae8a
+  data.tar.gz: c30e200b472c2ddfbf9566ff14c2ca34e408a0380d41ed8328a2580fa21a3349f214767211d7574a744e9a8d35f61e44423a643a6a42419fa2f96d6f73ba38fd

data/.travis.yml

@@ -1,10 +1,6 @@
-before_install:
-  - gem update bundler
-  - bundle --version
-  - gem update --system
-  - gem --version
+language: ruby
+cache: bundler
 rvm:
+  - 2.7
   - 2.6
   - 2.5
-  - 2.4
-  - 2.3

data/CHANGELOG.md

@@ -1,4 +1,16 @@
-## 6.0.0 2020-01-27)
+## 8.0.0 (2020-10-20)
+
+Changes:
+
+  - user profile picture link includes access token (#344, @anklos)
+
+## 7.0.0 (2020-08-03)
+
+Changes:
+
+  - bumped version of FB Graph API to v4.0
+
+## 6.0.0 (2020-01-27)
 
 Changes:
 

data/README.md

@@ -41,7 +41,7 @@ Option name | Default | Explanation
 `scope` | `email` | A comma-separated list of permissions you want to request from the user. See the Facebook docs for a full list of available permissions: https://developers.facebook.com/docs/reference/login/
 `display` | `page` | The display context to show the authentication page. Options are: `page`, `popup` and `touch`. Read the Facebook docs for more details: https://developers.facebook.com/docs/reference/dialogs/oauth/
 `image_size` | `square` | Set the size for the returned image url in the auth hash. Valid options include `square` (50x50), `small` (50 pixels wide, variable height), `normal` (100 pixels wide, variable height), or `large` (about 200 pixels wide, variable height). Additionally, you can request a picture of a specific size by setting this option to a hash with `:width` and `:height` as keys. This will return an available profile picture closest to the requested size and requested aspect ratio. If only `:width` or `:height` is specified, we will return a picture whose width or height is closest to the requested size, respectively.
-`info_fields` | 'name,email' | Specify exactly which fields should be returned when getting the user's info. Value should be a comma-separated string as per https://developers.facebook.com/docs/graph-api/reference/user/ (only `/me` endpoint).
+`info_fields` | `name,email` | Specify exactly which fields should be returned when getting the user's info. Value should be a comma-separated string as per https://developers.facebook.com/docs/graph-api/reference/user/ (only `/me` endpoint).
 `locale` |  | Specify locale which should be used when getting the user's info. Value should be locale string as per https://developers.facebook.com/docs/reference/api/locale/.
 `auth_type` | | Optionally specifies the requested authentication features as a comma-separated list, as per https://developers.facebook.com/docs/facebook-login/reauthentication/. Valid values are `https` (checks for the presence of the secure cookie and asks for re-authentication if it is not present), and `reauthenticate` (asks the user to re-authenticate unconditionally). Use 'rerequest' when you want to request premissions. Default is `nil`.
 `secure_image_url` | `false` | Set to `true` to use https for the avatar image url returned in the auth hash.
@@ -58,14 +58,14 @@ end
 
 ### API Version
 
-OmniAuth Facebook uses versioned API endpoints by default (current v3.0). You can configure a different version via `client_options` hash passed to `provider`, specifically you should change the version in the `site` and `authorize_url` parameters. For example, to change to v4.0 (assuming that exists):
+OmniAuth Facebook uses versioned API endpoints by default (current v4.0). You can configure a different version via `client_options` hash passed to `provider`, specifically you should change the version in the `site` and `authorize_url` parameters. For example, to change to v7.0 (assuming that exists):
 
 ```ruby
 use OmniAuth::Builder do
   provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'],
     client_options: {
-      site: 'https://graph.facebook.com/v4.0',
-      authorize_url: "https://www.facebook.com/v4.0/dialog/oauth"
+      site: 'https://graph.facebook.com/v7.0',
+      authorize_url: "https://www.facebook.com/v7.0/dialog/oauth"
     }
 end
 ```

data/example/app.rb

@@ -29,7 +29,7 @@ get '/client-side' do
         window.fbAsyncInit = function() {
           FB.init({
             appId: '#{ENV['FACEBOOK_APP_ID']}',
-            version: 'v3.0',
+            version: 'v4.0',
             cookie: true // IMPORTANT must enable cookies to allow the server to access the session
           });
           console.log("fb init");

data/lib/omniauth/facebook/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Facebook
-    VERSION = '6.0.0'
+    VERSION = '8.0.0'
   end
 end

data/lib/omniauth/strategies/facebook.rb

@@ -12,8 +12,8 @@ module OmniAuth
       DEFAULT_SCOPE = 'email'
 
       option :client_options, {
-        site: 'https://graph.facebook.com/v3.0',
-        authorize_url: "https://www.facebook.com/v3.0/dialog/oauth",
+        site: 'https://graph.facebook.com/v4.0',
+        authorize_url: "https://www.facebook.com/v4.0/dialog/oauth",
         token_url: 'oauth/access_token'
       }
 
@@ -161,13 +161,15 @@ module OmniAuth
         uri_class = options[:secure_image_url] ? URI::HTTPS : URI::HTTP
         site_uri = URI.parse(client.site)
         url = uri_class.build({host: site_uri.host, path: "#{site_uri.path}/#{uid}/picture"})
+        query = { access_token: access_token.token }
 
-        query = if options[:image_size].is_a?(String) || options[:image_size].is_a?(Symbol)
-          { type: options[:image_size] }
+        if options[:image_size].is_a?(String) || options[:image_size].is_a?(Symbol)
+          query[:type] = options[:image_size]
         elsif options[:image_size].is_a?(Hash)
-          options[:image_size]
+          query.merge!(options[:image_size])
         end
-        url.query = Rack::Utils.build_query(query) if query
+
+        url.query = Rack::Utils.build_query(query)
 
         url.to_s
       end

data/omniauth-facebook.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors  = ['Mark Dodwell', 'Josef Šimánek']
   s.email    = ['mark@madeofcode.com', 'retro@ballgag.cz']
   s.summary  = 'Facebook OAuth2 Strategy for OmniAuth'
-  s.homepage = 'https://github.com/mkdynamic/omniauth-facebook'
+  s.homepage = 'https://github.com/simi/omniauth-facebook'
   s.license  = 'MIT'
 
   s.files         = `git ls-files`.split("\n")

data/test/strategy_test.rb

@@ -9,11 +9,11 @@ end
 
 class ClientTest < StrategyTestCase
   test 'has correct Facebook site' do
-    assert_equal 'https://graph.facebook.com/v3.0', strategy.client.site
+    assert_equal 'https://graph.facebook.com/v4.0', strategy.client.site
   end
 
   test 'has correct authorize url' do
-    assert_equal 'https://www.facebook.com/v3.0/dialog/oauth', strategy.client.options[:authorize_url]
+    assert_equal 'https://www.facebook.com/v4.0/dialog/oauth', strategy.client.options[:authorize_url]
   end
 
   test 'has correct token url with versioning' do
@@ -95,41 +95,52 @@ class UidTest < StrategyTestCase
 end
 
 class InfoTest < StrategyTestCase
+  def setup
+    super
+    @access_token = stub('OAuth2::AccessToken')
+    @access_token.stubs(:token).returns('test_access_token')
+  end
+
   test 'returns the secure facebook avatar url when `secure_image_url` option is specified' do
     @options = { secure_image_url: true }
     raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
     strategy.stubs(:raw_info).returns(raw_info)
-    assert_equal 'https://graph.facebook.com/v3.0/321/picture', strategy.info['image']
+    strategy.stubs(:access_token).returns(@access_token)
+    assert_equal 'https://graph.facebook.com/v4.0/321/picture?access_token=test_access_token', strategy.info['image']
   end
 
   test 'returns the image_url based of the client site' do
     @options = { secure_image_url: true, client_options: {site: "https://blah.facebook.com/v2.2"}}
     raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
     strategy.stubs(:raw_info).returns(raw_info)
-    assert_equal 'https://blah.facebook.com/v2.2/321/picture', strategy.info['image']
+    strategy.stubs(:access_token).returns(@access_token)
+    assert_equal "https://blah.facebook.com/v2.2/321/picture?access_token=test_access_token", strategy.info['image']
   end
 
   test 'returns the image with size specified in the `image_size` option' do
     @options = { image_size: 'normal' }
     raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
     strategy.stubs(:raw_info).returns(raw_info)
-    assert_equal 'http://graph.facebook.com/v3.0/321/picture?type=normal', strategy.info['image']
+    strategy.stubs(:access_token).returns(@access_token)
+    assert_equal 'http://graph.facebook.com/v4.0/321/picture?access_token=test_access_token&type=normal', strategy.info['image']
   end
 
   test 'returns the image with size specified as a symbol in the `image_size` option' do
     @options = { image_size: :normal }
     raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
     strategy.stubs(:raw_info).returns(raw_info)
-    assert_equal 'http://graph.facebook.com/v3.0/321/picture?type=normal', strategy.info['image']
+    strategy.stubs(:access_token).returns(@access_token)
+    assert_equal 'http://graph.facebook.com/v4.0/321/picture?access_token=test_access_token&type=normal', strategy.info['image']
   end
 
   test 'returns the image with width and height specified in the `image_size` option' do
     @options = { image_size: { width: 123, height: 987 } }
     raw_info = { 'name' => 'Fred Smith', 'id' => '321' }
     strategy.stubs(:raw_info).returns(raw_info)
+    strategy.stubs(:access_token).returns(@access_token)
     assert_match 'width=123', strategy.info['image']
     assert_match 'height=987', strategy.info['image']
-    assert_match 'http://graph.facebook.com/v3.0/321/picture?', strategy.info['image']
+    assert_match 'http://graph.facebook.com/v4.0/321/picture?access_token=test_access_token', strategy.info['image']
   end
 end
 
@@ -138,6 +149,10 @@ class InfoTestOptionalDataPresent < StrategyTestCase
     super
     @raw_info ||= { 'name' => 'Fred Smith' }
     strategy.stubs(:raw_info).returns(@raw_info)
+
+    access_token = stub('OAuth2::AccessToken')
+    access_token.stubs(:token).returns('test_access_token')
+    strategy.stubs(:access_token).returns(access_token)
   end
 
   test 'returns the name' do
@@ -176,7 +191,7 @@ class InfoTestOptionalDataPresent < StrategyTestCase
 
   test 'returns the facebook avatar url' do
     @raw_info['id'] = '321'
-    assert_equal 'http://graph.facebook.com/v3.0/321/picture', strategy.info['image']
+    assert_equal 'http://graph.facebook.com/v4.0/321/picture?access_token=test_access_token', strategy.info['image']
   end
 
   test 'returns the Facebook link as the Facebook url' do
@@ -215,6 +230,10 @@ class InfoTestOptionalDataNotPresent < StrategyTestCase
     super
     @raw_info ||= { 'name' => 'Fred Smith' }
     strategy.stubs(:raw_info).returns(@raw_info)
+
+    access_token = stub('OAuth2::AccessToken')
+    access_token.stubs(:token).returns('test_access_token')
+    strategy.stubs(:access_token).returns(access_token)
   end
 
   test 'has no email key' do
@@ -258,7 +277,7 @@ class RawInfoTest < StrategyTestCase
     @options = {appsecret_proof: @appsecret_proof, fields: 'name,email'}
   end
 
-  test 'performs a GET to https://graph.facebook.com/v3.0/me' do
+  test 'performs a GET to https://graph.facebook.com/v4.0/me' do
     strategy.stubs(:appsecret_proof).returns(@appsecret_proof)
     strategy.stubs(:access_token).returns(@access_token)
     params = {params: @options}
@@ -266,7 +285,7 @@ class RawInfoTest < StrategyTestCase
     strategy.raw_info
   end
 
-  test 'performs a GET to https://graph.facebook.com/v3.0/me with locale' do
+  test 'performs a GET to https://graph.facebook.com/v4.0/me with locale' do
     @options.merge!({ locale: 'cs_CZ' })
     strategy.stubs(:access_token).returns(@access_token)
     strategy.stubs(:appsecret_proof).returns(@appsecret_proof)
@@ -275,7 +294,7 @@ class RawInfoTest < StrategyTestCase
     strategy.raw_info
   end
 
-  test 'performs a GET to https://graph.facebook.com/v3.0/me with info_fields' do
+  test 'performs a GET to https://graph.facebook.com/v4.0/me with info_fields' do
     @options.merge!({info_fields: 'about'})
     strategy.stubs(:access_token).returns(@access_token)
     strategy.stubs(:appsecret_proof).returns(@appsecret_proof)
@@ -284,7 +303,7 @@ class RawInfoTest < StrategyTestCase
     strategy.raw_info
   end
 
-  test 'performs a GET to https://graph.facebook.com/v3.0/me with default info_fields' do
+  test 'performs a GET to https://graph.facebook.com/v4.0/me with default info_fields' do
     strategy.stubs(:access_token).returns(@access_token)
     strategy.stubs(:appsecret_proof).returns(@appsecret_proof)
     params = {params: {appsecret_proof: @appsecret_proof, fields: 'name,email'}}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-facebook
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 8.0.0
 platform: ruby
 authors:
 - Mark Dodwell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -98,7 +98,7 @@ files:
 - test/signed_request_test.rb
 - test/strategy_test.rb
 - test/support/shared_examples.rb
-homepage: https://github.com/mkdynamic/omniauth-facebook
+homepage: https://github.com/simi/omniauth-facebook
 licenses:
 - MIT
 metadata: {}
@@ -117,8 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: Facebook OAuth2 Strategy for OmniAuth