Include person_name in notify jobs and fix ENV key

Pass user.name through controllers and services into SendEmailVerificationJob and SendConfirmEmailVerificationJob, add person_name to Notify template vars so emails can include the recipient's name, and update SendConfirmEmailVerificationJob signature. Also correct the Notify client initializer to use ENV['GOV_NOTIFY_API_KEY'] (was GOVUK_NOTIFY_API_KEY).

Author: mo-zag

app/controllers/v1/email_verifications_controller.rb

@@ -11,8 +11,9 @@ def create
       if verification_request.save
 
         SendEmailVerificationJob.perform_later(
-          email: new_email,
-          verification_url: verification_request.verification_url
+          new_email: new_email,
+          verification_url: verification_request.verification_url,
+          person_name: user.name
         )
 
         render jsonapi: verification_request, status: :ok, context: { request: request }

app/controllers/v1/users_controller.rb

@@ -31,8 +31,9 @@ def update_email
 
     if verification_request.save
       notify_result = SendEmailVerificationJob.perform_later(
-        email: new_email,
-        verification_url: verification_request.verification_url
+        new_email: new_email,
+        verification_url: verification_request.verification_url,
+        person_name: user.name
       )
 
       if notify_result == false

app/jobs/send_confirm_email_verification_job.rb

@@ -3,13 +3,14 @@ class SendConfirmEmailVerificationJob < ApplicationJob
 
   TEMPLATE_ID = '59cda9d1-9a70-4196-8b50-fba71e410765'.freeze
 
-  def perform(new_email:)
+  def perform(new_email:, person_name: nil)
     Notify.new.send_email(
       template_id: TEMPLATE_ID,
       email: new_email,
       vars: {
         login_url: ENV['FRONTEND_URL'],
-        email_address: new_email
+        email_address: new_email,
+        person_name: person_name
       }
     )
   end

app/jobs/send_email_verification_job.rb

@@ -3,13 +3,14 @@ class SendEmailVerificationJob < ApplicationJob
 
   TEMPLATE_ID = '26164cdb-915b-4e13-97e9-d4a42367f068'.freeze
 
-  def perform(new_email:, verification_url:)
+  def perform(new_email:, verification_url:, person_name: nil)
     Notify.new.send_email(
       template_id: TEMPLATE_ID,
       email: new_email,
       vars: {
         verify_url: verification_url,
-        new_email: new_email
+        new_email: new_email,
+        person_name: person_name
       }
     )
   end

app/services/notify.rb

@@ -2,7 +2,7 @@
 
 class Notify
   def initialize
-    @client = Notifications::Client.new(ENV['GOVUK_NOTIFY_API_KEY'])
+    @client = Notifications::Client.new(ENV['GOV_NOTIFY_API_KEY'])
   end
 
   def send_email(template_id:, email:, vars: {})

app/services/update_user_email.rb

@@ -25,7 +25,7 @@ def update_user_record
 
   def sync_with_auth0
     UpdateUserEmailInAuth0.new(user: @user).call
-    SendConfirmEmailVerificationJob.perform_later(new_email: @new_email)
+    SendConfirmEmailVerificationJob.perform_later(new_email: @new_email, person_name: @user.name)
   rescue Auth0::Exception => e
     errors.add(:base, "Auth0 update failed: #{e.message}")
     Rails.logger.error("Auth0 Error: #{e.message}")