diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 10:20:44 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 21:19:06 -0300 |
| commit | bdf3ee2957a3f2177911f2652626c52856ef9869 (patch) | |
| tree | 1972071a62b708820676809acd907f640f49a7fa /src/leap/bitmask/crypto/srpauth.py | |
| parent | 8b19f78391ec575cbc9ee0d45bca9e00e141fe5d (diff) | |
Use DELETE /1/logout to properly logout
Diffstat (limited to 'src/leap/bitmask/crypto/srpauth.py')
| -rw-r--r-- | src/leap/bitmask/crypto/srpauth.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py index 2d34bb74..55fff82b 100644 --- a/src/leap/bitmask/crypto/srpauth.py +++ b/src/leap/bitmask/crypto/srpauth.py @@ -478,13 +478,14 @@ class SRPAuth(QtCore.QObject): """ logger.debug("Starting logout...") - leap_assert(self.get_session_id(), - "Cannot logout an unexisting session") + if self.get_session_id() is None: + logger.debug("Already logged out") + return logout_url = "%s/%s/%s/" % (self._provider_config.get_api_uri(), self._provider_config. get_api_version(), - "sessions") + "logout") try: self._session.delete(logout_url, data=self.get_session_id(), @@ -494,12 +495,12 @@ class SRPAuth(QtCore.QObject): except Exception as e: logger.warning("Something went wrong with the logout: %r" % (e,)) - - self.set_session_id(None) - self.set_uid(None) - # Also reset the session - self._session = self._fetcher.session() - logger.debug("Successfully logged out.") + else: + self.set_session_id(None) + self.set_uid(None) + # Also reset the session + self._session = self._fetcher.session() + logger.debug("Successfully logged out.") def set_session_id(self, session_id): QtCore.QMutexLocker(self._session_id_lock) |