gevorkyan.aa/edx-oauth2-wordpress-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user_data() now uses self.user_details

Browse Source
This commit is contained in:
lpm0073 2022-10-05 20:14:13 -05:00
parent 631f2ce93c
commit 6002e392f2
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp_oauth_backend/wp_oauth.py
View File

@ -240,7 +240,6 @@ class StepwiseMathWPOAuth2(BaseOAuth2):
# #
# see https://python-social-auth.readthedocs.io/en/latest/backends/implementation.html # see https://python-social-auth.readthedocs.io/en/latest/backends/implementation.html
def user_data(self, access_token, *args, **kwargs) -> dict: def user_data(self, access_token, *args, **kwargs) -> dict:
user_details = None
url = f'{self.USER_QUERY}?' + urlencode({ url = f'{self.USER_QUERY}?' + urlencode({
'access_token': access_token 'access_token': access_token
@ -251,14 +250,14 @@ class StepwiseMathWPOAuth2(BaseOAuth2):
try: try:
response = json.loads(self._urlopen(url)) response = json.loads(self._urlopen(url))
user_details = self.get_user_details(response) self.get_user_details(response)
except ValueError as e: except ValueError as e:
logger.error('user_data() {err}'.format(err=e)) logger.error('user_data() {err}'.format(err=e))
return None return None
if not user_details or type(user_details) != dict or 'username' not in user_details.keys(): if not self.user_details or type(self.user_details) != dict or 'username' not in self.user_details.keys():
# we should never find ourselves here. # we should never find ourselves here.
return user_details return self.user_details
# add syncronization of any data fields that get missed by the built-in # add syncronization of any data fields that get missed by the built-in
# open edx third party authentication sync functionality. # open edx third party authentication sync functionality.
@ -266,20 +265,20 @@ class StepwiseMathWPOAuth2(BaseOAuth2):
# this gets called just prior to account creation for # this gets called just prior to account creation for
# new users, hence, we need to catch DoesNotExist # new users, hence, we need to catch DoesNotExist
# exceptions. # exceptions.
user=User.objects.get(username=user_details['username']) user=User.objects.get(username=self.user_details['username'])
except User.DoesNotExist: except User.DoesNotExist:
return user_details return self.user_details
if (user.is_superuser != user_details['is_superuser']) or (user.is_staff != user_details['is_staff']): if (user.is_superuser != self.user_details['is_superuser']) or (user.is_staff != self.user_details['is_staff']):
user.is_superuser = user_details['is_superuser'] user.is_superuser = self.user_details['is_superuser']
user.is_staff = user_details['is_staff'] user.is_staff = self.user_details['is_staff']
user.save() user.save()
logger.info('Updated the is_superuser/is_staff flags for user {username}'.format(username=user.username)) logger.info('Updated the is_superuser/is_staff flags for user {username}'.format(username=user.username))
if (user.first_name != user_details['first_name']) or (user.last_name != user_details['last_name']): if (user.first_name != self.user_details['first_name']) or (user.last_name != self.user_details['last_name']):
user.first_name = user_details['first_name'] user.first_name = self.user_details['first_name']
user.last_name = user_details['last_name'] user.last_name = self.user_details['last_name']
user.save() user.save()
logger.info('Updated first_name/last_name for user {username}'.format(username=user.username)) logger.info('Updated first_name/last_name for user {username}'.format(username=user.username))
return user_details return self.user_details