refactor: move security services to security dir

src/routers/activity.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 from src.services.activity import Activity, add_activity_to_activity, close_activity, create_activity, get_user_activities, get_user_activities_orgslug
 
 

src/routers/auth.py

@@ -1,7 +1,7 @@
 from urllib.request import Request
 from fastapi import Depends, APIRouter, HTTPException, status, Request
 from fastapi.security import  OAuth2PasswordRequestForm
-from src.dependencies.auth import *
+from src.security.auth import *
 from src.services.users.users import *
 from datetime import  timedelta
 from fastapi.responses import JSONResponse

src/routers/blocks.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, UploadFile, Form, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 from fastapi import HTTPException, status, UploadFile
 from src.services.blocks.block_types.imageBlock.images import create_image_block, get_image_block  
 from src.services.blocks.block_types.videoBlock.videoBlock import create_video_block, get_video_block

src/routers/courses/activities.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Depends, UploadFile, Form, Request
 from src.services.courses.activities.activities import *
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 from src.services.courses.activities.video import create_video_activity
 
 router = APIRouter()

src/routers/courses/chapters.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, Request, UploadFile, Form
 
 from src.services.courses.chapters import CourseChapter, CourseChapterMetaData, create_coursechapter, delete_coursechapter, get_coursechapter, get_coursechapters, get_coursechapters_meta, update_coursechapter, update_coursechapters_meta
 from src.services.users.users import PublicUser
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 
 router = APIRouter()
 

src/routers/courses/collections.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 from src.services.users.users import PublicUser, User
 from src.services.courses.collections import Collection, create_collection, get_collection, get_collections, update_collection, delete_collection
 

src/routers/courses/courses.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, UploadFile, Form, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 
 from src.services.courses.courses import Course,  create_course,  get_course, get_course_meta, get_courses, get_courses_orgslug, update_course, delete_course, update_course_thumbnail
 from src.services.users.users import PublicUser

src/routers/houses.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 
 from src.services.houses import House, HouseInDB, create_house, get_house, get_houses, update_house, delete_house
 from src.services.users.users import PublicUser, User

src/routers/orgs.py

@@ -1,6 +1,6 @@
 
 from fastapi import APIRouter, Depends, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 from src.services.orgs import Organization, create_org, delete_org, get_organization, get_organization_by_slug, get_orgs_by_user, update_org
 from src.services.users.users import PublicUser, User
 

src/routers/roles.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, Request
-from src.dependencies.auth import get_current_user
+from src.security.auth import get_current_user
 from src.services.roles.schemas.roles import Role
 from src.services.roles.roles import create_role, delete_role, read_role,  update_role
 from src.services.users.schemas.users import PublicUser, User

src/routers/users.py

@@ -1,7 +1,7 @@
 from fastapi import Depends, FastAPI, APIRouter
 from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
 from pydantic import BaseModel
-from src.dependencies.auth import *
+from src.security.auth import *
 from src.services.users.schemas.users import PasswordChangeForm, PublicUser, User, UserWithPassword
 from src.services.users.users import create_user, delete_user, get_profile_metadata, get_user_by_userid, read_user, update_user, update_user_password
 

src/security/auth.py

@@ -6,7 +6,7 @@ from jose import JWTError, jwt
 from datetime import datetime, timedelta
 from src.services.users.users import *
 from fastapi import Cookie, FastAPI
-from src.services.security import *
+from src.security.security import *
 from fastapi_jwt_auth import AuthJWT
 from fastapi_jwt_auth.exceptions import AuthJWTException
 

src/services/courses/activities/activities.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from src.services.security import verify_user_rights_with_roles
+from src.security.security import verify_user_rights_with_roles
 from src.services.users.schemas.users import PublicUser, User
 from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks, UploadFile, File
 from uuid import uuid4

src/services/courses/activities/video.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from src.services.security import verify_user_rights_with_roles
+from src.security.security import verify_user_rights_with_roles
 from src.services.courses.activities.uploads.videos import upload_video
 from src.services.users.users import PublicUser
 from src.services.courses.activities.activities import ActivityInDB

src/services/courses/chapters.py

@@ -5,7 +5,7 @@ from uuid import uuid4
 from pydantic import BaseModel
 from src.services.courses.courses import Course, CourseInDB
 from src.services.courses.activities.activities import Activity, ActivityInDB
-from src.services.security import verify_user_rights_with_roles
+from src.security.security import verify_user_rights_with_roles
 from src.services.users.users import PublicUser
 from fastapi import HTTPException, status, Request, Response, BackgroundTasks, UploadFile, File
 

src/services/courses/collections.py

@@ -3,7 +3,7 @@ from typing import List
 from uuid import uuid4
 from pydantic import BaseModel
 from src.services.users.users import PublicUser, User
-from src.services.security import *
+from src.security.security import *
 from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks
 from datetime import datetime
 

src/services/courses/courses.py

@@ -5,7 +5,7 @@ from pydantic import BaseModel
 from src.services.courses.activities.activities import ActivityInDB
 from src.services.courses.thumbnails import upload_thumbnail
 from src.services.users.users import PublicUser
-from src.services.security import *
+from src.security.security import *
 from fastapi import HTTPException, status, UploadFile
 from datetime import datetime
 

src/services/houses.py

@@ -3,7 +3,7 @@ from typing import List
 from uuid import uuid4
 from pydantic import BaseModel
 from src.services.users.users import PublicUser, User
-from src.services.security import *
+from src.security.security import *
 from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks
 from datetime import datetime
 

src/services/orgs.py

@@ -4,7 +4,7 @@ from uuid import uuid4
 from pydantic import BaseModel
 from src.services.users.schemas.users import UserOrganization
 from src.services.users.users import PublicUser, User
-from src.services.security import *
+from src.security.security import *
 from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks
 from datetime import datetime
 

src/services/roles/roles.py

@@ -4,7 +4,7 @@ from uuid import uuid4
 from pydantic import BaseModel
 from src.services.roles.schemas.roles import Role, RoleInDB
 from src.services.users.schemas.users import PublicUser, User
-from src.services.security import *
+from src.security.security import *
 from src.services.houses import House
 from fastapi import HTTPException, status, Request
 from datetime import datetime

src/services/users/users.py

@@ -3,7 +3,7 @@ from typing import Literal
 from uuid import uuid4
 from fastapi import HTTPException, Request, status
 from src.services.roles.schemas.roles import Role
-from src.services.security import security_hash_password, security_verify_password
+from src.security.security import security_hash_password, security_verify_password
 from src.services.users.schemas.users import PasswordChangeForm, PublicUser, User, UserOrganization, UserWithPassword, UserInDB