From 3b2cdca0cb0472402528f7046d1215d9f5ad5546 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Mon, 27 Jan 2014 23:46:47 +0100
Subject: [PATCH] Minor cleanup

---
 pydusken/authentication.py | 49 ++++----------------------------------
 1 file changed, 4 insertions(+), 45 deletions(-)

diff --git a/pydusken/authentication.py b/pydusken/authentication.py
index 85f1257..f5d1697 100644
--- a/pydusken/authentication.py
+++ b/pydusken/authentication.py
@@ -62,8 +62,11 @@ class DuskenBackend(object):
         user.save()
 
     def authenticate(self, username=None, password=None):
+        # TODO Username can be an email
+        #is_using_email = self._is_using_email(username)
+        #access_token = self._api.authenticate(email=username, password=password)
         try:
-            access_token = self._api.authenticate(username=username, password=password)
+            access_token = self._api.authenticate(username, password)
         except HTTPError as e:
             # Did not authenticate
             return None
@@ -77,50 +80,6 @@ class DuskenBackend(object):
 
         return user
 
-    #def authenticate(self, username=None, password=None):
-    #    # TODO you are here
-    #    # Check the username/password and return a User. Username can be an email
-    #    is_using_email = self._is_using_email(username)
-    #    try:
-    #        if is_using_email:
-    #            access_token = self._api.authenticate(email=username, password=password)
-    #        else:
-    #            access_token = self._api.authenticate(username=username, password=password)
-
-    #        if not access_token:
-    #            return None
-
-    #        try:
-    #            if is_using_email:
-    #                user = User.objects.get(email=username)
-    #            else:
-    #                user = User.objects.get(username=username)
-
-    #            try:
-    #                # Try refreshing access token
-    #                if user.duskenaccesstoken.access_token != access_token:
-    #                    user.duskenaccesstoken.access_token = access_token=access_token
-    #                    user.save()
-    #            except:
-    #                # ..create if not
-    #                d = DuskenAccessToken(access_token=access_token, user=user)
-    #                d.save()
-    #        except User.DoesNotExist:
-    #            # if user does not exist, create a local user
-    #            user = User(username=username)
-    #            user.set_unusable_password()
-    #            user.save()
-    #            DuskenAccessToken.objects.create(access_token=access_token['access_token'], user=user)
-
-    #        self._sync_user_detail(user)
-
-    #        return user
-
-    #    except HTTPError as e:
-    #        # Did not authenticate
-    #        pass
-    #    return None
-
     def get_user(self, user_id):
         try:
             return User.objects.get(pk=user_id)