Skip to content

Commit

Permalink
Fix invites not being disabled upon account suspension (#11412)
Browse files Browse the repository at this point in the history
* Disable invite links from disabled/suspended users

* Add has_many invites relationship to users

* Destroy unused invites when suspending an account
  • Loading branch information
ClearlyClaire authored and Gargron committed Aug 6, 2019
1 parent 6782922 commit 8904487
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion app/controllers/invites_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def destroy
private

def invites
Invite.where(user: current_user).order(id: :desc)
current_user.invites.order(id: :desc)
end

def resource_params
Expand Down
4 changes: 2 additions & 2 deletions app/models/invite.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
class Invite < ApplicationRecord
include Expireable

belongs_to :user
belongs_to :user, inverse_of: :invites
has_many :users, inverse_of: :invite

scope :available, -> { where(expires_at: nil).or(where('expires_at >= ?', Time.now.utc)) }

before_validation :set_code

def valid_for_use?
(max_uses.nil? || uses < max_uses) && !expired?
(max_uses.nil? || uses < max_uses) && !expired? && !(user.nil? || user.disabled?)
end

private
Expand Down
1 change: 1 addition & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class User < ApplicationRecord

has_many :applications, class_name: 'Doorkeeper::Application', as: :owner
has_many :backups, inverse_of: :user
has_many :invites, inverse_of: :user

has_one :invite_request, class_name: 'UserInviteRequest', inverse_of: :user, dependent: :destroy
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? }
Expand Down
1 change: 1 addition & 0 deletions app/services/suspend_account_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def purge_user!
@account.user.destroy
else
@account.user.disable!
@account.user.invites.where(uses: 0).destroy_all
end
end

Expand Down
16 changes: 11 additions & 5 deletions spec/models/invite_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,33 @@
RSpec.describe Invite, type: :model do
describe '#valid_for_use?' do
it 'returns true when there are no limitations' do
invite = Invite.new(max_uses: nil, expires_at: nil)
invite = Fabricate(:invite, max_uses: nil, expires_at: nil)
expect(invite.valid_for_use?).to be true
end

it 'returns true when not expired' do
invite = Invite.new(max_uses: nil, expires_at: 1.hour.from_now)
invite = Fabricate(:invite, max_uses: nil, expires_at: 1.hour.from_now)
expect(invite.valid_for_use?).to be true
end

it 'returns false when expired' do
invite = Invite.new(max_uses: nil, expires_at: 1.hour.ago)
invite = Fabricate(:invite, max_uses: nil, expires_at: 1.hour.ago)
expect(invite.valid_for_use?).to be false
end

it 'returns true when uses still available' do
invite = Invite.new(max_uses: 250, uses: 249, expires_at: nil)
invite = Fabricate(:invite, max_uses: 250, uses: 249, expires_at: nil)
expect(invite.valid_for_use?).to be true
end

it 'returns false when maximum uses reached' do
invite = Invite.new(max_uses: 250, uses: 250, expires_at: nil)
invite = Fabricate(:invite, max_uses: 250, uses: 250, expires_at: nil)
expect(invite.valid_for_use?).to be false
end

it 'returns false when invite creator has been disabled' do
invite = Fabricate(:invite, max_uses: nil, expires_at: nil)
SuspendAccountService.new.call(invite.user.account)
expect(invite.valid_for_use?).to be false
end
end
Expand Down

0 comments on commit 8904487

Please sign in to comment.