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.

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

OpenID integration. #1412

Merged
merged 4 commits into from
Jul 23, 2024
Merged

OpenID integration. #1412

merged 4 commits into from
Jul 23, 2024

Conversation

natacha-beck
Copy link
Contributor

commit 038a151
Author: Natacha Beck [email protected]
Date: Wed Jul 17 13:42:00 2024 -0400

[FIX] after PR revDate:   Mon Jul 15 12:25:08 2024 -0400

Update nh_mandatory_oidc.html.erb

(About 60 commits here)

commit 9f9963b
Author: natacha-beck [email protected]
Date: Wed May 22 04:24:49 2024 -0400

[WIP] 1st version of keycloak integration

commit 038a151
Author: Natacha Beck <[email protected]>
Date:   Wed Jul 17 13:42:00 2024 -0400

    [FIX] after PR revDate:   Mon Jul 15 12:25:08 2024 -0400

    Update nh_mandatory_oidc.html.erb

(About 60 commits here)

commit 9f9963b
Author: natacha-beck <[email protected]>
Date:   Wed May 22 04:24:49 2024 -0400

    [WIP] 1st version of keycloak integration
@natacha-beck natacha-beck mentioned this pull request Jul 22, 2024
@natacha-beck natacha-beck changed the title Squashed commit of the following: OpenID integration. Jul 22, 2024
@oidc_configs = OidcConfig.all
# Hash of OIDC uris with the OIDC name as key
@oidc_uris = generate_oidc_login_uri(@oidc_configs, globus_url)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for POST merge: these changes are unnecessary.

@@ -266,6 +288,8 @@ def create_from_user(user, origin='CBRAIN') #:nodoc:
# Send a proper HTTP error code
# when a user has not properly authenticated
def auth_failed
# Array of enabled OIDC providers configurations
@oidc_configs = OidcConfig.all
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're missing the hash of URLS here?

@@ -21,6 +21,7 @@
#

require 'ipaddr'
require 'oidc_config'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To remove.

Learn more at <%= link_to oidc.help_label, oidc.help_uri, :class => "globus_home_link" %>
</p>
<% end %>
<% else %>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The indentation seems wrong here?

@prioux
Copy link
Member

prioux commented Jul 23, 2024

I will merge this and then make some more modifications as an extra commit on master.

@prioux prioux merged commit d11210d into aces:master Jul 23, 2024
1 check passed
@prioux prioux added Enhancement User Interface Refactoring Priority: Normal Admin Features or bugs related to administrative features labels Jul 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Features or bugs related to administrative features Enhancement Priority: Normal Refactoring User Interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants