ammar/zod-backend
1
0
Fork 0
mirror of https://github.com/HamzaSha1/zod-backend.git synced 2025-08-25 13:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

added status for login and sign up from google and apple

Browse Source
This commit is contained in:
abutalib-kiwi
2023-10-27 12:05:47 +05:30
parent 801bc45bc5
commit b1d8949b08
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
account/serializers.py
View File

@ -216,6 +216,7 @@ class GuardianSerializer(serializers.ModelSerializer):
last_name = serializers.SerializerMethodField('get_last_name') last_name = serializers.SerializerMethodField('get_last_name')
auth_token = serializers.SerializerMethodField('get_auth_token') auth_token = serializers.SerializerMethodField('get_auth_token')
refresh_token = serializers.SerializerMethodField('get_refresh_token') refresh_token = serializers.SerializerMethodField('get_refresh_token')
sign_up = serializers.SerializerMethodField()
def get_auth_token(self, obj): def get_auth_token(self, obj):
refresh = RefreshToken.for_user(obj.user) refresh = RefreshToken.for_user(obj.user)
@ -253,12 +254,16 @@ class GuardianSerializer(serializers.ModelSerializer):
"""user last name""" """user last name"""
return obj.user.last_name return obj.user.last_name
def get_sign_up(self, obj):
return True if self.context.get('sign_up', '') else False
class Meta(object): class Meta(object):
"""Meta info""" """Meta info"""
model = Guardian model = Guardian
fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code',
'phone', 'family_name', 'gender', 'dob', 'referral_code', 'is_active', 'is_deleted', 'phone', 'family_name', 'gender', 'dob', 'referral_code', 'is_active', 'is_deleted',
'is_complete_profile', 'passcode', 'image', 'created_at', 'updated_at', 'user_type', 'country_name'] 'is_complete_profile', 'passcode', 'image', 'created_at', 'updated_at', 'user_type',
'country_name', 'sign_up']
class JuniorSerializer(serializers.ModelSerializer): class JuniorSerializer(serializers.ModelSerializer):
@ -269,6 +274,7 @@ class JuniorSerializer(serializers.ModelSerializer):
last_name = serializers.SerializerMethodField('get_last_name') last_name = serializers.SerializerMethodField('get_last_name')
auth_token = serializers.SerializerMethodField('get_auth_token') auth_token = serializers.SerializerMethodField('get_auth_token')
refresh_token = serializers.SerializerMethodField('get_refresh_token') refresh_token = serializers.SerializerMethodField('get_refresh_token')
sign_up = serializers.SerializerMethodField()
def get_auth_token(self, obj): def get_auth_token(self, obj):
refresh = RefreshToken.for_user(obj.auth) refresh = RefreshToken.for_user(obj.auth)
@ -295,13 +301,16 @@ class JuniorSerializer(serializers.ModelSerializer):
def get_last_name(self, obj): def get_last_name(self, obj):
return obj.auth.last_name return obj.auth.last_name
def get_sign_up(self, obj):
return True if self.context.get('sign_up', '') else False
class Meta(object): class Meta(object):
"""Meta info""" """Meta info"""
model = Junior model = Junior
fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code', fields = ['id', 'auth_token', 'refresh_token', 'email', 'first_name', 'last_name', 'country_code',
'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', 'is_password_set', 'phone', 'gender', 'dob', 'guardian_code', 'referral_code','is_active', 'is_password_set',
'is_complete_profile', 'created_at', 'image', 'updated_at', 'user_type', 'country_name','is_invited', 'is_complete_profile', 'created_at', 'image', 'updated_at', 'user_type', 'country_name','is_invited',
'is_deleted'] 'is_deleted', 'sign_up']
class EmailVerificationSerializer(serializers.ModelSerializer): class EmailVerificationSerializer(serializers.ModelSerializer):
"""Email verification serializer""" """Email verification serializer"""

8
account/views.py
View File

@ -129,7 +129,7 @@ class GoogleLoginMixin(object):
junior_code=generate_code(JUN, user_obj.id), junior_code=generate_code(JUN, user_obj.id),
referral_code=generate_code(ZOD, user_obj.id) referral_code=generate_code(ZOD, user_obj.id)
) )
serializer = JuniorSerializer(junior_query) serializer = JuniorSerializer(junior_query, context={'sign_up': True})
position = Junior.objects.all().count() position = Junior.objects.all().count()
JuniorPoints.objects.create(junior=junior_query, position=position) JuniorPoints.objects.create(junior=junior_query, position=position)
elif str(user_type) == '2': elif str(user_type) == '2':
@ -138,7 +138,7 @@ class GoogleLoginMixin(object):
guardian_code=generate_code(GRD, user_obj.id), guardian_code=generate_code(GRD, user_obj.id),
referral_code=generate_code(ZOD, user_obj.id) referral_code=generate_code(ZOD, user_obj.id)
) )
serializer = GuardianSerializer(guardian_query) serializer = GuardianSerializer(guardian_query, context={'sign_up': True})
else: else:
user_obj.delete() user_obj.delete()
return custom_error_response( return custom_error_response(
@ -220,7 +220,7 @@ class SigninWithApple(views.APIView):
signup_method='3', signup_method='3',
junior_code=generate_code(JUN, user.id), junior_code=generate_code(JUN, user.id),
referral_code=generate_code(ZOD, user.id)) referral_code=generate_code(ZOD, user.id))
serializer = JuniorSerializer(junior_query) serializer = JuniorSerializer(junior_query, context={'sign_up': True})
position = Junior.objects.all().count() position = Junior.objects.all().count()
JuniorPoints.objects.create(junior=junior_query, position=position) JuniorPoints.objects.create(junior=junior_query, position=position)
elif str(user_type) == '2': elif str(user_type) == '2':
@ -228,7 +228,7 @@ class SigninWithApple(views.APIView):
signup_method='3', signup_method='3',
guardian_code=generate_code(GRD, user.id), guardian_code=generate_code(GRD, user.id),
referral_code=generate_code(ZOD, user.id)) referral_code=generate_code(ZOD, user.id))
serializer = GuardianSerializer(guardian_query) serializer = GuardianSerializer(guardian_query, context={'sign_up': True})
else: else:
user.delete() user.delete()
return custom_error_response( return custom_error_response(