Get rid of EmailContext

app/controllers/accounts/connected_accounts/selected_email_controller.rb

@@ -53,7 +53,7 @@ def identity
       end
 
       def last_email
-        EmailContext.new(current_user).last_sign_in_email_address.id
+        current_user.last_sign_in_email_address.id
       end
     end
   end

app/controllers/concerns/mfa_setup_concern.rb

@@ -96,7 +96,7 @@ def threatmetrix_attrs
       user_id: current_user.id,
       request_ip: request&.remote_ip,
       threatmetrix_session_id: session[:threatmetrix_session_id],
-      email: EmailContext.new(current_user).last_sign_in_email_address.email,
+      email: current_user.last_sign_in_email_address.email,
       uuid_prefix: current_sp&.app_id,
     }
   end

app/controllers/sign_up/completions_controller.rb

@@ -22,7 +22,7 @@ def update
       update_verified_attributes
       send_in_person_completion_survey
       if user_session[:selected_email_id_for_linked_identity].nil?
-        user_session[:selected_email_id_for_linked_identity] = EmailContext.new(current_user)
+        user_session[:selected_email_id_for_linked_identity] = current_user
           .last_sign_in_email_address.id
       end
       if decider.go_back_to_mobile_app?

app/controllers/sign_up/select_email_controller.rb

@@ -52,7 +52,7 @@ def last_email
       if user_session[:selected_email_id_for_linked_identity]
         user_emails.find(user_session[:selected_email_id_for_linked_identity]).email
       else
-        EmailContext.new(current_user).last_sign_in_email_address.email
+        current_user.last_sign_in_email_address.email
       end
     end
 

app/models/user.rb

@@ -392,7 +392,7 @@ def qrcode(otp_secret_key)
       interval: IdentityConfig.store.totp_code_interval,
     }
     url = ROTP::TOTP.new(otp_secret_key, options).provisioning_uri(
-      EmailContext.new(self).last_sign_in_email_address.email,
+      last_sign_in_email_address.email,
     )
     qrcode = RQRCode::QRCode.new(url)
     qrcode.as_png(size: 240).to_data_url

app/policies/email_policy.rb

@@ -2,7 +2,7 @@
 
 class EmailPolicy
   def initialize(user)
-    @user = EmailContext.new(user)
+    @user = user
   end
 
   def can_delete_email?(email)
@@ -12,17 +12,17 @@ def can_delete_email?(email)
   end
 
   def can_add_email?
-    user.email_address_count < IdentityConfig.store.max_emails_per_account
+    user.email_addresses.count < IdentityConfig.store.max_emails_per_account
   end
 
   private
 
   def last_confirmed_email_address?
-    user.confirmed_email_address_count <= 1
+    user.confirmed_email_addresses.count <= 1
   end
 
   def last_email_address?
-    user.email_address_count <= 1
+    user.email_addresses.count <= 1
   end
 
   attr_reader :user

app/presenters/account_show_presenter.rb

@@ -120,7 +120,7 @@ def personal_key_generated_at
   def header_personalization
     return decrypted_pii.first_name if decrypted_pii.present?
 
-    EmailContext.new(user).last_sign_in_email_address.email
+    user.last_sign_in_email_address.email
   end
 
   def totp_content

app/presenters/openid_connect_user_info_presenter.rb

@@ -57,10 +57,6 @@ def all_emails_from_sp_identity(identity)
     identity.user.confirmed_email_addresses.map(&:email)
   end
 
-  def email_context
-    @email_context ||= EmailContext.new(identity.user)
-  end
-
   def ial2_attributes
     {
       given_name: stringify_attr(ial2_data.first_name),

app/services/displayable_pii_formatter.rb

@@ -41,7 +41,7 @@ def email
     if @selected_email_id
       current_user.confirmed_email_addresses.find(@selected_email_id).email
     else
-      EmailContext.new(current_user).last_sign_in_email_address.email
+      current_user.last_sign_in_email_address.email
     end
   end
 

config/initializers/saml_idp.rb

@@ -27,7 +27,7 @@
   config.name_id.formats =
     {
       persistent: ->(principal) { principal.asserted_attributes[:uuid][:getter].call(principal) },
-      email_address: ->(principal) { EmailContext.new(principal).last_sign_in_email_address.email },
+      email_address: ->(principal) { principal.last_sign_in_email_address.email },
     }
 
   ## Technical contact ##

spec/services/attribute_asserter_spec.rb

@@ -272,8 +272,7 @@
           end
 
           it 'does not create a getter function for IAL1 attributes' do
-            expected_email = EmailContext.new(user).last_sign_in_email_address.email
-            expect(get_asserted_attribute(user, :email)).to eq expected_email
+            expect(get_asserted_attribute(user, :email)).to eq user.last_sign_in_email_address.email
           end
 
           it 'gets UUID from Service Provider' do
@@ -293,8 +292,8 @@
             end
 
             it 'does not create a getter function for IAL1 attributes' do
-              expected_email = EmailContext.new(user).last_sign_in_email_address.email
-              expect(get_asserted_attribute(user, :email)).to eq expected_email
+              expect(get_asserted_attribute(user, :email))
+                .to eq user.last_sign_in_email_address.email
             end
 
             it 'gets UUID from Service Provider' do