Skip to content

A platform for community discussion. Free, open, simple.

FIX: Accept an OIDC token response that carries only an id_token (#43587)

David Taylora3e135f77e95
diff --git a/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb b/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb
index efd740bc283..62bd9468a91 100644
--- a/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb
+++ b/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb
@@ -254,7 +254,8 @@ module OmniAuth
return super if options.use_userinfo
response =
client.request(:post, options[:client_options][:token_url], body: get_token_options)
- ::OAuth2::AccessToken.from_hash(client, response.parsed)
+ parsed = response.parsed
+ ::OAuth2::AccessToken.new(client, parsed["id_token"].to_s, parsed)
end
end
end
diff --git a/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb b/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb
index 8439df983aa..0f69ec54b42 100644
--- a/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb
+++ b/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb
@@ -184,7 +184,7 @@ describe OmniAuth::Strategies::OpenIDConnect do
body: hash_including("code" => "supersecretcode", "p" => "someallowedvalue"),
).to_return(
status: 200,
- body: { access_token: "AnAccessToken", id_token: @token }.to_json,
+ body: { id_token: @token }.to_json,
headers: {
"Content-Type" => "application/json",
},
@@ -202,6 +202,20 @@ describe OmniAuth::Strategies::OpenIDConnect do
expect(@app_called).to eq(true)
end
+ it "handles a blank access_token alongside the id_token" do
+ stub_request(:post, "https://id.example.com/token").to_return(
+ status: 200,
+ body: { access_token: "", id_token: @token }.to_json,
+ headers: {
+ "Content-Type" => "application/json",
+ },
+ )
+
+ expect(strategy.callback_phase[0]).to eq(200)
+ expect(strategy.uid).to eq("someuserid")
+ expect(strategy.extra[:id_token]).to eq(@token)
+ end
+
it "checks the nonce" do
strategy.session["omniauth.nonce"] = "overriddenNonce"
expect(strategy.callback_phase[0]).to eq(302)