oauth2 1.4.1 → 1.4.4

data/gemfiles/ruby_2.1.gemfile

@@ -1,19 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
+gem 'faraday', '~> 0.15.4'
 gem 'rack', '~> 1.2'
 
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.2.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.3.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.4.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.5.gemfile

@@ -1,17 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
-group :development do
-  gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
-end
-
 gemspec :path => '../'

data/gemfiles/ruby_2.6.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'pry'
+  gem 'byebug'
+  gem 'pry-byebug'
+end
+
+gemspec :path => '../'

data/gemfiles/ruby_2.7.gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'pry'
+  gem 'byebug'
+  gem 'pry-byebug'
+end
+
+gemspec :path => '../'

data/gemfiles/ruby_head.gemfile

@@ -1,17 +1,9 @@
 source 'https://rubygems.org'
 
-gem 'faraday', '0.9.2'
-
 group :development do
   gem 'pry'
-end
-
-group :test do
-  gem 'rake'
-  gem 'rspec'
-  gem 'rspec-pending_for'
-  gem 'rubocop', '~> 0.53.0'
-  gem 'rubocop-rspec', '~> 1.24.0'
+  gem 'byebug'
+  gem 'pry-byebug'
 end
 
 gemspec :path => '../'

data/gemfiles/truffleruby.gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'

data/lib/oauth2/access_token.rb

@@ -46,7 +46,7 @@ module OAuth2
       end
       @expires_in ||= opts.delete('expires')
       @expires_in &&= @expires_in.to_i
-      @expires_at &&= @expires_at.to_i
+      @expires_at &&= convert_expires_at(@expires_at)
       @expires_at ||= Time.now.to_i + @expires_in if @expires_in
       @options = {:mode          => opts.delete(:mode) || :header,
                   :header_format => opts.delete(:header_format) || 'Bearer %s',
@@ -169,5 +169,12 @@ module OAuth2
         raise("invalid :mode option of #{options[:mode]}")
       end
     end
+
+    def convert_expires_at(expires_at)
+      expires_at_i = expires_at.to_i
+      return expires_at_i if expires_at_i > Time.now.utc.to_i
+      return Time.parse(expires_at).to_i if expires_at.is_a?(String)
+      expires_at_i
+    end
   end
 end

data/lib/oauth2/authenticator.rb

@@ -25,6 +25,10 @@ module OAuth2
         apply_basic_auth(params)
       when :request_body
         apply_params_auth(params)
+      when :tls_client_auth
+        apply_client_id(params)
+      when :private_key_jwt
+        params
       else
         raise NotImplementedError
       end
@@ -42,6 +46,12 @@ module OAuth2
       {'client_id' => id, 'client_secret' => secret}.merge(params)
     end
 
+    # When using schemes that don't require the client_secret to be passed i.e TLS Client Auth,
+    # we don't want to send the secret
+    def apply_client_id(params)
+      { 'client_id' => id }.merge(params)
+    end
+
     # Adds an `Authorization` header with Basic Auth credentials if and only if
     # it is not already set in the params.
     def apply_basic_auth(params)

data/lib/oauth2/client.rb

@@ -94,9 +94,10 @@ module OAuth2
     def request(verb, url, opts = {}) # rubocop:disable CyclomaticComplexity, MethodLength, Metrics/AbcSize
       connection.response :logger, ::Logger.new($stdout) if ENV['OAUTH_DEBUG'] == 'true'
 
-      url = connection.build_url(url, opts[:params]).to_s
+      url = connection.build_url(url).to_s
 
       response = connection.run_request(verb, url, opts[:body], opts[:headers]) do |req|
+        req.params.update(opts[:params]) if opts[:params]
         yield(req) if block_given?
       end
       response = Response.new(response, :parse => opts[:parse])
@@ -130,7 +131,7 @@ module OAuth2
     # @param [Hash] params a Hash of params for the token endpoint
     # @param [Hash] access token options, to pass to the AccessToken object
     # @param [Class] class of access token for easier subclassing OAuth2::AccessToken
-    # @return [AccessToken] the initalized AccessToken
+    # @return [AccessToken] the initialized AccessToken
     def get_token(params, access_token_opts = {}, access_token_class = AccessToken) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       params = Authenticator.new(id, secret, options[:auth_scheme]).apply(params)
       opts = {:raise_errors => options[:raise_errors], :parse => params.delete(:parse)}

data/lib/oauth2/version.rb

@@ -1,6 +1,6 @@
 module OAuth2
   module Version
-    module_function
+  module_function
 
     # The major version
     #
@@ -20,7 +20,7 @@ module OAuth2
     #
     # @return [Integer]
     def patch
-      1
+      4
     end
 
     # The pre-release version, if any
@@ -35,10 +35,10 @@ module OAuth2
     # @return [Hash]
     def to_h
       {
-          :major => major,
-          :minor => minor,
-          :patch => patch,
-          :pre => pre,
+        :major => major,
+        :minor => minor,
+        :patch => patch,
+        :pre => pre,
       }
     end
 

data/oauth2.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oauth2/version'
 
 Gem::Specification.new do |spec|
-  spec.add_dependency 'faraday', ['>= 0.8', '< 0.16.0']
+  spec.add_dependency 'faraday', ['>= 0.8', '< 2.0']
   spec.add_dependency 'jwt', ['>= 1.0', '< 3.0']
   spec.add_dependency 'multi_json', '~> 1.3'
   spec.add_dependency 'multi_xml', '~> 0.5'
@@ -22,6 +22,14 @@ Gem::Specification.new do |spec|
   spec.summary       = 'A Ruby wrapper for the OAuth 2.0 protocol.'
   spec.version       = OAuth2::Version
 
+  spec.metadata = {
+    'bug_tracker_uri'   => 'https://github.com/oauth-xx/oauth2/issues',
+    'changelog_uri'     => "https://github.com/oauth-xx/oauth2/blob/v#{spec.version}/CHANGELOG.md",
+    'documentation_uri' => "https://www.rubydoc.info/gems/oauth2/#{spec.version}",
+    'source_code_uri'   => "https://github.com/oauth-xx/oauth2/tree/v#{spec.version}",
+    'wiki_uri'          => 'https://github.com/oauth-xx/oauth2/wiki'
+  }
+
   spec.require_paths = %w[lib]
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
@@ -31,10 +39,14 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'addressable', '~> 2.3'
   spec.add_development_dependency 'backports', '~> 3.11'
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '>= 1.16'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rdoc', ['>= 5.0', '< 7']
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-stubbed_env'
+  spec.add_development_dependency 'rspec-pending_for'
+  spec.add_development_dependency 'rspec-block_is_expected'
+  spec.add_development_dependency 'silent_stream'
   spec.add_development_dependency 'wwtd'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Peter Boling
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -21,7 +21,7 @@ dependencies:
         version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '0.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +132,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
@@ -204,6 +204,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-stubbed_env
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-pending_for
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-block_is_expected
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: silent_stream
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +289,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_rspec.yml"
 - ".rubocop_todo.yml"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -242,29 +299,21 @@ files:
 - README.md
 - Rakefile
 - gemfiles/jruby_1.7.gemfile
-- gemfiles/jruby_1.7.gemfile.lock
 - gemfiles/jruby_9.0.gemfile
 - gemfiles/jruby_9.1.gemfile
-- gemfiles/jruby_9.1.gemfile.lock
 - gemfiles/jruby_9.2.gemfile
-- gemfiles/jruby_9.2.gemfile.lock
 - gemfiles/jruby_head.gemfile
 - gemfiles/ruby_1.9.gemfile
-- gemfiles/ruby_1.9.gemfile.lock
 - gemfiles/ruby_2.0.gemfile
-- gemfiles/ruby_2.0.gemfile.lock
 - gemfiles/ruby_2.1.gemfile
-- gemfiles/ruby_2.1.gemfile.lock
 - gemfiles/ruby_2.2.gemfile
-- gemfiles/ruby_2.2.gemfile.lock
 - gemfiles/ruby_2.3.gemfile
-- gemfiles/ruby_2.3.gemfile.lock
 - gemfiles/ruby_2.4.gemfile
-- gemfiles/ruby_2.4.gemfile.lock
 - gemfiles/ruby_2.5.gemfile
-- gemfiles/ruby_2.5.gemfile.lock
+- gemfiles/ruby_2.6.gemfile
+- gemfiles/ruby_2.7.gemfile
 - gemfiles/ruby_head.gemfile
-- gemfiles/ruby_head.gemfile.lock
+- gemfiles/truffleruby.gemfile
 - lib/oauth2.rb
 - lib/oauth2/access_token.rb
 - lib/oauth2/authenticator.rb
@@ -283,7 +332,12 @@ files:
 homepage: https://github.com/oauth-xx/oauth2
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/oauth-xx/oauth2/issues
+  changelog_uri: https://github.com/oauth-xx/oauth2/blob/v1.4.4/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/oauth2/1.4.4
+  source_code_uri: https://github.com/oauth-xx/oauth2/tree/v1.4.4
+  wiki_uri: https://github.com/oauth-xx/oauth2/wiki
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -299,8 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the OAuth 2.0 protocol.