revamped authentication system

app/routes/admin_pages.py

@@ -28,7 +28,7 @@ from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 from sqlalchemy.orm import Session
 
-from app.api.deps import get_current_admin_user, get_db
+from app.api.deps import get_current_admin_from_cookie_or_header, get_db
 from models.database.user import User
 
 router = APIRouter()
@@ -70,7 +70,7 @@ async def admin_login_page(request: Request):
 @router.get("/dashboard", response_class=HTMLResponse, include_in_schema=False)
 async def admin_dashboard_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -93,7 +93,7 @@ async def admin_dashboard_page(
 @router.get("/vendors", response_class=HTMLResponse, include_in_schema=False)
 async def admin_vendors_list_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -112,7 +112,7 @@ async def admin_vendors_list_page(
 @router.get("/vendors/create", response_class=HTMLResponse, include_in_schema=False)
 async def admin_vendor_create_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -131,7 +131,7 @@ async def admin_vendor_create_page(
 async def admin_vendor_detail_page(
         request: Request,
         vendor_code: str = Path(..., description="Vendor code"),
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -152,7 +152,7 @@ async def admin_vendor_detail_page(
 async def admin_vendor_edit_page(
         request: Request,
         vendor_code: str = Path(..., description="Vendor code"),
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -176,7 +176,7 @@ async def admin_vendor_edit_page(
 async def admin_vendor_domains_page(
         request: Request,
         vendor_code: str = Path(..., description="Vendor code"),
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -201,7 +201,7 @@ async def admin_vendor_domains_page(
 async def admin_vendor_theme_page(
         request: Request,
         vendor_code: str = Path(..., description="Vendor code"),
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -225,7 +225,7 @@ async def admin_vendor_theme_page(
 @router.get("/users", response_class=HTMLResponse, include_in_schema=False)
 async def admin_users_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -248,7 +248,7 @@ async def admin_users_page(
 @router.get("/imports", response_class=HTMLResponse, include_in_schema=False)
 async def admin_imports_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -271,7 +271,7 @@ async def admin_imports_page(
 @router.get("/settings", response_class=HTMLResponse, include_in_schema=False)
 async def admin_settings_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -294,7 +294,7 @@ async def admin_settings_page(
 @router.get("/components", response_class=HTMLResponse, include_in_schema=False)
 async def admin_components_page(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -313,7 +313,7 @@ async def admin_components_page(
 @router.get("/icons", response_class=HTMLResponse, include_in_schema=False)
 async def admin_icons_page(
     request: Request,
-    current_user: User = Depends(get_current_admin_user),
+    current_user: User = Depends(get_current_admin_from_cookie_or_header),
     db: Session = Depends(get_db)
 ):
     """
@@ -332,7 +332,7 @@ async def admin_icons_page(
 @router.get("/testing", response_class=HTMLResponse, include_in_schema=False)
 async def admin_testing_hub(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -351,7 +351,7 @@ async def admin_testing_hub(
 @router.get("/test/auth-flow", response_class=HTMLResponse, include_in_schema=False)
 async def admin_test_auth_flow(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """
@@ -370,7 +370,7 @@ async def admin_test_auth_flow(
 @router.get("/test/vendors-users-migration", response_class=HTMLResponse, include_in_schema=False)
 async def admin_test_vendors_users_migration(
         request: Request,
-        current_user: User = Depends(get_current_admin_user),
+        current_user: User = Depends(get_current_admin_from_cookie_or_header),
         db: Session = Depends(get_db)
 ):
     """