From 18983960a1fe2f35ebb7f752f71705b3314300e1 Mon Sep 17 00:00:00 2001 From: Gabriel Le Breton Date: Wed, 3 Jul 2019 11:09:27 -0400 Subject: [PATCH] Add docker setup for demo project --- demo/Dockerfile | 8 ++++++++ demo/demo/settings.py | 2 +- demo/docker-compose.yml | 13 +++++++++++++ demo/myapp/serializers.py | 8 ++++---- 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 demo/Dockerfile create mode 100644 demo/docker-compose.yml diff --git a/demo/Dockerfile b/demo/Dockerfile new file mode 100644 index 0000000..ab2717b --- /dev/null +++ b/demo/Dockerfile @@ -0,0 +1,8 @@ +FROM python:3 +ENV PYTHONUNBUFFERED 1 +RUN mkdir /code +WORKDIR /code +COPY requirements.txt /code/ +RUN pip install -r requirements.txt +COPY . /code/ + diff --git a/demo/demo/settings.py b/demo/demo/settings.py index 194b670..ace0f2d 100644 --- a/demo/demo/settings.py +++ b/demo/demo/settings.py @@ -150,6 +150,6 @@ CACHES = { } REST_AUTH_SERIALIZERS = { - 'LOGIN_SERIALIZER': 'myapp.serializers.RestAuthLoginSerializer', + 'LOGIN_SERIALIZER': 'myapp.serializers.RestAuthAxesLoginSerializer', # 'TOKEN_SERIALIZER': 'path.to.custom.TokenSerializer', } diff --git a/demo/docker-compose.yml b/demo/docker-compose.yml new file mode 100644 index 0000000..321252c --- /dev/null +++ b/demo/docker-compose.yml @@ -0,0 +1,13 @@ +version: '3' + +services: + web: + build: . + image: gableroux/django-rest-auth-demo + command: python manage.py runserver 0.0.0.0:1234 + environment: + PYTHONUNBUFFERED: 1 + volumes: + - .:/code + ports: + - "1234:1234" diff --git a/demo/myapp/serializers.py b/demo/myapp/serializers.py index 1b9f590..051f9c6 100644 --- a/demo/myapp/serializers.py +++ b/demo/myapp/serializers.py @@ -5,12 +5,12 @@ from rest_framework import exceptions # noinspection PyAbstractClass -class RestAuthLoginSerializer(LoginSerializer): +class RestAuthAxesLoginSerializer(LoginSerializer): def validate(self, attrs): try: - attrs = super().validate(attrs) - except exceptions.ValidationError: + return super().validate(attrs) + except exceptions.ValidationError as e: if getattr(self.context['request'], 'axes_locked_out', None): raise serializers.ValidationError(get_lockout_message()) - return attrs + raise e