From 57dd2135a655bc4e6d29e4e90706ac8955f6d9b2 Mon Sep 17 00:00:00 2001
From: Attiya Ishaque <atiya.ishaq@arbisoft.com>
Date: Fri, 5 Jul 2024 14:23:22 +0500
Subject: [PATCH] fix: update autogenerated username functionality (#35052)

---
 .../user_authn/views/tests/test_utils.py      |  2 ++
 .../core/djangoapps/user_authn/views/utils.py | 27 ++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/openedx/core/djangoapps/user_authn/views/tests/test_utils.py b/openedx/core/djangoapps/user_authn/views/tests/test_utils.py
index c931fe339901..397448005f85 100644
--- a/openedx/core/djangoapps/user_authn/views/tests/test_utils.py
+++ b/openedx/core/djangoapps/user_authn/views/tests/test_utils.py
@@ -45,6 +45,8 @@ def test_generate_username_from_data(self, data, expected_initials):
         ({}, None),
         ({'first_name': '', 'last_name': ''}, None),
         ({'name': ''}, None),
+        ({'name': '='}, None),
+        ({'name': '@'}, None),
         ({'first_name': '阿提亚', 'last_name': '阿提亚'}, "AT"),
         ({'first_name': 'أحمد', 'last_name': 'محمد'}, "HM"),
         ({'name': 'أحمد محمد'}, "HM"),
diff --git a/openedx/core/djangoapps/user_authn/views/utils.py b/openedx/core/djangoapps/user_authn/views/utils.py
index c6107923a3f1..9b4054bd4037 100644
--- a/openedx/core/djangoapps/user_authn/views/utils.py
+++ b/openedx/core/djangoapps/user_authn/views/utils.py
@@ -128,16 +128,25 @@ def _get_username_prefix(data):
     - str: Name initials or None.
     """
     username_regex_partial = settings.USERNAME_REGEX_PARTIAL
+    valid_username_regex = r'^[A-Za-z0-9_\-]+$'
     full_name = ''
-    if data.get('first_name', '').strip() and data.get('last_name', '').strip():
-        full_name = f"{unidecode(data.get('first_name', ''))} {unidecode(data.get('last_name', ''))}"
-    elif data.get('name', '').strip():
-        full_name = unidecode(data['name'])
-
-    if full_name.strip():
-        full_name = re.findall(username_regex_partial, full_name)[0]
-        name_initials = "".join([name_part[0] for name_part in full_name.split()[:2]])
-        return name_initials.upper() if name_initials else None
+    try:
+        if data.get('first_name', '').strip() and data.get('last_name', '').strip():
+            full_name = f"{unidecode(data.get('first_name', ''))} {unidecode(data.get('last_name', ''))}"
+        elif data.get('name', '').strip():
+            full_name = unidecode(data['name'])
+
+        if full_name.strip():
+            matched_name = re.findall(username_regex_partial, full_name)
+            if matched_name:
+                full_name = " ".join(matched_name)
+                name_initials = "".join([name_part[0] for name_part in full_name.split()[:2]])
+                if re.match(valid_username_regex, name_initials):
+                    return name_initials.upper() if name_initials else None
+
+    except Exception as e:  # pylint: disable=broad-except
+        logging.info(f"Error in _get_username_prefix: {e}")
+        return None
 
     return None