Remove second confirmation step

Author: Julián Berbel Alt

app/controllers/users_controller.rb

@@ -47,25 +47,19 @@ def exam_authorizations
     @exam_authorization_requests ||= ExamAuthorizationRequest.where(user: current_user, organization: Organization.current)
   end
 
-  def delete_request
-  end
-
   def send_delete_confirmation_email
     current_user.generate_delete_account_token!
-    UserMailer.delete_account(current_user).deliver_now
+    UserMailer.delete_account(current_user).post!
     redirect_to delete_request_user_path
   end
 
   def delete_confirmation
-    redirect_to delete_confirmation_invalid_user_path unless @user.delete_account_token_matches? params[:token]
-  end
+    return redirect_to delete_confirmation_invalid_user_path unless @user.delete_account_token_matches? params[:token]
 
-  def delete_confirmation_invalid
-  end
+    @user.destroy!
 
-  def disable
-    current_user.disable!
-    redirect_to root_path
+    flash.notice = I18n.t(:user_deleted_successfully)
+    redirect_to logout_path
   end
 
   def permissible_params

app/views/users/_user_delete_account.html.erb

@@ -1,5 +1 @@
 <%= render partial: 'user_delete_confirmation' %>
-
-<%= content_for :no_container do %>
-  <%= render partial: 'user_delete_modal', locals: { submit_url: delete_request_user_url } %>
-<% end %>

app/views/users/delete_confirmation.html.erb

@@ -79,7 +79,6 @@
       post :delete_request, to: 'users#send_delete_confirmation_email'
       get :delete_confirmation_invalid
       get :delete_confirmation
-      post :delete_confirmation, to: 'users#disable'
     end
 
     resources :faqs, only: [:index]