add login functions for cookie and non-cookie authentication

kontor-api/src/webapps/admin/route_admin.py

@@ -1,31 +1,29 @@
-from typing import AnyStr
+from typing import Optional
 from fastapi import APIRouter, Request
-from fastapi.security.utils import get_authorization_scheme_param
 from fastapi.templating import Jinja2Templates
 
-from src.apis.utils import SessionDep
-from src.apis.version1.admin import get_current_user_from_token
 from src.db.models.admin import Permission, Profile
+from src.db.session import SessionDep
 
 templates = Jinja2Templates(directory="src/templates")
 router = APIRouter(include_in_schema=False, prefix="/admin")
 
 @router.get("/profiles")
-def get_profiles(db: SessionDep, request: Request, msg: str | None = None):
+def get_profiles(db: SessionDep, request: Request, msg: Optional[str] = None):
     profiles = db.query(Profile).all()
     return templates.TemplateResponse("admin/profiles.html", {"request": request, "msg": msg, "profiles": profiles})
 
 @router.get("/profiles/{profile_id}")
-def comic_details(profile_id: AnyStr, request: Request, db: SessionDep):
+def comic_details(profile_id: str, request: Request, db: SessionDep):
     profile = db.get(Profile, profile_id)
     return templates.TemplateResponse("admin/profile_detail.html", {"request": request, "profile":profile})
 
 @router.get("/permissions")
-def get_permissions(db: SessionDep, request: Request, msg: str | None = None):
+def get_permissions(db: SessionDep, request: Request, msg: Optional[str] = None):
     permissions = db.query(Permission).all()
     return templates.TemplateResponse("admin/permissions.html", {"request": request, "msg": msg, "permissions": permissions})
 
 @router.get("/permissions/{permission_id}")
-def artist_detail(permission_id: AnyStr, request: Request, db: SessionDep):
+def artist_detail(permission_id: str, request: Request, db: SessionDep):
     permission= db.get(Permission, str(permission_id))
     return templates.TemplateResponse("comic/permission_detail.html", {"request": request, "permission": permission})