Compare commits

..

No commits in common. "db218cb8c21cabbaeeba1a72b6ca535aa7bcfb32" and "759bab3ff3345ff4e89cd8bcad03c265e4d7fa01" have entirely different histories.

5 changed files with 6 additions and 27 deletions

View File

@ -24,5 +24,5 @@ mypy = "*"
python_version = "3.9"
[scripts]
test = "pytest app/test/test_auth.py app/test/test_server.py -W ignore::DeprecationWarning -s"
test = "pytest app/test/test_main.py -s"
dev = "uvicorn app.main:app --reload"

View File

@ -1,11 +1,8 @@
from fastapi import FastAPI, Depends
from app import auth, user, server
from os import getenv
app = FastAPI()
dependencies = list()
if not getenv('DISABLE_AUTH'):
dependencies.append(Depends(auth.authorise))
app.include_router(auth.router)
app.include_router(user.router)
app.include_router(server.router, dependencies=dependencies)
app.include_router(server.router, dependencies=[Depends(auth.authorise)])

View File

@ -1,21 +0,0 @@
#curl -i -X POST http://localhost:8000/token -H "Content-Type: application/x-www-form-urlencoded" -d "username=johndoe&password=secret"
# curl -X 'GET' \
# 'http://localhost:8000/users/me/' \
# -H 'accept: application/json' \
# -H 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJqb2huZG9lIiwiZXhwIjoxNjMxNDQ4MjQ1fQ.DrM92jgRiry0uXBXn-61rRehATW4zDhHUWoGR6lv6Us'
from fastapi import FastAPI
from fastapi.testclient import TestClient
import docker
from server import *
app = FastAPI()
app.include_router(router)
testclient = TestClient(app)
def test_start():
#response = testclient.post("/server/minecraft/start")
#assert response.status_code == 200
pass

View File

@ -9,3 +9,6 @@ async def read_users_me(current_user: User = Depends(get_current_active_user)):
return current_user
@router.get("/users/me/items/")
async def read_own_items(current_user: User = Depends(get_current_active_user)):
return [{"item_id": "Foo", "owner": current_user.username}]