From 96002275e522b364c13dcca539e39705e8a6c1ef Mon Sep 17 00:00:00 2001
From: Jonathan Batchelor <jmb@thebatchelors.net>
Date: Thu, 4 Dec 2014 17:12:58 +0000
Subject: [PATCH 1/2] Some fixes for the demo app

---
 demo/demo/settings.py                                 | 8 ++++++++
 demo/demo/urls.py                                     | 1 +
 demo/templates/fragments/email_verification_form.html | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/demo/demo/settings.py b/demo/demo/settings.py
index b0b3941..860680b 100644
--- a/demo/demo/settings.py
+++ b/demo/demo/settings.py
@@ -105,3 +105,11 @@ SITE_ID = 1
 ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_AUTHENTICATION_METHOD = 'email'
 ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
+
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.BasicAuthentication',
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+    )
+}
diff --git a/demo/demo/urls.py b/demo/demo/urls.py
index 42b4a88..1eb8778 100644
--- a/demo/demo/urls.py
+++ b/demo/demo/urls.py
@@ -33,5 +33,6 @@ urlpatterns = patterns('',
 
     url(r'^rest-auth/', include('rest_auth.urls')),
     url(r'^rest-auth/registration/', include('rest_auth.registration.urls')),
+    url(r'^account/', include('allauth.urls')),
     url(r'^admin/', include(admin.site.urls)),
 )
diff --git a/demo/templates/fragments/email_verification_form.html b/demo/templates/fragments/email_verification_form.html
index aa9a5f6..2298d0e 100644
--- a/demo/templates/fragments/email_verification_form.html
+++ b/demo/templates/fragments/email_verification_form.html
@@ -1,5 +1,5 @@
 <!-- Signup form -->
-<form class="form-horizontal ajax-post" role="form" action="{% url 'verify_email' %}">
+<form class="form-horizontal ajax-post" role="form" action="{% url 'rest_verify_email' %}">
   <div class="form-group">
     <label for="key" class="col-sm-2 control-label">Key</label>
     <div class="col-sm-10">

From b66563d7033f3d745859d28612641e46a090338c Mon Sep 17 00:00:00 2001
From: Jonathan Batchelor <jmb@thebatchelors.net>
Date: Thu, 4 Dec 2014 17:35:01 +0000
Subject: [PATCH 2/2] Fixed authentication backend settings for demo

---
 demo/demo/settings.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/demo/demo/settings.py b/demo/demo/settings.py
index 860680b..34d11b0 100644
--- a/demo/demo/settings.py
+++ b/demo/demo/settings.py
@@ -108,7 +108,6 @@ ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
 
 REST_FRAMEWORK = {
     'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.BasicAuthentication',
         'rest_framework.authentication.SessionAuthentication',
         'rest_framework.authentication.TokenAuthentication',
     )