From 4984f632aec2bda5a8c27c182f1370c31cf01245 Mon Sep 17 00:00:00 2001 From: Sean Date: Wed, 29 Jan 2025 19:50:04 -0800 Subject: [PATCH] Set username to fall back to email address --- ghostwriter/users/adapters.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ghostwriter/users/adapters.py b/ghostwriter/users/adapters.py index e6ad070f6..409903e48 100644 --- a/ghostwriter/users/adapters.py +++ b/ghostwriter/users/adapters.py @@ -75,14 +75,16 @@ def populate_user(self, request, sociallogin, data): last_name = data.get("last_name") email = data.get("email") name = data.get("name") + + # If no username or the username is the email address + # Use the email address but strip the domain + if username is None or (username == email): + username = email.split("@")[0] + user = sociallogin.user user_username(user, username or "") user_email(user, valid_email_or_none(email) or "") - # If the username is the email address, strip the domain - if username == email: - user_username(user, username.split("@")[0]) - name_parts = (name or "").partition(" ") user_field(user, "first_name", first_name or name_parts[0]) user_field(user, "last_name", last_name or name_parts[2])