diff --git a/travian/backend/src/__init__.py b/travian/backend/src/__init__.py index bbd9d6e8..c6c14652 100644 --- a/travian/backend/src/__init__.py +++ b/travian/backend/src/__init__.py @@ -1,9 +1,7 @@ -from fastapi import FastAPI, Depends, Response +from fastapi import FastAPI from fastapi.responses import RedirectResponse from src.api.v1.village import village_router from src.api.v1.auth import auth_router -from src.core.auth import get_current_user -from src.core.config import * from fastapi.middleware.cors import CORSMiddleware diff --git a/travian/backend/src/api/v1/village.py b/travian/backend/src/api/v1/village.py index ed1e1404..bcfe10b9 100644 --- a/travian/backend/src/api/v1/village.py +++ b/travian/backend/src/api/v1/village.py @@ -3,10 +3,8 @@ from src.core.auth import get_current_user from src.db.services.village import ( create_village, - get_village_infos, get_user_villages, ) -from src.db.utils import get_db from src.db.schemas.villages import NewVillage, NewVillageRequest, UserVillages village_router = village = APIRouter() diff --git a/travian/backend/src/core/auth.py b/travian/backend/src/core/auth.py index 52252e9e..be9cd645 100644 --- a/travian/backend/src/core/auth.py +++ b/travian/backend/src/core/auth.py @@ -1,4 +1,4 @@ -from jose import JWTError, jwt +from jose import jwt from fastapi import Depends from src.db.services.user import create_user, get_user_by_email, user_exits from src.db.schemas.user import UserCreate, UserJWTToken diff --git a/travian/backend/src/core/config.py b/travian/backend/src/core/config.py index 104cc8cb..84deec37 100644 --- a/travian/backend/src/core/config.py +++ b/travian/backend/src/core/config.py @@ -2,9 +2,6 @@ from dotenv import load_dotenv load_dotenv(dotenv_path="local.env") -print( - "123456789123456789123456789123456789123456789123456789123456789123456789123456789123456789" -) # FastAPI AUTH_TOKEN_ALGO = "HS256" diff --git a/travian/backend/src/core/security.py b/travian/backend/src/core/security.py index 11f7ce04..2332ea40 100644 --- a/travian/backend/src/core/security.py +++ b/travian/backend/src/core/security.py @@ -3,7 +3,6 @@ import hmac from datetime import datetime, timedelta import jwt -from fastapi.security import OAuth2PasswordBearer from src.core.config import SECRET_KEY, AUTH_TOKEN_ALGO diff --git a/travian/backend/src/core/user.py b/travian/backend/src/core/user.py index 71d7ea3e..bc30b8d8 100644 --- a/travian/backend/src/core/user.py +++ b/travian/backend/src/core/user.py @@ -19,9 +19,6 @@ class UserAuth(BaseModel): salt: bytes -ß - - class id(BaseModel): """current authenticated User data stored in the JWT Web Token""" diff --git a/travian/backend/src/db/schemas/villages.py b/travian/backend/src/db/schemas/villages.py index 6ac43afc..c988034d 100644 --- a/travian/backend/src/db/schemas/villages.py +++ b/travian/backend/src/db/schemas/villages.py @@ -1,5 +1,4 @@ # pylint: disable=no-name-in-module, too-few-public-methods -from turtle import position from typing import Optional from pydantic import BaseModel, Field diff --git a/travian/backend/src/db/services/user.py b/travian/backend/src/db/services/user.py index e926a3ec..3896bc68 100644 --- a/travian/backend/src/db/services/user.py +++ b/travian/backend/src/db/services/user.py @@ -14,9 +14,13 @@ def create_user( is_active = True is_superuser = False sql = """ - INSERT INTO transactions.users (uuid, email, active, superuser, created_on, password, password_salt, tribe_id) - VALUES (%s, %s, %s, %s, %s, %s, %s, %s) - """ + INSERT INTO transactions.users ( + uuid, email, active, superuser, created_on, + password, password_salt, tribe_id + ) VALUES ( + %s, %s, %s, %s, %s, %s, %s, %s + ) + """ params = ( uuid, user.email,