Clean up unused method in cookie auth.

Author: mikeckennedy

app/ch12-forms/final/pypi_org/infrastructure/cookie_auth.py

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

app/ch13-validation/final/pypi_org/infrastructure/cookie_auth.py

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

app/ch13-validation/starter/pypi_org/infrastructure/cookie_auth.py

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

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

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

app/ch14_testing/starter/pypi_org/infrastructure/cookie_auth.py

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

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

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

app/ch15_deploy/starter/pypi_org/infrastructure/cookie_auth.py

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None

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

@@ -1,16 +1,16 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
+import bson
 from flask import Request
 from flask import Response
 
-from pypi_org.infrastructure.num_convert import try_int
+from pypi_org.infrastructure.num_convert import try_object_id
 
 auth_cookie_name = 'pypi_demo_user'
 
 
-def set_auth(response: Response, user_id: int):
+def set_auth(response: Response, user_id: bson.ObjectId):
     hash_val = __hash_text(str(user_id))
     val = "{}:{}".format(user_id, hash_val)
     response.set_cookie(auth_cookie_name, val, secure=False, httponly=True, samesite='Lax')
@@ -21,11 +21,7 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
-def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
+def get_user_id_via_auth_cookie(request: Request) -> Optional[bson.ObjectId]:
     if auth_cookie_name not in request.cookies:
         return None
 
@@ -41,7 +37,7 @@ def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
         print("Warning: Hash mismatch, invalid cookie value")
         return None
 
-    return try_int(user_id)
+    return try_object_id(user_id)
 
 
 def logout(response: Response):

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

@@ -1,5 +1,4 @@
 import hashlib
-from datetime import timedelta
 from typing import Optional
 
 from flask import Request
@@ -21,10 +20,6 @@ def __hash_text(text: str) -> str:
     return hashlib.sha512(text.encode('utf-8')).hexdigest()
 
 
-def __add_cookie_callback(_, response: Response, name: str, value: str):
-    response.set_cookie(name, value, max_age=timedelta(days=30), secure=False, httponly=True, samesite='Lax')
-
-
 def get_user_id_via_auth_cookie(request: Request) -> Optional[int]:
     if auth_cookie_name not in request.cookies:
         return None