Skip to content

Commit

Permalink
Properly generate login URLs.
Browse files Browse the repository at this point in the history
  • Loading branch information
arikfr committed Feb 27, 2018
1 parent 9ddf374 commit d1062ce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions redash/handlers/authentication.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ def render_token_login_page(template, org_slug, token):
show_saml_login=current_org.get_setting('auth_saml_enabled'),
show_remote_user_login=settings.REMOTE_USER_LOGIN_ENABLED,
show_ldap_login=settings.LDAP_LOGIN_ENABLED,
org_slug=org_slug,
user=user), status_code


Expand Down
6 changes: 3 additions & 3 deletions redash/templates/invite.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@
{% endif %}

{% if show_saml_login %}
<a href="/saml/login" class="login-button btn btn-default btn-block">SAML Login</a>
<a href="{{ url_for('saml_auth.sp_initiated', org_slug=org_slug) }}" class="login-button btn btn-default btn-block">SAML Login</a>
{% endif %}

{% if show_remote_user_login %}
<a href="/remote_user/login" class="login-button btn btn-default btn-block">Remote User Login</a>
<a href="{{ url_for('remote_user_auth.login') }}" class="login-button btn btn-default btn-block">Remote User Login</a>
{% endif %}

{% if show_ldap_login %}
<a href="/ldap_auth/login" class="login-button btn btn-default btn-block">LDAP/SSO Login</a>
<a href="{{ url_for('ldap_auth.login') }}" class="login-button btn btn-default btn-block">LDAP/SSO Login</a>
{% endif %}

{% if show_google_openid or show_saml_login or show_remote_user_login or show_ldap_login %}
Expand Down

0 comments on commit d1062ce

Please sign in to comment.