From ae1838655876363065dd062a21064d385a90eb33 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 19 May 2019 21:40:36 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=9Cinvited=20by=E2=80=9D=20not=20sh?=
=?UTF-8?q?owing=20up=20for=20invited=20accounts=20in=20admin=20interface?=
=?UTF-8?q?=20(#10791)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/user.rb | 6 +++++-
app/validators/blacklisted_email_validator.rb | 2 +-
spec/validators/blacklisted_email_validator_spec.rb | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/models/user.rb b/app/models/user.rb
index 6941b040d..3d1eb5f20 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -114,6 +114,10 @@ class User < ApplicationRecord
end
def invited?
+ invite_id.present?
+ end
+
+ def valid_invitation?
invite_id.present? && invite.valid_for_use?
end
@@ -274,7 +278,7 @@ class User < ApplicationRecord
private
def set_approved
- self.approved = open_registrations? || invited? || external?
+ self.approved = open_registrations? || valid_invitation? || external?
end
def open_registrations?
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index a288c20ef..0d01a1c47 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -2,7 +2,7 @@
class BlacklistedEmailValidator < ActiveModel::Validator
def validate(user)
- return if user.invited?
+ return if user.valid_invitation?
@email = user.email
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index 84b0107dd..ccc5dc0f4 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe BlacklistedEmailValidator, type: :validator do
let(:errors) { double(add: nil) }
before do
- allow(user).to receive(:invited?) { false }
+ allow(user).to receive(:valid_invitation?) { false }
allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email }
described_class.new.validate(user)
end