Changes in login and token obtaining procedures,

token is now stored and can be reused when new token can be downloaded

diff --git a/diaspy/connection.py b/diaspy/connection.py
index e139afd4dfd13173504b173355ca61b78ce7ccdf..d2f2044accc19e3bacfea8e568a35df80bb9f5d3 100644 (file)
--- a/diaspy/connection.py
+++ b/diaspy/connection.py
@@ -13,6 +13,10 @@ class LoginError(Exception):
     pass
 
 
+class TokenError(Exception):
+    pass
+
+
 class Connection():
     """Object representing connection with the server.
     It is pushed around internally and is considered private.
@@ -20,6 +24,7 @@ class Connection():
     _token_regex = re.compile(r'content="(.*?)"\s+name="csrf-token')
     _userinfo_regex = re.compile(r'window.current_user_attributes = ({.*})')
     login_data = {}
+    token = ''
 
     def __init__(self, pod, username='', password=''):
         """
@@ -89,13 +94,14 @@ class Connection():
 
     def _setlogin(self, username, password):
         """This function is used to set data for login.
+
         .. note::
             It should be called before _login() function.
         """
         self.username, self.password = username, password
         self.login_data = {'user[username]': self.username,
                            'user[password]': self.password,
-                           'authenticity_token': self.get_token()}
+                           'authenticity_token': self._fetchtoken()}
 
     def _login(self):
         """Handles actual login request.
@@ -105,7 +111,7 @@ class Connection():
                             data=self.login_data,
                             headers={'accept': 'application/json'})
         if request.status_code != 201:
-            raise LoginError('{0}: Login failed.'.format(request.status_code))
+            raise LoginError('{0}: login failed'.format(request.status_code))
 
     def login(self, username='', password=''):
         """This function is used to log in to a pod.
@@ -120,6 +126,9 @@ class Connection():
         When logged out you can't do anything.
         """
         self.get('users/sign_out')
+        self.username = ''
+        self.token = ''
+        self.password = ''
 
     def podswitch(self, pod):
         """Switches pod from current to another one.
@@ -136,11 +145,29 @@ class Connection():
         userdata = json.loads(self._userinfo_regex.search(request.text).group(1))
         return userdata
 
+    def _fetchtoken(self):
+        """This method tries to get token string needed for authentication on D*.
+
+        :returns: token string
+        """
+        request = self.get('stream')
+        token = self._token_regex.search(request.text).group(1)
+        return token
+ 
     def get_token(self):
         """This function returns a token needed for authentication in most cases.
+        Each time it is run a _fetchtoken() is called and refreshed token is stored.
+
+        It is more safe to use than _fetchtoken().
 
         :returns: string -- token used to authenticate
         """
-        r = self.get('stream')
-        token = self._token_regex.search(r.text).group(1)
+        try:
+            token = self._fetchtoken()
+        except requests.exceptions.ConnectionError as e:
+            warnings.warn('{0} was cought: trying to reuse old token'.format(e))
+            token = self.token
+        finally:
+            if not token: raise TokenError('cannot obtain token and no previous token found for reuse')
+            self.token = token
         return token

diff --git a/diaspy/models.py b/diaspy/models.py
index 9f68f1c46ff5763aaec706acc02e8d7560ac493a..996c74f0504681dd5c52b416855737b98dd5a2d6 100644 (file)
--- a/diaspy/models.py
+++ b/diaspy/models.py
@@ -64,6 +64,10 @@ class Notification():
     def __getitem__(self, key):
         return self.data[key]
 
+    def _refresh(self):
+        """Refreshes data of the notification.
+        """
+
     def mark(self, unread=False):
         """Marks notification to read/unread.
         Marks notification to read if `unread` is False.

diff --git a/tests.py b/tests.py
index 66a54eb047875aa40df9128a9bb458a78784db89..6bf07d78d53546fbf3020074fba526d70c076082 100644 (file)
--- a/tests.py
+++ b/tests.py
@@ -203,4 +203,17 @@ class PostTests(unittest.TestCase):
         s = diaspy.streams.Stream(test_connection)
 
 
+class NotificationsTests(unittest.TestCase):
+    def testMarkgingRead(self):
+        notifications = diaspy.notifications.Notifications(test_connection)
+        notif = None
+        for n in notifications:
+            if n.unread:
+                notif = n
+                break
+        if notif is not None:
+            n.mark(unread=False)
+        else:
+            warnings.warn('test not sufficient: no unread notifications were found')
+
 if __name__ == '__main__': unittest.main()