omniauth-facebook2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c051fcad79b58c9fd1988af188abaa207b500e3cf6380f005ff2541709419d3
-  data.tar.gz: f3a352c67dec65e0332fbafd805f3e508675ee5a5fc71cde0e6e8c055f114b71
+  metadata.gz: 8be4fa997d52fac1a5aeb94f7c263ea302c73aad21ae1ca781894b9ba334af36
+  data.tar.gz: 26d1801e8ced6643562da38aaf2ea8da7af8753236d837c7c26884deec1556ca
 SHA512:
-  metadata.gz: 5433ff4b75e0bb8335e975b5f973d111cdc645c2de8cff6cc82527deae5eee643eaf5f0b57ed49a24941375533f37c44791fbdf9ded21e3d8556e041c08bae41
-  data.tar.gz: 331e183495646573db070811ac4ea5ff4c53dec6db57956d75fa5daf17b1d9f01416986fbec5287de861e1be14027b2f4b7673741cb30feff23de875581548e8
+  metadata.gz: '0924c4c2d93d3cac3359b0c1ca7a2a8a953a6193bd017144d1aaf049f534773441635e37292df45eaf5dbe3dd733915af117035d79f6a8c19e2738f493a1322b'
+  data.tar.gz: d101c589578e6201bf7b4c8d8b6064f8de43fdff3d81b0b503af72cc63d9b3be5711d32f05199090e1c08686cee0fdde73187d362d446f8f5fea906a6c84a38a

data/README.md

@@ -27,7 +27,8 @@ Configure OmniAuth in your Rack/Rails app:
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :facebook2,
            ENV.fetch('FACEBOOK_APP_ID'),
-           ENV.fetch('FACEBOOK_APP_SECRET')
+           ENV.fetch('FACEBOOK_APP_SECRET'),
+           api_version: 'v26.0' # optional; default is v25.0
 end
 ```
 
@@ -52,6 +53,7 @@ end
 Supported request/provider options include:
 
 - `scope` (default: `email`)
+- `api_version` (default: `v25.0`)
 - `display`
 - `auth_type` (example: `rerequest`)
 - `config_id` (Facebook Login for Business)
@@ -62,6 +64,19 @@ Supported request/provider options include:
 - `secure_image_url` (default: `true`)
 - `callback_url` / `callback_path`
 
+If you need full endpoint control, `client_options` still works and takes precedence over `api_version`:
+
+```ruby
+provider :facebook2,
+         ENV.fetch('FACEBOOK_APP_ID'),
+         ENV.fetch('FACEBOOK_APP_SECRET'),
+         client_options: {
+           site: 'https://graph.facebook.com/v26.0',
+           authorize_url: 'https://www.facebook.com/v26.0/dialog/oauth',
+           token_url: 'oauth/access_token'
+         }
+```
+
 ## Auth Hash
 
 Example payload from `request.env['omniauth.auth']` (captured from a real smoke run):
@@ -111,11 +126,11 @@ RAILS_VERSION='~> 8.1.0' bundle exec rake test_rails_integration
 
 ## Endpoints
 
-Default endpoints target Facebook Graph API `v25.0`:
+Default endpoints target Facebook Graph API `v25.0` (or `vX.Y` set via `api_version`):
 
-- Authorize: `https://www.facebook.com/v25.0/dialog/oauth`
-- Token: `https://graph.facebook.com/v25.0/oauth/access_token`
-- User info: `https://graph.facebook.com/v25.0/me`
+- Authorize: `https://www.facebook.com/vX.Y/dialog/oauth`
+- Token: `https://graph.facebook.com/vX.Y/oauth/access_token`
+- User info: `https://graph.facebook.com/vX.Y/me`
 
 ## Test Structure
 

data/lib/omniauth/facebook2/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Facebook2
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/lib/omniauth/strategies/facebook2.rb

@@ -14,9 +14,11 @@ module OmniAuth
       DEFAULT_SCOPE = 'email'
       DEFAULT_FACEBOOK_API_VERSION = 'v25.0'
       DEFAULT_INFO_FIELDS = 'name,email'
+      DEFAULT_TOKEN_URL = 'oauth/access_token'
 
       option :name, 'facebook2'
       option :scope, DEFAULT_SCOPE
+      option :api_version, DEFAULT_FACEBOOK_API_VERSION
       option :authorize_options, %i[scope display auth_type config_id redirect_uri]
       option :secure_image_url, true
       option :appsecret_proof, true
@@ -25,7 +27,7 @@ module OmniAuth
       option :client_options,
              site: "https://graph.facebook.com/#{DEFAULT_FACEBOOK_API_VERSION}",
              authorize_url: "https://www.facebook.com/#{DEFAULT_FACEBOOK_API_VERSION}/dialog/oauth",
-             token_url: 'oauth/access_token',
+             token_url: DEFAULT_TOKEN_URL,
              connection_opts: {
                headers: {
                  user_agent: 'icoretech-omniauth-facebook2 gem',
@@ -98,6 +100,14 @@ module OmniAuth
         fail!(:unknown_signature_algorithm, e)
       end
 
+      def client
+        @client ||= ::OAuth2::Client.new(
+          options.client_id,
+          options.client_secret,
+          deep_symbolize(normalized_client_options)
+        )
+      end
+
       def callback_url
         return '' if options.authorization_code_from_signed_request_in_cookie
 
@@ -201,6 +211,38 @@ module OmniAuth
         token_params['scope'] || (access_token['scope'] if access_token.respond_to?(:[]))
       end
 
+      def normalized_client_options
+        client_options = options.client_options.to_h.transform_keys(&:to_sym)
+        version = options[:api_version]
+        return client_options if blank?(version)
+
+        current_site = client_options[:site]
+        current_authorize_url = client_options[:authorize_url]
+        current_token_url = client_options[:token_url]
+        default_site = graph_site_for(DEFAULT_FACEBOOK_API_VERSION)
+        default_authorize_url = authorize_url_for(DEFAULT_FACEBOOK_API_VERSION)
+
+        client_options[:site] = graph_site_for(version) if default_endpoint?(current_site, default_site)
+        if default_endpoint?(current_authorize_url, default_authorize_url)
+          client_options[:authorize_url] = authorize_url_for(version)
+        end
+        client_options[:token_url] = DEFAULT_TOKEN_URL if blank?(current_token_url)
+
+        client_options
+      end
+
+      def graph_site_for(version)
+        "https://graph.facebook.com/#{version}"
+      end
+
+      def authorize_url_for(version)
+        "https://www.facebook.com/#{version}/dialog/oauth"
+      end
+
+      def default_endpoint?(value, default_value)
+        blank?(value) || value == default_value
+      end
+
       def blank?(value)
         value.nil? || (value.respond_to?(:empty?) && value.empty?)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-facebook2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Claudio Poli