small cleanup changes based on feedback

3 files changed, 11 insertions, 14 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index cdc7c8ad84a..5e1355662b6 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -810,6 +810,10 @@ class User < ActiveRecord::Base
     avatar_path(args) || GravatarService.new.execute(email, size, scale, username: username)
   end
 
+  def primary_email_verified?
+    confirmed? && !temp_oauth_email?
+  end
+
   def all_emails
     all_emails = []
     all_emails << email unless temp_oauth_email?
@@ -817,15 +821,15 @@ class User < ActiveRecord::Base
     all_emails
   end
 
-  def all_verified_emails
+  def verified_emails
     verified_emails = []
-    verified_emails << email if confirmed? && !temp_oauth_email?
-    verified_emails.concat(emails.select {|e| e.confirmed?}.map(&:email))
+    verified_emails << email if primary_email_verified?
+    verified_emails.concat(emails.where.not(confirmed_at: nil).pluck(:email))
     verified_emails
   end
 
-  def verified_email?(email)
-    all_verified_emails.include?(email)
+  def verified_email?(check_email)
+    (email == check_email && primary_email_verified?) || verified_emails.include?(check_email)
   end
 
   def hook_attrs
diff --git a/app/views/devise/mailer/confirmation_instructions.html.haml b/app/views/devise/mailer/confirmation_instructions.html.haml
index a0fb687e152..d2685140913 100644
--- a/app/views/devise/mailer/confirmation_instructions.html.haml
+++ b/app/views/devise/mailer/confirmation_instructions.html.haml
@@ -1,4 +1 @@
-- if @resource.is_a?(User)
-  = render partial: 'confirmation_instructions_account'
-- else
-  = render partial: 'confirmation_instructions_secondary'
+= render partial: "confirmation_instructions_#{@resource.is_a?(User) ? 'account' : 'secondary'}"
\ No newline at end of file
diff --git a/app/views/devise/mailer/confirmation_instructions.text.erb b/app/views/devise/mailer/confirmation_instructions.text.erb
index 057bb0b23f9..05fddddf415 100644
--- a/app/views/devise/mailer/confirmation_instructions.text.erb
+++ b/app/views/devise/mailer/confirmation_instructions.text.erb
@@ -1,5 +1 @@
-<% if @resource.is_a?(User) %>
-<%= render partial: 'confirmation_instructions_account' %>
-<% else %>
-<%= render partial: 'confirmation_instructions_secondary' %>
-<% end %>
+<%= render partial: "confirmation_instructions_#{@resource.is_a?(User) ? 'account' : 'secondary'}" %>
\ No newline at end of file