From f37f4c1ef41a9a6a19ee44ea131ad88777e956d9 Mon Sep 17 00:00:00 2001 From: Ahmad Farhat Date: Tue, 1 Jun 2021 17:42:23 -0400 Subject: [PATCH] Fix LDAP password string (#2747) * Fix LDAP password string * Rspec --- app/controllers/sessions_controller.rb | 4 ++-- config/locales/en.yml | 1 + spec/controllers/sessions_controller_spec.rb | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index e131a845..dec17481 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -146,12 +146,12 @@ class SessionsController < ApplicationController ldap_config[:uid] = ENV['LDAP_UID'] if params[:session][:username].blank? || session_params[:password].blank? - return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials")) + return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials_external")) end result = send_ldap_request(params[:session], ldap_config) - return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials")) unless result + return redirect_to(ldap_signin_path, alert: I18n.t("invalid_credentials_external")) unless result @auth = parse_auth(result.first, ENV['LDAP_ROLE_FIELD'], ENV['LDAP_ATTRIBUTE_MAPPING']) diff --git a/config/locales/en.yml b/config/locales/en.yml index 04e14a1b..4fa9b725 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -314,6 +314,7 @@ en: home_room: Home Room info_update_success: Information successfully updated. invalid_credentials: The email and password you entered did not match our records. Try again or click Forgot Password to reset your password. + invalid_credentials_external: The email and password you entered did not match our records. Please try again. invalid_login_method: Login failed due to account mismatch. You need to log in with omniauth. invite_message: "To invite someone to the meeting, send them this link:" javascript: diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 79376fb9..9d16adb4 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -658,7 +658,7 @@ describe SessionsController, type: :controller do } expect(response).to redirect_to(ldap_signin_path) - expect(flash[:alert]).to eq(I18n.t("invalid_credentials")) + expect(flash[:alert]).to eq(I18n.t("invalid_credentials_external")) end it "redirects to signin if no password provided" do @@ -672,7 +672,7 @@ describe SessionsController, type: :controller do } expect(response).to redirect_to(ldap_signin_path) - expect(flash[:alert]).to eq(I18n.t("invalid_credentials")) + expect(flash[:alert]).to eq(I18n.t("invalid_credentials_external")) end it "redirects to signin if no username provided" do @@ -686,7 +686,7 @@ describe SessionsController, type: :controller do } expect(response).to redirect_to(ldap_signin_path) - expect(flash[:alert]).to eq(I18n.t("invalid_credentials")) + expect(flash[:alert]).to eq(I18n.t("invalid_credentials_external")) end end end