MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-15 01:03:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5256 from aaronraimist/logout-correct-error

Browse source 
Show correct error when logging out and access token is missing
This commit is contained in:
Erik Johnston 2019-05-30 13:33:44 +01:00 committed by GitHub
commit 45f5d8f3fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/5256.bugfix Normal file
View file

@ -0,0 +1 @@
Show the correct error when logging out and access token is missing.

27
synapse/rest/client/v1/logout.py
View file

@ -17,8 +17,6 @@ import logging
from twisted.internet import defer from twisted.internet import defer
from synapse.api.errors import AuthError
from .base import ClientV1RestServlet, client_path_patterns from .base import ClientV1RestServlet, client_path_patterns
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -38,23 +36,16 @@ class LogoutRestServlet(ClientV1RestServlet):
@defer.inlineCallbacks @defer.inlineCallbacks
def on_POST(self, request): def on_POST(self, request):
try: requester = yield self.auth.get_user_by_req(request)
requester = yield self.auth.get_user_by_req(request)
except AuthError: if requester.device_id is None:
# this implies the access token has already been deleted. # the acccess token wasn't associated with a device.
defer.returnValue((401, { # Just delete the access token
"errcode": "M_UNKNOWN_TOKEN", access_token = self._auth.get_access_token_from_request(request)
"error": "Access Token unknown or expired" yield self._auth_handler.delete_access_token(access_token)
}))
else: else:
if requester.device_id is None: yield self._device_handler.delete_device(
# the acccess token wasn't associated with a device. requester.user.to_string(), requester.device_id)
# Just delete the access token
access_token = self._auth.get_access_token_from_request(request)
yield self._auth_handler.delete_access_token(access_token)
else:
yield self._device_handler.delete_device(
requester.user.to_string(), requester.device_id)
defer.returnValue((200, {})) defer.returnValue((200, {}))