tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update doorkeeper i18n for invalid code challenge method (#37827)

Browse Source
This commit is contained in:
Matt Jankowski 2026-02-17 04:01:59 -05:00 committed by GitHub
parent 1618c28a48
commit 2cb8471d81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/locales/doorkeeper.en.yml
View File

@ -83,7 +83,10 @@ en:
access_denied: The resource owner or authorization server denied the request. access_denied: The resource owner or authorization server denied the request.
credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured. credential_flow_not_configured: Resource Owner Password Credentials flow failed due to Doorkeeper.configure.resource_owner_from_credentials being unconfigured.
invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method. invalid_client: Client authentication failed due to unknown client, no client authentication included, or unsupported authentication method.
invalid_code_challenge_method: The code challenge method must be S256, plain is unsupported. invalid_code_challenge_method:
one: The code_challenge_method must be %{challenge_methods}.
other: The code_challenge_method must be one of %{challenge_methods}.
zero: The authorization server does not support PKCE as there are no accepted code_challenge_method values.
invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client. invalid_grant: The provided authorization grant is invalid, expired, revoked, does not match the redirection URI used in the authorization request, or was issued to another client.
invalid_redirect_uri: The redirect uri included is not valid. invalid_redirect_uri: The redirect uri included is not valid.
invalid_request: invalid_request:

31
spec/system/oauth_spec.rb
View File

@ -98,28 +98,27 @@ RSpec.describe 'Using OAuth from an external app' do
context 'when using plain code challenge method' do context 'when using plain code challenge method' do
let(:pkce_code_challenge_method) { 'plain' } let(:pkce_code_challenge_method) { 'plain' }
it 'does not include the PKCE values in the response' do it 'shows an error message and does not include the PKCE values or authorize button' do
subject subject
expect(page).to have_no_css('.oauth-prompt input[name=code_challenge]') expect(page)
expect(page).to have_no_css('.oauth-prompt input[name=code_challenge_method]') .to have_no_css('.oauth-prompt input[name=code_challenge]')
end .and have_no_css('.oauth-prompt input[name=code_challenge_method]')
.and have_no_css('.oauth-prompt button[type="submit"]')
it 'does not include the authorize button' do
subject
expect(page).to have_no_css('.oauth-prompt button[type="submit"]')
end
it 'includes an error message' do
subject
within '.form-container .flash-message' do within '.form-container .flash-message' do
# FIXME: Replace with doorkeeper.errors.messages.invalid_code_challenge_method.one for Doorkeeper > 5.8.0 expect(page)
# see: https://github.com/doorkeeper-gem/doorkeeper/pull/1747 .to have_content(doorkeeper_invalid_code_message)
expect(page).to have_content(I18n.t('doorkeeper.errors.messages.invalid_code_challenge_method'))
end end
end end
def doorkeeper_invalid_code_message
I18n.t(
'doorkeeper.errors.messages.invalid_code_challenge_method',
challenge_methods: Doorkeeper.configuration.pkce_code_challenge_methods.join(', '),
count: Doorkeeper.configuration.pkce_code_challenge_methods.length
)
end
end end
context 'when the user has yet to enable TOTP' do context 'when the user has yet to enable TOTP' do