From 22464cead462f080cca0631a7f596b844c26827a Mon Sep 17 00:00:00 2001 From: swve Date: Sat, 25 Mar 2023 00:24:20 +0100 Subject: [PATCH] refactor: move security services to security dir --- src/routers/activity.py | 2 +- src/routers/auth.py | 2 +- src/routers/blocks.py | 2 +- src/routers/courses/activities.py | 2 +- src/routers/courses/chapters.py | 2 +- src/routers/courses/collections.py | 2 +- src/routers/courses/courses.py | 2 +- src/routers/houses.py | 2 +- src/routers/orgs.py | 2 +- src/routers/roles.py | 2 +- src/routers/users.py | 2 +- src/{dependencies => security}/__init__.py | 0 src/{dependencies => security}/auth.py | 2 +- src/{services => security}/security.py | 0 src/services/courses/activities/activities.py | 2 +- src/services/courses/activities/video.py | 2 +- src/services/courses/chapters.py | 2 +- src/services/courses/collections.py | 2 +- src/services/courses/courses.py | 2 +- src/services/houses.py | 2 +- src/services/orgs.py | 2 +- src/services/roles/roles.py | 2 +- src/services/users/users.py | 2 +- 23 files changed, 21 insertions(+), 21 deletions(-) rename src/{dependencies => security}/__init__.py (100%) rename src/{dependencies => security}/auth.py (98%) rename src/{services => security}/security.py (100%) diff --git a/src/routers/activity.py b/src/routers/activity.py index 91479bef..6ea6e04c 100644 --- a/src/routers/activity.py +++ b/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 diff --git a/src/routers/auth.py b/src/routers/auth.py index 9c8bf905..27dd78cf 100644 --- a/src/routers/auth.py +++ b/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 diff --git a/src/routers/blocks.py b/src/routers/blocks.py index 6cf26d63..6d90bb32 100644 --- a/src/routers/blocks.py +++ b/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 diff --git a/src/routers/courses/activities.py b/src/routers/courses/activities.py index f77e1225..c0cc5f8b 100644 --- a/src/routers/courses/activities.py +++ b/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() diff --git a/src/routers/courses/chapters.py b/src/routers/courses/chapters.py index 57d42fec..aa024cae 100644 --- a/src/routers/courses/chapters.py +++ b/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() diff --git a/src/routers/courses/collections.py b/src/routers/courses/collections.py index 26293524..fe5f8f17 100644 --- a/src/routers/courses/collections.py +++ b/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 diff --git a/src/routers/courses/courses.py b/src/routers/courses/courses.py index f440d8e5..6bd0d20e 100644 --- a/src/routers/courses/courses.py +++ b/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 diff --git a/src/routers/houses.py b/src/routers/houses.py index 8827402f..16782197 100644 --- a/src/routers/houses.py +++ b/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 diff --git a/src/routers/orgs.py b/src/routers/orgs.py index e571195e..579c0c02 100644 --- a/src/routers/orgs.py +++ b/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 diff --git a/src/routers/roles.py b/src/routers/roles.py index 903125e3..e784324d 100644 --- a/src/routers/roles.py +++ b/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 diff --git a/src/routers/users.py b/src/routers/users.py index 8d79b7d0..3a17567c 100644 --- a/src/routers/users.py +++ b/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 diff --git a/src/dependencies/__init__.py b/src/security/__init__.py similarity index 100% rename from src/dependencies/__init__.py rename to src/security/__init__.py diff --git a/src/dependencies/auth.py b/src/security/auth.py similarity index 98% rename from src/dependencies/auth.py rename to src/security/auth.py index 1e3f0c02..60a1487a 100644 --- a/src/dependencies/auth.py +++ b/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 diff --git a/src/services/security.py b/src/security/security.py similarity index 100% rename from src/services/security.py rename to src/security/security.py diff --git a/src/services/courses/activities/activities.py b/src/services/courses/activities/activities.py index b3205925..1adf49b6 100644 --- a/src/services/courses/activities/activities.py +++ b/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 diff --git a/src/services/courses/activities/video.py b/src/services/courses/activities/video.py index d921585f..f4ac26aa 100644 --- a/src/services/courses/activities/video.py +++ b/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 diff --git a/src/services/courses/chapters.py b/src/services/courses/chapters.py index 460a0d97..a2a4e1c1 100644 --- a/src/services/courses/chapters.py +++ b/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 diff --git a/src/services/courses/collections.py b/src/services/courses/collections.py index 63eca6f7..387d910d 100644 --- a/src/services/courses/collections.py +++ b/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 diff --git a/src/services/courses/courses.py b/src/services/courses/courses.py index a2560cd4..5e568904 100644 --- a/src/services/courses/courses.py +++ b/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 diff --git a/src/services/houses.py b/src/services/houses.py index 5023302b..ecca7b68 100644 --- a/src/services/houses.py +++ b/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 diff --git a/src/services/orgs.py b/src/services/orgs.py index 90b13586..28fd642a 100644 --- a/src/services/orgs.py +++ b/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 diff --git a/src/services/roles/roles.py b/src/services/roles/roles.py index cae2585c..67f34594 100644 --- a/src/services/roles/roles.py +++ b/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 diff --git a/src/services/users/users.py b/src/services/users/users.py index 7a4fdc6d..e64adcc4 100644 --- a/src/services/users/users.py +++ b/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