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.

Sign up for GitHub

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

String changes to the SSO CILogon Sign-in button #906

Merged
merged 4 commits into from
Sep 18, 2024
Merged

String changes to the SSO CILogon Sign-in button #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83ec1e4
String changes to the SSO CILogon Sing-in button
200455939-yashu Sep 16, 2024
679aab2
Update test to correspond with update of SSO button
aaronskiba Sep 17, 2024
29df6de
Set text as `.html_safe` to use `<br>` tag
aaronskiba Sep 17, 2024
20a2bf0
Update CHANGELOG
lagoan Sep 18, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## [Unreleased]

### Changed

- Updated SSO button string [portagenetwork/roadmap#903](https://github.com/portagenetwork/roadmap/issues/903)

## [4.1.1+portage-4.2.1] - 2024-09-12

### Changed
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_sign_in_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<p class="text-center fontsize-h4">- <%= _('or') %> -</p>
<div class="form-group">
<span class="center-block btn-group-justified">
<%= link_to _("Sign in with CILogon"), user_openid_connect_omniauth_authorize_path, method: :post, data: { turbo: false }, class: 'btn btn-default' %>
<%= link_to _("Sign in with institutional or social ID").html_safe, user_openid_connect_omniauth_authorize_path, method: :post, data: { turbo: false }, class: 'btn btn-default' %>
</span>
</div>
<% else %>
Expand Down
2 changes: 1 addition & 1 deletion spec/integration/openid_connect_sso_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

it 'creates account from external credentials' do
visit root_path
click_link 'Sign in with CILogon'
click_link 'Sign in with institutional or social ID'

identifier = Identifier.last
expect(identifier.value).to eql('https://www.cilogon.org/12345')
Expand Down
Loading