Make GPG signature verification work with non-primary email (#36959)

1 files changed, 11 insertions, 4 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 09c9b3250eb..cdc7c8ad84a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -817,6 +817,17 @@ class User < ActiveRecord::Base
     all_emails
   end
 
+  def all_verified_emails
+    verified_emails = []
+    verified_emails << email if confirmed? && !temp_oauth_email?
+    verified_emails.concat(emails.select {|e| e.confirmed?}.map(&:email))
+    verified_emails
+  end
+
+  def verified_email?(email)
+    all_verified_emails.include?(email)
+  end
+
   def hook_attrs
     {
       name: name,
@@ -1041,10 +1052,6 @@ class User < ActiveRecord::Base
     ensure_rss_token!
   end
 
-  def verified_email?(email)
-    self.email == email
-  end
-
   def sync_attribute?(attribute)
     return true if ldap_user? && attribute == :email