Skip to content

Commit 6b7cace

Browse files
committed
Fixing login (exchange int for ObjectId).
1 parent fd4d81d commit 6b7cace

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

app/ch16_mongodb/final/pypi_org/infrastructure/cookie_auth.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from datetime import timedelta
33
from typing import Optional
44

5+
import bson
56
from flask import Request
67
from flask import Response
78

@@ -25,7 +26,7 @@ def __add_cookie_callback(_, response: Response, name: str, value: str):
2526
response.set_cookie(name, value, max_age=timedelta(days=30))
2627

2728

28-
def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
29+
def get_user_id_via_auth_cookie(request: Request) -> Optional[bson.ObjectId]:
2930
if auth_cookie_name not in request.cookies:
3031
return None
3132

@@ -41,7 +42,10 @@ def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
4142
print("Warning: Hash mismatch, invalid cookie value")
4243
return None
4344

44-
return try_int(user_id)
45+
try:
46+
return bson.ObjectId(user_id)
47+
except:
48+
return None
4549

4650

4751
def logout(response: Response):

app/ch16_mongodb/final/pypi_org/viewmodels/shared/viewmodelbase.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from typing import Optional
22

3+
import bson
34
import flask
45
from flask import Request
56

@@ -12,7 +13,7 @@ def __init__(self):
1213
self.request_dict = request_dict.create('')
1314

1415
self.error: Optional[str] = None
15-
self.user_id: Optional[int] = cookie_auth.get_user_id_via_auth_cookie(self.request)
16+
self.user_id: Optional[bson.ObjectId] = cookie_auth.get_user_id_via_auth_cookie(self.request)
1617

1718
def to_dict(self):
1819
return self.__dict__

0 commit comments

Comments
 (0)