Update old dependencies

backend/Pipfile

@@ -12,14 +12,14 @@ ipython = "*"
 
 [packages]
 
-django = "==1.10.5"
-django-cors-middleware = "==1.3.1"
-django-extensions = "==1.7.1"
-djangorestframework = "==3.9.1"
-pyjwt = "==1.4.2"
+django = "*"
+django-cors-middleware = "*"
+django-extensions = "*"
+djangorestframework = "*"
+pyjwt = "*"
 gunicorn = "*"
 gevent = "*"
-"psycopg2" = "*"
+psycopg2-binary = "*"
 "boto3" = "*"
 
 

backend/conduit/apps/articles/urls.py

@@ -10,6 +10,7 @@
 router = DefaultRouter()
 router.register(r'articles', ArticleViewSet)
 
+app_name = "articles"
 urlpatterns = [
     url(r'^articles/feed/?$', ArticlesFeedAPIView.as_view()),
 

backend/conduit/apps/authentication/backends.py

@@ -1,6 +1,7 @@
 import jwt
 
 from django.conf import settings
+from django.utils.encoding import force_str
 
 from rest_framework import authentication, exceptions
 
@@ -74,9 +75,10 @@ def _authenticate_credentials(self, request, token):
         Try to authenticate the given credentials. If authentication is
         successful, return the user and token. If not, throw an error.
         """
+        sec = force_str(settings.SECRET_KEY, encoding="utf-8")
         try:
-            payload = jwt.decode(token, settings.SECRET_KEY)
-        except:
+            payload = jwt.decode(token, sec, algorithms=['HS256'])
+        except jwt.exceptions.DecodeError:
             msg = 'Invalid authentication. Could not decode token.'
             raise exceptions.AuthenticationFailed(msg)
 

backend/conduit/apps/authentication/models.py

@@ -1,3 +1,4 @@
+from django.utils import encoding
 import jwt
 
 from datetime import datetime, timedelta
@@ -7,6 +8,7 @@
     AbstractBaseUser, BaseUserManager, PermissionsMixin
 )
 from django.db import models
+from django.utils.encoding import force_str
 
 from conduit.apps.core.models import TimestampedModel
 
@@ -131,9 +133,10 @@ def _generate_jwt_token(self):
         """
         dt = datetime.now() + timedelta(days=60)
 
+        sec = force_str(settings.SECRET_KEY, encoding="utf-8")
         token = jwt.encode({
             'id': self.pk,
             'exp': int(dt.strftime('%s'))
-        }, settings.SECRET_KEY, algorithm='HS256')
+        }, sec, algorithm='HS256')
 
-        return token.decode('utf-8')
+        return token

backend/conduit/apps/authentication/urls.py

@@ -4,6 +4,7 @@
     LoginAPIView, RegistrationAPIView, UserRetrieveUpdateAPIView
 )
 
+app_name = "authentication"
 urlpatterns = [
     url(r'^user/?$', UserRetrieveUpdateAPIView.as_view()),
     url(r'^users/?$', RegistrationAPIView.as_view()),

backend/conduit/apps/profiles/urls.py

@@ -2,6 +2,7 @@
 
 from .views import ProfileRetrieveAPIView, ProfileFollowAPIView
 
+app_name = "profiles"
 urlpatterns = [
     url(r'^profiles/(?P<username>\w+)/?$', ProfileRetrieveAPIView.as_view()),
     url(r'^profiles/(?P<username>\w+)/follow/?$', 

infrastructure/aws/codedeploy/after_install

@@ -4,7 +4,7 @@ mkdir -p /var/log/django
 mkdir -p /var/www/conduit/static/
 
 cd /deploy/backend || exit 2
-pipenv install
+pipenv sync
 
 AWS_DEFAULT_REGION="$(curl -s http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region)"
 export AWS_DEFAULT_REGION

infrastructure/aws/codedeploy/start_server

@@ -7,4 +7,4 @@ export AWS_DEFAULT_REGION
 DJANGO_SETTINGS_MODULE='conduit.settings.ec2'
 export DJANGO_SETTINGS_MODULE
 
-pipenv run gunicorn --config ../infrastructure/aws/codedeploy/gunicorn.ec2.conf conduit.wsgi
+pipenv run gunicorn --config ../infrastructure/aws/codedeploy/gunicorn.ec2.conf.py conduit.wsgi

infrastructure/docker/api/Dockerfile

@@ -13,9 +13,9 @@ WORKDIR /app
 COPY backend/Pipfile /app
 COPY backend/Pipfile.lock /app
 
-RUN pipenv install
+RUN pipenv sync
 
-COPY infrastructure/docker/api/gunicorn.docker.conf /conf/gunicorn.conf
+COPY infrastructure/docker/api/gunicorn.docker.conf.py /conf/gunicorn.conf.py
 
 COPY backend /app
 
@@ -26,6 +26,6 @@ CMD [ \
   "pipenv", \
   "run", \
   "gunicorn", \
-  "--config", "/conf/gunicorn.conf", \
+  "--config", "/conf/gunicorn.conf.py", \
   "conduit.wsgi" \
-]
+  ]