From 83abc1feadb23ad3937867b0ca9ab0cf779c8cb7 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Fri, 3 Jun 2016 20:51:27 +0100
Subject: [PATCH] Waveform signalling fixes

---
 Dockerfile        | 24 ++++++------------------
 api/auth.py       |  3 ++-
 core/utils/url.py |  3 ++-
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1191b68..fd64e60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,12 @@
 FROM fergalmoran/django
 
-RUN mkdir /code
-RUN mkdir /srv/logs
-RUN mkdir /files
-RUN mkdir /files/static
-RUN mkdir /files/media
-RUN mkdir /files/cache
-RUN mkdir /files/cache/mixes
-RUN mkdir /files/cache/waveforms
-RUN mkdir /files/tmp
-RUN touch /files/tmp/dss.log
-
-WORKDIR /code
-
-ADD requirements.txt /code/
 ADD . /code/
 
 
-RUN npm install -g yuglify
-RUN pip install -r requirements.txt
+RUN mkdir /files/static
+RUN mkdir /files/media
+RUN mkdir /files/cache/mixes
+RUN mkdir /files/cache/waveforms
+RUN touch /files/tmp/dss.log
 
-RUN adduser --disabled-password --gecos '' djworker
-RUN chown djworker /files -R
+WORKDIR /code
diff --git a/api/auth.py b/api/auth.py
index eb46791..fa9a7c8 100644
--- a/api/auth.py
+++ b/api/auth.py
@@ -181,7 +181,8 @@ class ObtainUser(APIView):
                     'id': request.user.id,
                     'name': request.user.username,
                     'slug': request.user.userprofile.slug,
-                    'userRole': 'user'
+                    'session': request.user.userprofile.get_session_id(),
+                    'userRole': 'user',
                 })
         else:
             return Response(status=status.HTTP_401_UNAUTHORIZED)
diff --git a/core/utils/url.py b/core/utils/url.py
index 03dd048..6400655 100755
--- a/core/utils/url.py
+++ b/core/utils/url.py
@@ -1,5 +1,6 @@
-import urllib.parse
 import re
+import urllib
+
 from django.contrib.sites.models import Site
 from django.template.defaultfilters import slugify