Skip to content

Commit bd5fe97

Browse files
Feed end_session_endpoint to the mgt
1 parent c654558 commit bd5fe97

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

deps/rabbitmq_management/priv/www/js/oidc-oauth/helper.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ export function oidc_settings_from(resource_server) {
154154
automaticSilentRenew: true,
155155
revokeAccessTokenOnSignout: true
156156
}
157-
if (resource_server.end_session_endpoint != "") {
157+
if (resource_server.oauth_end_session_endpoint != "") {
158158
oidcSettings.metadataSeed = {
159-
end_session_endpoint: resource_server.end_session_endpoint
159+
end_session_endpoint: resource_server.oauth_end_session_endpoint
160160
}
161161
}
162162
if (resource_server.oauth_client_secret != "") {
@@ -214,8 +214,8 @@ export function oauth_initialize(authSettings) {
214214
if (resource_server) {
215215
oauth.sp_initiated = resource_server.sp_initiated
216216
oauth.authority = resource_server.oauth_provider_url
217-
if (resource_server.end_session_endpoint != "") {
218-
oauth.end_session_endpoint = resource_server.end_session_endpoint
217+
if (resource_server.oauth_end_session_endpoint != "") {
218+
oauth.oauth_end_session_endpoint = resource_server.oauth_end_session_endpoint
219219
}
220220
if (!resource_server.sp_initiated) return oauth;
221221
else oauth_initialize_user_manager(resource_server)
@@ -314,8 +314,8 @@ export function oauth_initiateLogout() {
314314
})
315315

316316
} else {
317-
if (oauth.end_session_endpoint != null) {
318-
location.href = oauth.end_session_endpoint
317+
if (oauth.oauth_end_session_endpoint != null) {
318+
location.href = oauth.oauth_end_session_endpoint
319319
}else {
320320
go_to_authority()
321321
}

deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ oauth_provider_to_map(OAuthProvider) ->
7272
end,
7373
case OAuthProvider#oauth_provider.end_session_endpoint of
7474
undefined -> Map0;
75-
V -> maps:put(end_session_endpoint, V, Map0)
75+
V -> maps:put(oauth_end_session_endpoint, V, Map0)
7676
end.
7777

7878
skip_unknown_mgt_resource_servers(ManagementProps, OAuth2Resources) ->
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
management.oauth_provider_url = ${FAKEPORTAL_URL}
1+
#management.oauth_provider_url = ${FAKEPORTAL_URL}
22

33
auth_oauth2.end_session_endpoint = ${FAKEPORTAL_URL}/logout
4+
auth_oauth2.issuer = ${FAKEPORTAL_URL}

0 commit comments

Comments
 (0)