Quellcode durchsuchen

Fix invites not being disabled upon account suspension (#11412)

* Disable invite links from disabled/suspended users

* Add has_many invites relationship to users

* Destroy unused invites when suspending an account
master^2
ThibG vor 4 Jahren
committed by Eugen Rochko
Ursprung
Commit
92569ffde8
5 geänderte Dateien mit 16 neuen und 8 gelöschten Zeilen
  1. +1
    -1
      app/controllers/invites_controller.rb
  2. +2
    -2
      app/models/invite.rb
  3. +1
    -0
      app/models/user.rb
  4. +1
    -0
      app/services/suspend_account_service.rb
  5. +11
    -5
      spec/models/invite_spec.rb

+ 1
- 1
app/controllers/invites_controller.rb Datei anzeigen

@@ -39,7 +39,7 @@ class InvitesController < ApplicationController
private

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

def resource_params


+ 2
- 2
app/models/invite.rb Datei anzeigen

@@ -17,7 +17,7 @@
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)) }
@@ -25,7 +25,7 @@ class Invite < ApplicationRecord
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


+ 1
- 0
app/models/user.rb Datei anzeigen

@@ -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? }


+ 1
- 0
app/services/suspend_account_service.rb Datei anzeigen

@@ -64,6 +64,7 @@ class SuspendAccountService < BaseService
@account.user.destroy
else
@account.user.disable!
@account.user.invites.where(uses: 0).destroy_all
end
end



+ 11
- 5
spec/models/invite_spec.rb Datei anzeigen

@@ -3,27 +3,33 @@ require 'rails_helper'
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


Laden…
Abbrechen
Speichern