ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-11-26 08:34:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/KiwiTechLLC/ZODBank-Backend into dev

Browse Source
This commit is contained in:
abutalib-kiwi
2023-11-27 12:46:42 +05:30
parent a3a4a8d091 772c0c89b5
commit 03f0a4c363
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
account/views.py
View File

@ -74,7 +74,7 @@ class GoogleLoginMixin(object):
user_info = response.json() user_info = response.json()
email = user_info['email'] email = user_info['email']
first_name = user_info['given_name'] first_name = user_info['given_name']
last_name = user_info['family_name'] last_name = user_info['family_name'] if 'family_name' in user_info and user_info['family_name'] else user_info['given_name']
profile_picture = user_info['picture'] profile_picture = user_info['picture']
except Exception as e: except Exception as e:
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST) return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)

4
base/messages.py
View File

@ -96,8 +96,8 @@ ERROR_CODE = {
"2067": "Action not allowed. User type missing.", "2067": "Action not allowed. User type missing.",
"2068": "No guardian associated with this junior", "2068": "No guardian associated with this junior",
"2069": "Invalid user type", "2069": "Invalid user type",
"2070": "You do not find as a guardian", "2070": "You are not registered as a guardian in our system. Please try again as junior.",
"2071": "You do not find as a junior", "2071": "You are not registered as a junior in our system. Please try again as guardian.",
"2072": "You can not approve or reject this task because junior does not exist in the system", "2072": "You can not approve or reject this task because junior does not exist in the system",
"2073": "You can not approve or reject this junior because junior does not exist in the system", "2073": "You can not approve or reject this junior because junior does not exist in the system",
"2074": "You can not complete this task because you does not exist in the system", "2074": "You can not complete this task because you does not exist in the system",