Get rid of try except
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
parent
0b4f4cb0b4
commit
119c9c10b0
1 changed files with 9 additions and 16 deletions
|
@ -38,23 +38,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 as e:
|
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((e.code, {
|
# Just delete the access token
|
||||||
"errcode": e.errcode,
|
access_token = self._auth.get_access_token_from_request(request)
|
||||||
"error": e.msg
|
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, {}))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue