remove datetime.utcnow()

This commit is contained in:
Kenneth Kehl
2024-05-23 13:59:51 -07:00
parent 752a13fbd2
commit 905df17f65
83 changed files with 591 additions and 570 deletions

View File

@@ -1,6 +1,5 @@
import json
import uuid
from datetime import datetime
from urllib.parse import urlencode
from flask import Blueprint, abort, current_app, jsonify, request
@@ -55,7 +54,7 @@ from app.user.users_schema import (
post_verify_code_schema,
post_verify_webauthn_schema,
)
from app.utils import url_with_token
from app.utils import url_with_token, utc_now
from notifications_utils.recipients import is_us_phone_number, use_numeric_sender
user_blueprint = Blueprint("user", __name__)
@@ -222,15 +221,15 @@ def verify_user_code(user_id):
# only relevant from sms
increment_failed_login_count(user_to_verify)
raise InvalidRequest("Code not found", status_code=404)
if datetime.utcnow() > code.expiry_datetime or code.code_used:
if utc_now() > code.expiry_datetime or code.code_used:
# sms and email
increment_failed_login_count(user_to_verify)
raise InvalidRequest("Code has expired", status_code=400)
user_to_verify.current_session_id = str(uuid.uuid4())
user_to_verify.logged_in_at = datetime.utcnow()
user_to_verify.logged_in_at = utc_now()
if data["code_type"] == CodeType.EMAIL:
user_to_verify.email_access_validated_at = datetime.utcnow()
user_to_verify.email_access_validated_at = utc_now()
user_to_verify.failed_login_count = 0
save_model_user(user_to_verify)
@@ -263,7 +262,7 @@ def complete_login_after_webauthn_authentication_attempt(user_id):
if successful:
user.current_session_id = str(uuid.uuid4())
user.logged_in_at = datetime.utcnow()
user.logged_in_at = utc_now()
user.failed_login_count = 0
save_model_user(user)
else:
@@ -676,7 +675,7 @@ def get_organizations_and_services_for_user(user_id):
def _create_reset_password_url(email, next_redirect, base_url=None):
data = json.dumps({"email": email, "created_at": str(datetime.utcnow())})
data = json.dumps({"email": email, "created_at": str(utc_now())})
static_url_part = "/new-password/"
full_url = url_with_token(
data, static_url_part, current_app.config, base_url=base_url