From 86bbb63c4fa70468da2ba0643e67e1025de2c6f1 Mon Sep 17 00:00:00 2001
From: Nikolai Kristiansen <nikolaik@gmail.com>
Date: Sun, 26 Jan 2014 19:01:47 +0100
Subject: [PATCH] Auth fixes

---
 pydusken/__init__.py       | 6 +++---
 pydusken/authentication.py | 2 --
 pydusken/models.py         | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pydusken/__init__.py b/pydusken/__init__.py
index 3e8db96..3878dfc 100644
--- a/pydusken/__init__.py
+++ b/pydusken/__init__.py
@@ -34,9 +34,9 @@ class DuskenApi(object):
             logging.error("Could not authenticate with API. Correct client_id, client_secret, username and password?\n{0}".format(e))
             return None
 
-        return self.access_token
+        return self.oauth2_access_token
 
-    def get_access_token(self, username, password, scope='read', grant_type='password'):
+    def get_access_token(self, username, password, scope='read'):
         resp = requests.post(
             "{0}/oauth2/access_token/".format(self.base_url),
             data=dict(
@@ -45,7 +45,7 @@ class DuskenApi(object):
                 client_id = self._client_id,
                 client_secret = self._client_secret,
                 scope=scope,
-                grant_type=grant_type))
+                grant_type='password'))
 
         resp.raise_for_status()
 
diff --git a/pydusken/authentication.py b/pydusken/authentication.py
index 94b8013..85f1257 100644
--- a/pydusken/authentication.py
+++ b/pydusken/authentication.py
@@ -72,9 +72,7 @@ class DuskenBackend(object):
             return None
 
         user = self._get_or_create_local_user(username)
-
         self._refresh_access_token(user, access_token)
-
         self._sync_user_detail(user)
 
         return user
diff --git a/pydusken/models.py b/pydusken/models.py
index bd27a0a..4a9340a 100644
--- a/pydusken/models.py
+++ b/pydusken/models.py
@@ -7,6 +7,8 @@ class DuskenAccessToken(models.Model):
     expires_in = models.IntegerField()
     scope = models.CharField(max_length=255)
     user = models.OneToOneField(User)
+    created = models.DateTimeField(auto_now_add=True)
+    updated = models.DateTimeField(auto_now=True)
 
     def __unicode__(self):
         return u"{0} {1}".format(self.user, self.access_token)