The personal finance app for everyone
Add/remove members and invitations (#1744)
Josh Pigford0696e1f2f73a
diff --git a/app/controllers/invitations_controller.rb b/app/controllers/invitations_controller.rbindex 020b4707..ca37435a 100644--- a/app/controllers/invitations_controller.rb+++ b/app/controllers/invitations_controller.rb@@ -34,6 +34,24 @@ class InvitationsController < ApplicationControllerendend+ def destroy+ unless Current.user.admin?+ flash[:alert] = t("invitations.destroy.not_authorized")+ redirect_to settings_profile_path+ return+ end++ @invitation = Current.family.invitations.find(params[:id])++ if @invitation.destroy+ flash[:notice] = t("invitations.destroy.success")+ else+ flash[:alert] = t("invitations.destroy.failure")+ end++ redirect_to settings_profile_path+ end+privatedef invitation_paramsdiff --git a/app/controllers/settings/profiles_controller.rb b/app/controllers/settings/profiles_controller.rbindex 882824ec..443ba16b 100644--- a/app/controllers/settings/profiles_controller.rb+++ b/app/controllers/settings/profiles_controller.rb@@ -4,4 +4,28 @@ class Settings::ProfilesController < SettingsController@users = Current.family.users.order(:created_at)@pending_invitations = Current.family.invitations.pendingend++ def destroy+ unless Current.user.admin?+ flash[:alert] = t("settings.profiles.destroy.not_authorized")+ redirect_to settings_profile_path+ return+ end++ @user = Current.family.users.find(params[:user_id])++ if @user == Current.user+ flash[:alert] = t("settings.profiles.destroy.cannot_remove_self")+ redirect_to settings_profile_path+ return+ end++ if @user.destroy+ flash[:notice] = t("settings.profiles.destroy.member_removed")+ else+ flash[:alert] = t("settings.profiles.destroy.member_removal_failed")+ end++ redirect_to settings_profile_path+ endenddiff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erbindex c21775d6..5f0d5e10 100644--- a/app/views/settings/profiles/show.html.erb+++ b/app/views/settings/profiles/show.html.erb@@ -43,6 +43,21 @@<div class="rounded-md bg-gray-100 px-1.5 py-0.5"><p class="uppercase text-gray-500 font-medium text-xs"><%= user.role %></p></div>+ <% if Current.user.admin? && user != Current.user %>+ <div class="ml-auto">+ <%= button_to settings_profile_path(user_id: user),+ method: :delete,+ class: "text-red-500 hover:text-red-700",+ data: { turbo_confirm: {+ title: t(".confirm_remove_member.title"),+ body: t(".confirm_remove_member.body", name: user.display_name),+ accept: t(".remove_member"),+ acceptClass: "w-full bg-red-500 text-white rounded-xl text-center p-[10px] border mb-2"+ }} do %>+ <%= lucide_icon "x", class: "w-5 h-5" %>+ <% end %>+ </div>+ <% end %></div><% end %><% if @pending_invitations.any? %>@@ -59,25 +74,40 @@</div></div></div>- <% if self_hosted? %>- <div class="flex items-center gap-2" data-controller="clipboard">- <p class="text-gray-500 text-sm"><%= t(".invitation_link") %></p>- <span data-clipboard-target="source" class="hidden"><%= accept_invitation_url(invitation.token) %></span>- <input type="text"- readonly- autocomplete="off"- value="<%= accept_invitation_url(invitation.token) %>"- class="text-sm bg-gray-50 px-2 py-1 rounded border border-gray-200 w-72">- <button data-action="clipboard#copy" class="text-gray-500 hover:text-gray-700">- <span data-clipboard-target="iconDefault">- <%= lucide_icon "copy", class: "w-5 h-5" %>- </span>- <span class="hidden" data-clipboard-target="iconSuccess">- <%= lucide_icon "check", class: "w-5 h-5" %>- </span>- </button>- </div>- <% end %>+ <div class="flex items-center gap-4">+ <% if self_hosted? %>+ <div class="flex items-center gap-2" data-controller="clipboard">+ <p class="text-gray-500 text-sm"><%= t(".invitation_link") %></p>+ <span data-clipboard-target="source" class="hidden"><%= accept_invitation_url(invitation.token) %></span>+ <input type="text"+ readonly+ autocomplete="off"+ value="<%= accept_invitation_url(invitation.token) %>"+ class="text-sm bg-gray-50 px-2 py-1 rounded border border-gray-200 w-72">+ <button data-action="clipboard#copy" class="text-gray-500 hover:text-gray-700">+ <span data-clipboard-target="iconDefault">+ <%= lucide_icon "copy", class: "w-5 h-5" %>+ </span>+ <span class="hidden" data-clipboard-target="iconSuccess">+ <%= lucide_icon "check", class: "w-5 h-5" %>+ </span>+ </button>+ </div>+ <% end %>+ <% if Current.user.admin? %>+ <%= button_to invitation_path(invitation),+ method: :delete,+ class: "text-red-500 hover:text-red-700",+ data: { turbo_confirm: {+ title: t(".confirm_remove_invitation.title"),+ body: t(".confirm_remove_invitation.body", email: invitation.email),+ accept: t(".remove_invitation"),+ acceptClass: "w-full bg-red-500 text-white rounded-xl text-center p-[10px] border mb-2"+ }} do %>+ <%= lucide_icon "x", class: "w-5 h-5" %>+ <% end %>+ <% end %>+ </div></div><% end %><% end %>diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rbindex e4ce7417..ad1a5da7 100644--- a/config/initializers/sentry.rb+++ b/config/initializers/sentry.rb@@ -3,7 +3,7 @@ if ENV["SENTRY_DSN"].present?config.dsn = ENV["SENTRY_DSN"]config.environment = ENV["RAILS_ENV"]config.breadcrumbs_logger = [ :active_support_logger, :http_logger ]- config.enabled_environments = %w[development production]+ config.enabled_environments = %w[production]# Set traces_sample_rate to 1.0 to capture 100%# of transactions for performance monitoring.diff --git a/config/locales/views/invitations/en.yml b/config/locales/views/invitations/en.ymlindex 5ce17ce5..db862831 100644--- a/config/locales/views/invitations/en.yml+++ b/config/locales/views/invitations/en.yml@@ -4,6 +4,10 @@ en:create:failure: Could not send invitationsuccess: Invitation sent successfully+ destroy:+ not_authorized: You are not authorized to manage invitations.+ success: Invitation was successfully removed.+ failure: There was a problem removing the invitation.new:email_label: Email Addressemail_placeholder: Enter email addressdiff --git a/config/locales/views/settings/en.yml b/config/locales/views/settings/en.ymlindex f784db97..5bfa97d4 100644--- a/config/locales/views/settings/en.yml+++ b/config/locales/views/settings/en.yml@@ -48,11 +48,24 @@ en:theme_title: Themetimezone: Timezoneprofiles:+ destroy:+ not_authorized: You are not authorized to remove members.+ cannot_remove_self: You cannot remove yourself from the account.+ member_removed: Member was successfully removed.+ member_removal_failed: There was a problem removing the member.show:confirm_delete:body: Are you sure you want to permanently delete your account? This actionis irreversible.title: Delete account?+ confirm_remove_member:+ title: Remove Member+ body: Are you sure you want to remove %{name} from your account?+ remove_member: Remove Member+ confirm_remove_invitation:+ title: Remove Invitation+ body: Are you sure you want to remove the invitation for %{email}?+ remove_invitation: Remove Invitationdanger_zone_title: Danger Zonedelete_account: Delete accountdelete_account_warning: Deleting your account will permanently remove alldiff --git a/config/routes.rb b/config/routes.rbindex cec4c1fd..d83ac11b 100644--- a/config/routes.rb+++ b/config/routes.rb@@ -20,7 +20,7 @@ Rails.application.routes.draw doendnamespace :settings do- resource :profile, only: :show+ resource :profile, only: [ :show, :destroy ]resource :preferences, only: :showresource :hosting, only: %i[show update]resource :billing, only: :show@@ -142,7 +142,7 @@ Rails.application.routes.draw doresources :exchange_rate_provider_missings, only: :updateend- resources :invitations, only: [ :new, :create ] do+ resources :invitations, only: [ :new, :create, :destroy ] doget :accept, on: :memberenddiff --git a/test/controllers/invitations_controller_test.rb b/test/controllers/invitations_controller_test.rbindex b6b7edbe..e6a596e1 100644--- a/test/controllers/invitations_controller_test.rb+++ b/test/controllers/invitations_controller_test.rb@@ -2,7 +2,7 @@ require "test_helper"class InvitationsControllerTest < ActionDispatch::IntegrationTestsetup do- sign_in @user = users(:family_admin)+ sign_in @admin = users(:family_admin)@invitation = invitations(:one)end@@ -25,7 +25,7 @@ class InvitationsControllerTest < ActionDispatch::IntegrationTestinvitation = Invitation.order(created_at: :desc).firstassert_equal "member", invitation.role- assert_equal @user, invitation.inviter+ assert_equal @admin, invitation.inviterassert_equal "[email protected]", invitation.emailassert_redirected_to settings_profile_pathassert_equal I18n.t("invitations.create.success"), flash[:notice]@@ -59,8 +59,8 @@ class InvitationsControllerTest < ActionDispatch::IntegrationTestinvitation = Invitation.order(created_at: :desc).firstassert_equal "admin", invitation.role- assert_equal @user.family, invitation.family- assert_equal @user, invitation.inviter+ assert_equal @admin.family, invitation.family+ assert_equal @admin, invitation.inviterendtest "should handle invalid invitation creation" do@@ -86,4 +86,29 @@ class InvitationsControllerTest < ActionDispatch::IntegrationTestget accept_invitation_url("invalid-token")assert_response :not_foundend++ test "admin can remove pending invitation" do+ assert_difference("Invitation.count", -1) do+ delete invitation_url(@invitation)+ end++ assert_redirected_to settings_profile_path+ assert_equal I18n.t("invitations.destroy.success"), flash[:notice]+ end++ test "non-admin cannot remove invitations" do+ sign_in users(:family_member)++ assert_no_difference("Invitation.count") do+ delete invitation_url(@invitation)+ end++ assert_redirected_to settings_profile_path+ assert_equal I18n.t("invitations.destroy.not_authorized"), flash[:alert]+ end++ test "should handle invalid invitation removal" do+ delete invitation_url(id: "invalid-id")+ assert_response :not_found+ endenddiff --git a/test/controllers/settings/profiles_controller_test.rb b/test/controllers/settings/profiles_controller_test.rbindex ff6b36ed..27d62c17 100644--- a/test/controllers/settings/profiles_controller_test.rb+++ b/test/controllers/settings/profiles_controller_test.rb@@ -2,11 +2,46 @@ require "test_helper"class Settings::ProfilesControllerTest < ActionDispatch::IntegrationTestsetup do- sign_in @user = users(:family_admin)+ @admin = users(:family_admin)+ @member = users(:family_member)end- test "get" do- get settings_profile_url+ test "should get show" do+ sign_in @admin+ get settings_profile_pathassert_response :successend++ test "admin can remove a family member" do+ sign_in @admin+ assert_difference("User.count", -1) do+ delete settings_profile_path(user_id: @member)+ end++ assert_redirected_to settings_profile_path+ assert_equal I18n.t("settings.profiles.destroy.member_removed"), flash[:notice]+ assert_raises(ActiveRecord::RecordNotFound) { User.find(@member.id) }+ end++ test "admin cannot remove themselves" do+ sign_in @admin+ assert_no_difference("User.count") do+ delete settings_profile_path(user_id: @admin)+ end++ assert_redirected_to settings_profile_path+ assert_equal I18n.t("settings.profiles.destroy.cannot_remove_self"), flash[:alert]+ assert User.find(@admin.id)+ end++ test "non-admin cannot remove members" do+ sign_in @member+ assert_no_difference("User.count") do+ delete settings_profile_path(user_id: @admin)+ end++ assert_redirected_to settings_profile_path+ assert_equal I18n.t("settings.profiles.destroy.not_authorized"), flash[:alert]+ assert User.find(@admin.id)+ endenddiff --git a/test/fixtures/invitations.yml b/test/fixtures/invitations.ymlindex 12ae9a05..09cd96f7 100644--- a/test/fixtures/invitations.yml+++ b/test/fixtures/invitations.yml@@ -17,3 +17,13 @@ two:created_at: <%= Time.current %>updated_at: <%= Time.current %>expires_at: <%= 3.days.from_now %>++other_family:+ email: "[email protected]"+ token: "valid-token-789"+ role: "member"+ inviter: empty+ family: empty+ created_at: <%= Time.current %>+ updated_at: <%= Time.current %>+ expires_at: <%= 3.days.from_now %>