openid_connect 2.3.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1846c96c032313eff89f8fcb9a753643c373ff00d6de12254b7f679d7802b4ab
-  data.tar.gz: 58c0780a7873c51f18fad3d847272fa49b59d88992a0833cf3f3396edc6d9303
+  metadata.gz: 605cbe04505cb2af337c82b012039c9b13be826348fa790f6b0cd1d90cdd0cc3
+  data.tar.gz: 240523a1e7b9e755827a8be1499918f8684f413ee0e8a81af00cb062ccf2699a
 SHA512:
-  metadata.gz: 4d605a9a6301af104cf1173b8626e5c1403a930b16cd49c738e2b7e08a8b8f23cfac4d53cfc649cb5484c73e22e1dc3c8b72941abda64942c405931cc17392e8
-  data.tar.gz: 70c4fcd75e6f7913475b5d8c070df75d37c242e3888010b5ec30eba95784258577b6de1575f52e494d44bf0c475a6d62b76e180c67c7e573f198ff910cf35d7c
+  metadata.gz: 60150ee35c5bf11ec4d945e692450b5eef982b47bfb800bb81fd40a328872f8bff124f683f42dc9c1689a2b2c910da0f3a5fd9a92e4f3481a0cde9032744ac80
+  data.tar.gz: a4b25a2ae74e5d2dcabe811e104c5cf7d8075e07a376d948fae8483d90dd1948c592160b3f68a1838c821288d21269b9a76b5a28043b7874b8fbaff28982696d

data/.github/workflows/spec.yml

@@ -11,21 +11,21 @@ permissions:
 
 jobs:
   spec:
+    runs-on: ubuntu-latest
+    name: Ruby ${{ matrix.ruby }}
     strategy:
       matrix:
-        os: ['ubuntu-20.04', 'ubuntu-22.04']
-        ruby-version: ['3.1', '3.2', '3.3']
-        include:
-        - os: 'ubuntu-20.04'
-          ruby-version: '3.0'
-    runs-on: ${{ matrix.os }}
-
+        ruby:
+          - '3.2'
+          - '3.3'
+          - '3.4'
+          - '4.0'
     steps:
     - uses: actions/checkout@v3
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
     - name: Run Specs
       run: bundle exec rake spec

data/README.rdoc

@@ -41,6 +41,10 @@ There is also OpenID Foudation Certified RP implementation using this gem below.
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+== Documentation
+
+see GitHub Wiki (https://github.com/nov/openid_connect/wiki)
+
 == Copyright
 
 Copyright (c) 2011 nov matake. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-2.3.1
+2.5.0

data/lib/openid_connect/access_token.rb

@@ -8,9 +8,17 @@ module OpenIDConnect
       @token_type = :bearer
     end
 
-    def userinfo!(params = {})
+    def userinfo!(params = {}, http_method: :get, headers: {})
+      raise ArgumentError, 'http_method must be :get or :post' unless [:get, :post].include?(http_method)
+
       hash = resource_request do
-        get client.userinfo_uri, params
+        case http_method
+        when :get
+          get client.userinfo_uri, params, headers
+        when :post
+          # Per OIDC Core §5.3.1
+          post client.userinfo_uri, params, { 'Content-Type' => 'application/x-www-form-urlencoded' }.merge(headers)
+        end
       end
       ResponseObject::UserInfo.new hash
     end

data/lib/openid_connect/response_object/user_info.rb

@@ -29,7 +29,7 @@ module OpenIDConnect
       validates :email_verified, :phone_number_verified, allow_nil: true, inclusion: {in: [true, false]}
       validates :zoneinfo,                               allow_nil: true, inclusion: {in: TZInfo::TimezoneProxy.all.collect(&:name)}
       validates :profile, :picture, :website,            allow_nil: true, url: true
-      validates :email,                                  allow_nil: true, email: true
+      validates :email,                                  allow_nil: true, format: { with: /\A[^@\s]+@[^@\s]+\.[^@\s]+\z/ }
       validates :updated_at,                             allow_nil: true, numericality: {only_integer: true}
       validate :validate_address
       validate :require_at_least_one_attributes

data/lib/openid_connect.rb

@@ -7,7 +7,6 @@ require 'webfinger'
 require 'active_model'
 require 'tzinfo'
 require 'validate_url'
-require 'email_validator/strict'
 require 'mail'
 require 'attr_required'
 require 'attr_optional'

data/openid_connect.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "attr_required", ">= 1.0.0"
   s.add_runtime_dependency "activemodel"
   s.add_runtime_dependency "validate_url"
-  s.add_runtime_dependency "email_validator"
   s.add_runtime_dependency "mail"
   s.add_runtime_dependency 'faraday', '~> 2.0'
   s.add_runtime_dependency 'faraday-follow_redirects'

data/spec/openid_connect/access_token_spec.rb

@@ -92,6 +92,28 @@ describe OpenIDConnect::AccessToken do
       userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
     end
 
+    context 'when http_method is :post' do
+      it 'should make a POST request and return UserInfo' do
+        userinfo = mock_json :post, client.userinfo_uri, 'userinfo/openid', params: {}, request_header: { 'Content-Type' => 'application/x-www-form-urlencoded' } do
+          access_token.userinfo!(http_method: :post)
+        end
+        userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
+      end
+
+      it 'should allow overriding Content-Type via headers' do
+        userinfo = mock_json :post, client.userinfo_uri, 'userinfo/openid', params: {}, request_header: { 'Content-Type' => 'application/json' } do
+          access_token.userinfo!(http_method: :post, headers: { 'Content-Type' => 'application/json' })
+        end
+        userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
+      end
+    end
+
+    context 'when http_method is invalid' do
+      it 'should raise ArgumentError' do
+        expect { access_token.userinfo!(http_method: :delete) }.to raise_error ArgumentError, 'http_method must be :get or :post'
+      end
+    end
+
     describe 'error handling' do
       let(:endpoint) { client.userinfo_uri }
       let(:request) { access_token.userinfo! }

data/spec/openid_connect/discovery/provider/config/resource_spec.rb

@@ -9,7 +9,7 @@ describe OpenIDConnect::Discovery::Provider::Config::Resource do
   describe '#endpoint' do
     context 'when invalid host' do
       before do
-        resource.host = 'hoge*hoge'
+        resource.host = 'invalid:host'
       end
 
       it do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.5.0
 platform: ruby
 authors:
 - nov matake
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tzinfo
@@ -66,20 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: email_validator
-  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'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +347,6 @@ homepage: https://github.com/nov/openid_connect
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -377,8 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: OpenID Connect Server & Client Library
 test_files: