Skip to content

Commit

Permalink
Restore old logic.
Browse files Browse the repository at this point in the history
No-Issue

Signed-off-by: James Tanner <[email protected]>
  • Loading branch information
jctanner committed Nov 25, 2023
1 parent ac83ab0 commit 9915938
Showing 1 changed file with 16 additions and 3 deletions.
19 changes: 16 additions & 3 deletions galaxy_ng/social/pipeline/user.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#!/usr/bin/env python3

import logging
from django.contrib.auth import get_user_model


logger = logging.getLogger(__name__)


User = get_user_model()


USER_FIELDS = ['username', 'email']


Expand All @@ -20,7 +24,6 @@ def create_user(strategy, details, backend, user=None, *args, **kwargs):
if user.username != details.get('username'):
user.username = details.get('username')
user.save()
logger.info(f'create_user(2): returning user-kwarg {user}:{user.id}')
return {'is_new': False}

fields = dict(
Expand All @@ -29,10 +32,20 @@ def create_user(strategy, details, backend, user=None, *args, **kwargs):
)

if not fields:
logger.info(f'create_user(3): no fields for {user}:{user.id}')
return

# bypass the strange logic that can't find the user ... ?
username = details.get('username')
if username:
found_user = User.objects.filter(username=username).first()
if found_user is not None:
return {
'is_new': False,
'user': found_user
}

new_user = strategy.create_user(**fields)
return {
'is_new': True,
'user': strategy.create_user(**fields)
'user': new_user
}

0 comments on commit 9915938

Please sign in to comment.