♻️ refactor imports

This commit is contained in:
swve 2022-08-13 21:20:49 +02:00
parent 976b730de5
commit 3d542b0055
9 changed files with 22 additions and 22 deletions

View file

@ -1,8 +1,8 @@
from fastapi import Depends, FastAPI, APIRouter, HTTPException, status from fastapi import Depends, FastAPI, APIRouter, HTTPException, status
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
from pydantic import BaseModel from pydantic import BaseModel
from ..services.auth import * from src.services.auth import *
from ..services.users import * from src.services.users import *
from datetime import datetime, timedelta from datetime import datetime, timedelta
router = APIRouter() router = APIRouter()

View file

@ -1,8 +1,8 @@
from fastapi import Depends, FastAPI, APIRouter from fastapi import Depends, FastAPI, APIRouter
from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
from pydantic import BaseModel from pydantic import BaseModel
from ..services.auth import * from src.services.auth import *
from ..services.users import * from src.services.users import *
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token") oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token")

View file

@ -4,8 +4,8 @@ from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
from passlib.context import CryptContext from passlib.context import CryptContext
from jose import JWTError, jwt from jose import JWTError, jwt
from datetime import datetime, timedelta from datetime import datetime, timedelta
from ..services.users import * from src.services.users import *
from ..services.security import * from src.services.security import *
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token") oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/auth/token")

View file

@ -3,8 +3,8 @@ from typing import List
from uuid import uuid4 from uuid import uuid4
from pydantic import BaseModel from pydantic import BaseModel
from src.services.users import User from src.services.users import User
from ..services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB
from ..services.security import * from src.services.security import *
from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks
from datetime import datetime 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): async def delete_coursechapter(coursechapter_id: str, current_user: User):
await check_database() await check_database()
coursechapters = learnhouseDB["coursechapters"] coursechapters = learnhouseDB["coursechapters"]
coursechapter = coursechapters.find_one( coursechapter = coursechapters.find_one(

View file

@ -3,8 +3,8 @@ from typing import List
from uuid import uuid4 from uuid import uuid4
from pydantic import BaseModel from pydantic import BaseModel
from src.services.users import User from src.services.users import User
from ..services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB
from ..services.security import * from src.services.security import *
from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks
from datetime import datetime from datetime import datetime

View file

@ -3,8 +3,8 @@ from typing import List
from uuid import uuid4 from uuid import uuid4
from pydantic import BaseModel from pydantic import BaseModel
from src.services.users import User from src.services.users import User
from ..services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB
from ..services.security import * from src.services.security import *
from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks from fastapi import FastAPI, HTTPException, status, Request, Response, BackgroundTasks
from datetime import datetime from datetime import datetime

View file

@ -3,9 +3,9 @@ from typing import List
from uuid import uuid4 from uuid import uuid4
from pydantic import BaseModel from pydantic import BaseModel
from src.services.users import User from src.services.users import User
from ..services.database import check_database, learnhouseDB, learnhouseDB from src.services.database import check_database, learnhouseDB, learnhouseDB
from ..services.security import * from src.services.security import *
from ..services.houses import House from src.services.houses import House
from fastapi import HTTPException, status from fastapi import HTTPException, status
from datetime import datetime from datetime import datetime
@ -156,6 +156,7 @@ async def verify_user_permissions(action: str, current_user: User):
isOwner = "owner" in user["user_type"] isOwner = "owner" in user["user_type"]
isEditor = "editor" in user["user_type"] isEditor = "editor" in user["user_type"]
# TODO: verify for all actions.
if action == "delete": if action == "delete":
if isEditor: if isEditor:
raise HTTPException( raise HTTPException(

View file

@ -3,8 +3,8 @@ from passlib.context import CryptContext
from jose import JWTError, jwt from jose import JWTError, jwt
import logging import logging
from passlib.hash import pbkdf2_sha256 from passlib.hash import pbkdf2_sha256
from ..services.database import check_database from src.services.database import check_database
from ..services.database import check_database, learnhouseDB, learnhouseDB from src.services.database import check_database, learnhouseDB, learnhouseDB
### 🔒 JWT ############################################################## ### 🔒 JWT ##############################################################

View file

@ -1,6 +1,6 @@
from pydantic import BaseModel from pydantic import BaseModel
from ..services.database import check_database, learnhouseDB, learnhouseDB from src.services.database import check_database, learnhouseDB, learnhouseDB
from ..services.security import * from src.services.security import *
from fastapi import HTTPException, status from fastapi import HTTPException, status
from datetime import datetime from datetime import datetime
@ -24,6 +24,7 @@ class UserInDB(User):
#### Classes #################################################### #### Classes ####################################################
# TODO : user actions security
async def get_user(username: str): async def get_user(username: str):
check_database() check_database()