Commit 8cce6308 authored by James Edwards-Jones's avatar James Edwards-Jones

Group SAML settings SSO link includes token

parent 11110e6c
......@@ -30,6 +30,6 @@
- if @saml_provider.persisted?
.well-segment.borderless
%label= _("GitLab single sign on URL")
- user_login_url = sso_group_saml_providers_url(@group)
- user_login_url = sso_group_saml_providers_url(@group, token: @group.saml_discovery_token)
%div= link_to user_login_url, user_login_url, class: "qa-user-login-url-link"
.form-text.text-muted= _("Used by members to sign in to your group in GitLab")
......@@ -92,7 +92,8 @@ describe 'SAML provider settings' do
login_url = find('label', text: 'GitLab single sign on URL').find('~* a').text
expect(login_url).to end_with "/groups/#{group.full_path}/-/saml/sso"
expect(login_url).to include "/groups/#{group.full_path}/-/saml/sso"
expect(login_url).to end_with "?token=#{group.reload.saml_discovery_token}"
end
context 'enforced sso enabled' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment