Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OAuth 2: JWT token refresh should preserve user identity displayed in the UI (backport #12818) #12831

Merged
merged 5 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix dialyzer errors
  • Loading branch information
MarcialRosales committed Nov 29, 2024
commit 7c37546858dfd60e3ca1111fa15fd98f80862a55
11 changes: 9 additions & 2 deletions deps/rabbitmq_auth_backend_oauth2/src/uaa_jwt.erl
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,20 @@ decode_and_verify(Token) ->
end
end.

-spec resolve_resource_server_id(binary()) -> binary() | {error, term()}.
resolve_resource_server_id(Token) ->
-spec resolve_resource_server_id(binary()|map()) -> binary() | {error, term()}.
resolve_resource_server_id(Token) when is_binary(Token) ->
case uaa_jwt_jwt:get_aud(Token) of
{error, _} = Error ->
Error;
{ok, Audience} ->
rabbit_oauth2_config:get_resource_server_id_for_audience(Audience)
end;
resolve_resource_server_id(Token) when is_map(Token) ->
case maps:get(<<"aud">>, Token, undefined) of
undefined ->
{error, audience_not_found_in_token};
Audience ->
rabbit_oauth2_config:get_resource_server_id_for_audience(Audience)
end.

-spec get_jwk(binary(), oauth_provider_id()) -> {ok, map()} | {error, term()}.
Expand Down
7 changes: 7 additions & 0 deletions selenium/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,10 @@ suites/screens/*
test/oauth/*/h2/*.trace.db
test/oauth/*/h2/*.lock.db
*/target/*
tls-gen
test/*/certs/*.pem
test/*/certs/*.p12
test/*/certs/*.jks
test/*/*/*.pem
test/*/*/*.p12
test/*/*/*.jks
Loading