Skip to content

Commit cb71213

Browse files
committed
Fix: minor fixes in server
Fixed a problem with login when there was an error loggin in, the server would return 500 instead of an actual error
1 parent 880ea53 commit cb71213

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

server/httpserver/server.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,12 @@ def get(self):
185185

186186
class ListMessagesHandler(tornado.web.RequestHandler):
187187
def get(self):
188-
189-
u=getUserFromToken(self.get_argument("token"))
188+
try:
189+
190+
u=getUserFromToken(self.get_argument("token"))
191+
except LoginError:
192+
self.write(json.dumps({'type': 'listMessages','response': 'failure','reason':'incorrect_token'}\
193+
,indent=4,separators=(',', ': ')))
190194
global locations
191195
finalJson={'type':'listMessages','response':'success'}
192196
try:

0 commit comments

Comments
 (0)