Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Aug 3, 2023
1 parent 8d67aab commit 88eabe7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 18 deletions.
8 changes: 4 additions & 4 deletions travit_service/travit_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@
}

# EMAIL
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'smtp.gmail.com'
EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
EMAIL_HOST = "smtp.gmail.com"
EMAIL_PORT = 587 # Use the appropriate port for your SMTP server
EMAIL_USE_TLS = True
EMAIL_HOST_USER = '[email protected]'
EMAIL_HOST_PASSWORD = 'hfwbrsjepxfjdoyt'
EMAIL_HOST_USER = "[email protected]"
EMAIL_HOST_PASSWORD = "hfwbrsjepxfjdoyt"

DJOSER = {
"SERIALIZERS": {
Expand Down
12 changes: 6 additions & 6 deletions travit_service/travit_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from drf_yasg import openapi
from drf_yasg.views import get_schema_view
from rest_framework import permissions

from users.views import ActivateUserViewSet

schema_view = get_schema_view(
Expand All @@ -44,14 +43,15 @@
schema_view.with_ui("swagger", cache_timeout=0),
name="schema-swagger-ui",
),
path("redoc/", schema_view.with_ui("redoc",
cache_timeout=0), name="schema-redoc"),
path("redoc/", schema_view.with_ui("redoc", cache_timeout=0), name="schema-redoc"),
path("admin/", admin.site.urls),
path("auth/", include("djoser.urls")),
path("auth/", include("djoser.urls.authtoken")),
path("destinations/", include("destinations.urls")),

# Activation url
path("verify/<str:uid>/<str:token>/",
ActivateUserViewSet.as_view({'get': 'activation'}), name='activation'),
path(
"verify/<str:uid>/<str:token>/",
ActivateUserViewSet.as_view({"get": "activation"}),
name="activation",
),
]
1 change: 0 additions & 1 deletion travit_service/users/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from .views import ActivateUserViewSet


router = routers.DefaultRouter()
router.register("", ActivateUserViewSet)

Expand Down
11 changes: 4 additions & 7 deletions travit_service/users/views.py
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
from djoser.views import UserViewSet
from rest_framework import status
from rest_framework.response import Response

from .models import User
from djoser.views import UserViewSet


class ActivateUserViewSet(UserViewSet):

queryset = User.objects.all()

def get_serializer(self, *args, **kwargs):
serializer_class = self.get_serializer_class()
print('serializer class is', serializer_class)
kwargs.setdefault('context', self.get_serializer_context())
print("serializer class is", serializer_class)
kwargs.setdefault("context", self.get_serializer_context())

# this line is the only change from the base implementation
kwargs['data'] = {"uid": self.kwargs['uid'],
"token": self.kwargs['token']}
kwargs["data"] = {"uid": self.kwargs["uid"], "token": self.kwargs["token"]}

return serializer_class(*args, **kwargs)

def activation(self, request, uid, token, *args, **kwargs):
try:

super().activation(request, *args, **kwargs)
except Exception as e:
return Response({"Error in activation": e})
Expand Down

0 comments on commit 88eabe7

Please sign in to comment.