Fix unconfirmed user alert message (#94)

stevepolitodesign · May 17, 2023 · 0e9d1de · 0e9d1de
1 parent 0416b6f
commit 0e9d1de
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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