From 874c333496cce1ba7ab6161d93ab19302a51ff42 Mon Sep 17 00:00:00 2001 From: sboursen-scinote Date: Sat, 6 Apr 2024 17:26:26 +0200 Subject: [PATCH] Add openid connect and saml connected accounts [SCI-10584] --- .../_openid_connect.html.erb | 24 +++++++++++++++++ .../account/connected_accounts/_saml.html.erb | 24 +++++++++++++++++ .../_openid_connect_modal.html.erb | 23 ++++++++++++++++ .../unlink_modals/_saml_modal.html.erb | 23 ++++++++++++++++ config/locales/en.yml | 26 ++++++++++++++++--- 5 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 app/views/users/settings/account/connected_accounts/_openid_connect.html.erb create mode 100644 app/views/users/settings/account/connected_accounts/_saml.html.erb create mode 100644 app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb create mode 100644 app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb diff --git a/app/views/users/settings/account/connected_accounts/_openid_connect.html.erb b/app/views/users/settings/account/connected_accounts/_openid_connect.html.erb new file mode 100644 index 000000000..f75ac0673 --- /dev/null +++ b/app/views/users/settings/account/connected_accounts/_openid_connect.html.erb @@ -0,0 +1,24 @@ +
+
+
+ <%= t('users.settings.account.connected_accounts.openid_connect.title') %>
+

<%= t('users.settings.account.connected_accounts.openid_connect.connect_hint') %>

+
+
+
+ + <%= t('users.settings.account.connected_accounts.openid_connect.connected') %> + + +
+
+ <%= link_to t('users.settings.account.connected_accounts.openid_connect.unlink_button'), + '#unlinkOpenIdConnectModal', + class: 'btn btn-danger', + data: { toggle: 'modal'} %> +
+
+
+
+ +<%= render partial: 'users/settings/account/connected_accounts/unlink_modals/openid_connect_modal', locals: { provider: provider } %> diff --git a/app/views/users/settings/account/connected_accounts/_saml.html.erb b/app/views/users/settings/account/connected_accounts/_saml.html.erb new file mode 100644 index 000000000..1642890ec --- /dev/null +++ b/app/views/users/settings/account/connected_accounts/_saml.html.erb @@ -0,0 +1,24 @@ +
+
+
+ <%= t('users.settings.account.connected_accounts.saml.title') %>
+

<%= t('users.settings.account.connected_accounts.saml.connect_hint') %>

+
+
+
+ + <%= t('users.settings.account.connected_accounts.saml.connected') %> + + +
+
+ <%= link_to t('users.settings.account.connected_accounts.saml.unlink_button'), + '#unlinksamlModal', + class: 'btn btn-danger', + data: { toggle: 'modal'} %> +
+
+
+
+ +<%= render partial: 'users/settings/account/connected_accounts/unlink_modals/saml_modal', locals: { provider: provider } %> diff --git a/app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb b/app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb new file mode 100644 index 000000000..2540763a7 --- /dev/null +++ b/app/views/users/settings/account/connected_accounts/unlink_modals/_openid_connect_modal.html.erb @@ -0,0 +1,23 @@ + diff --git a/app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb b/app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb new file mode 100644 index 000000000..6c81c46d0 --- /dev/null +++ b/app/views/users/settings/account/connected_accounts/unlink_modals/_saml_modal.html.erb @@ -0,0 +1,23 @@ + diff --git a/config/locales/en.yml b/config/locales/en.yml index 2b829dca5..1e771b5de 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2898,13 +2898,13 @@ en: not_connected: "You have no Connected accounts" unlink_success: "Successfully unlinked" azure_ad: - title: "Your Azure AD Account" - connect_hint: "Allows you to sign in with your Azure AD account." + title: "Your Microsoft Azure (Active Directory) Account" + connect_hint: "Allows you to sign in with your Microsoft Azure (Active Directory) account." connected: "Connected" unlink_button: "Unlink" unlink_modal: - title: "Unlink Azure AD account?" - description_1: "Are you sure you would like unlink Azure AD and SciNote accounts?" + title: "Unlink Microsoft Azure (Active Directory) account?" + description_1: "Are you sure you would like unlink Microsoft Azure (Active Directory) and SciNote accounts?" submit_button: "Submit" okta: title: "Your Okta Account" @@ -2915,6 +2915,24 @@ en: title: "Unlink Okta account?" description_1: "Are you sure you would like unlink Okta and SciNote accounts?" submit_button: "Submit" + openid_connect: + title: "Your OpenID Connect Account" + connect_hint: "Allows you to sign in with your OpenID Connect account." + connected: "Connected" + unlink_button: "Unlink" + unlink_modal: + title: "Unlink OpenID Connect account?" + description_1: "Are you sure you would like unlink OpenID Connect and SciNote accounts?" + submit_button: "Submit" + saml: + title: "Your SAML Account" + connect_hint: "Allows you to sign in with your SAML account." + connected: "Connected" + unlink_button: "Unlink" + unlink_modal: + title: "Unlink SAML account?" + description_1: "Are you sure you would like unlink SAML and SciNote accounts?" + submit_button: "Submit" errors: not_found: "You have no Connected accounts for this provider" generic: "Unable to unlink linked account"