omniauth-facebook2 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d869a7ba2cd2246e67ee9bf54357d49dac8f98b2a923e54b4f7b5958e4b5f3e3
-  data.tar.gz: e4c61f6ae8e9ee156a3683cb0d46731f2963497965865224bfe873cbcd40e119
+  metadata.gz: c2fed6fe78aaec447b3ef10186c6b09e5af585c7362887b1ab2a690e6a494d92
+  data.tar.gz: b9419b8295724e0ed582c78c2b5275b4aa40897ff0e81ef04a046b495da89f89
 SHA512:
-  metadata.gz: 5c078bbeb1a197d0a4f41aae96af96b315e8da4ebe95fbdc3eeb30fcd53beb5bee538cfae299e21dc6043836619c4e435fa171ca3f9b5be8fb39b8a790020183
-  data.tar.gz: e08a6b86e68247f5220f703c68ace0b8acdafaa4350ec93cf173506db47a86e83b427bb9203ccc4907ef79513534d7c1243ea14541a5ac0ce7f0a65ef0dfac6a
+  metadata.gz: 15478c0698d021ac155fca06623a826999362b3a161bcd839ec65bbd731887e477767c8504a107ce87c8bca38bf8dba6f004c07d47106a1a3050d528db97d4c3
+  data.tar.gz: 671e5abb1f82d17f267fa972eb01e2cd5cbfb194651f5aac4c98f0306bc10c3af6329bc97388df45ab2708a2ede7897d03d1f58c8318d30de63d2af4bf57698f

data/README.md

@@ -1,4 +1,4 @@
-# OmniAuth Facebook2 Strategy
+# OmniAuth Facebook Strategy
 
 [![Test](https://github.com/icoretech/omniauth-facebook2/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/icoretech/omniauth-facebook2/actions/workflows/test.yml?query=branch%3Amain)
 [![Gem Version](https://badge.fury.io/rb/omniauth-facebook2.svg)](https://badge.fury.io/rb/omniauth-facebook2)

data/lib/omniauth/facebook2/signed_request.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'base64'
-require 'json'
-require 'openssl'
+require "base64"
+require "json"
+require "openssl"
 
 module OmniAuth
   module Facebook2
@@ -10,7 +10,7 @@ module OmniAuth
     class SignedRequest
       class UnknownSignatureAlgorithmError < NotImplementedError; end
 
-      SUPPORTED_ALGORITHM = 'HMAC-SHA256'
+      SUPPORTED_ALGORITHM = "HMAC-SHA256"
 
       attr_reader :value, :secret
 
@@ -30,26 +30,26 @@ module OmniAuth
       private
 
       def parse_signed_request
-        signature, encoded_payload = value.to_s.split('.', 2)
+        signature, encoded_payload = value.to_s.split(".", 2)
         return if blank?(signature) || blank?(encoded_payload)
 
         decoded_signature = base64_decode_url(signature)
         decoded_payload = JSON.parse(base64_decode_url(encoded_payload))
 
-        unless decoded_payload['algorithm'] == SUPPORTED_ALGORITHM
-          raise UnknownSignatureAlgorithmError, "unknown algorithm: #{decoded_payload['algorithm']}"
+        unless decoded_payload["algorithm"] == SUPPORTED_ALGORITHM
+          raise UnknownSignatureAlgorithmError, "unknown algorithm: #{decoded_payload["algorithm"]}"
         end
 
         decoded_payload if valid_signature?(decoded_signature, encoded_payload)
       end
 
-      def valid_signature?(signature, payload, algorithm = OpenSSL::Digest.new('SHA256'))
+      def valid_signature?(signature, payload, algorithm = OpenSSL::Digest.new("SHA256"))
         OpenSSL::HMAC.digest(algorithm, secret, payload) == signature
       end
 
       def base64_decode_url(value)
-        value += '=' * ((4 - value.size.modulo(4)) % 4)
-        Base64.decode64(value.tr('-_', '+/'))
+        value += "=" * ((4 - value.size.modulo(4)) % 4)
+        Base64.decode64(value.tr("-_", "+/"))
       end
 
       def blank?(value)

data/lib/omniauth/facebook2/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module Facebook2
-    VERSION = '0.1.2'
+    VERSION = "0.1.3"
   end
 end

data/lib/omniauth/facebook2.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require 'omniauth/facebook2/version'
-require 'omniauth/facebook2/signed_request'
-require 'omniauth/strategies/facebook2'
+require "omniauth/facebook2/version"
+require "omniauth/facebook2/signed_request"
+require "omniauth/strategies/facebook2"

data/lib/omniauth/strategies/facebook2.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'omniauth-oauth2'
-require 'openssl'
-require 'rack/utils'
-require 'uri'
+require "omniauth-oauth2"
+require "openssl"
+require "rack/utils"
+require "uri"
 
 module OmniAuth
   module Strategies
@@ -11,12 +11,12 @@ module OmniAuth
     class Facebook2 < OmniAuth::Strategies::OAuth2
       class NoAuthorizationCodeError < StandardError; end
 
-      DEFAULT_SCOPE = 'email'
-      DEFAULT_FACEBOOK_API_VERSION = 'v25.0'
-      DEFAULT_INFO_FIELDS = 'name,email'
-      DEFAULT_TOKEN_URL = 'oauth/access_token'
+      DEFAULT_SCOPE = "email"
+      DEFAULT_FACEBOOK_API_VERSION = "v25.0"
+      DEFAULT_INFO_FIELDS = "name,email"
+      DEFAULT_TOKEN_URL = "oauth/access_token"
 
-      option :name, 'facebook2'
+      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]
@@ -25,61 +25,61 @@ module OmniAuth
       option :authorization_code_from_signed_request_in_cookie, nil
 
       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: DEFAULT_TOKEN_URL,
-             connection_opts: {
-               headers: {
-                 user_agent: 'icoretech-omniauth-facebook2 gem',
-                 accept: 'application/json',
-                 content_type: 'application/json'
-               }
-             }
+        site: "https://graph.facebook.com/#{DEFAULT_FACEBOOK_API_VERSION}",
+        authorize_url: "https://www.facebook.com/#{DEFAULT_FACEBOOK_API_VERSION}/dialog/oauth",
+        token_url: DEFAULT_TOKEN_URL,
+        connection_opts: {
+          headers: {
+            user_agent: "icoretech-omniauth-facebook2 gem",
+            accept: "application/json",
+            content_type: "application/json"
+          }
+        }
 
       option :access_token_options,
-             header_format: 'OAuth %s',
-             param_name: 'access_token'
+        header_format: "OAuth %s",
+        param_name: "access_token"
 
-      uid { raw_info['id'] }
+      uid { raw_info["id"] }
 
       info do
         prune(
           {
-            'nickname' => raw_info['username'],
-            'email' => raw_info['email'],
-            'name' => raw_info['name'],
-            'first_name' => raw_info['first_name'],
-            'last_name' => raw_info['last_name'],
-            'image' => image_url(uid),
-            'description' => raw_info['bio'],
-            'urls' => {
-              'Facebook' => raw_info['link'],
-              'Website' => raw_info['website']
+            "nickname" => raw_info["username"],
+            "email" => raw_info["email"],
+            "name" => raw_info["name"],
+            "first_name" => raw_info["first_name"],
+            "last_name" => raw_info["last_name"],
+            "image" => image_url(uid),
+            "description" => raw_info["bio"],
+            "urls" => {
+              "Facebook" => raw_info["link"],
+              "Website" => raw_info["website"]
             },
-            'location' => raw_info.dig('location', 'name'),
-            'verified' => raw_info['verified']
+            "location" => raw_info.dig("location", "name"),
+            "verified" => raw_info["verified"]
           }
         )
       end
 
       credentials do
         {
-          'token' => access_token.token,
-          'refresh_token' => access_token.refresh_token,
-          'expires_at' => access_token.expires_at,
-          'expires' => access_token.expires?,
-          'scope' => token_scope
+          "token" => access_token.token,
+          "refresh_token" => access_token.refresh_token,
+          "expires_at" => access_token.expires_at,
+          "expires" => access_token.expires?,
+          "scope" => token_scope
         }.compact
       end
 
       extra do
         data = {}
-        data['raw_info'] = raw_info unless skip_info?
+        data["raw_info"] = raw_info unless skip_info?
         prune(data)
       end
 
       def raw_info
-        @raw_info ||= access_token.get('me', info_options).parsed || {}
+        @raw_info ||= access_token.get("me", info_options).parsed || {}
       end
 
       def info_options
@@ -89,7 +89,7 @@ module OmniAuth
         params[:appsecret_proof] = appsecret_proof if options[:appsecret_proof]
         params[:locale] = options[:locale] if options[:locale]
 
-        { params: params }
+        {params: params}
       end
 
       def callback_phase
@@ -115,13 +115,13 @@ module OmniAuth
       end
 
       def callback_url
-        return '' if options.authorization_code_from_signed_request_in_cookie
+        return "" if options.authorization_code_from_signed_request_in_cookie
 
         options[:callback_url] || super
       end
 
       def query_string
-        return '' if request.params['code']
+        return "" if request.params["code"]
 
         super
       end
@@ -163,10 +163,10 @@ module OmniAuth
       end
 
       def with_authorization_code!
-        if request.params.key?('code') && !blank?(request.params['code'])
+        if request.params.key?("code") && !blank?(request.params["code"])
           yield
-        elsif (code_from_signed_request = signed_request_from_cookie && signed_request_from_cookie['code'])
-          request.params['code'] = code_from_signed_request
+        elsif (code_from_signed_request = signed_request_from_cookie && signed_request_from_cookie["code"])
+          request.params["code"] = code_from_signed_request
           options.authorization_code_from_signed_request_in_cookie = true
           original_provider_ignores_state = options.provider_ignores_state
           options.provider_ignores_state = true
@@ -174,13 +174,13 @@ module OmniAuth
           begin
             yield
           ensure
-            request.params.delete('code')
+            request.params.delete("code")
             options.authorization_code_from_signed_request_in_cookie = false
             options.provider_ignores_state = original_provider_ignores_state
           end
         else
           raise NoAuthorizationCodeError,
-                'must pass either a `code` (query param) or an `fbsr_<app_id>` signed request cookie'
+            "must pass either a `code` (query param) or an `fbsr_<app_id>` signed request cookie"
         end
       end
 
@@ -199,26 +199,26 @@ module OmniAuth
         url = uri_class.build(host: site_uri.host, path: "#{site_uri.path}/#{user_id}/picture")
 
         query = if options[:image_size].is_a?(String) || options[:image_size].is_a?(Symbol)
-                  { type: options[:image_size] }
-                elsif options[:image_size].is_a?(Hash)
-                  options[:image_size]
-                end
+          {type: options[:image_size]}
+        elsif options[:image_size].is_a?(Hash)
+          options[:image_size]
+        end
         url.query = Rack::Utils.build_query(query) if query
 
         url.to_s
       end
 
       def appsecret_proof
-        @appsecret_proof ||= OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('SHA256'), client.secret, access_token.token)
+        @appsecret_proof ||= OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new("SHA256"), client.secret, access_token.token)
       end
 
       def token_scope
         token_params = access_token.respond_to?(:params) ? access_token.params : {}
-        token_params['scope'] || (access_token['scope'] if access_token.respond_to?(:[]))
+        token_params["scope"] || (access_token["scope"] if access_token.respond_to?(:[]))
       end
 
       def missing_session_state?
-        present?(request.params['state']) && blank?(session['omniauth.state'])
+        present?(request.params["state"]) && blank?(session["omniauth.state"])
       end
 
       def oauth_state_nil_compare_error?(error)
@@ -228,7 +228,7 @@ module OmniAuth
       def fail_state_mismatch
         fail!(
           :csrf_detected,
-          OmniAuth::Strategies::OAuth2::CallbackError.new(:csrf_detected, 'OAuth state was missing or mismatched')
+          OmniAuth::Strategies::OAuth2::CallbackError.new(:csrf_detected, "OAuth state was missing or mismatched")
         )
       end
 
@@ -275,10 +275,10 @@ module OmniAuth
 
     # Backward-compatible strategy name for existing `facebook` callback paths.
     class Facebook < Facebook2
-      option :name, 'facebook'
+      option :name, "facebook"
     end
   end
 end
 
-OmniAuth.config.add_camelization 'facebook2', 'Facebook2'
-OmniAuth.config.add_camelization 'facebook', 'Facebook'
+OmniAuth.config.add_camelization "facebook2", "Facebook2"
+OmniAuth.config.add_camelization "facebook", "Facebook"

data/lib/omniauth-facebook2.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-require 'omniauth/facebook2'
+require "omniauth/facebook2"

data/omniauth-facebook2.gemspec

@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'omniauth/facebook2/version'
+require "omniauth/facebook2/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'omniauth-facebook2'
+  spec.name = "omniauth-facebook2"
   spec.version = OmniAuth::Facebook2::VERSION
-  spec.authors = ['Claudio Poli']
-  spec.email = ['masterkain@gmail.com']
+  spec.authors = ["Claudio Poli"]
+  spec.email = ["masterkain@gmail.com"]
 
-  spec.summary = 'OmniAuth strategy for Facebook OAuth2 authentication.'
+  spec.summary = "OmniAuth strategy for Facebook OAuth2 authentication."
   spec.description =
-    'OAuth2 strategy for OmniAuth that authenticates users with Facebook ' \
-    'and exposes profile metadata from the Graph API.'
-  spec.homepage = 'https://github.com/icoretech/omniauth-facebook2'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 3.2'
+    "OAuth2 strategy for OmniAuth that authenticates users with Facebook " \
+    "and exposes profile metadata from the Graph API."
+  spec.homepage = "https://github.com/icoretech/omniauth-facebook2"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.2"
 
-  spec.metadata['source_code_uri'] = 'https://github.com/icoretech/omniauth-facebook2'
-  spec.metadata['bug_tracker_uri'] = 'https://github.com/icoretech/omniauth-facebook2/issues'
-  spec.metadata['changelog_uri'] = 'https://github.com/icoretech/omniauth-facebook2/releases'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata["source_code_uri"] = "https://github.com/icoretech/omniauth-facebook2"
+  spec.metadata["bug_tracker_uri"] = "https://github.com/icoretech/omniauth-facebook2/issues"
+  spec.metadata["changelog_uri"] = "https://github.com/icoretech/omniauth-facebook2/releases"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.files = Dir[
-    'lib/**/*.rb',
-    'README*',
-    'LICENSE*',
-    '*.gemspec'
+    "lib/**/*.rb",
+    "README*",
+    "LICENSE*",
+    "*.gemspec"
   ]
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'cgi', '>= 0.3.6'
-  spec.add_dependency 'omniauth-oauth2', '>= 1.8', '< 2.0'
+  spec.add_dependency "cgi", ">= 0.3.6"
+  spec.add_dependency "omniauth-oauth2", ">= 1.8", "< 2.0"
 end

metadata

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