FIX: mark user as approved if an invite is already present

2025-02-25 18:55:32 -06:00 · 2015-06-26 01:21:26 +05:30
parent 0a9e2f54ff
commit 03665e8466
3 changed files with 37 additions and 3 deletions
--- a/app/services/user_activator.rb
+++ b/app/services/user_activator.rb
@@ -23,7 +23,8 @@ class UserActivator
  end

  def factory
-    if SiteSetting.must_approve_users?
+    invite = Invite.find_by(email: Email.downcase(@user.email))
+    if SiteSetting.must_approve_users? && !(invite.present? && !invite.expired? && !invite.destroyed? && invite.link_valid?)
      ApprovalActivator
    elsif !user.active?
      EmailActivator