openid_connect 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cf79613b4379a8ed1cbc832e36b7596c46b12b1f081bcbec61dab0141a52117
-  data.tar.gz: b8a1ee5ff52388587ecc6433165f45b9c7548bd9c042a53bc8c095034252dd67
+  metadata.gz: d5d610417958d0eb88277e192cf20e90d56b84273f11c9fd36b7abb0e1e23789
+  data.tar.gz: 7c67b82bcfa68236cd8b30aaecf2365072122bb82736c3beb6c84966a0d752f6
 SHA512:
-  metadata.gz: abe7c87e7b186ae774ec11168d920b55c6f390cade7efa9a16877484d2dfa42ef591faaee622029b5fc94aae9fe42a16d8cc4d6f470d06769c163d1f3603c56d
-  data.tar.gz: afd508e72c9b98defc16fb8118059f9cb113d2a2a58575ffa704949b20a518ed3835b12be2b25c92c9e283f9b2e36d245b5985a16f656e818c9bcc57217f1c0d
+  metadata.gz: 929805046a5cddddf3732292b0b3a79eb84ff5d9cb7036775eaf0c88dac94cf1ca1d191139effbe1405ca4225029354b9ee40162f2593571c4d0f7c93123a553
+  data.tar.gz: 46eb9dbf0af8f267fc859c502aba268751dce244b4820aa2cb37a68aa646ece43ec281955613d363e918cbc4985c86821e60c3c6dbea69df28c7b1c9296a0c91

data/.github/workflows/spec.yml

@@ -3,7 +3,7 @@ name: Spec
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 permissions:
@@ -13,12 +13,11 @@ jobs:
   spec:
     strategy:
       matrix:
-        os: ['ubuntu-20.04']
-        ruby-version: ['2.6', '2.7', '3.0', '3.1']
-        # ubuntu 22.04 only supports ssl 3 and thus only ruby 3.1
+        os: ['ubuntu-20.04', 'ubuntu-22.04']
+        ruby-version: ['3.1', '3.2', '3.3']
         include:
-        - os: 'ubuntu-22.04'
-          ruby-version: '3.1'
+        - os: 'ubuntu-20.04'
+          ruby-version: '3.0'
     runs-on: ${{ matrix.os }}
 
     steps:

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [2.2.0] - 2022-10-11
+
+### Changed
+
+- automatic json response decoding by @nov in https://github.com/nov/openid_connect/pull/77
+
+## [2.1.0] - 2022-10-10
+
+### Changed
+
+- mTLS access token by @nov in https://github.com/nov/openid_connect/pull/76
+
 ## [2.0.0] - 2022-10-09
 
 ### Added

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.1

data/lib/openid_connect/access_token.rb

@@ -28,7 +28,7 @@ module OpenIDConnect
       res = yield
       case res.status
       when 200
-        JSON.parse(res.body).with_indifferent_access
+        res.body.with_indifferent_access
       when 400
         raise BadRequest.new('API Access Faild', res)
       when 401

data/lib/openid_connect/client/registrar.rb

@@ -170,7 +170,7 @@ module OpenIDConnect
       end
 
       def handle_success_response(response)
-        credentials = JSON.parse(response.body).with_indifferent_access
+        credentials = response.body.with_indifferent_access
         Client.new(
           identifier: credentials[:client_id],
           secret:     credentials[:client_secret],

data/lib/openid_connect/client.rb

@@ -26,7 +26,7 @@ module OpenIDConnect
     end
 
     def handle_success_response(response)
-      token_hash = JSON.parse(response.body).with_indifferent_access
+      token_hash = response.body.with_indifferent_access
       token_type = (@forced_token_type || token_hash[:token_type]).try(:downcase)
       case token_type
       when 'bearer'
@@ -34,8 +34,6 @@ module OpenIDConnect
       else
         raise Exception.new("Unexpected Token Type: #{token_type}")
       end
-    rescue JSON::ParserError
-      raise Exception.new("Unknown Token Type")
     end
   end
 end

data/lib/openid_connect/discovery/provider/config/response.rb

@@ -81,9 +81,7 @@ module OpenIDConnect
           end
 
           def jwks
-            @jwks ||= JSON.parse(
-              OpenIDConnect.http_client.get(jwks_uri).body
-            ).with_indifferent_access
+            @jwks ||= OpenIDConnect.http_client.get(jwks_uri).body.with_indifferent_access
             JSON::JWK::Set.new @jwks[:keys]
           end
 

data/lib/openid_connect.rb

@@ -69,9 +69,10 @@ module OpenIDConnect
     Faraday.new(headers: {user_agent: "OpenIDConnect (#{VERSION})"}) do |faraday|
       faraday.request :url_encoded
       faraday.request :json
-      faraday.response :logger, OpenIDConnect.logger, {bodies: true} if debugging?
+      faraday.response :json
       faraday.adapter Faraday.default_adapter
       http_config&.call(faraday)
+      faraday.response :logger, OpenIDConnect.logger, {bodies: true} if debugging?
     end
   end
   def self.http_config(&block)

data/openid_connect.gemspec

@@ -22,13 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json-jwt", ">= 1.16"
   s.add_runtime_dependency "swd", "~> 2.0"
   s.add_runtime_dependency "webfinger", "~> 2.0"
-  s.add_runtime_dependency "rack-oauth2", "~> 2.0"
-  if Gem.ruby_version >= Gem::Version.create(3.1)
-    # TODO:
-    #  remove "net-smtp" dependency after mail gem 2.8+ (which supports ruby 3.1+) released.
-    #  ref.) https://rubygems.org/gems/mail
-    s.add_runtime_dependency "net-smtp"
-  end
+  s.add_runtime_dependency "rack-oauth2", "~> 2.2"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-its"

data/spec/mock_response/errors/unknown.json

@@ -1 +1,3 @@
-Fuckin Unknown Error
+{
+  "unknown": "unknown"
+}

data/spec/openid_connect/client_spec.rb

@@ -162,16 +162,6 @@ describe OpenIDConnect::Client do
       end
     end
 
-    context 'when invalid JSON is returned' do
-      it 'should raise OpenIDConnect::Exception' do
-        mock_json :post, client.token_endpoint, 'access_token/invalid_json', request_header: header_params, params: protocol_params do
-          expect do
-            access_token
-          end.to raise_error OpenIDConnect::Exception, 'Unknown Token Type'
-        end
-      end
-    end
-
     context 'otherwise' do
       it 'should raise Unexpected Token Type exception' do
         mock_json :post, client.token_endpoint, 'access_token/mac', request_header: header_params, params: protocol_params do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - nov matake
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -156,28 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: net-smtp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -377,7 +363,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: OpenID Connect Server & Client Library