From 3d542b00555cc26e4588802d35537486d6b7f05b Mon Sep 17 00:00:00 2001 From: swve Date: Sat, 13 Aug 2022 21:20:49 +0200 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20imports?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/auth.py | 4 ++-- src/routers/users.py | 4 ++-- src/services/auth.py | 4 ++-- src/services/courses.py | 6 ++---- src/services/houses.py | 4 ++-- src/services/orgs.py | 4 ++-- src/services/roles.py | 9 +++++---- src/services/security.py | 4 ++-- src/services/users.py | 5 +++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/routers/auth.py b/src/routers/auth.py index c085547d..49aef977 100644 --- a/src/routers/auth.py +++ b/src/routers/auth.py @@ -1,8 +1,8 @@ from fastapi import Depends, FastAPI, APIRouter, HTTPException, status from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from pydantic import BaseModel -from ..services.auth import * -from ..services.users import * +from src.services.auth import * +from src.services.users import * from datetime import datetime, timedelta router = APIRouter() diff --git a/src/routers/users.py b/src/routers/users.py index 612177fd..0a913ec0 100644 --- a/src/routers/users.py +++ b/src/routers/users.py @@ -1,8 +1,8 @@ from fastapi import Depends, FastAPI, APIRouter from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from pydantic import BaseModel -from ..services.auth import * -from ..services.users import * +from src.services.auth import * +from src.services.users import * oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token") diff --git a/src/services/auth.py b/src/services/auth.py index 2275ea7b..f6f8e76b 100644 --- a/src/services/auth.py +++ b/src/services/auth.py @@ -4,8 +4,8 @@ from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from passlib.context import CryptContext from jose import JWTError, jwt from datetime import datetime, timedelta -from ..services.users import * -from ..services.security import * +from src.services.users import * +from src.services.security import * oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token") diff --git a/src/services/courses.py b/src/services/courses.py index 38185977..f5019c9b 100644 --- a/src/services/courses.py +++ b/src/services/courses.py @@ -3,8 +3,8 @@ from typing import List from uuid import uuid4 from pydantic import BaseModel from src.services.users import User -from ..services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB -from ..services.security import * +from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB +from src.services.security import * from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks from datetime import datetime @@ -233,8 +233,6 @@ async def update_coursechapter(coursechapter_object: CourseChapter, coursechapt async def delete_coursechapter(coursechapter_id: str, current_user: User): await check_database() - - coursechapters = learnhouseDB["coursechapters"] coursechapter = coursechapters.find_one( diff --git a/src/services/houses.py b/src/services/houses.py index 6af483ce..8b5fd982 100644 --- a/src/services/houses.py +++ b/src/services/houses.py @@ -3,8 +3,8 @@ from typing import List from uuid import uuid4 from pydantic import BaseModel from src.services.users import User -from ..services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB -from ..services.security import * +from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB +from src.services.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 4284e04d..53ccf493 100644 --- a/src/services/orgs.py +++ b/src/services/orgs.py @@ -3,8 +3,8 @@ from typing import List from uuid import uuid4 from pydantic import BaseModel from src.services.users import User -from ..services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB -from ..services.security import * +from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB +from src.services.security import * from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks from datetime import datetime diff --git a/src/services/roles.py b/src/services/roles.py index 4ffb0d1e..1992bd64 100644 --- a/src/services/roles.py +++ b/src/services/roles.py @@ -3,9 +3,9 @@ from typing import List from uuid import uuid4 from pydantic import BaseModel from src.services.users import User -from ..services.database import check_database, learnhouseDB, learnhouseDB -from ..services.security import * -from ..services.houses import House +from src.services.database import check_database, learnhouseDB, learnhouseDB +from src.services.security import * +from src.services.houses import House from fastapi import HTTPException, status from datetime import datetime @@ -155,7 +155,8 @@ async def verify_user_permissions(action: str, current_user: User): isOwner = "owner" in user["user_type"] isEditor = "editor" in user["user_type"] - + + # TODO: verify for all actions. if action == "delete": if isEditor: raise HTTPException( diff --git a/src/services/security.py b/src/services/security.py index 9519d0b9..9e82a2c6 100644 --- a/src/services/security.py +++ b/src/services/security.py @@ -3,8 +3,8 @@ from passlib.context import CryptContext from jose import JWTError, jwt import logging from passlib.hash import pbkdf2_sha256 -from ..services.database import check_database -from ..services.database import check_database, learnhouseDB, learnhouseDB +from src.services.database import check_database +from src.services.database import check_database, learnhouseDB, learnhouseDB ### 🔒 JWT ############################################################## diff --git a/src/services/users.py b/src/services/users.py index c707aeff..d1c8bd89 100644 --- a/src/services/users.py +++ b/src/services/users.py @@ -1,6 +1,6 @@ from pydantic import BaseModel -from ..services.database import check_database, learnhouseDB, learnhouseDB -from ..services.security import * +from src.services.database import check_database, learnhouseDB, learnhouseDB +from src.services.security import * from fastapi import HTTPException, status from datetime import datetime @@ -24,6 +24,7 @@ class UserInDB(User): #### Classes #################################################### +# TODO : user actions security async def get_user(username: str): check_database()