doorkeeper-openid_connect 1.10.0 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b09f0d036559583b3db8dd63e6e35452e5f9c42c90ce098ab263c1817016994
-  data.tar.gz: f9c9584568d90c9d351a347d435ba471d8e798aa42c9ac28edebefcd59d33c1a
+  metadata.gz: a7213362be6e1d40b9d790e35b6b860d6cbf80691282732e1257a4a01998ee39
+  data.tar.gz: 0f0830786b8f43e64ee75c69c4ffadcfae0e1af2d5d4ace18214879740dbb7c3
 SHA512:
-  metadata.gz: a5a7f986bd19adcc2f3b4a03467d6052e32722f06162446b5ba944a8b905a111aa27528ccfc827e493382e95ab9dc89834a4ee483895951883291bda1387db81
-  data.tar.gz: c9fc3444e391e9b971bd193b18f388dafa47c5f5d6188d055fad2f524f9c8d6ceb67929a6b2ab5179ab50ff3c854e8d4883c9f6a43b9cd650cceba97a2e4dee2
+  metadata.gz: 626d292fa7351472982a54e48001973c7d9202bf146ce6dbd5f2577def44ee22d3f753117db18ae175134e727caaca64a4ab05b5b87f38e821254af13e93416b
+  data.tar.gz: d48ae4ce304b01e15f45200b9c3bf47e987decf85bd6c7270c87f56bb3f463617ac5de287b9b243d2538ff3c92f2b84d03771df81b5edea50360694029afa5dc

data/CHANGELOG.md

@@ -2,8 +2,34 @@
 
 - Please add here
 
+## v1.10.2 (2026-06-22)
+
+- [#315] Drop support for EOL Ruby 3.1 (EOL 2025-03-25) and require Ruby `>= 3.2`. `i18n 1.15.0` uses the `Fiber[]` storage API which only exists on Ruby 3.2+, so the Ruby 3.1 CI row no longer loads; the matrix now tests Ruby 3.2 as the minimum
+- [#316] Set `fail-fast: false` in CI matrix so a single failing job no longer cancels the rest
+- [#303] execute account selection even without owner, and `select_account_for_resource_owner` can now receive `nil` as the first argument.
+- [#304] allow handle auth_time per grant
+- [#305] Document the `auth_time_from_access_token` config option in the README (per-grant `auth_time`), clarifying that it only affects the ID Token `auth_time` claim and not `max_age` enforcement
+- [#307] Fix `bundle exec rake server` for the test application
+- [#313] Move Configuration documentation from README to Wiki
+- [#312] Raise `Errors::MissingRequiredClaim` instead of silently dropping a blank REQUIRED ID Token claim (`iss`/`sub`/`aud`/`exp`/`iat`) in `IdToken#as_json`, which previously could emit a non-conformant ID Token (OIDC Core 1.0 §2). OPTIONAL claims such as `nonce`/`auth_time` are still omitted when blank
+- [#311] Include the REQUIRED `client_secret_expires_at` member (value `0`, never expires) in the Dynamic Client Registration response whenever a `client_secret` is issued (RFC 7591 §3.2.1 / OpenID Connect Dynamic Client Registration 1.0 §3.2)
+- [#309] Add a browser dashboard to the test application (`spec/dummy`) for exercising the OpenID Connect endpoints by hand — replacing the rails console + curl workflow with forms for Setup, Discovery, Authorization (code / implicit / PKCE / nonce / prompt / `max_age`), token exchange, UserInfo, introspection and revocation
+
+## v1.10.1 (2026-06-03)
+
+- [#294] Drop stale `Metrics/ClassLength` and `Metrics/BlockLength` overrides from `.rubocop_todo.yml`
+- [#293] Drop `Naming/VariableNumber` from `.rubocop_todo.yml` and normalise test variable names
+- [#291] Document multi-namespace mount pattern for multiple resource owner models ([#192](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/issues/192))
+- [#292] Drop formatting cops from `.rubocop_todo.yml` and align trailing-comma style with upstream doorkeeper
+- [#296] Fix the `prompt` parameter being rejected with `invalid_request` when it contains leading or duplicate spaces (e.g. `prompt=%20none`) — blank entries in the space-delimited value are now ignored
+- [#299] Raise `InvalidConfiguration` when the `issuer` config resolves to a blank value instead of silently advertising an empty `issuer` in the discovery document. Since v1.10.0 an arity-2 `issuer` block receives `(resource_owner, application)` — both `nil` in the discovery context — so a block relying on the old v1.9.0 request argument could return `nil` and produce a discovery `issuer` that mismatched the ID token `iss` ([#298](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/issues/298))
+
 ## v1.10.0 (2026-06-01)
 
+>[!IMPORTANT]
+>
+>- **Breaking (arity-2 issuer blocks):** `resolve_issuer` now dispatches arity-2 blocks with `(resource_owner, application)` in all contexts, including discovery. In v1.9.0 `DiscoveryController` passed `request` as the first argument; existing arity-2 blocks that relied on this receive `(nil, nil)` in v1.10.0 and should migrate to arity-3 — see [#298](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/issues/298) for details and migration examples
+
 - [#241] Fix NameError on doorkeeper master by deferring AR model loading in run_hooks (see [Doorkeeper PR](https://github.com/doorkeeper-gem/doorkeeper/pull/1804))
 - [#242] Fix `NoMethodError` for openid_request in testing environments.
 - [#246] Fix `at_hash` to use correct hash algorithm based on `signing_algorithm`

data/README.md

@@ -14,13 +14,7 @@ OpenID Connect is a single-sign-on and identity layer with a [growing list of se
   - [Known Issues](#known-issues)
   - [Example Applications](#example-applications)
 - [Installation](#installation)
-- [Configuration](#configuration)
-  - [Scopes](#scopes)
-  - [Claims](#claims)
-  - [Routes](#routes)
-  - [Nonces](#nonces)
-  - [Internationalization (I18n)](#internationalization-i18n)
-  - [Dynamic Client Registration](#dynamic-client-registration)
+- [Configuration](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Configuration)
 - [Development](#development)
 - [License](#license)
 - [Sponsors](#sponsors)
@@ -77,440 +71,14 @@ wiki and [CHANGELOG.md](CHANGELOG.md) for upgrade instructions.
 
 ## Configuration
 
-Make sure you've [configured Doorkeeper](https://github.com/doorkeeper-gem/doorkeeper#configuration) before continuing.
-
-Verify your settings in `config/initializers/doorkeeper.rb`:
-
-- `resource_owner_authenticator`
-  - This callback needs to returns a falsey value if the current user can't be determined:
-
-    ```ruby
-    resource_owner_authenticator do
-      if current_user
-        current_user
-      else
-        redirect_to(new_user_session_url)
-        nil
-      end
-    end
-    ```
-- `grant_flows`
-  - If you want to use `id_token` or `id_token token` response types you need to add `implicit_oidc` to `grant_flows`:
-
-    ```ruby
-    grant_flows %w(authorization_code implicit_oidc)
-    ```
-
-The following settings are required in `config/initializers/doorkeeper_openid_connect.rb`:
-
-- `issuer`
-  - Identifier for the issuer of the response (i.e. your application URL). The value is a case sensitive URL using the `https` scheme that contains scheme, host, and optionally, port number and path components and no query or fragment components.
-  - You can either pass a string value, or a block to generate the issuer dynamically. The block receives `resource_owner`, `application`, and `request` so that the same configuration can serve both ID token issuance (where `resource_owner` and `application` are available) and the discovery endpoint (where only `request` is available):
-
-    ```ruby
-    # config/initializers/doorkeeper_openid_connect.rb
-    Doorkeeper::OpenidConnect.configure do
-      # ...
-      issuer do |resource_owner, application, request|
-        request&.base_url || "https://default.example.com"
-      end
-    end
-    ```
-
-  - For backward compatibility, blocks with arity 0, 1, or 2 are also accepted. An arity-1 block receives `request` from the discovery endpoint and `resource_owner` from the ID token context, while an arity-2 block always receives `resource_owner` and `application`.
-- `subject`
-  - Identifier for the resource owner (i.e. the authenticated user). A locally unique and never reassigned identifier within the issuer for the end-user, which is intended to be consumed by the client. The value is a case-sensitive string and must not exceed 255 ASCII characters in length.
-  - The database ID of the user is an acceptable choice if you don't mind leaking that information.
-  - If you want to provide a different subject identifier to each client, use [pairwise subject identifier](http://openid.net/specs/openid-connect-core-1_0.html#SubjectIDTypes) with configurations like below.
-
-    ```ruby
-    # config/initializers/doorkeeper_openid_connect.rb
-    Doorkeeper::OpenidConnect.configure do
-    # ...
-      subject_types_supported [:pairwise]
-
-      subject do |resource_owner, application|
-        Digest::SHA256.hexdigest("#{resource_owner.id}#{URI.parse(application.redirect_uri).host}#{'your_secret_salt'}")
-      end
-    # ...
-    end
-    ```
-
-- `signing_key`
-  - Private key to be used for [JSON Web Signature](https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-31).
-  - You can generate a private key with the `openssl` command, see e.g. [Generate an RSA keypair using OpenSSL](https://en.wikibooks.org/wiki/Cryptography/Generate_a_keypair_using_OpenSSL).
-  - You should not commit the key to your repository, but use an external file (in combination with `File.read`) and/or the [dotenv-rails](https://github.com/bkeepers/dotenv) gem (in combination with `ENV[...]`).
-- `signing_algorithm`
-  - The signing algorithm used for the ID token, which defaults to `:rs256`. The list of supported algorithms can be found [here](https://github.com/jwt/ruby-jwt#algorithms-and-usage)
-- `resource_owner_from_access_token`
-  - Defines how to translate the Doorkeeper access token to a resource owner model.
-
-> [!Note]
-> Both `signing_key` and `signing_algorithm` also accept callable objects (e.g. a lambda), which are evaluated on each call — useful for multi-tenant setups where the key or algorithm varies per request:
->
-> ```ruby
-> signing_key -> { current_tenant.private_key }
-> signing_algorithm -> { current_tenant.algorithm }
-> ```
-
-> [!Note]
-> `signing_key` also accepts an array for key rotation. The first entry is the active key used to sign newly issued ID tokens; the remaining entries are still published in the JWKS so clients can validate tokens signed with a retired key during a rotation window. Callable forms returning an array are also supported.
->
-> ```ruby
-> signing_key [
->   File.read("config/keys/current.pem"),  # active, signs new tokens
->   File.read("config/keys/previous.pem"), # retired, exposed in JWKS only
-> ]
-> ```
-
-The following settings are optional, but recommended for better client compatibility:
-
-- `auth_time_from_resource_owner`
-  - Returns the time of the user's last login, this can be a `Time`, `DateTime`, or any other class that responds to `to_i`
-  - Used to populate the `auth_time` claim on the ID Token.
-  - Used as a fallback for `max_age` enforcement when `auth_time_from_session` is not configured. **Note:** for multi-session deployments this is insecure (it returns the most recent login on _any_ device), and emits a deprecation warning — prefer `auth_time_from_session` below.
-- `auth_time_from_session`
-  - Returns the time the user authenticated for the *current* session. Required for correct `max_age` enforcement when the same user can hold multiple concurrent sessions (e.g. PC + smartphone) — `auth_time_from_resource_owner` cannot distinguish between sessions and would let a stale session inherit a fresh login from another device.
-  - The block is executed in the controller's scope and receives `(session, request)`. Return value can be a `Time`, `DateTime`, or anything responding to `to_i`. Return `nil` to force reauthentication.
-
-    ```ruby
-    # Example: capture auth_time on the session at login,
-    # and surface it here for the OIDC max_age check.
-    auth_time_from_session do |session, _request|
-      session[:auth_time]
-    end
-    ```
-- `reauthenticate_resource_owner`
-  - Defines how to trigger reauthentication for the current user (e.g. display a password prompt, or sign-out the user and redirect to the login form).
-  - Required to support the `max_age` and `prompt=login` parameters.
-  - The block is executed in the controller's scope, so you have access to methods like `params`, `redirect_to` etc.
-- `select_account_for_resource_owner`
-  - Defines how to trigger account selection to choose the current login user.
-  - Required to support the `prompt=select_account` parameter.
-  - The block is executed in the controller's scope, so you have access to methods like `params`, `redirect_to` etc.
-
-The following settings are optional:
-
-- `expiration`
-  - Expiration time after which the ID Token must not be accepted for processing by clients.
-  - The default is 120 seconds, it can be configured using a value or block.
-    ```ruby
-    # config/initializers/doorkeeper_openid_connect.rb
-    Doorkeeper::OpenidConnect.configure do
-      # ...
-      expiration do |resource_owner, application|
-        # You will have to ensure the application model implements an expiration method
-        application.expiration
-      end
-      # ...
-    end
-    ```
-
-- `protocol`
-  - The protocol to use when generating URIs for the discovery endpoints.
-  - The default is `https` for production, and `http` for all other environments
-  - Note that the OIDC specification mandates HTTPS, so you shouldn't change this
-    for production environments unless you have a really good reason!
-
-- `end_session_endpoint`
-  - The URL that the user is redirected to after ending the session on the client.
-  - Used by implementations like https://github.com/IdentityModel/oidc-client-js.
-  - The block is executed in the controller's scope, so you have access to your route helpers.
-
-- `discovery_url_options`
-  - The URL options for every available endpoint to use when generating the endpoint URL in the
-    discovery response. Available endpoints: `authorization`, `token`, `revocation`,
-    `introspection`, `userinfo`, `jwks`, `dynamic_client_registration`.
-  - This option requires option keys with an available endpoint and
-    [URL options](https://api.rubyonrails.org/v6.0.3.3/classes/ActionDispatch/Routing/UrlFor.html#method-i-url_for)
-    as value.
-  - The default is to use the request host, just like all the other URLs in the discovery response.
-  - This is useful when you want endpoints to use a different URL than other requests.
-    For example, if your Doorkeeper server is behind a firewall with other servers, you might want
-    other servers to use an "internal" URL to communicate with Doorkeeper, but you want to present
-    an "external" URL to end-users for authentication requests. Note that this setting does not
-    actually change the URL that your Doorkeeper server responds on - that is outside the scope of
-    Doorkeeper.
-
-    ```ruby
-    # config/initializers/doorkeeper_openid_connect.rb
-    Doorkeeper::OpenidConnect.configure do
-    # ...
-      discovery_url_options do |request|
-        {
-          authorization: { host: 'host.example.com' },
-          jwks:          { protocol: request.ssl? ? :https : :http }
-        }
-      end
-    # ...
-    end
-    ```
-
-- `apply_prompt_to_non_oidc_requests`
-  - Whether to honor the `prompt` authorization parameter (`none`, `login`, `consent`, `select_account`) on plain OAuth requests that do not include the `openid` scope.
-  - Defaults to `false`, which preserves the historical behavior of silently ignoring `prompt` outside of OIDC requests.
-  - `max_age` enforcement remains OIDC-only regardless of this option, since it is defined by OIDC Core.
-
-    ```ruby
-    # config/initializers/doorkeeper_openid_connect.rb
-    Doorkeeper::OpenidConnect.configure do
-      # ...
-      apply_prompt_to_non_oidc_requests true
-      # ...
-    end
-    ```
-
-### Scopes
-
-To perform authentication over OpenID Connect, an OAuth client needs to request the `openid` scope. This scope needs to be enabled using either `optional_scopes` in the global Doorkeeper configuration in `config/initializers/doorkeeper.rb`, or by adding it to any OAuth application's `scope` attribute.
-
-> Note that any application defining its own scopes won't inherit the scopes defined in the initializer, so you might have to update existing applications as well.
->
-> See [Using Scopes](https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes) in the Doorkeeper wiki for more information.
-
-#### `offline_access`
-
-Per [OIDC Core §11](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess), the `offline_access` scope signals that the client wants a refresh token so it can access the user's resources while the user is offline. Doorkeeper's existing `use_refresh_token` block already covers the basic flow — issue a refresh token only when the client actually asked for `offline_access`:
+See the [wiki](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Configuration) for detailed configuration instructions, including:
 
-```ruby
-# config/initializers/doorkeeper.rb
-Doorkeeper.configure do
-  optional_scopes :openid, :offline_access
-
-  # Issue a refresh token only when the client requests offline_access
-  use_refresh_token do |context|
-    context.scopes.exists?("offline_access")
-  end
-end
-```
-
-> **Note:** This does not automatically enforce [OIDC Core §11](https://openid.net/specs/openid-connect-core-1_0.html#OfflineAccess)'s strict requirements — for example, the OP MUST ignore `offline_access` unless `prompt=consent` is present and `response_type` returns an Authorization Code. If you need that level of enforcement, filter the scope in your `use_refresh_token` block or authorization controller override.
-
-### Claims
-
-Claims can be defined in a `claims` block inside `config/initializers/doorkeeper_openid_connect.rb`:
-
-```ruby
-Doorkeeper::OpenidConnect.configure do
-  claims do
-    claim :email do |resource_owner|
-      resource_owner.email
-    end
-
-    claim :full_name do |resource_owner|
-      "#{resource_owner.first_name} #{resource_owner.last_name}"
-    end
-
-    claim :preferred_username, scope: :openid do |resource_owner, scopes, access_token|
-      # Pass the resource_owner's preferred_username if the application has
-      # `profile` scope access. Otherwise, provide a more generic alternative.
-      scopes.exists?(:profile) ? resource_owner.preferred_username : "summer-sun-9449"
-    end
-
-    claim :groups, response: [:id_token, :user_info] do |resource_owner|
-      resource_owner.groups
-    end
-  end
-end
-```
-
-Each claim block will be passed:
-
-- the `resource_owner`, which is the return value of `resource_owner_authenticator` in your initializer
-- the `scopes` granted by the access token, which is an instance of `Doorkeeper::OAuth::Scopes`
-- the `access_token` itself, which is an instance of `Doorkeeper::AccessToken`
-
-By default all custom claims are only returned from the `UserInfo` endpoint and not included in the ID token. You can optionally pass a `response:` keyword with one or both of the symbols `:id_token` or `:user_info` to specify where the claim should be returned.
-
-You can also pass a `scope:` keyword argument on each claim to specify which OAuth scope should be required to access the claim. If you define any of the defined [Standard Claims](http://openid.net/specs/openid-connect-core-1_0.html#StandardClaims) they will by default use their [corresponding scopes](http://openid.net/specs/openid-connect-core-1_0.html#ScopeClaims) (`profile`, `email`, `address` and `phone`), and any other claims will by default use the `profile` scope. Again, to use any of these scopes you need to enable them as described above.
-
-You can also pass an array of scopes, in which case the claim is returned whenever the access token grants any of the listed scopes. This is useful when you want to expose the same claim under both a standard scope and an aggregate scope:
-
-``` ruby
-claim :given_name, scope: [:profile, :all_data] do |user|
-  user.first_name
-end
-
-claim :email, scope: [:email, :all_data] do |user|
-  user.email
-end
-```
-
-#### Authentication Context (`acr`) and Methods (`amr`)
-
-The `claim` DSL also handles standard top-level ID Token claims such as [`acr`](http://openid.net/specs/openid-connect-core-1_0.html#IDToken) (Authentication Context Class Reference) and [`amr`](https://www.rfc-editor.org/rfc/rfc8176) (Authentication Methods References) — commonly used to expose MFA status to clients:
-
-```ruby
-claims do
-  claim :acr, response: [:id_token, :user_info], scope: :openid do |resource_owner|
-    # Single string — e.g. a URI like "urn:mace:incommon:iap:silver",
-    # or a numeric Level of Assurance "1".."4" per ISO/IEC 29115.
-    resource_owner.mfa_enabled? ? "2" : "1"
-  end
-
-  claim :amr, response: [:id_token, :user_info], scope: :openid do |resource_owner|
-    # Array of strings, per RFC 8176.
-    methods = ["pwd"]
-    methods << "mfa" if resource_owner.mfa_enabled?
-    methods << "otp" if resource_owner.last_login_used_totp?
-    methods
-  end
-end
-```
-
-Two defaults are worth calling out because they bite silently:
-
-- **`response: [:id_token, :user_info]`** — custom claims default to UserInfo only, but relying parties usually expect `acr` / `amr` on the ID Token.
-- **`scope: :openid`** — without it, non-standard claims fall back to the `profile` scope and disappear for clients that only requested `openid`.
-
-Claim names you declare here are automatically advertised under `claims_supported` in the discovery document. The list of advertised `acr` values (`acr_values_supported`) is not currently generated.
-
-
-### Routes
-
-The installation generator will update your `config/routes.rb` to define all required routes:
-
-``` ruby
-Rails.application.routes.draw do
-  use_doorkeeper_openid_connect
-  # your routes
-end
-```
-
-This will mount the following routes:
-
-```
-GET   /oauth/userinfo
-POST  /oauth/userinfo
-GET   /oauth/discovery/keys
-GET   /.well-known/openid-configuration
-GET   /.well-known/oauth-authorization-server
-GET   /.well-known/webfinger
-```
-
-With the exception of the hard-coded `/.well-known` paths (see [RFC 5785](https://tools.ietf.org/html/rfc5785)) you can customize routes in the same way as with Doorkeeper, please refer to [this page on their wiki](https://github.com/doorkeeper-gem/doorkeeper/wiki/Customizing-routes#version--05-1).
-
-#### Customizing the `jwks_uri` path in the discovery document
-
-[`discovery_url_options`](#configuration) lets you tweak the host, protocol, or port of the published `jwks_uri`, but not the path itself. To advertise a custom path — while keeping `/oauth/discovery/keys` working for existing clients during a rollover — mount the discovery controller at the new path and re-point the `oauth_discovery_keys_url` helper at it via [`direct`](https://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/CustomUrlHelpers.html#method-i-direct):
-
-```ruby
-# config/routes.rb
-Rails.application.routes.draw do
-  use_doorkeeper_openid_connect
-
-  # 1. Mount the custom path under a non-conflicting helper name
-  get "/-/jwks",
-      to: "doorkeeper/openid_connect/discovery#keys",
-      as: :custom_jwks
-
-  # 2. Re-point oauth_discovery_keys_url at the new path
-  direct(:oauth_discovery_keys) { |opts| custom_jwks_url(opts) }
-end
-```
-
-After this, `.well-known/openid-configuration` returns `"jwks_uri": "https://example.com/-/jwks"`, and the original `/oauth/discovery/keys` route still responds (handy during a rollover).
-
-> [!Note]
-> A naive `match "/-/jwks", ..., as: :oauth_discovery_keys` won't work — Rails has refused to reuse a route name [since 4.0](https://github.com/rails/rails/commit/a2b7c0e69d) and raises `ArgumentError: Invalid route name, already in use: 'oauth_discovery_keys'`. The `direct` helper sidesteps this by overriding the URL helper itself rather than re-declaring the route name.
-
-### Nonces
-
-To support clients who send nonces you have to tweak Doorkeeper's authorization view so the parameter is passed on.
-
-If you don't already have custom templates, run this generator in your Rails application to add them:
-
-```sh
-rails generate doorkeeper:views
-```
-
-Then tweak the template as follows:
-
-```patch
---- i/app/views/doorkeeper/authorizations/new.html.erb
-+++ w/app/views/doorkeeper/authorizations/new.html.erb
-@@ -26,6 +26,7 @@
-       <%= hidden_field_tag :state, @pre_auth.state %>
-       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
-       <%= hidden_field_tag :scope, @pre_auth.scope %>
-+      <%= hidden_field_tag :nonce, @pre_auth.nonce %>
-       <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "btn btn-success btn-lg btn-block" %>
-     <% end %>
-     <%= form_tag oauth_authorization_path, method: :delete do %>
-@@ -34,6 +35,7 @@
-       <%= hidden_field_tag :state, @pre_auth.state %>
-       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
-       <%= hidden_field_tag :scope, @pre_auth.scope %>
-+      <%= hidden_field_tag :nonce, @pre_auth.nonce %>
-       <%= submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "btn btn-danger btn-lg btn-block" %>
-     <% end %>
-   </div>
-```
-
-### Internationalization (I18n)
-
-We use Rails locale files for error messages and scope descriptions, see [config/locales/en.yml](config/locales/en.yml). You can override these by adding them to your own translations in `config/locale`.
-
-### Dynamic Client Registration
-
-This gem supports [OpenID Connect Dynamic Client Registration 1.0](https://openid.net/specs/openid-connect-registration-1_0.html) based on [RFC 7591](https://www.rfc-editor.org/rfc/rfc7591).
-
-To enable dynamic client registration, add the following to `config/initializers/doorkeeper_openid_connect.rb`:
-
-```ruby
-Doorkeeper::OpenidConnect.configure do
-  # ...
-  dynamic_client_registration true
-  # ...
-end
-```
-
-This exposes a `POST /oauth/registration` endpoint where OAuth clients can register themselves.
-
-#### Supported parameters
-
-The registration endpoint currently accepts the following [RFC 7591 §2](https://www.rfc-editor.org/rfc/rfc7591#section-2) parameters:
-
-| Parameter | Description |
-| --- | --- |
-| `client_name` | Human-readable name of the client |
-| `redirect_uris` | Array of redirection URIs |
-| `scope` | Space-delimited list of requested scopes |
-| `token_endpoint_auth_method` | Requested authentication method. Defaults to `client_secret_basic`. `none` is always allowed (and registers a public client); other allowed values depend on the host application's Doorkeeper `client_credentials_methods` configuration. Unsupported values are rejected with `invalid_client_metadata`. |
-| `application_type` | Client type: `web` (default) or `native`, per [OpenID Connect Discovery 1.0](https://openid.net/specs/openid-connect-discovery-1_0.html). Unsupported values are rejected with `invalid_client_metadata`. |
-| `response_types` | Array of OAuth 2.0 response types the client will use (e.g. `["code"]`). Must be a subset of the server's supported response types. Defaults to the server's full set when omitted. |
-| `grant_types` | Array of OAuth 2.0 grant types the client will use (e.g. `["authorization_code"]`). Must be a subset of the server's supported grant types. Defaults to the server's full set when omitted. |
-
-When `token_endpoint_auth_method` is set to `none`, the client is registered as **public** (i.e. `confidential: false`). For all other values — or when the parameter is omitted — the client is registered as **confidential**, matching the RFC 7591 default of `client_secret_basic`.
-
-Other RFC 7591 parameters (e.g. `client_uri`, `logo_uri`, `contacts`) require schema additions to `oauth_applications` and are not yet supported.
-
-#### Authorization
-
-By default, the registration endpoint is open to any request. To require authorization (e.g. an Initial Access Token per [RFC 7591 §3.1](https://www.rfc-editor.org/rfc/rfc7591#section-3.1)), configure `authorize_dynamic_client_registration`:
-
-```ruby
-Doorkeeper::OpenidConnect.configure do
-  # ...
-  dynamic_client_registration true
-  authorize_dynamic_client_registration do
-    provided = request.headers["Authorization"].to_s
-    expected = "Bearer #{ENV['DCR_INITIAL_ACCESS_TOKEN']}"
-    # Use a constant-time comparison to avoid leaking the token via timing.
-    # Digesting first keeps the comparison fixed-length so the token's length
-    # isn't leaked either.
-    ActiveSupport::SecurityUtils.secure_compare(
-      Digest::SHA256.hexdigest(provided),
-      Digest::SHA256.hexdigest(expected),
-    )
-  end
-  # ...
-end
-```
-
-The block is evaluated in the controller scope (with access to `request`, `params`, `request.headers`, etc.). Return a truthy value to allow the request, or a falsy value to reject it with `401 invalid_token`.
-
-When not configured (default), the endpoint remains open for backward compatibility.
+- [Scopes](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Scopes)
+- [Claims](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Claims)
+- [Routes](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Routes)
+- [Nonces](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Nonces)
+- [Internationalization (I18n)](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/I18n)
+- [Dynamic Client Registration](https://github.com/doorkeeper-gem/doorkeeper-openid_connect/wiki/Dynamic-Client-Registration)
 
 ## Development
 

data/app/controllers/doorkeeper/openid_connect/discovery_controller.rb

@@ -53,7 +53,7 @@ module Doorkeeper
           subject_types_supported: openid_connect.subject_types_supported,
 
           id_token_signing_alg_values_supported: [
-            ::Doorkeeper::OpenidConnect.signing_algorithm
+            ::Doorkeeper::OpenidConnect.signing_algorithm,
           ],
 
           claim_types_supported: [
@@ -93,8 +93,8 @@ module Doorkeeper
             {
               rel: WEBFINGER_RELATION,
               href: issuer,
-            }
-          ]
+            },
+          ],
         }
       end
 
@@ -113,7 +113,7 @@ module Doorkeeper
 
       def discovery_url_default_options
         {
-          protocol: protocol
+          protocol: protocol,
         }
       end
 

data/app/controllers/doorkeeper/openid_connect/dynamic_client_registration_controller.rb

@@ -17,7 +17,7 @@ module Doorkeeper
         render json: registration_response(client, registration), status: :created
       rescue ActiveRecord::RecordInvalid => e
         render json: { error: "invalid_client_params", error_description: e.record.errors.full_messages.join(", ") },
-          status: :bad_request
+               status: :bad_request
       end
 
       private
@@ -72,6 +72,10 @@ module Doorkeeper
         if registration.confidential_client?
           response[:client_secret] =
             doorkeeper_application.plaintext_secret || doorkeeper_application.secret
+          # RFC 7591 §3.2.1 / OIDC Dynamic Client Registration 1.0 §3.2:
+          # client_secret_expires_at is REQUIRED when a client_secret is issued.
+          # Doorkeeper secrets never expire, so the value is 0 (no expiration).
+          response[:client_secret_expires_at] = 0
         end
 
         response

data/config/locales/en.yml

@@ -22,4 +22,7 @@ en:
           select_account_for_resource_owner_not_configured: 'Failure due to Doorkeeper::OpenidConnect.configure.select_account_for_resource_owner missing configuration.'
           subject_not_configured: 'ID Token generation failed due to Doorkeeper::OpenidConnect.configure.subject missing configuration.'
           signing_key_not_configured: 'Doorkeeper::OpenidConnect.configure.signing_key must resolve to at least one key.'
+          issuer_not_configured: 'Doorkeeper::OpenidConnect.configure.issuer must resolve to a non-blank value.'
           dynamic_client_registration_unauthorized: 'Authorization required for client registration'
+          # ID Token claim error messages
+          missing_required_claim: 'Required ID Token claim `%{claim}` is missing or blank'

data/lib/doorkeeper/oauth/id_token_response.rb

@@ -21,7 +21,7 @@ module Doorkeeper
       def body
         {
           state: pre_auth.state,
-          id_token: id_token.as_jws_token
+          id_token: id_token.as_jws_token,
         }
       end
 

data/lib/doorkeeper/oauth/id_token_token_response.rb

@@ -7,7 +7,7 @@ module Doorkeeper
         super.merge({
           access_token: auth.token.token,
           token_type: auth.token.token_type,
-          expires_in: auth.token.expires_in_seconds
+          expires_in: auth.token.expires_in_seconds,
         })
       end
     end

data/lib/doorkeeper/openid_connect/claims_builder.rb

@@ -31,7 +31,7 @@ module Doorkeeper
             name: name,
             response: response,
             scope: scope,
-            generator: block
+            generator: block,
           )
       end
       alias claim normal_claim

data/lib/doorkeeper/openid_connect/config.rb

@@ -5,7 +5,7 @@ module Doorkeeper
     def self.configure(&block)
       if Doorkeeper.configuration.orm != :active_record
         raise Errors::InvalidConfiguration,
-"Doorkeeper OpenID Connect currently only supports the ActiveRecord ORM adapter"
+              "Doorkeeper OpenID Connect currently only supports the ActiveRecord ORM adapter"
       end
 
       @config = Config::Builder.new(&block).build
@@ -54,6 +54,7 @@ module Doorkeeper
       }
 
       option :auth_time_from_session, default: nil
+      option :auth_time_from_access_token, default: nil
 
       option :reauthenticate_resource_owner, default: lambda { |*_|
         raise Errors::InvalidConfiguration, I18n.translate("doorkeeper.openid_connect.errors.messages.reauthenticate_resource_owner_not_configured")

data/lib/doorkeeper/openid_connect/errors.rb

@@ -12,6 +12,18 @@ module Doorkeeper
       # internal errors
       class InvalidConfiguration < OpenidConnectError; end
 
+      # Raised when a REQUIRED ID Token claim (OIDC Core §2: iss/sub/aud/exp/iat)
+      # resolves to a blank value, which would otherwise be silently dropped and
+      # produce a non-conformant ID Token.
+      class MissingRequiredClaim < OpenidConnectError
+        attr_reader :claim
+
+        def initialize(claim)
+          @claim = claim
+          super(I18n.translate("doorkeeper.openid_connect.errors.messages.missing_required_claim", claim: claim))
+        end
+      end
+
       class MissingConfiguration < OpenidConnectError
         def initialize
           super("Configuration for Doorkeeper OpenID Connect missing. Do you have doorkeeper_openid_connect initializer?")

data/lib/doorkeeper/openid_connect/helpers/controller.rb

@@ -125,7 +125,7 @@ module Doorkeeper
                 render :new
               end
             when "select_account"
-              select_account_for_oidc_resource_owner(owner) if owner
+              select_account_for_oidc_resource_owner(owner)
             when "create"
               # NOTE: not supported, but not raise error.
             else
@@ -176,7 +176,11 @@ module Doorkeeper
         end
 
         def oidc_prompt_values
-          @oidc_prompt_values ||= params[:prompt].to_s.split(/ +/).uniq
+          # Reject blank entries so leading/duplicate spaces in the
+          # space-delimited `prompt` parameter don't surface as an empty
+          # value (which would otherwise be treated as an unknown prompt and
+          # rejected with `invalid_request`).
+          @oidc_prompt_values ||= params[:prompt].to_s.split(/ +/).reject(&:blank?).uniq
         end
 
         # Resolve auth_time for max_age enforcement.

data/lib/doorkeeper/openid_connect/id_token.rb

@@ -5,6 +5,10 @@ module Doorkeeper
     class IdToken
       include ActiveModel::Validations
 
+      # OIDC Core 1.0 §2 — these claims are REQUIRED in every ID Token, so they
+      # must never be silently dropped when blank.
+      REQUIRED_CLAIMS = %i[iss sub aud exp iat].freeze
+
       attr_reader :nonce
 
       def initialize(access_token, nonce = nil, expires_in = Doorkeeper::OpenidConnect.configuration.expiration)
@@ -26,19 +30,31 @@ module Doorkeeper
           exp: expiration,
           iat: issued_at,
           nonce: nonce,
-          auth_time: auth_time
+          auth_time: auth_time,
         )
       end
 
       def as_json(*_)
-        claims.reject { |_, value| value.nil? || value == "" }
+        claims.each_with_object({}) do |(key, value), result|
+          blank = value.nil? || value == ""
+
+          if blank
+            # A REQUIRED claim must never be silently omitted; surface the
+            # misconfiguration instead of issuing a non-conformant ID Token.
+            raise Errors::MissingRequiredClaim, key if REQUIRED_CLAIMS.include?(key)
+
+            next
+          end
+
+          result[key] = value
+        end
       end
 
       def as_jws_token
         ::JWT.encode(as_json,
-          Doorkeeper::OpenidConnect.signing_key.keypair,
-          Doorkeeper::OpenidConnect.signing_algorithm.to_s,
-          { typ: "JWT", kid: Doorkeeper::OpenidConnect.signing_key.kid }).to_s
+                     Doorkeeper::OpenidConnect.signing_key.keypair,
+                     Doorkeeper::OpenidConnect.signing_algorithm.to_s,
+                     { typ: "JWT", kid: Doorkeeper::OpenidConnect.signing_key.kid }).to_s
       end
 
       private
@@ -46,13 +62,15 @@ module Doorkeeper
       def issuer
         Doorkeeper::OpenidConnect.resolve_issuer(
           resource_owner: @resource_owner,
-          application: @access_token.application
+          application: @access_token.application,
         )
       end
 
       def subject
-        Doorkeeper::OpenidConnect.configuration.subject.call(@resource_owner,
-@access_token.application).to_s
+        Doorkeeper::OpenidConnect.configuration.subject.call(
+          @resource_owner,
+          @access_token.application,
+        ).to_s
       end
 
       def audience
@@ -76,7 +94,13 @@ module Doorkeeper
       end
 
       def auth_time
-        Doorkeeper::OpenidConnect.configuration.auth_time_from_resource_owner.call(@resource_owner).try(:to_i)
+        config = Doorkeeper::OpenidConnect.configuration
+
+        if config.auth_time_from_access_token
+          config.auth_time_from_access_token.call(@access_token).try(:to_i)
+        else
+          config.auth_time_from_resource_owner.call(@resource_owner).try(:to_i)
+        end
       rescue Errors::InvalidConfiguration
         nil
       end

data/lib/doorkeeper/openid_connect/oauth/authorization/code.rb

@@ -27,7 +27,7 @@ module Doorkeeper
           def create_openid_request(access_grant)
             ::Doorkeeper::OpenidConnect.configuration.open_id_request_model.create!(
               access_grant: access_grant,
-              nonce: pre_auth.nonce
+              nonce: pre_auth.nonce,
             )
           end
         end

data/lib/doorkeeper/openid_connect/orm/active_record/access_grant.rb

@@ -6,10 +6,10 @@ module Doorkeeper
       def self.prepended(base)
         base.class_eval do
           has_one :openid_request,
-            class_name: Doorkeeper::OpenidConnect.configuration.open_id_request_class,
-            foreign_key: "access_grant_id",
-            inverse_of: :access_grant,
-            dependent: :delete
+                  class_name: Doorkeeper::OpenidConnect.configuration.open_id_request_class,
+                  foreign_key: "access_grant_id",
+                  inverse_of: :access_grant,
+                  dependent: :delete
         end
       end
     end

data/lib/doorkeeper/openid_connect/orm/active_record.rb

@@ -11,7 +11,7 @@ module Doorkeeper
       module ActiveRecord
         module Mixins
           autoload :OpenidRequest,
-"doorkeeper/openid_connect/orm/active_record/mixins/openid_request"
+                   "doorkeeper/openid_connect/orm/active_record/mixins/openid_request"
         end
 
         def run_hooks
@@ -30,7 +30,7 @@ module Doorkeeper
             if Doorkeeper.configuration.respond_to?(:active_record_options) && Doorkeeper.configuration.active_record_options[:establish_connection]
               [Doorkeeper::OpenidConnect.configuration.open_id_request_model].each do |c|
                 c.send :establish_connection,
-Doorkeeper.configuration.active_record_options[:establish_connection]
+                       Doorkeeper.configuration.active_record_options[:establish_connection]
               end
             end
           end
@@ -51,7 +51,7 @@ Doorkeeper.configuration.active_record_options[:establish_connection]
             if Doorkeeper.configuration.active_record_options[:establish_connection]
               [Doorkeeper::OpenidConnect.configuration.open_id_request_model].each do |c|
                 c.send :establish_connection,
-Doorkeeper.configuration.active_record_options[:establish_connection]
+                       Doorkeeper.configuration.active_record_options[:establish_connection]
               end
             end
           end

data/lib/doorkeeper/openid_connect/rails/routes/mapping.rb

@@ -11,13 +11,13 @@ module Doorkeeper
             @controllers = {
               userinfo: "doorkeeper/openid_connect/userinfo",
               discovery: "doorkeeper/openid_connect/discovery",
-              dynamic_client_registration: "doorkeeper/openid_connect/dynamic_client_registration"
+              dynamic_client_registration: "doorkeeper/openid_connect/dynamic_client_registration",
             }
 
             @as = {
               userinfo: :userinfo,
               discovery: :discovery,
-              dynamic_client_registration: :dynamic_client_registration
+              dynamic_client_registration: :dynamic_client_registration,
             }
 
             @skips = []
@@ -26,7 +26,7 @@ module Doorkeeper
           def [](routes)
             {
               controllers: @controllers[routes],
-              as: @as[routes]
+              as: @as[routes],
             }
           end
 

data/lib/doorkeeper/openid_connect/user_info.rb

@@ -14,7 +14,7 @@ module Doorkeeper
         # the canonical subject identifier (which would defeat pairwise /
         # subject-type guarantees).
         ClaimsBuilder.generate(@access_token, :user_info).merge(
-          sub: subject
+          sub: subject,
         )
       end
 

data/lib/doorkeeper/openid_connect/version.rb

@@ -4,7 +4,7 @@ module Doorkeeper
   module OpenidConnect
     MAJOR = 1
     MINOR = 10
-    TINY = 0
+    TINY = 2
     PRE = nil
 
     # Full version number

data/lib/doorkeeper/openid_connect.rb

@@ -132,18 +132,29 @@ module Doorkeeper
     # @return [String] the issuer string
     def self.resolve_issuer(resource_owner: nil, application: nil, request: nil)
       issuer = configuration.issuer
-      return issuer.to_s unless issuer.respond_to?(:call)
-
-      case issuer.arity
-      when 0
-        issuer.call
-      when 1
-        issuer.call(request || resource_owner)
-      when 2
-        issuer.call(resource_owner, application)
-      else
-        issuer.call(resource_owner, application, request)
-      end.to_s
+
+      value =
+        if issuer.respond_to?(:call)
+          case issuer.arity
+          when 0
+            issuer.call
+          when 1
+            issuer.call(request || resource_owner)
+          when 2
+            issuer.call(resource_owner, application)
+          else
+            issuer.call(resource_owner, application, request)
+          end
+        else
+          issuer
+        end.to_s
+
+      if value.blank?
+        raise Errors::InvalidConfiguration,
+              I18n.translate("doorkeeper.openid_connect.errors.messages.issuer_not_configured")
+      end
+
+      value
     end
 
     Doorkeeper::GrantFlow.register(
@@ -161,7 +172,7 @@ module Doorkeeper
     )
 
     Doorkeeper::GrantFlow.register_alias(
-      "implicit_oidc", as: ["implicit", "id_token", "id_token token"]
+      "implicit_oidc", as: ["implicit", "id_token", "id_token token"],
     )
   end
 end

data/lib/generators/doorkeeper/openid_connect/install_generator.rb

@@ -10,7 +10,7 @@ module Doorkeeper
       def install
         template "initializer.rb", "config/initializers/doorkeeper_openid_connect.rb"
         copy_file File.expand_path("../../../../config/locales/en.yml", __dir__),
-"config/locales/doorkeeper_openid_connect.en.yml"
+                  "config/locales/doorkeeper_openid_connect.en.yml"
         route "use_doorkeeper_openid_connect"
       end
     end

data/lib/generators/doorkeeper/openid_connect/migration_generator.rb

@@ -13,7 +13,7 @@ module Doorkeeper
         migration_template(
           "migration.rb.erb",
           "db/migrate/create_doorkeeper_openid_connect_tables.rb",
-          migration_version: migration_version
+          migration_version: migration_version,
         )
       end
 

data/lib/generators/doorkeeper/openid_connect/templates/initializer.rb

@@ -57,6 +57,18 @@ Doorkeeper::OpenidConnect.configure do
   #   session[:auth_time]
   # end
 
+  # Advanced:
+  # If you store `auth_time` in a custom authentication context record linked
+  # to the access token, you can configure a block like below to derive it
+  # from the access token instead of `auth_time_from_resource_owner`.
+  #
+  # This allows you to track `auth_time` per grant instead of per user,
+  # but requires more custom implementation on your part.
+  #
+  # auth_time_from_access_token do |access_token|
+  #   access_token.your_custom_authentication_context_record.auth_time
+  # end
+
   reauthenticate_resource_owner do |resource_owner, return_to|
     # Example implementation:
     # store_location_for resource_owner, return_to
@@ -64,9 +76,11 @@ Doorkeeper::OpenidConnect.configure do
     # redirect_to new_user_session_url
   end
 
-  select_account_for_resource_owner do |resource_owner, return_to|
+  select_account_for_resource_owner do |resource_owner_or_nil, return_to|
     # Example implementation:
-    # store_location_for resource_owner, return_to
+    # if resource_owner_or_nil
+    #   store_location_for resource_owner_or_nil, return_to
+    # end
     # redirect_to account_select_url
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper-openid_connect
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.2
 platform: ruby
 authors:
 - Sam Dengler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-01 00:00:00.000000000 Z
+date: 2026-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: doorkeeper
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="