Enabling user to resend confirmation email if the first one was not r…

…eceived

app/controllers/users_controller.rb

@@ -5,7 +5,6 @@ class UsersController < ApplicationController
   def create
     @user = User.new(create_user_params)
     if @user.save
-      @user.send_confirmation_email!
       redirect_to(root_path, notice: 'Please check your email for confirmation instructions.')
     else
       render(:new, status: :unprocessable_entity)
@@ -77,6 +76,22 @@ def update
     end
   end
 
+  def resend_confirmation
+    @user = User.find(params[:id])
+
+    # Make sure the user is entitled to resend the confirmation email
+    not_owner and return
+
+    if @user.confirmed
+      # Make sure the user is not already confirmed
+      redirect_to(root_path, notice: 'Your account is already confirmed.')
+    else
+      # Otherwise, send the confirmation email
+      @user.send_confirmation_email!
+      redirect_to(edit_account_path, notice: 'Please check your email for confirmation instructions.')
+    end
+  end
+
   private
 
   def create_user_params
@@ -114,9 +129,6 @@ def update_password
   def user_updates_their_email(msg)
     # If the user is updating their email, send a confirmation email and adavise them to check their email
     if update_user_params[:email].present? && update_user_params[:email] != @user.email
-      @user.send_confirmation_email!
-      @user.confirmed = false
-      @user.confirmed_at = nil
       'Email & account updated successfully. Please check your mail for confirmation instructions.' 
     else
       msg

app/models/user.rb

@@ -4,8 +4,9 @@ class User < ApplicationRecord
   attr_accessor :current_password
 
   # Callbacks
-  before_save :downcase_email, if: :will_save_change_to_email?
-  before_save :generate_password_digest
+  after_create :send_confirmation_email!
+  before_save  :downcase_email, if: :will_save_change_to_email?
+  before_save  :generate_password_digest
 
   # Mailer configuration
   MAILER_FROM_EMAIL = '<Ask Me!> no-reply@ask.me'
@@ -35,18 +36,18 @@ def confirm!
     update_columns(confirmed_at: Time.current, confirmed: true)
   end
 
-  # Send a confirmation email to the user
-  def send_confirmation_email!
-    confirmation_token = signed_id(purpose: :email_confirmation, expires_in: CONFIRMATION_TOKEN_EXPIRATION)
-    UserMailer.confirmation(self, confirmation_token).deliver_now
-  end
-
   # Send a password reset email to the user
   def send_password_reset_email!
     password_reset_token = signed_id(purpose: :reset_password, expires_in: PASSWORD_RESET_TOKEN_EXPIRATION)
     UserMailer.password_reset(self, password_reset_token).deliver_now
   end
 
+  # Send a confirmation email to the user
+  def send_confirmation_email!
+    confirmation_token = signed_id(purpose: :email_confirmation, expires_in: CONFIRMATION_TOKEN_EXPIRATION)
+    UserMailer.confirmation(self, confirmation_token).deliver_now
+  end
+
   private
 
   # Make sure we save all emails in lowercase
@@ -59,4 +60,12 @@ def generate_password_digest
     require('argon2')
     self.password_digest = Argon2::Password.create(password) if password.present?
   end
+
+  # Method called only when an existing user changes their email address.
+  def change_email
+    send_confirmation_email!
+    self.confirmed = false
+    self.confirmed_at = nil
+  end
+
 end

app/views/users/edit.html.erb

@@ -9,7 +9,12 @@
   <% end %>
   <div>
     <%= form.label :email, "Current Email" %>
-    <%= form.email_field :email, autocomplete: "email", class: "form-input w-full block rounded-xl border-slate-300 border-2 focus:outline-none focus:border-green-500 focus:ring-green-500"  %>
+    <%= form.email_field :email, autocomplete: "email", class: "form-input w-full block rounded-xl border-slate-300 border-2 focus:outline-none focus:border-green-500 focus:ring-green-500 mb-1"  %>
+    <% if @user.confirmed %>
+      <span class="bg-green-300 text-green-700 text-sm px-4 py-1 rounded-full">confirmed</span>
+    <% else %>
+      <span class="bg-blue-300 text-blue-700 text-sm px-4 py-1 rounded-full">unconfirmed</span> <%= link_to "resend confirmation", resend_confirmation_path(@user), data: { 'turbo-method': :put }, class: "ml-2 text-blue-700 text-sm hover:text-blue-800 ease-in-out duration-500 transition-colors" %>
+    <% end %>
   </div>
   <h2 class="font-bold text-lg my-3">Change your password</h2>
   <div>

config/routes.rb

@@ -5,6 +5,7 @@
   put 'account/:id', to: 'users#update', as: 'update_account'
   get 'account/:id', to: 'users#edit', as: 'edit_account'
   delete 'account/:id', to: 'users#destroy', as: 'destroy_account'
+  put 'account/:id/resend_confirmation', to: 'users#resend_confirmation', as: 'resend_confirmation'
 
   # User routes
   post 'sign_up', to: 'users#create'