diff --git a/.gitignore b/.gitignore index 328cad0..dbeeff5 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ venv __pycache__ __pycache__/ -*.py[cod] +*.py[cod] \ No newline at end of file diff --git a/authentication/serializers.py b/authentication/serializers.py index 7eb1220..b83c437 100644 --- a/authentication/serializers.py +++ b/authentication/serializers.py @@ -53,9 +53,12 @@ class LoginSerializer(serializers.ModelSerializer): def get_tokens(self, obj): user = User.objects.get(email=obj['email']) + + token = RefreshToken.for_user(user) + return { - 'refresh': user.tokens()['refresh'], - 'access': user.tokens()['access'] + 'refresh': str(token), + 'access' : str(token.access_token) } class Meta: diff --git a/db.sqlite3 b/db.sqlite3 index 7c5c942..890784c 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/income/apps.py b/income/apps.py index 12ca16e..c245150 100644 --- a/income/apps.py +++ b/income/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -class ExpensesConfig(AppConfig): - name = 'expenses' +class IncomeConfig(AppConfig): + name = 'income' diff --git a/incomeexpensesapi/settings.py b/incomeexpensesapi/settings.py index 6bfc2ca..fb5858c 100644 --- a/incomeexpensesapi/settings.py +++ b/incomeexpensesapi/settings.py @@ -168,3 +168,5 @@ EMAIL_PORT = 587 EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER') EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD') + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/requirements.txt b/requirements.txt index 744fa18..15d757b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,19 @@ -asgiref==3.2.7 +asgiref==3.7.2 autopep8==1.5.4 cachetools==4.1.1 certifi==2020.4.5.1 chardet==3.0.4 coreapi==2.3.3 coreschema==0.0.4 -Django==3.0.7 +distlib==0.3.8 +Django==3.2.20 django-cors-headers==3.5.0 -djangorestframework==3.11.0 -djangorestframework-simplejwt==4.4.0 +djangorestframework==3.11.2 +djangorestframework-simplejwt==5.3.1 drf-yasg==1.17.1 facebook-sdk==3.1.0 Faker==4.1.0 +filelock==3.13.1 future==0.18.2 google-api-core==1.22.2 google-api-python-client==1.12.1 @@ -27,23 +29,28 @@ Jinja2==2.11.2 MarkupSafe==1.1.1 oauthlib==3.1.0 packaging==20.4 +platformdirs==4.1.0 protobuf==3.13.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 pycodestyle==2.6.0 -PyJWT==1.7.1 +PyJWT==2.8.0 pyparsing==2.4.7 python-dateutil==2.8.1 python-twitter==3.5 pytz==2020.1 +PyYAML==6.0.1 requests==2.23.0 requests-oauthlib==1.3.0 rsa==4.6 -ruamel.yaml==0.16.10 -ruamel.yaml.clib==0.2.0 +ruamel.yaml==0.18.6 +ruamel.yaml.clib==0.2.8 six==1.15.0 +speedtest-cli==2.1.3 sqlparse==0.3.1 text-unidecode==1.3 -toml==0.10.1 +toml==0.10.2 +typing_extensions==4.9.0 uritemplate==3.0.1 urllib3==1.25.9 +virtualenv==20.25.0