deployment changes

seraleman · Oct 7, 2021 · 60d1486 · 60d1486
1 parent 0264d08
commit 60d1486
Show file tree

Hide file tree

Showing 22 changed files with 58 additions and 51 deletions.
diff --git a/authApp/__pycache__/admin.cpython-39.pyc b/authApp/__pycache__/admin.cpython-39.pyc
diff --git a/authApp/admin.py b/authApp/admin.py
@@ -1,7 +1,4 @@
 from django.contrib import admin
-
-# Register your models here.
-
 from .models.user import User
 from .models.account import Account
 

diff --git a/authApp/migrations/0002_alter_user_email.py b/authApp/migrations/0002_alter_user_email.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.7 on 2021-10-07 19:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authApp', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(max_length=100, verbose_name='Email'),
+        ),
+    ]
diff --git a/authApp/migrations/__pycache__/0002_alter_user_email.cpython-39.pyc b/authApp/migrations/__pycache__/0002_alter_user_email.cpython-39.pyc
diff --git a/authApp/models/__pycache__/account.cpython-39.pyc b/authApp/models/__pycache__/account.cpython-39.pyc
diff --git a/authApp/models/__pycache__/user.cpython-39.pyc b/authApp/models/__pycache__/user.cpython-39.pyc
diff --git a/authApp/models/account.py b/authApp/models/account.py
@@ -1,11 +1,9 @@
 from django.db import models
 from .user import User
 
-
 class Account(models.Model):
     id = models.AutoField(primary_key=True)
-    user = models.ForeignKey(
-        User, related_name='account', on_delete=models.CASCADE)
+    user = models.ForeignKey(User, related_name='account', on_delete=models.CASCADE)
     balance = models.IntegerField(default=0)
     lastChangeDate = models.DateTimeField()
     isActive = models.BooleanField(default=True)
diff --git a/authApp/models/user.py b/authApp/models/user.py
@@ -2,10 +2,11 @@
 from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, BaseUserManager
 from django.contrib.auth.hashers import make_password
 
-
 class UserManager(BaseUserManager):
     def create_user(self, username, password=None):
-        """ Creates and saves a user with the given username and password """
+        """
+        Creates and saves a user with the given username and password.
+        """
         if not username:
             raise ValueError('Users must have an username')
         user = self.model(username=username)
@@ -14,7 +15,9 @@ def create_user(self, username, password=None):
         return user
 
     def create_superuser(self, username, password):
-        """ Creates and saves a superuser with the given username and password """
+        """
+        Creates and saves a superuser with the given username and password.
+        """
         user = self.create_user(
             username=username,
             password=password,
@@ -23,16 +26,15 @@ def create_superuser(self, username, password):
         user.save(using=self._db)
         return user
 
-
 class User(AbstractBaseUser, PermissionsMixin):
     id = models.BigAutoField(primary_key=True)
-    username = models.CharField('Username', max_length=15, unique=True)
-    password = models.CharField('Password', max_length=256)
-    name = models.CharField('Name', max_length=30)
-    email = models.CharField('Email', max_length=100)
+    username = models.CharField('Username', max_length = 15, unique=True)
+    password = models.CharField('Password', max_length = 256)
+    name = models.CharField('Name', max_length = 30)
+    email = models.EmailField('Email', max_length = 100)
 
     def save(self, **kwargs):
-        some_salt = 'mMUj0DrIK6vgtdIYepkIxN'
+        some_salt = 'mMUj0DrIK6vgtdIYepkIxN' 
         self.password = make_password(self.password, some_salt)
         super().save(**kwargs)
 

diff --git a/authApp/serializers/__pycache__/__init__.cpython-39.pyc b/authApp/serializers/__pycache__/__init__.cpython-39.pyc
diff --git a/authApp/serializers/__pycache__/accountSerializer.cpython-39.pyc b/authApp/serializers/__pycache__/accountSerializer.cpython-39.pyc
diff --git a/authApp/serializers/__pycache__/userSerializer.cpython-39.pyc b/authApp/serializers/__pycache__/userSerializer.cpython-39.pyc
diff --git a/authApp/serializers/accountSerializer.py b/authApp/serializers/accountSerializer.py
@@ -1,8 +1,7 @@
 from authApp.models.account import Account
 from rest_framework import serializers
 
-
 class AccountSerializer(serializers.ModelSerializer):
     class Meta:
         model = Account
-        fields = ['balance', 'lastChangeDate', 'IsActive']
+        fields = ['balance', 'lastChangeDate', 'isActive']
diff --git a/authApp/serializers/userSerializer.py b/authApp/serializers/userSerializer.py
@@ -1,13 +1,10 @@
-from collections import UserString
 from rest_framework import serializers
 from authApp.models.user import User
 from authApp.models.account import Account
 from authApp.serializers.accountSerializer import AccountSerializer
 
-
 class UserSerializer(serializers.ModelSerializer):
     account = AccountSerializer()
-
     class Meta:
         model = User
         fields = ['id', 'username', 'password', 'name', 'email', 'account']
@@ -20,16 +17,16 @@ def create(self, validated_data):
 
     def to_representation(self, obj):
         user = User.objects.get(id=obj.id)
-        account = Account.objects.get(user=obj.id)
+        account = Account.objects.get(user=obj.id)       
         return {
-            'id': user.id,
-            'username': user.username,
-            'name': user.name,
-            'email': user.email,
-            'account': {
-                'id': account.id,
-                'balance': account.balance,
-                'lastChangeDate': account.lastChangeDate,
-                'isActive': account.isActive
-            }
-        }
+                    'id': user.id, 
+                    'username': user.username,
+                    'name': user.name,
+                    'email': user.email,
+                    'account': {
+                        'id': account.id,
+                        'balance': account.balance,
+                        'lastChangeDate': account.lastChangeDate,
+                        'isActive': account.isActive
+                    }
+                }
diff --git a/authApp/views/__pycache__/__init__.cpython-39.pyc b/authApp/views/__pycache__/__init__.cpython-39.pyc
diff --git a/authApp/views/__pycache__/userCreateView.cpython-39.pyc b/authApp/views/__pycache__/userCreateView.cpython-39.pyc
diff --git a/authApp/views/__pycache__/userDetailView.cpython-39.pyc b/authApp/views/__pycache__/userDetailView.cpython-39.pyc
diff --git a/authApp/views/userCreateView.py b/authApp/views/userCreateView.py
@@ -1,22 +1,19 @@
-from rest_framework import serializers, status, views
+from rest_framework import status, views
 from rest_framework.response import Response
-from rest_framework_simplejwt.serializers import TokenObtainPairSerializer, TokenObtainSerializer
+from rest_framework_simplejwt.serializers import TokenObtainPairSerializer
 
 from authApp.serializers.userSerializer import UserSerializer
 
-
 class UserCreateView(views.APIView):
 
     def post(self, request, *args, **kwargs):
         serializer = UserSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         serializer.save()
 
-        tokenData = {
-            "username": request.data["username"],
-            "password": request.data["password"]
-        }
-        tokenSerializer = TokenObtainSerializer(data=tokenData)
-        tokenSerializer.is_valid(raise_excepetion=True)
-
+        tokenData = {"username":request.data["username"], 
+                     "password":request.data["password"]}
+        tokenSerializer = TokenObtainPairSerializer(data=tokenData)
+        tokenSerializer.is_valid(raise_exception=True)
+
         return Response(tokenSerializer.validated_data, status=status.HTTP_201_CREATED)
diff --git a/authApp/views/userDetailView.py b/authApp/views/userDetailView.py
@@ -7,16 +7,16 @@
 from authApp.models.user import User
 from authApp.serializers.userSerializer import UserSerializer
 
-
 class UserDetailView(generics.RetrieveAPIView):
     queryset = User.objects.all()
     serializer_class = UserSerializer
     permission_classes = (IsAuthenticated,)
-
+    
     def get(self, request, *args, **kwargs):
+
         token = request.META.get('HTTP_AUTHORIZATION')[7:]
         tokenBackend = TokenBackend(algorithm=settings.SIMPLE_JWT['ALGORITHM'])
-        valid_data = tokenBackend.decode(token, verify=False)
+        valid_data = tokenBackend.decode(token,verify=False)
 
         if valid_data['user_id'] != kwargs['pk']:
             stringResponse = {'detail':'Unauthorized Request'}

diff --git a/authProject/__pycache__/settings.cpython-39.pyc b/authProject/__pycache__/settings.cpython-39.pyc
diff --git a/authProject/__pycache__/urls.cpython-39.pyc b/authProject/__pycache__/urls.cpython-39.pyc
diff --git a/authProject/settings.py b/authProject/settings.py
@@ -10,6 +10,7 @@
 https://docs.djangoproject.com/en/3.2/ref/settings/
 """
 
+import django_heroku
 from pathlib import Path
 from datetime import timedelta
 
@@ -43,14 +44,14 @@
 ]
 
 SIMPLE_JWT = {
-    'ACCES_TOKEN_LIFETIME': timedelta(minutes=5),
+    'ACCESS_TOKEN_LIFETIME': timedelta(minutes=5),
     'REFRESH_TOKEN_LIFETIME': timedelta(days=1),
-    'ROTATE_REFRESH_TOKEN': False,
+    'ROTATE_REFRESH_TOKENS': False,
     'BLACKLIST_AFTER_ROTATION': True,
     'UPDATE_LAST_LOGIN': False,
 
     'ALGORITHM': 'HS256',
-    'USER_ID_FIELD': id,
+    'USER_ID_FIELD': 'id',
     'USER_ID_CLAIM': 'user_id',
 }
 
@@ -154,5 +155,4 @@
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-import django_heroku
 django_heroku.settings(locals())
diff --git a/authProject/urls.py b/authProject/urls.py
@@ -14,8 +14,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.urls import path
-from rest_framework_simplejwt.views import (
-    TokenObtainPairView, TokenRefreshView)
+from rest_framework_simplejwt.views import (TokenObtainPairView, TokenRefreshView)
 from authApp import views
 
 urlpatterns = [