diff --git a/account/serializers.py b/account/serializers.py index 4ee88c4..afd923c 100644 --- a/account/serializers.py +++ b/account/serializers.py @@ -15,11 +15,12 @@ from rest_framework_simplejwt.tokens import RefreshToken class GoogleSignInSerializer(serializers.Serializer): """Google login Serializer""" + email = serializers.EmailField() def create(self, validated_data): """Create or update user model""" with transaction.atomic(): - print() + print("validated_data====>",validated_data) if User.objects.filter(email__iexact=self.validated_data['email']).exists(): return User.objects.get(email__iexact=self.validated_data['email']) diff --git a/account/urls.py b/account/urls.py index 8462378..eab8be4 100644 --- a/account/urls.py +++ b/account/urls.py @@ -5,14 +5,14 @@ from rest_framework.decorators import api_view """Third party import""" from rest_framework import routers from .views import (UserLogin, SendPhoneOtp, UserPhoneVerification, UserEmailVerification, ReSendEmailOtp, - ForgotPasswordAPIView, ResetPasswordAPIView, ChangePasswordAPIView, GoogleLoginAPIViewset) + ForgotPasswordAPIView, ResetPasswordAPIView, ChangePasswordAPIView) """Router""" router = routers.SimpleRouter() """API End points with router""" router.register('user', UserLogin, basename='user') router.register('admin', UserLogin, basename='admin') -router.register('google-login', GoogleLoginAPIViewset, basename='admin') +# router.register('google-login', GoogleLoginAPIViewset, basename='admin') router.register('send-phone-otp', SendPhoneOtp, basename='send-phone-otp') router.register('user-phone-verification', UserPhoneVerification, basename='user-phone-verification') router.register('user-email-verification', UserEmailVerification, basename='user-email-verification') diff --git a/account/views.py b/account/views.py index 4fe28a5..69e4e95 100644 --- a/account/views.py +++ b/account/views.py @@ -22,24 +22,27 @@ from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated from templated_email import send_templated_mail -class GoogleLoginAPIViewset(viewsets.ModelViewSet): - """Google Login""" - serializer_class = GoogleSignInSerializer - - def create(self, request, *args, **kwargs): - """ - Override default behaviour of create method - """ - provider_type = [] - serializer = self.get_serializer(data=request.data) - if serializer.is_valid(raise_exception=True): - provider = self.get_provider_view(request.data.get('provider')) - # if User is not authenticated then send error message - if not provider.is_authenticated(request): - return custom_error_response({}, status.HTTP_400_BAD_REQUEST) - - user = serializer.save() - if User.objects.filter(email__iexact=user.email).exists(): +# class GoogleLoginAPIViewset(viewsets.ModelViewSet): +# """Google Login""" +# serializer_class = GoogleSignInSerializer +# +# def create(self, request, *args, **kwargs): +# """ +# Override default behaviour of create method +# """ +# provider_type = [] +# serializer = self.get_serializer(data=request.data) +# if serializer.is_valid(raise_exception=True): +# # provider = self.get_provider_view(request.data.get('provider')) +# # if User is not authenticated then send error message +# # if not provider.is_authenticated(request): +# # return custom_error_response({}, status.HTTP_400_BAD_REQUEST) +# +# user = serializer.save() +# if User.objects.filter(email__iexact=user.email).exists(): +# print("ppppppppppppp") +# return custom_response(SUCCESS_CODE["3003"], response_status=status.HTTP_200_OK) +# return custom_response(ERROR_CODE["2002"], response_status=status.HTTP_400_BAD_REQUEST) diff --git a/zod_bank/settings.py b/zod_bank/settings.py index e1527a4..5ef382e 100644 --- a/zod_bank/settings.py +++ b/zod_bank/settings.py @@ -187,4 +187,5 @@ EMAIL_HOST_USER = os.getenv('EMAIL_HOST_USER') EMAIL_HOST_PASSWORD = os.getenv('EMAIL_HOST_PASSWORD') EMAIL_PORT = os.getenv('EMAIL_PORT') -STATIC_URL = '/static/' +STATIC_URL = 'static/' +STATIC_ROOT = 'static'