Added token functionality

Author: A-Malone

fileupload/admin.py

@@ -1,4 +1,5 @@
-from fileupload.models import File
+from fileupload.models import File, SingleUseToken
 from django.contrib import admin
 
 admin.site.register(File)
+admin.site.register(SingleUseToken)

fileupload/migrations/0001_initial.py

@@ -1,8 +1,11 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9 on 2015-12-19 13:27
+# Generated by Django 1.9 on 2015-12-19 14:19
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import fileupload.models
 
 
 class Migration(migrations.Migration):
@@ -21,4 +24,18 @@ class Migration(migrations.Migration):
                 ('slug', models.SlugField(blank=True)),
             ],
         ),
+        migrations.CreateModel(
+            name='SingleUseToken',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('token', models.CharField(default=fileupload.models.get_new_token, max_length=200)),
+                ('create_date', models.DateTimeField(default=django.utils.timezone.now)),
+                ('expiry_date', models.DateTimeField(default=django.utils.timezone.now)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='file',
+            name='token',
+            field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, to='fileupload.SingleUseToken'),
+        ),
     ]

fileupload/models.py

@@ -1,5 +1,17 @@
-# encoding: utf-8
+import os
+import uuid
+
 from django.db import models
+from django.utils import timezone
+
+def get_new_token():
+    return uuid.uuid1()
+
+# Create your models here.
+class SingleUseToken(models.Model):
+    token           = models.CharField(default=get_new_token, max_length=200)
+    create_date     = models.DateTimeField(default=timezone.now)
+    expiry_date     = models.DateTimeField(default=timezone.now)
 
 class File(models.Model):
     """This is a small demo using just two fields. The slug field is really not
@@ -8,8 +20,9 @@ class File(models.Model):
     problems installing pillow, use a more generic FileField instead.
 
     """
-    file = models.FileField()
-    slug = models.SlugField(max_length=50, blank=True)
+    file            = models.FileField()
+    slug            = models.SlugField(max_length=50, blank=True)
+    token           = models.ForeignKey(SingleUseToken, on_delete=models.CASCADE)
 
     def __unicode__(self):
         return self.file.name

fileupload/serialize.py

@@ -31,6 +31,6 @@ def serialize(instance, file_attr='file'):
         'type': mimetypes.guess_type(obj.path)[0] or 'image/png',
         'thumbnailUrl': obj.url,
         'size': obj.size,
-        'deleteUrl': reverse('upload-delete', args=[instance.pk]),
+        'deleteUrl': reverse('upload-delete', args=[instance.token.token,instance.pk]),
         'deleteType': 'DELETE',
     }

fileupload/static/js/app.js

@@ -11,14 +11,10 @@
 
 /*jslint nomen: true, regexp: true */
 /*global window, angular */
-
-(function () {
+function createControllers(url, urlview) {
     'use strict';
 
-
-    var isOnGitHub = window.location.hostname === 'blueimp.github.io',
-        url = '/upload/angular/',
-        urlview = '/upload/view/';
+    var demo_settings = false
 
     angular.module('demo', [
         'blueimp.fileupload'
@@ -32,7 +28,7 @@
                     '/cors/result.html?%s'
                 );
 
-                if (isOnGitHub) {
+                if (demo_settings) {
                     // Demo settings:
                     angular.extend(fileUploadProvider.defaults, {
                         // Enable image resizing, except for Android and Opera,
@@ -53,7 +49,7 @@
                 $scope.options = {
                     url: url
                 };
-                if (!isOnGitHub) {
+                if (!demo_settings) {
                     $scope.loadingFiles = true;
                     $http.get(urlview)
                         .then(
@@ -102,5 +98,4 @@
                 }
             }
         ]);
-
-}());
+};

fileupload/templates/fileupload/file_angular_form.html

@@ -43,8 +43,7 @@
 
 <!-- The file upload form used as target for the file upload widget -->
 <form id="fileupload" action="." method="POST" enctype="multipart/form-data" data-ng-app="demo" data-ng-controller="DemoFileUploadController" data-file-upload="options" data-ng-class="{'fileupload-processing': processing() || loadingFiles}"> {% csrf_token %}
-    <!-- Redirect browsers with JavaScript disabled to the origin page -->
-    <noscript><input type="hidden" name="redirect" value="http://blueimp.github.io/jQuery-File-Upload/"></noscript>
+    <input type="hidden" name="token" multiple ng-disabled="disabled" value="{{ token.pk }}">
     <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
     <div class="row fileupload-buttonbar">
         <div class="col-lg-7">
@@ -169,6 +168,11 @@ <h3 class="title"></h3>
 <script src="{% static "js/jquery.fileupload-angular.js" %}"></script>
 <!-- The main application script -->
 <script src="{% static "js/app.js" %}"></script>
+<script>
+(function (){
+    createControllers("{% url 'upload-angular' token.token %}", "{% url 'upload-view' token.token %}")
+}());
+</script>
 <script src="{% static "js/csrf.js" %}"></script>
 </body>
 </html>

fileupload/urls.py

@@ -4,7 +4,7 @@
 
 urlpatterns = [
     url(r'^new/$', views.FileCreateView.as_view(), name='upload-new'),
-    url(r'^angular/$', views.AngularVersionCreateView.as_view(), name='upload-angular'),
-    url(r'^delete/(?P<pk>\d+)$', views.FileDeleteView.as_view(), name='upload-delete'),
-    url(r'^view/$', views.FileListView.as_view(), name='upload-view'),
+    url(r'^(?P<token_id>[a-z0-9\-]+)$', views.AngularVersionCreateView.as_view(), name='upload-angular'),
+    url(r'^(?P<token_id>[a-z0-9\-]+)/delete/(?P<pk>\d+)$', views.FileDeleteView.as_view(), name='upload-delete'),
+    url(r'^(?P<token_id>[a-z0-9\-]+)/view/$', views.FileListView.as_view(), name='upload-view'),
 ]

fileupload/views.py

@@ -3,7 +3,8 @@
 
 from django.http import HttpResponse
 from django.views.generic import CreateView, DeleteView, ListView
-from .models import File
+from django.shortcuts import get_object_or_404
+from .models import File, SingleUseToken
 from .response import JSONResponse, response_mimetype
 from .serialize import serialize
 
@@ -12,7 +13,20 @@ class FileCreateView(CreateView):
     model = File
     fields = "__all__"
 
+    def dispatch(self, *args, **kwargs):
+        print(kwargs['token_id'])
+        self.token = get_object_or_404(SingleUseToken, token=kwargs['token_id'])
+        return super(FileCreateView, self).dispatch(*args, **kwargs)
+
+    # Adds the token to the context
+    def get_context_data(self, *args, **kwargs):
+        context_data = super(FileCreateView, self).get_context_data(
+            *args, **kwargs)
+        context_data.update({'token': self.token})
+        return context_data
+
     def form_valid(self, form):
+        print("Valid")
         self.object = form.save()
         files = [serialize(self.object)]
         data = {'files': files}