Add provider_display_name to posts

[diaspy.git] / diaspy / connection.py

diff --git a/diaspy/connection.py b/diaspy/connection.py
index 001e215005f57dbf4ef26fbfbf512d7f1cb2f4fa..e0d435230991168f848375d6d4dcb6840597dc3a 100644 (file)
--- a/diaspy/connection.py
+++ b/diaspy/connection.py
@@ -17,6 +17,7 @@ class Connection():
     """
     _token_regex = re.compile(r'content="(.*?)"\s+name="csrf-token')
     _userinfo_regex = re.compile(r'window.current_user_attributes = ({.*})')
+    _userinfo_regex_2 = re.compile(r'gon.user=({.*});gon.preloads')
 
     def __init__(self, pod, username='', password='', schema='https'):
         """
@@ -30,7 +31,9 @@ class Connection():
         self.pod = pod
         self._session = requests.Session()
         self._login_data = {}
+        self._userdata = {}
         self._token = ''
+        self._diaspora_session = ''
         try:
             self._setlogin(username, password)
         except requests.exceptions.MissingSchema:
@@ -51,7 +54,7 @@ class Connection():
         """
         return self._token
 
-    def get(self, string, headers={}, params={}):
+    def get(self, string, headers={}, params={}, direct=False):
         """This method gets data from session.
         Performs additional checks if needed.
 
@@ -60,8 +63,12 @@ class Connection():
 
         :param string: URL to get without the pod's URL and slash eg. 'stream'.
         :type string: str
+        :param direct: if passed as True it will not be expanded
+        :type direct: bool
         """
-        return self._session.get('{0}/{1}'.format(self.pod, string), params=params, headers=headers)
+        if not direct: url = '{0}/{1}'.format(self.pod, string)
+        else: url = string
+        return self._session.get(url, params=params, headers=headers)
 
     def post(self, string, data, headers={}, params={}):
         """This method posts data to session.
@@ -119,10 +126,10 @@ class Connection():
         Raises LoginError if login failed.
         """
         request = self.post('users/sign_in',
-                            data=self._login_data,
-                            headers={'accept': 'application/json'})
-        if request.status_code != 201:
+                            data=self._login_data)
+        if request.status_code not in [200, 201]:
             raise errors.LoginError('{0}: login failed'.format(request.status_code))
+        self._diaspora_session = request.cookies['_diaspora_session']
 
     def login(self, username='', password=''):
         """This function is used to log in to a pod.
@@ -148,16 +155,18 @@ class Connection():
         self._setlogin(username, password)
         self._login()
 
-    def getUserInfo(self):
+    def getUserInfo(self, fetch=False):
         """This function returns the current user's attributes.
 
         :returns: dict -- json formatted user info.
         """
         request = self.get('bookmarklet')
         userdata = self._userinfo_regex.search(request.text)
+        if userdata is None: userdata = self._userinfo_regex_2.search(request.text)
         if userdata is None: raise errors.DiaspyError('cannot find user data')
-        userdata = json.loads(userdata.group(1))
-        return userdata
+        userdata = userdata.group(1)
+        warnings.warn(userdata)
+        return json.loads(userdata)
 
     def _fetchtoken(self):
         """This method tries to get token string needed for authentication on D*.
@@ -169,10 +178,16 @@ class Connection():
         self._token = token
         return token
 
-    def get_token(self, fetch=False):
+    def get_token(self, fetch=True):
         """This function returns a token needed for authentication in most cases.
         **Notice:** using repr() is recommended method for getting token.
 
+        Each time it is run a _fetchtoken() is called and refreshed token is stored.
+
+        It is more safe to use than _fetchtoken().
+        By setting new you can request new token or decide to get stored one.
+        If no token is stored new one will be fetched anyway.
+
         :returns: string -- token used to authenticate
         """
         try:
@@ -183,3 +198,8 @@ class Connection():
         finally:
             if not self._token: raise errors.TokenError('cannot obtain token and no previous token found for reuse')
         return self._token
+
+    def getSessionToken(self):
+        """Returns session token string (_diaspora_session).
+        """
+        return self._diaspora_session