Skip to content

Commit

Permalink
Merge branch 'feat/gpd-session-improve' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AleksMat committed Feb 14, 2019
2 parents 40a2102 + 4089761 commit 08a83b7
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions sentinelhub/geopedia.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def __init__(self, *, username=None, password=None, password_md5=None, is_global
self._session_info = None
self._session_start = None

self._provide_session()
self.provide_session()

@property
def session_info(self):
Expand All @@ -100,7 +100,7 @@ def session_info(self):
:return: A dictionary with session info
:rtype: dict
"""
return self._provide_session()
return self.provide_session()

@property
def session_id(self):
Expand All @@ -109,7 +109,7 @@ def session_id(self):
:return: A session ID string
:rtype: str
"""
return self._parse_session_id(self._provide_session())
return self._parse_session_id(self.provide_session())

@property
def session_headers(self):
Expand All @@ -118,7 +118,7 @@ def session_headers(self):
:return: A dictionary containing session headers
:rtype: dict
"""
session_info = self._provide_session()
session_info = self.provide_session()
return {
session_info['sessionHeaderName']: self._parse_session_id(session_info)
}
Expand All @@ -130,7 +130,7 @@ def user_info(self):
:return: A dictionary with user info
:rtype: dict
"""
return self._provide_session()['user']
return self.provide_session()['user']

@property
def user_id(self):
Expand All @@ -139,19 +139,19 @@ def user_id(self):
:return: User ID string
:rtype: str
"""
return self._parse_user_id(self._provide_session())
return self._parse_user_id(self.provide_session())

def restart(self):
""" Method that restarts Geopedia Session
:return: It returns the object itself, with new session
:rtype: GeopediaSession
"""
self._provide_session(start_new=True)
self.provide_session(start_new=True)
return self

def _provide_session(self, start_new=False):
""" Returns a session ID
def provide_session(self, start_new=False):
""" Makes sure that session is still valid and provides session info
:param start_new: If `True` it will always create a new session. Otherwise it will create a new
session only if no session exists or the previous session timed out.
Expand Down

0 comments on commit 08a83b7

Please sign in to comment.