Skip to content

Commit f9e03d6

Browse files
michaelklishinmergify[bot]
michaelklishin
authored and
mergify[bot]
committed
OAuth 2: a better approach than #15148, closes #15858
(cherry picked from commit 5016060)
1 parent 22123cd commit f9e03d6

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎deps/rabbitmq_management/priv/www/js/main.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ function render_login_oauth(oauth, messages) {
4747
formatData.resource_servers = oauth.resource_servers;
4848
formatData.declared_resource_servers_count = oauth.declared_resource_servers_count;
4949
formatData.oauth_disable_basic_auth = oauth.oauth_disable_basic_auth;
50-
formatData.strict_auth_mechanism = oauth.strict_auth_mechanism;
51-
formatData.preferred_auth_mechanism = oauth.preferred_auth_mechanism;
50+
formatData.strict_auth_mechanism = oauth.strict_auth_mechanism || null;
51+
formatData.preferred_auth_mechanism = oauth.preferred_auth_mechanism || null;
5252

5353
if (Array.isArray(messages)) {
5454
formatData.warnings = messages

‎deps/rabbitmq_management/priv/www/js/tmpl/login_oauth.ejs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
<% } %>
1313
</div>
1414
<% if (!notAuthorized) { %>
15-
<% if (strict_auth_mechanism !== undefined && strict_auth_mechanism.type === "oauth2") { %>
15+
<% if (strict_auth_mechanism != null && strict_auth_mechanism.type === "oauth2") { %>
1616
<button id="login" onclick="oauth_initiateLogin('<%=strict_auth_mechanism.resource_id%>')">Click here to log in</button>
1717
<% } else if ((typeof resource_servers == 'object' && resource_servers.length == 1) && oauth_disable_basic_auth) { %>
1818
<button id="login" onclick="oauth_initiateLogin('<%=resource_servers[0].id%>')">Click here to log in</button>
19-
<% } else if (typeof resource_servers == 'object' && resource_servers.length >= 1 && strict_auth_mechanism == undefined) { %>
19+
<% } else if (typeof resource_servers == 'object' && resource_servers.length >= 1 && strict_auth_mechanism == null) { %>
2020
2121
<b>Login with :</b>
2222
<p/>
23-
<% const OAuth2Visible = (strict_auth_mechanism === undefined || strict_auth_mechanism.type === "oauth2") ||
24-
(preferred_auth_mechanism === undefined || preferred_auth_mechanism === "oauth2"); %>
25-
<% const OAuth2Invisible = (preferred_auth_mechanism !== undefined && preferred_auth_mechanism.type !== "oauth2"); %>
26-
<% const OAuth2Hidden = (strict_auth_mechanism !== undefined && strict_auth_mechanism.type !== "oauth2"); %>
27-
<% const preferredResourceId = preferred_auth_mechanism !== undefined && preferred_auth_mechanism.type === "oauth2" ? preferred_auth_mechanism.resource_id : null; %>
23+
<% const OAuth2Visible = (strict_auth_mechanism == null || strict_auth_mechanism.type === "oauth2") ||
24+
(preferred_auth_mechanism == null || preferred_auth_mechanism === "oauth2"); %>
25+
<% const OAuth2Invisible = (preferred_auth_mechanism != null && preferred_auth_mechanism.type !== "oauth2"); %>
26+
<% const OAuth2Hidden = (strict_auth_mechanism != null && strict_auth_mechanism.type !== "oauth2"); %>
27+
<% const preferredResourceId = preferred_auth_mechanism != null && preferred_auth_mechanism.type === "oauth2" ? preferred_auth_mechanism.resource_id : null; %>
2828
<!-- begin login with oauth2 -->
2929
<% if (!OAuth2Hidden) { %>
3030
<div class="section disable-pref <%= OAuth2Visible ? 'section-visible' : '' %> <%= OAuth2Invisible ? 'section-invisible' : '' %> " id="login-with-oauth2">
@@ -55,10 +55,10 @@
5555
<% } %>
5656
5757
<!-- begin login with basic auth -->
58-
<% const basicAuthVisible = (strict_auth_mechanism !== undefined && strict_auth_mechanism.type === "basic") ||
59-
(preferred_auth_mechanism !== undefined && preferred_auth_mechanism.type === "basic"); %>
60-
<% const basicAuthInvisible = (strict_auth_mechanism === undefined && preferred_auth_mechanism === undefined || (preferred_auth_mechanism !== undefined && preferred_auth_mechanism.type !== "basic"));%>
61-
<% const basicAuthHidden = (strict_auth_mechanism !== undefined && strict_auth_mechanism.type !== "basic"); %>
58+
<% const basicAuthVisible = (strict_auth_mechanism != null && strict_auth_mechanism.type === "basic") ||
59+
(preferred_auth_mechanism != null && preferred_auth_mechanism.type === "basic"); %>
60+
<% const basicAuthInvisible = (strict_auth_mechanism == null && preferred_auth_mechanism == null || (preferred_auth_mechanism != null && preferred_auth_mechanism.type !== "basic"));%>
61+
<% const basicAuthHidden = (strict_auth_mechanism != null && strict_auth_mechanism.type !== "basic"); %>
6262
<% if (!oauth_disable_basic_auth && !basicAuthHidden) { %>
6363
<div class="section disable-pref <%= basicAuthInvisible ? 'section-invisible' : ''%> <%= basicAuthVisible ? 'section-visible' : ''%> " id="login-with-basic-auth">
6464
<h2>Basic Authentication</h2>

0 commit comments

Comments
 (0)