Skip to content

Commit 920f96d

Browse files
committed
Use distinct cookie names across all the demo apps.
1 parent 17ec459 commit 920f96d

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

demos/auth/authdemo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self):
4242

4343
class BaseHandler(tornado.web.RequestHandler):
4444
def get_current_user(self):
45-
user_json = self.get_secure_cookie("user")
45+
user_json = self.get_secure_cookie("authdemo_user")
4646
if not user_json: return None
4747
return tornado.escape.json_decode(user_json)
4848

@@ -66,7 +66,7 @@ def get(self):
6666
def _on_auth(self, user):
6767
if not user:
6868
raise tornado.web.HTTPError(500, "Google auth failed")
69-
self.set_secure_cookie("user", tornado.escape.json_encode(user))
69+
self.set_secure_cookie("authdemo_user", tornado.escape.json_encode(user))
7070
self.redirect("/")
7171

7272

@@ -77,7 +77,7 @@ def get(self):
7777
# returning to this app will log them back in immediately with no
7878
# interaction (unless they have separately logged out of Google in
7979
# the meantime).
80-
self.clear_cookie("user")
80+
self.clear_cookie("authdemo_user")
8181
self.write('You are now logged out. '
8282
'Click <a href="/">here</a> to log back in.')
8383

demos/blog/blog.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def db(self):
6969
return self.application.db
7070

7171
def get_current_user(self):
72-
user_id = self.get_secure_cookie("user")
72+
user_id = self.get_secure_cookie("blogdemo_user")
7373
if not user_id: return None
7474
return self.db.get("SELECT * FROM authors WHERE id = %s", int(user_id))
7575

@@ -170,13 +170,13 @@ def _on_auth(self, user):
170170
return
171171
else:
172172
author_id = author["id"]
173-
self.set_secure_cookie("user", str(author_id))
173+
self.set_secure_cookie("blogdemo_user", str(author_id))
174174
self.redirect(self.get_argument("next", "/"))
175175

176176

177177
class AuthLogoutHandler(BaseHandler):
178178
def get(self):
179-
self.clear_cookie("user")
179+
self.clear_cookie("blogdemo_user")
180180
self.redirect(self.get_argument("next", "/"))
181181

182182

demos/chat/chatdemo.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def __init__(self):
5050

5151
class BaseHandler(tornado.web.RequestHandler):
5252
def get_current_user(self):
53-
user_json = self.get_secure_cookie("user")
53+
user_json = self.get_secure_cookie("chatdemo_user")
5454
if not user_json: return None
5555
return tornado.escape.json_decode(user_json)
5656

@@ -142,13 +142,13 @@ def get(self):
142142
def _on_auth(self, user):
143143
if not user:
144144
raise tornado.web.HTTPError(500, "Google auth failed")
145-
self.set_secure_cookie("user", tornado.escape.json_encode(user))
145+
self.set_secure_cookie("chatdemo_user", tornado.escape.json_encode(user))
146146
self.redirect("/")
147147

148148

149149
class AuthLogoutHandler(BaseHandler):
150150
def get(self):
151-
self.clear_cookie("user")
151+
self.clear_cookie("chatdemo_user")
152152
self.write("You are now logged out")
153153

154154

demos/facebook/facebook.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def __init__(self):
5555

5656
class BaseHandler(tornado.web.RequestHandler):
5757
def get_current_user(self):
58-
user_json = self.get_secure_cookie("user")
58+
user_json = self.get_secure_cookie("fbdemo_user")
5959
if not user_json: return None
6060
return tornado.escape.json_decode(user_json)
6161

@@ -92,17 +92,17 @@ def get(self):
9292
self.authorize_redirect(redirect_uri=my_url,
9393
client_id=self.settings["facebook_api_key"],
9494
extra_params={"scope": "read_stream"})
95-
95+
9696
def _on_auth(self, user):
9797
if not user:
9898
raise tornado.web.HTTPError(500, "Facebook auth failed")
99-
self.set_secure_cookie("user", tornado.escape.json_encode(user))
99+
self.set_secure_cookie("fbdemo_user", tornado.escape.json_encode(user))
100100
self.redirect(self.get_argument("next", "/"))
101101

102102

103103
class AuthLogoutHandler(BaseHandler, tornado.auth.FacebookGraphMixin):
104104
def get(self):
105-
self.clear_cookie("user")
105+
self.clear_cookie("fbdemo_user")
106106
self.redirect(self.get_argument("next", "/"))
107107

108108

0 commit comments

Comments
 (0)