From 0e9d1de6b214958df37b362786413c9ed5a289b5 Mon Sep 17 00:00:00 2001
From: Arthur Ariza <37642667+arthurariza@users.noreply.github.com>
Date: Wed, 17 May 2023 06:53:48 -0300
Subject: [PATCH] Fix unconfirmed user alert message (#94)

---
 README.md                                    | 4 ++--
 app/controllers/sessions_controller.rb       | 2 +-
 test/controllers/sessions_controller_test.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0010e75..d627d77 100644
--- a/README.md
+++ b/README.md
@@ -513,7 +513,7 @@ class SessionsController < ApplicationController
     @user = User.find_by(email: params[:user][:email].downcase)
     if @user
       if @user.unconfirmed?
-        redirect_to new_confirmation_path, alert: "Incorrect email or password."
+        redirect_to new_confirmation_path, alert: "Please confirm your email first."
       elsif @user.authenticate(params[:user][:password])
         login @user
         redirect_to root_path, notice: "Signed in."
@@ -1283,7 +1283,7 @@ class SessionsController < ApplicationController
     @user = User.authenticate_by(email: params[:user][:email].downcase, password: params[:user][:password])
     if @user
       if @user.unconfirmed?
-        redirect_to new_confirmation_path, alert: "Incorrect email or password."
+        redirect_to new_confirmation_path, alert: "Please confirm your email first."
       else
         after_login_path = session[:user_return_to] || root_path
         login @user
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index c23c2a3..c99c83a 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -6,7 +6,7 @@ def create
     @user = User.authenticate_by(email: params[:user][:email].downcase, password: params[:user][:password])
     if @user
       if @user.unconfirmed?
-        redirect_to new_confirmation_path, alert: "Incorrect email or password."
+        redirect_to new_confirmation_path, alert: "Please confirm your email first."
       else
         after_login_path = session[:user_return_to] || root_path
         active_session = login @user
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
index e19390c..928d560 100644
--- a/test/controllers/sessions_controller_test.rb
+++ b/test/controllers/sessions_controller_test.rb
@@ -68,7 +68,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
         password: @unconfirmed_user.password
       }
     }
-    assert_equal "Incorrect email or password.", flash[:alert]
+    assert_equal "Please confirm your email first.", flash[:alert]
     assert_nil current_user
     assert_redirected_to new_confirmation_path
   end