From 3aa5024cb217784f605563ab48c1043fd5a152f3 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Sat, 6 May 2023 14:44:30 -0600 Subject: [PATCH] Allow login with email authentication --- .../authentication/resources/classes/plugins/email.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/authentication/resources/classes/plugins/email.php b/core/authentication/resources/classes/plugins/email.php index 2dfdc124b8..548c29d780 100644 --- a/core/authentication/resources/classes/plugins/email.php +++ b/core/authentication/resources/classes/plugins/email.php @@ -108,7 +108,10 @@ class plugin_email { //get the user details $sql = "select user_uuid, username, user_email, contact_uuid \n"; $sql .= "from v_users\n"; - $sql .= "where username = :username\n"; + $sql .= "where (\n"; + $sql .= " username = :username\n"; + $sql .= " or user_email = :username\n"; + $sql .= ")\n"; if ($_SESSION["users"]["unique"]["text"] != "global") { //unique username per domain (not globally unique across system - example: email address) $sql .= "and domain_uuid = :domain_uuid "; @@ -294,7 +297,10 @@ class plugin_email { //get the user details $sql = "select user_uuid, user_email, contact_uuid, user_email_secret\n"; $sql .= "from v_users\n"; - $sql .= "where username = :username\n"; + $sql .= "where (\n"; + $sql .= " username = :username\n"; + $sql .= " or user_email = :username\n"; + $sql .= ")\n"; if ($_SESSION["users"]["unique"]["text"] != "global") { //unique username per domain (not globally unique across system - example: email address) $sql .= "and domain_uuid = :domain_uuid ";