From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 6 Mar 2013 10:46:23 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
X-Git-Tag: myslice-django-0.1-1~72
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5f3beaa46982befb596ec6ee4e235e99c570f635;hp=9913041d5c2f410547dc4538f2f92353eb8dc308;p=myslice.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
---

diff --git a/auth/backend.py b/auth/backend.py
index 25114e73..0eb1f2d6 100644
--- a/auth/backend.py
+++ b/auth/backend.py
@@ -18,7 +18,9 @@ class MyCustomBackend:
 
     # Create an authentication method
     # This is called by the standard Django login procedure
-    def authenticate(self, username=None, password=None):
+    def authenticate(self, token=None):
+        username=token['username']
+        password=token['password']
         users=MyCustomBackend.hard_wired_users
         if username not in users: return None
         if password != users[username]: return None