bida/bastodon
7
0
Fork 0
Code Issues 7 Pull requests Releases Wiki Activity

Link to the Identity provider's account settings from the account settings (#24100)

Browse source 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
CSDUMMI 2023-03-17 10:09:01 +01:00 committed by GitHub
parent be9a4912d8
commit d75a1e5054
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/application_controller.rb
View file

@ -16,6 +16,8 @@ class ApplicationController < ActionController::Base
helper_method :current_theme helper_method :current_theme
helper_method :single_user_mode? helper_method :single_user_mode?
helper_method :use_seamless_external_login? helper_method :use_seamless_external_login?
helper_method :omniauth_only?
helper_method :sso_account_settings
helper_method :whitelist_mode? helper_method :whitelist_mode?
rescue_from ActionController::ParameterMissing, Paperclip::AdapterRegistry::NoHandlerError, with: :bad_request rescue_from ActionController::ParameterMissing, Paperclip::AdapterRegistry::NoHandlerError, with: :bad_request
@ -118,6 +120,14 @@ class ApplicationController < ActionController::Base
Devise.pam_authentication || Devise.ldap_authentication Devise.pam_authentication || Devise.ldap_authentication
end end
def omniauth_only?
ENV['OMNIAUTH_ONLY'] == 'true'
end
def sso_account_settings
ENV.fetch('SSO_ACCOUNT_SETTINGS')
end
def current_account def current_account
return @current_account if defined?(@current_account) return @current_account if defined?(@current_account)

4
app/views/auth/registrations/edit.html.haml
View file

@ -8,7 +8,7 @@
= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit', novalidate: false }) do |f| = simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, class: 'auth_edit', novalidate: false }) do |f|
= render 'shared/error_messages', object: resource = render 'shared/error_messages', object: resource
- if !use_seamless_external_login? || resource.encrypted_password.present? - if (!use_seamless_external_login? || resource.encrypted_password.present?) && !omniauth_only?
.fields-row .fields-row
.fields-row__column.fields-group.fields-row__column-6 .fields-row__column.fields-group.fields-row__column-6
= f.input :email, wrapper: :with_label, input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, required: true, disabled: current_account.suspended? = f.input :email, wrapper: :with_label, input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, required: true, disabled: current_account.suspended?
@ -23,6 +23,8 @@
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit, class: 'button', disabled: current_account.suspended? = f.button :button, t('generic.save_changes'), type: :submit, class: 'button', disabled: current_account.suspended?
- elsif omniauth_only? && sso_account_settings.present?
= link_to t('users.go_to_sso_account_settings'), sso_account_settings
- else - else
%p.hint= t('users.seamless_external_login') %p.hint= t('users.seamless_external_login')

1
config/locales/en.yml
View file

@ -1691,6 +1691,7 @@ en:
title: Welcome aboard, %{name}! title: Welcome aboard, %{name}!
users: users:
follow_limit_reached: You cannot follow more than %{limit} people follow_limit_reached: You cannot follow more than %{limit} people
go_to_sso_account_settings: Go to your identity provider's account settings
invalid_otp_token: Invalid two-factor code invalid_otp_token: Invalid two-factor code
otp_lost_help_html: If you lost access to both, you may get in touch with %{email} otp_lost_help_html: If you lost access to both, you may get in touch with %{email}
seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available. seamless_external_login: You are logged in via an external service, so password and e-mail settings are not available.