add login functions for cookie and non-cookie authentication

kontor-api/src/webapps/media/route_actors.py

@@ -2,11 +2,8 @@ from typing import AnyStr
 
 from fastapi import APIRouter, Request
 from fastapi.templating import Jinja2Templates
-from sqlalchemy import or_
-
-from src.apis.utils import SessionDep
 from src.db.models.media import MediaActor
-from src.core.log_conf import logger
+from src.db.session import SessionDep
 
 templates = Jinja2Templates(directory="src/templates")
 router = APIRouter(include_in_schema=False, prefix="/media")

kontor-api/src/webapps/media/route_media.py

@@ -5,11 +5,11 @@ from fastapi.security.utils import get_authorization_scheme_param
 from fastapi.templating import Jinja2Templates
 from sqlalchemy import or_
 
-from src.apis.utils import SessionDep
-from src.apis.version1.admin import get_current_user_from_token
+from src.core.security import get_current_user_from_token
 from src.db.models.admin import Profile
-from src.db.models.media import MediaFile, MediaActor
+from src.db.models.media import MediaFile
 from src.core.log_conf import logger
+from src.db.session import SessionDep
 
 templates = Jinja2Templates(directory="src/templates")
 router = APIRouter(include_in_schema=False, prefix="/media")
@@ -37,7 +37,7 @@ def get_mediafiles(db: SessionDep, request: Request, msg: str | None = None):
     try:
         token = request.cookies.get("access_token")
         scheme, param = get_authorization_scheme_param(token)  # scheme will hold "Bearer" and param will hold actual token value
-        current_user: Profile = get_current_user_from_token(token=param, db=db)
+        current_user: Profile = get_current_user_from_token(token=param)
         return templates.TemplateResponse("media/files.html", {"request": request, "msg": msg, "mediafiles": mediafiles})
     except Exception as e:
         print(e)
@@ -54,4 +54,3 @@ def file_details(file_id: AnyStr, request: Request, db: SessionDep):
 def edit_file(db: SessionDep, request: Request, file_id: str):
     media_file = db.get(MediaFile, file_id)
     return templates.TemplateResponse("media/file_detail.html", {"request": request, "mediafile":media_file})
-

kontor-api/src/webapps/media/route_videos.py

@@ -4,11 +4,11 @@ from fastapi import APIRouter, Request, status, responses
 from fastapi.security.utils import get_authorization_scheme_param
 from fastapi.templating import Jinja2Templates
 
-from src.apis.utils import SessionDep
 from src.db.models.media import MediaVideo
 from src.db.repository.media import create_new_video
-from src.apis.version1.admin import get_current_user_from_token
+#from src.apis.version1.admin import get_current_user_from_token
 from src.db.models.admin import Profile
+from src.db.session import SessionDep
 from src.schema.media.video import AddLink
 from src.webapps.media.forms import AddLinkForm