oauth2 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6df01671ac06be9840d38d64d3cc349e3f8a41
-  data.tar.gz: 4ebfa842881a53f3c98cc407646614f5f8883cbc
+  metadata.gz: 64323d2b66a74a3aba80fa955d23d280e64ede95
+  data.tar.gz: b5d9c12d616a0ccd67d15eed3b887cd6b1e174ec
 SHA512:
-  metadata.gz: fde60355bd37fd6ab71e9f103fae0d4fbb065b62c4070c95aef84842fb9cfce6a6125e75a0e78e98c87c54c32ccc72042a1c5cfae514d534799310ac5a82e0c6
-  data.tar.gz: 6c358951c337a85275fe064a599e2fa03d92c4eeb3425d3ec2e51b857aa42cdcfd31ab1e1a2e77a2e9780c246970a0bcde4c3ae2e42c5775847e951faf45be28
+  metadata.gz: d0c36b6f6f2a2b8db5d8aae0f7897ffa6de5321ee06064f757f523ca144a119befde42d13943f4507848999adc0f68b011534ddd64258210dbabbcfa6c83e34b
+  data.tar.gz: 8aef0531493683b4b9fc390a545e297e1107611d76363486acc473925264337438992b3f7b288a546e17685a7d198e306fc8b2d4f3dc153c1acd1f20f7e6cca7

data/README.md

@@ -106,12 +106,12 @@ implementations:
 * Ruby 1.8.7
 * Ruby 1.9.3
 * Ruby 2.0.0
-* Ruby 2.1.0
-* [JRuby][]
-* [Rubinius][]
+* Ruby 2.1
+* Ruby 2.2
+* Ruby 2.3
+* [JRuby 9K][]
 
 [jruby]: http://jruby.org/
-[rubinius]: http://rubini.us/
 
 If something doesn't work on one of these interpreters, it's a bug.
 

data/lib/oauth2/access_token.rb

@@ -10,6 +10,7 @@ module OAuth2
       # @param [Hash] a hash of AccessToken property values
       # @return [AccessToken] the initalized AccessToken
       def from_hash(client, hash)
+        hash = hash.dup
         new(client, hash.delete('access_token') || hash.delete(:access_token), hash)
       end
 
@@ -39,6 +40,7 @@ module OAuth2
     def initialize(client, token, opts = {}) # rubocop:disable Metrics/AbcSize
       @client = client
       @token = token.to_s
+      opts = opts.dup
       [:refresh_token, :expires_in, :expires_at].each do |arg|
         instance_variable_set("@#{arg}", opts.delete(arg) || opts.delete(arg.to_s))
       end
@@ -78,7 +80,7 @@ module OAuth2
     # @return [AccessToken] a new AccessToken
     # @note options should be carried over to the new AccessToken
     def refresh!(params = {})
-      fail('A refresh_token is not available') unless refresh_token
+      raise('A refresh_token is not available') unless refresh_token
       params[:client_id] = @client.id
       params[:client_secret] = @client.secret
       params[:grant_type] = 'refresh_token'
@@ -166,7 +168,7 @@ module OAuth2
         end
         # @todo support for multi-part (file uploads)
       else
-        fail("invalid :mode option of #{options[:mode]}")
+        raise("invalid :mode option of #{options[:mode]}")
       end
     end
   end

data/lib/oauth2/client.rb

@@ -110,12 +110,12 @@ module OAuth2
         response
       when 400..599
         error = Error.new(response)
-        fail(error) if opts.fetch(:raise_errors, options[:raise_errors])
+        raise(error) if opts.fetch(:raise_errors, options[:raise_errors])
         response.error = error
         response
       else
         error = Error.new(response)
-        fail(error, "Unhandled status code value of #{response.status}")
+        raise(error, "Unhandled status code value of #{response.status}")
       end
     end
 
@@ -137,7 +137,7 @@ module OAuth2
       end
       response = request(options[:token_method], token_url, opts)
       error = Error.new(response)
-      fail(error) if options[:raise_errors] && !(response.parsed.is_a?(Hash) && response.parsed['access_token'])
+      raise(error) if options[:raise_errors] && !(response.parsed.is_a?(Hash) && response.parsed['access_token'])
       access_token_class.from_hash(self, response.parsed.merge(access_token_opts))
     end
 

data/lib/oauth2/error.rb

@@ -8,17 +8,33 @@ module OAuth2
       response.error = self
       @response = response
 
-      message = []
-
       if response.parsed.is_a?(Hash)
         @code = response.parsed['error']
         @description = response.parsed['error_description']
-        message << "#{@code}: #{@description}"
+        error_description = "#{@code}: #{@description}"
       end
 
-      message << response.body
+      super(error_message(response.body, :error_description => error_description))
+    end
+
+    # Makes a error message
+    # @param [String] response_body response body of request
+    # @param [String] opts :error_description error description to show first line
+    def error_message(response_body, opts = {})
+      message = []
+
+      opts[:error_description] && message << opts[:error_description]
+
+      error_message = if opts[:error_description] && opts[:error_description].respond_to?(:encoding)
+                        script_encoding = opts[:error_description].encoding
+                        response_body.encode(script_encoding)
+                      else
+                        response_body
+                      end
+
+      message << error_message
 
-      super(message.join("\n"))
+      message.join("\n")
     end
   end
 end

data/lib/oauth2/mac_token.rb

@@ -64,7 +64,7 @@ module OAuth2
 
       uri = URI.parse(url)
 
-      fail(ArgumentError, "could not parse \"#{url}\" into URI") unless uri.is_a?(URI::HTTP)
+      raise(ArgumentError, "could not parse \"#{url}\" into URI") unless uri.is_a?(URI::HTTP)
 
       mac = signature(timestamp, nonce, verb, uri)
 
@@ -102,7 +102,7 @@ module OAuth2
         when 'hmac-sha-256'
           OpenSSL::Digest::SHA256.new
         else
-          fail(ArgumentError, 'Unsupported algorithm')
+          raise(ArgumentError, 'Unsupported algorithm')
         end
       end
     end

data/lib/oauth2/strategy/assertion.rb

@@ -25,7 +25,7 @@ module OAuth2
       #
       # @raise [NotImplementedError]
       def authorize_url
-        fail(NotImplementedError, 'The authorization endpoint is not used in this strategy')
+        raise(NotImplementedError, 'The authorization endpoint is not used in this strategy')
       end
 
       # Retrieve an access token given the specified client.
@@ -49,19 +49,21 @@ module OAuth2
 
       def build_request(params)
         assertion = build_assertion(params)
-        {:grant_type     => 'assertion',
-         :assertion_type => 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-         :assertion      => assertion,
-         :scope          => params[:scope],
+        {
+          :grant_type     => 'assertion',
+          :assertion_type => 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+          :assertion      => assertion,
+          :scope          => params[:scope],
         }.merge(client_params)
       end
 
       def build_assertion(params)
-        claims = {:iss => params[:iss],
-                  :aud => params[:aud],
-                  :prn => params[:prn],
-                  :exp => params[:exp],
-                 }
+        claims = {
+          :iss => params[:iss],
+          :aud => params[:aud],
+          :prn => params[:prn],
+          :exp => params[:exp],
+        }
         if params[:hmac_secret]
           JWT.encode(claims, params[:hmac_secret], 'HS256')
         elsif params[:private_key]

data/lib/oauth2/strategy/client_credentials.rb

@@ -10,7 +10,7 @@ module OAuth2
       #
       # @raise [NotImplementedError]
       def authorize_url
-        fail(NotImplementedError, 'The authorization endpoint is not used in this strategy')
+        raise(NotImplementedError, 'The authorization endpoint is not used in this strategy')
       end
 
       # Retrieve an access token given the specified client.

data/lib/oauth2/strategy/implicit.rb

@@ -22,7 +22,7 @@ module OAuth2
       #
       # @raise [NotImplementedError]
       def get_token(*)
-        fail(NotImplementedError, 'The token is accessed differently in this strategy')
+        raise(NotImplementedError, 'The token is accessed differently in this strategy')
       end
     end
   end

data/lib/oauth2/strategy/password.rb

@@ -8,7 +8,7 @@ module OAuth2
       #
       # @raise [NotImplementedError]
       def authorize_url
-        fail(NotImplementedError, 'The authorization endpoint is not used in this strategy')
+        raise(NotImplementedError, 'The authorization endpoint is not used in this strategy')
       end
 
       # Retrieve an access token given the specified End User username and password.

data/lib/oauth2/version.rb

@@ -13,7 +13,7 @@ module OAuth2
     #
     # @return [Integer]
     def minor
-      1
+      2
     end
 
     # The patch version

data/oauth2.gemspec

@@ -5,7 +5,7 @@ require 'oauth2/version'
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'faraday', ['>= 0.8', '< 0.10']
-  spec.add_dependency 'jwt', '~> 1.0', '< 1.5.2'
+  spec.add_dependency 'jwt', '~> 1.0'
   spec.add_dependency 'multi_json', '~> 1.3'
   spec.add_dependency 'multi_xml', '~> 0.5'
   spec.add_dependency 'rack', ['>= 1.2', '< 3']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,9 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +45,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement