omniauth 2.1.3 → 2.2.0

data/lib/omniauth.rb

@@ -1,7 +1,3 @@
-# TODO: Fixed in https://github.com/rack/rack/pull/1610 for Rack 3
-if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-  require 'delegate'
-end
 require 'rack'
 require 'singleton'
 require 'logger'
@@ -29,19 +25,20 @@ module OmniAuth
     include Singleton
 
     def self.default_logger
-      logger = Logger.new(STDOUT)
+      logger = Logger.new($stdout)
       logger.progname = 'omniauth'
       logger
     end
 
-    def self.defaults # rubocop:disable MethodLength
+    def self.defaults # rubocop:disable Metrics/MethodLength
       @defaults ||= {
         :camelizations => {},
         :path_prefix => '/auth',
-        :on_failure => OmniAuth::FailureEndpoint,
+        :on_failure => FailureEndpoint,
         :failure_raise_out_environments => ['development'],
-        :request_validation_phase => OmniAuth::AuthenticityTokenProtection,
+        :request_validation_phase => AuthenticityTokenProtection,
         :before_request_phase   => nil,
+        :after_request_phase    => nil,
         :before_callback_phase  => nil,
         :before_options_phase   => nil,
         :form_css => Form::DEFAULT_CSS,
@@ -49,12 +46,13 @@ module OmniAuth
         :logger => default_logger,
         :allowed_request_methods => %i[post],
         :mock_auth => {:default => AuthHash.new('provider' => 'default', 'uid' => '1234', 'info' => {'name' => 'Example User'})},
-        :silence_get_warning => false
+        :silence_get_warning => false,
+        :allowed_hosts => nil
       }
     end
 
     def initialize
-      self.class.defaults.each_pair { |k, v| send("#{k}=", v) }
+      self.class.defaults.each_pair { |k, v| public_send("#{k}=", v) }
     end
 
     def on_failure(&block)
@@ -97,19 +95,28 @@ module OmniAuth
       end
     end
 
+    def after_request_phase(&block)
+      if block_given?
+        @after_request_phase = block
+      else
+        @after_request_phase
+      end
+    end
+
     def add_mock(provider, original = {})
       # Create key-stringified new hash from given auth hash
-      mock = {}
+      mock = {} #: Hash[String, untyped]
       original.each_pair do |key, val|
         mock[key.to_s] = if val.is_a? Hash
-                           Hash[val.each_pair { |k, v| [k.to_s, v] }]
+                           val.transform_keys(&:to_s)
                          else
                            val
                          end
       end
 
       # Merge with the default mock and ensure provider is correct.
-      mock = mock_auth[:default].dup.merge(mock)
+      default = mock_auth.fetch(:default) #: AuthHash
+      mock = default.merge(mock)
       mock['provider'] = provider.to_s
 
       # Add it to the mocks.
@@ -126,9 +133,10 @@ module OmniAuth
       camelizations[name.to_s] = camelized.to_s
     end
 
-    attr_writer :on_failure, :before_callback_phase, :before_options_phase, :before_request_phase, :request_validation_phase
+    attr_writer :on_failure, :before_callback_phase, :before_options_phase, :before_request_phase, :after_request_phase, :request_validation_phase
     attr_accessor :failure_raise_out_environments, :path_prefix, :allowed_request_methods, :form_css,
-                  :test_mode, :mock_auth, :full_host, :camelizations, :logger, :silence_get_warning
+                  :test_mode, :mock_auth, :full_host, :camelizations, :logger, :silence_get_warning,
+                  :allowed_hosts
   end
 
   def self.config
@@ -148,7 +156,7 @@ module OmniAuth
   end
 
   module Utils
-  module_function # rubocop:disable Layout/IndentationWidth
+  module_function
 
     def form_css
       "<style type='text/css'>#{OmniAuth.config.form_css}</style>"
@@ -157,25 +165,29 @@ module OmniAuth
     def deep_merge(hash, other_hash)
       target = hash.dup
 
-      other_hash.each_key do |key|
-        if other_hash[key].is_a?(::Hash) && hash[key].is_a?(::Hash)
-          target[key] = deep_merge(target[key], other_hash[key])
-          next
-        end
-
-        target[key] = other_hash[key]
+      other_hash.each_pair do |key, value|
+        current = hash[key]
+        target[key] = current.is_a?(Hash) && value.is_a?(Hash) ? deep_merge(current, value) : value
       end
 
       target
     end
 
     def camelize(word, first_letter_in_uppercase = true)
-      return OmniAuth.config.camelizations[word.to_s] if OmniAuth.config.camelizations[word.to_s]
+      camelized = OmniAuth.config.camelizations[word.to_s]
+      return camelized if camelized
 
       if first_letter_in_uppercase
-        word.to_s.gsub(%r{/(.?)}) { '::' + Regexp.last_match[1].upcase }.gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
+        namespaced = word.to_s.gsub(%r{/(.?)}) do
+          char = Regexp.last_match(1) #: String
+          "::#{char.upcase}"
+        end
+        namespaced.gsub(/(\A|_)(.)/) do
+          char = Regexp.last_match(2) #: String
+          char.upcase
+        end
       else
-        camelize(word).tap { |w| w[0] = w[0].downcase }
+        camelize(word).tap { |w| w[0] = w[0].to_s.downcase }
       end
     end
   end

data/sig/manifest.yaml

@@ -0,0 +1,5 @@
+# Standard libraries these signatures refer to, which RBS loads for anyone
+# using them.
+dependencies:
+  - name: logger
+  - name: singleton