omniauth-oidc-strategy 0.3.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 2c3a01044e3cdcdfd2a0712deb95c1f8d015c11dd0af41cb9f46d647e8add7d9
+  data.tar.gz: 682e13153d0afe1e9ba025417b665a33bf7f67b0ebbeb1e36a5fef27c299cdc1
+SHA512:
+  metadata.gz: b049f61a08d5f64802a3e486aff0ccbed8c78a3632501f71145867d63910ac7a0c1ba50cf94270e809005e7963b7a8fd444fe25b22beb0a0f27c7f3dfed9bd96
+  data.tar.gz: bc093f7a404270346fc0ceab91471d6d80f9d4a6ca20de69c0877ffe751b85b28b2e87516a426b7f74d52690ac946dc8b48a07acc90934d9e6d2812e19828083

data/.rubocop.yml

@@ -0,0 +1,5 @@
+# Omakase Ruby styling for Rails
+inherit_gem:
+  rubocop-rails-omakase: rubocop.yml
+
+# Your own specialized rules go here

data/CHANGELOG.md

@@ -0,0 +1,19 @@
+## [Released]
+
+## [0.2.3] - 2024-08-04
+- Update readme
+
+## [0.2.2] - 2024-08-04
+- Update dependencies, update documentation, fix end_session_uri, update other_phase
+
+## [0.2.1] - 2024-07-21
+- Update dependencies
+
+## [0.2.0] - 2024-07-06
+- Add option to fetch user info or skip it
+
+## [0.1.1] - 2024-06-16
+- Add dependabot
+
+## [0.1.0] - 2024-06-13
+- Initial release

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at slmusayev@gmail.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2024 Suleyman Musayev
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,235 @@
+# OmniAuth::Oidc
+
+[![CI](https://github.com/CanalWestStudio/omniauth-oidc/actions/workflows/pull_request.yml/badge.svg)](https://github.com/CanalWestStudio/omniauth-oidc/actions/workflows/pull_request.yml)
+[![Gem Version](https://badge.fury.io/rb/omniauth-oidc.svg)](https://badge.fury.io/rb/omniauth-oidc)
+
+An OmniAuth strategy for OpenID Connect (OIDC) authentication. Supports multiple OIDC providers, PKCE, RP-Initiated Logout, and automatic discovery via the provider's configuration endpoint.
+
+Requires Ruby 3.1+.
+
+## Installation
+
+    $ bundle add omniauth-oidc
+
+Or install directly:
+
+    $ gem install omniauth-oidc
+
+## Configuration
+
+You need a Client ID, Client Secret, and the OIDC configuration endpoint URL at minimum.
+
+```ruby
+# config/initializers/omniauth.rb
+Rails.application.config.middleware.use OmniAuth::Builder do
+  provider :oidc, {
+    name: :my_provider,
+    client_options: {
+      identifier: ENV["MY_PROVIDER_CLIENT_ID"],
+      secret: ENV["MY_PROVIDER_CLIENT_SECRET"],
+      config_endpoint: "https://provider.example.com/.well-known/openid-configuration"
+    }
+  }
+end
+```
+
+With Devise:
+
+```ruby
+Devise.setup do |config|
+  config.omniauth :oidc, {
+    name: :my_provider,
+    scope: [:openid, :email, :profile],
+    uid_field: "preferred_username",
+    client_options: {
+      identifier: ENV["MY_PROVIDER_CLIENT_ID"],
+      secret: ENV["MY_PROVIDER_CLIENT_SECRET"],
+      config_endpoint: "https://provider.example.com/.well-known/openid-configuration"
+    }
+  }
+end
+```
+
+The gem fetches authorization, token, userinfo, and JWKS endpoints automatically from the `config_endpoint`. You can override any of them explicitly in `client_options` if needed.
+
+The gem does not accept `redirect_uri` as a configurable option — it is built dynamically from the provider `name` (see [Routes](#routes)).
+
+### All Options
+
+| Option | Description | Default |
+|---|---|---|
+| `name` | Provider identifier, used in route paths | `:oidc` |
+| `issuer` | Expected token issuer | Fetched from `config_endpoint` |
+| `scope` | OIDC scopes | `[:openid]` |
+| `response_type` | `"code"` or `"id_token"` | `"code"` |
+| `response_mode` | `:query`, `:fragment`, `:form_post`, or `:web_message` | `nil` |
+| `display` | `:page`, `:popup`, `:touch`, or `:wap` | `nil` |
+| `prompt` | `:none`, `:login`, `:consent`, or `:select_account` | `nil` |
+| `require_state` | Verify the `state` parameter on callbacks | `true` |
+| `state` | Custom state value or a `Proc` that returns one | Random 16-byte hex |
+| `send_nonce` | Include a nonce in the authorization request | `true` |
+| `fetch_user_info` | Fetch user info from the userinfo endpoint | `true` |
+| `uid_field` | User info field to use as `uid` | `"sub"` |
+| `send_scope_to_token_endpoint` | Include scope in the token request | `true` |
+| `client_auth_method` | Auth method for the token endpoint (e.g. `:basic`, `:jwks`) | `:basic` |
+| `pkce` | Enable PKCE (S256) | `false` |
+| `pkce_verifier` | Custom PKCE verifier `Proc` | Random 128-char hex |
+| `pkce_options` | Custom code challenge generation `Proc` and method | SHA256 / `"S256"` |
+| `extra_authorize_params` | Hash of extra params merged into the authorization request | `{}` |
+| `allow_authorize_params` | List of dynamic param keys allowed from the request | `[]` |
+| `acr_values` | Authentication Class Reference values ([RFC 9470](https://www.rfc-editor.org/rfc/rfc9470.html)) | `nil` |
+| `logout_path` | Path that triggers RP-Initiated Logout | `"/logout"` |
+| `post_logout_redirect_uri` | Where to redirect after provider logout | `nil` |
+| `client_signing_alg` | Expected JWT signing algorithm (e.g. `:RS256`) | `nil` (any) |
+| `jwt_secret_base64` | Base64-encoded secret for HMAC signing algorithms | `client_options.secret` |
+| `client_jwk_signing_key` | JWK key for JWT verification | `nil` |
+| `client_x509_signing_key` | X.509 certificate for JWT verification | `nil` |
+
+### Client Options
+
+| Option | Description | Default |
+|---|---|---|
+| `identifier` | OAuth 2.0 client ID | **required** |
+| `secret` | OAuth 2.0 client secret | **required** |
+| `config_endpoint` | OIDC discovery endpoint URL | **required** |
+| `scheme` | HTTP scheme | `"https"` |
+| `host` | Authorization server host | From `config_endpoint` |
+| `port` | Authorization server port | `443` |
+| `authorization_endpoint` | Override discovered authorize URL | From `config_endpoint` |
+| `token_endpoint` | Override discovered token URL | From `config_endpoint` |
+| `userinfo_endpoint` | Override discovered userinfo URL | From `config_endpoint` |
+| `jwks_uri` | Override discovered JWKS URL | From `config_endpoint` |
+| `end_session_endpoint` | Provider logout URL | From `config_endpoint` |
+| `environment` | Custom environment param sent with authorization requests | `nil` |
+
+## Routes
+
+The callback URL follows the pattern `https://your-app.com/auth/<name>/callback`, where `<name>` is the provider name from your configuration. Register this URL with your OIDC provider as an allowed redirect URI.
+
+```ruby
+# config/routes.rb
+Rails.application.routes.draw do
+  match "auth/:provider/callback", to: "callbacks#omniauth", via: [:get, :post]
+end
+```
+
+To initiate authentication, use a POST link (OmniAuth requires POST for CSRF protection):
+
+```ruby
+<%= button_to "Login with My Provider", "/auth/my_provider" %>
+```
+
+## Handling Callbacks
+
+```ruby
+class CallbacksController < ApplicationController
+  def omniauth
+    auth = request.env["omniauth.auth"]
+
+    user = User.find_or_create_by(uid: auth["uid"]) do |u|
+      u.name = auth["info"]["name"]
+      u.email = auth["info"]["email"]
+    end
+
+    session[:user_id] = user.id
+    redirect_to root_path, notice: "Logged in"
+  end
+end
+```
+
+### Access Token Only (No User Info)
+
+Set `fetch_user_info: false` to skip the userinfo endpoint. The callback will contain only credentials:
+
+```ruby
+provider :oidc, {
+  name: :my_provider,
+  fetch_user_info: false,
+  client_options: {
+    identifier: ENV["MY_PROVIDER_CLIENT_ID"],
+    secret: ENV["MY_PROVIDER_CLIENT_SECRET"],
+    config_endpoint: "https://provider.example.com/.well-known/openid-configuration"
+  }
+}
+```
+
+```ruby
+# request.env["omniauth.auth"] will contain:
+# {
+#   "provider" => :my_provider,
+#   "credentials" => {
+#     "id_token" => "...",
+#     "token" => "...",
+#     "refresh_token" => "...",
+#     "expires_in" => 300,
+#     "scope" => nil
+#   }
+# }
+```
+
+## RP-Initiated Logout
+
+To log the user out of both your application and the OIDC provider, configure `logout_path` and `end_session_endpoint`:
+
+```ruby
+provider :oidc, {
+  name: :my_provider,
+  logout_path: "/logout",
+  post_logout_redirect_uri: "https://your-app.com/signed_out",
+  client_options: {
+    identifier: ENV["MY_PROVIDER_CLIENT_ID"],
+    secret: ENV["MY_PROVIDER_CLIENT_SECRET"],
+    config_endpoint: "https://provider.example.com/.well-known/openid-configuration",
+    end_session_endpoint: "https://provider.example.com/signout"
+  }
+}
+```
+
+When a request matches `logout_path`, the gem redirects to the provider's `end_session_endpoint` with `id_token_hint` (from the session) and `post_logout_redirect_uri` if configured.
+
+The `end_session_endpoint` can also be discovered automatically from the `config_endpoint` if the provider advertises it.
+
+See the [OIDC RP-Initiated Logout spec](https://openid.net/specs/openid-connect-rpinitiated-1_0.html) for details.
+
+## Security
+
+### What the gem handles
+
+- **TLS 1.2+** — All HTTP requests enforce a minimum of TLS 1.2, allowing TLS 1.3 negotiation
+- **State validation** — The `state` parameter is verified on callbacks to prevent CSRF (enabled by default)
+- **Nonce verification** — A session-stored nonce is used for ID token verification; nonces from request params are never accepted
+- **PKCE** — Proof Key for Code Exchange (S256) is available via `pkce: true`
+- **Security headers** — All redirects include `Cache-Control: no-cache, no-store`, `Pragma: no-cache`, and `Referrer-Policy: no-referrer`
+- **RP-Initiated Logout** — Sends `id_token_hint` with end-session requests per the OIDC spec
+- **No `open-uri`** — The gem avoids `Kernel.open` by using Faraday for all HTTP
+
+### Host application responsibilities
+
+**Session and cookie security:**
+- Configure session cookies with `Secure`, `HttpOnly`, and `SameSite=Lax` (or `Strict`)
+- In Rails: `config.session_store :cookie_store, secure: true, httponly: true, same_site: :lax`
+
+**HTTPS:**
+- Enforce HTTPS on all pages
+- In Rails: `config.force_ssl = true`
+
+**Token storage:**
+- Encrypt refresh tokens at rest if persisted (e.g. AES-256-GCM)
+- Store encryption keys separately from encrypted data
+- Never log OAuth tokens or user credentials
+
+**Input handling:**
+- Sanitize user info from the OIDC provider before rendering in views
+- Use parameterized queries when storing user data
+
+### Reporting vulnerabilities
+
+If you discover a security vulnerability, please report it privately via [GitHub Security Advisories](https://github.com/CanalWestStudio/omniauth-oidc/security/advisories) rather than opening a public issue.
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/CanalWestStudio/omniauth-oidc. Contributors are expected to adhere to the [code of conduct](https://github.com/CanalWestStudio/omniauth-oidc/blob/main/CODE_OF_CONDUCT.md).
+
+## License
+
+Available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "bundler/gem_tasks"
+require "minitest/test_task"
+
+Minitest::TestTask.create
+
+require "rubocop/rake_task"
+
+RuboCop::RakeTask.new
+
+task default: %i[test rubocop]

data/lib/omniauth/oidc/config.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module OmniauthOidc
+  # Fetches and wraps the OIDC provider's discovery document, providing
+  # method-based access to standard OpenID Connect configuration fields.
+  class Config
+    FIELDS = %i[
+      issuer
+      authorization_endpoint
+      token_endpoint
+      userinfo_endpoint
+      jwks_uri
+      end_session_endpoint
+      scopes_supported
+    ].freeze
+
+    attr_reader(*FIELDS)
+
+    def initialize(data)
+      FIELDS.each do |field|
+        instance_variable_set(:"@#{field}", data[field.to_s] || data[field])
+      end
+    end
+
+    DEFAULT_TTL = 3600 # 1 hour
+
+    def self.fetch(endpoint_url, ttl: DEFAULT_TTL)
+      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+      if (cached = cache[endpoint_url]) && (now - cached[:fetched_at] < ttl)
+        return cached[:config]
+      end
+
+      json = OmniAuth::Strategies::Oidc::Transport.fetch_json(endpoint_url)
+      config = new(json)
+      cache[endpoint_url] = { config: config, fetched_at: now }
+      config
+    end
+
+    def self.cache
+      @cache ||= {}
+    end
+
+    def self.clear_cache!
+      @cache = {}
+    end
+  end
+end

data/lib/omniauth/oidc/errors.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module OmniauthOidc
+  class Error < RuntimeError; end
+
+  class MissingCodeError < Error; end
+
+  class MissingIdTokenError < Error; end
+end

data/lib/omniauth/oidc/user_agent.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require_relative "./version"
+
+module OmniauthOidc
+  USER_AGENT = "#{name}Client #{VERSION}-#{RUBY_PLATFORM}"
+end

data/lib/omniauth/oidc/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module OmniauthOidc
+  VERSION = "0.3.2"
+end

data/lib/omniauth/strategies/oidc/callback.rb

@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+module OmniAuth
+  module Strategies
+    class Oidc
+      # Callback phase
+      module Callback
+        def callback_phase # rubocop:disable Metrics
+          error_handler
+
+          verify_id_token!(params["id_token"]) if configured_response_type == "id_token"
+
+          client.redirect_uri = redirect_uri
+
+          return id_token_callback_phase if configured_response_type == "id_token"
+
+          client.authorization_code = authorization_code
+
+          access_token
+          super
+        rescue CallbackError => e
+          fail!(e.error, e)
+        rescue ::Rack::OAuth2::Client::Error => e
+          fail!(e.response[:error], e)
+        rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+          fail!(:timeout, e)
+        rescue ::SocketError => e
+          fail!(:failed_to_connect, e)
+        end
+
+        private
+
+        def access_token
+          return @access_token if @access_token
+
+          token_request_params = {
+            scope: (scope if options.send_scope_to_token_endpoint),
+            client_auth_method: options.client_auth_method
+          }
+
+          if options.pkce
+            token_request_params[:code_verifier] =
+              params["code_verifier"] || session.delete("omniauth.pkce.verifier")
+          end
+
+          set_client_options_for_callback_phase
+
+          @access_token = client.access_token!(token_request_params)
+
+          if configured_response_type == "code"
+            verify_id_token!(@access_token.id_token)
+            store_id_token(@access_token.id_token)
+          end
+
+          options.fetch_user_info ? get_user_info_from_access_token : define_access_token
+        end
+
+        def id_token_callback_phase
+          decode_id_token(params["id_token"])
+          store_id_token(params["id_token"])
+
+          define_user_info
+        end
+
+        def valid_response_type?
+          return true if params.key?(configured_response_type)
+
+          error_attrs = RESPONSE_TYPE_EXCEPTIONS[configured_response_type]
+          fail!(error_attrs[:key], error_attrs[:exception_class].new(params["error"]))
+
+          false
+        end
+
+        def get_user_info_from_access_token
+          define_user_info
+        end
+
+        def define_user_info
+          env["omniauth.auth"] = AuthHash.new(serialized_user_info_auth_hash)
+        end
+
+        def define_access_token
+          env["omniauth.auth"] = AuthHash.new(serialized_access_token_auth_hash)
+        end
+
+        def store_id_token(id_token)
+          session["omniauth.id_token"] = id_token if id_token
+        end
+
+        def configured_response_type
+          @configured_response_type ||= options.response_type.to_s
+        end
+
+        def set_client_options_for_callback_phase
+          configure_discovery_endpoints(client)
+          client.redirect_uri = redirect_uri
+        end
+
+        def error_handler
+          error = params["error_reason"] || params["error"]
+          error_description = params["error_description"] || params["error_reason"]
+
+          raise CallbackError, error: params["error"], reason: error_description, uri: params["error_uri"] if error
+
+          verify_state!
+
+          return unless valid_response_type?
+
+          options.issuer = issuer if options.issuer.nil? || options.issuer.empty?
+        end
+
+        def verify_state!
+          session_state = stored_state
+
+          if options.require_state
+            if params["state"].to_s.empty? || params["state"] != session_state
+              raise CallbackError, error: :csrf_detected, reason: "Invalid 'state' parameter"
+            end
+          elsif !params["state"].to_s.empty? && params["state"] != session_state
+            raise CallbackError, error: :csrf_detected, reason: "Invalid 'state' parameter"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/oidc/request.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module OmniAuth
+  module Strategies
+    class Oidc
+      # Code request phase
+      module Request
+        def request_phase
+          @identifier = client_options.identifier
+          @secret = secret
+
+          set_client_options_for_request_phase
+          redirect authorize_uri
+        end
+
+        def authorize_uri # rubocop:disable Metrics/AbcSize
+          client.redirect_uri = redirect_uri
+          opts = serialized_request_options
+
+          opts.merge!(options.extra_authorize_params) unless options.extra_authorize_params.empty?
+
+          options.allow_authorize_params.each do |key|
+            opts[key] = request.params[key.to_s] unless opts.key?(key)
+          end
+
+          # Add environment to the request if it is set
+          opts[:environment] = client_options.environment if client_options.environment
+
+          if options.pkce
+            verifier = options.pkce_verifier ? options.pkce_verifier.call : SecureRandom.hex(64)
+
+            opts.merge!(pkce_authorize_params(verifier))
+            session["omniauth.pkce.verifier"] = verifier
+          end
+
+          client.authorization_uri(opts.reject { |_k, v| v.nil? })
+        end
+
+        private
+
+        def new_state
+          state = if options.state.respond_to?(:call)
+                    if options.state.arity == 1
+                      options.state.call(env)
+                    else
+                      options.state.call
+                    end
+          end
+          session["omniauth.state"] = state || SecureRandom.hex(16)
+        end
+
+        def set_client_options_for_request_phase
+          configure_discovery_endpoints(client_options)
+        end
+      end
+    end
+  end
+end