validations updated
This commit is contained in:
@@ -37,7 +37,6 @@ class UserLoginModule:
|
||||
async def login_user_via_credentials(self, access_data: "Login") -> Dict[str, Any]:
|
||||
"""Login user via credentials."""
|
||||
# Get the actual data from the BaseRequestModel if needed
|
||||
print("access_data", access_data)
|
||||
if hasattr(access_data, "data"):
|
||||
access_data = access_data.data
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"""Token service for handling authentication tokens and user sessions."""
|
||||
|
||||
import json
|
||||
from typing import List, Union, TypeVar, Dict, Any, Optional, TYPE_CHECKING
|
||||
|
||||
from AllConfigs.Token.config import Auth
|
||||
@@ -75,7 +74,6 @@ class TokenService:
|
||||
)
|
||||
|
||||
occupants_selection_dict: Dict[str, Any] = {}
|
||||
|
||||
for living_space in living_spaces:
|
||||
build_parts_selection = BuildParts.filter_all(
|
||||
BuildParts.id == living_space.build_parts_id,
|
||||
@@ -221,7 +219,6 @@ class TokenService:
|
||||
company_address = Addresses.filter_by_one(
|
||||
id=company.official_address_id, db=db_session
|
||||
).data
|
||||
|
||||
companies_list.append(
|
||||
{
|
||||
"uu_id": str(company.uu_id),
|
||||
@@ -287,15 +284,14 @@ class TokenService:
|
||||
Users.client_arrow = DateTimeLocal(is_client=True, timezone=user.local_timezone)
|
||||
db_session = UsersTokens.new_session()
|
||||
# Handle login based on user type
|
||||
login_dict = (
|
||||
cls.do_occupant_login(request=request, user=user, domain=domain)
|
||||
if user.is_occupant
|
||||
else (
|
||||
cls.do_employee_login(request=request, user=user, domain=domain)
|
||||
if user.is_employee
|
||||
else {}
|
||||
if user.is_occupant:
|
||||
login_dict = cls.do_occupant_login(
|
||||
request=request, user=user, domain=domain
|
||||
)
|
||||
elif user.is_employee:
|
||||
login_dict = cls.do_employee_login(
|
||||
request=request, user=user, domain=domain
|
||||
)
|
||||
)
|
||||
|
||||
# Handle remember me functionality
|
||||
if remember:
|
||||
|
||||
Reference in New Issue
Block a user