diff --git a/app/controllers/profiles/accounts_controller.rb b/app/controllers/profiles/accounts_controller.rb index b0d65f284affac87f65f91ff7d5bf974ac2cac01..8bc2a3db08afb188cd69a219cc9ffa97da8459d6 100644 --- a/app/controllers/profiles/accounts_controller.rb +++ b/app/controllers/profiles/accounts_controller.rb @@ -8,20 +8,6 @@ class Profiles::AccountsController < Profiles::ApplicationController end # rubocop: disable CodeReuse/ActiveRecord - def unlink - provider = params[:provider] - identity = current_user.identities.find_by(provider: provider) - - return render_404 unless identity - - if unlink_allowed?(provider) - identity.destroy - else - flash[:alert] = "You are not allowed to unlink your primary login account" - end - - redirect_to profile_account_path - end # rubocop: enable CodeReuse/ActiveRecord private diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index ee2c5a13b8a91e2c8a0dd1f160c30aebe2908ba0..84ead6952c09b6f66df8644be915d7bb9f8e62fd 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -21,33 +21,6 @@ = link_to _('Enable two-factor authentication'), profile_two_factor_auth_path, class: 'btn btn-success' %hr -- if display_providers_on_profile? - .row.prepend-top-default - .col-lg-4.profile-settings-sidebar - %h4.prepend-top-0 - = s_('Profiles|Social sign-in') - %p - = s_('Profiles|Activate signin with one of the following services') - .col-lg-8 - %label.label-bold - = s_('Profiles|Connected Accounts') - %p= s_('Profiles|Click on icon to activate signin with one of the following services') - - button_based_providers.each do |provider| - .provider-btn-group - .provider-btn-image - = provider_image_tag(provider) - - if auth_active?(provider) - - if unlink_allowed?(provider) - = link_to unlink_profile_account_path(provider: provider), method: :delete, class: 'provider-btn' do - = s_('Profiles|Disconnect') - - else - %a.provider-btn - = s_('Profiles|Active') - - else - = link_to omniauth_authorize_path(:user, provider), method: :post, class: 'provider-btn not-active' do - = s_('Profiles|Connect') - = render_if_exists 'profiles/accounts/group_saml_unlink_buttons', group_saml_identities: local_assigns[:group_saml_identities] - %hr - if current_user.can_change_username? .row.prepend-top-default .col-lg-4.profile-settings-sidebar