|
|
|
|
@ -17,6 +17,7 @@ from constants.languages import language_timezone_mapping, languages
|
|
|
|
|
from events.tenant_event import tenant_was_created
|
|
|
|
|
from extensions.ext_database import db
|
|
|
|
|
from extensions.ext_redis import redis_client, redis_fallback
|
|
|
|
|
from libs.datetime_utils import naive_utc_now
|
|
|
|
|
from libs.helper import RateLimiter, TokenManager
|
|
|
|
|
from libs.passport import PassportService
|
|
|
|
|
from libs.password import compare_password, hash_password, valid_password
|
|
|
|
|
@ -135,8 +136,8 @@ class AccountService:
|
|
|
|
|
available_ta.current = True
|
|
|
|
|
db.session.commit()
|
|
|
|
|
|
|
|
|
|
if datetime.now(UTC).replace(tzinfo=None) - account.last_active_at > timedelta(minutes=10):
|
|
|
|
|
account.last_active_at = datetime.now(UTC).replace(tzinfo=None)
|
|
|
|
|
if naive_utc_now() - account.last_active_at > timedelta(minutes=10):
|
|
|
|
|
account.last_active_at = naive_utc_now()
|
|
|
|
|
db.session.commit()
|
|
|
|
|
|
|
|
|
|
return cast(Account, account)
|
|
|
|
|
@ -180,7 +181,7 @@ class AccountService:
|
|
|
|
|
|
|
|
|
|
if account.status == AccountStatus.PENDING.value:
|
|
|
|
|
account.status = AccountStatus.ACTIVE.value
|
|
|
|
|
account.initialized_at = datetime.now(UTC).replace(tzinfo=None)
|
|
|
|
|
account.initialized_at = naive_utc_now()
|
|
|
|
|
|
|
|
|
|
db.session.commit()
|
|
|
|
|
|
|
|
|
|
@ -318,7 +319,7 @@ class AccountService:
|
|
|
|
|
# If it exists, update the record
|
|
|
|
|
account_integrate.open_id = open_id
|
|
|
|
|
account_integrate.encrypted_token = "" # todo
|
|
|
|
|
account_integrate.updated_at = datetime.now(UTC).replace(tzinfo=None)
|
|
|
|
|
account_integrate.updated_at = naive_utc_now()
|
|
|
|
|
else:
|
|
|
|
|
# If it does not exist, create a new record
|
|
|
|
|
account_integrate = AccountIntegrate(
|
|
|
|
|
@ -353,7 +354,7 @@ class AccountService:
|
|
|
|
|
@staticmethod
|
|
|
|
|
def update_login_info(account: Account, *, ip_address: str) -> None:
|
|
|
|
|
"""Update last login time and ip"""
|
|
|
|
|
account.last_login_at = datetime.now(UTC).replace(tzinfo=None)
|
|
|
|
|
account.last_login_at = naive_utc_now()
|
|
|
|
|
account.last_login_ip = ip_address
|
|
|
|
|
db.session.add(account)
|
|
|
|
|
db.session.commit()
|
|
|
|
|
@ -1117,7 +1118,7 @@ class RegisterService:
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
account.last_login_ip = ip_address
|
|
|
|
|
account.initialized_at = datetime.now(UTC).replace(tzinfo=None)
|
|
|
|
|
account.initialized_at = naive_utc_now()
|
|
|
|
|
|
|
|
|
|
TenantService.create_owner_tenant_if_not_exist(account=account, is_setup=True)
|
|
|
|
|
|
|
|
|
|
@ -1158,7 +1159,7 @@ class RegisterService:
|
|
|
|
|
is_setup=is_setup,
|
|
|
|
|
)
|
|
|
|
|
account.status = AccountStatus.ACTIVE.value if not status else status.value
|
|
|
|
|
account.initialized_at = datetime.now(UTC).replace(tzinfo=None)
|
|
|
|
|
account.initialized_at = naive_utc_now()
|
|
|
|
|
|
|
|
|
|
if open_id is not None and provider is not None:
|
|
|
|
|
AccountService.link_account_integrate(provider, open_id, account)
|
|
|
|
|
|