feat(users): add register route

api/v1/__init__.py

@@ -1,7 +1,8 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 from .jobs import router as jobs_router
-from .token import router as token_router
+from api.auth.token import router as token_router
+from api.auth.auth_utils import get_active_current_user
 
-router = APIRouter(prefix="/v1")
+router = APIRouter(prefix="/v1", dependencies=[Depends(get_active_current_user)])
 router.include_router(jobs_router)
 router.include_router(token_router)

api/v1/jobs/__init__.py

@@ -4,9 +4,8 @@ from api.core.scrapers.indeed import IndeedScraper
 from api.core.scrapers.ziprecruiter import ZipRecruiterScraper
 from api.core.scrapers.linkedin import LinkedInScraper
 from api.core.scrapers import ScraperInput, Site
-from ...v1.token.auth import get_active_current_user
 
-router = APIRouter(prefix="/jobs", dependencies=[Depends(get_active_current_user)])
+router = APIRouter(prefix="/jobs")
 
 SCRAPER_MAPPING = {
     Site.LINKEDIN: LinkedInScraper,

api/v1/token/__init__.py

@@ -1,23 +0,0 @@
-from fastapi import APIRouter, Depends, HTTPException, status
-from fastapi.security import OAuth2PasswordRequestForm
-
-from api.core.users import Token
-from .db_utils import authenticate_user
-from .auth import create_access_token
-
-ACCESS_TOKEN_EXPIRE_MINUTES = 30
-router = APIRouter(prefix="/token")
-
-
-@router.post("/", response_model=Token)
-async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
-    user = authenticate_user(form_data.username, form_data.password)
-    if user is None:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED,
-            detail="Incorrect username or password",
-            headers={"WWW-Authenticate": "Bearer"},
-        )
-
-    access_token = create_access_token(data={"sub": user.username})
-    return {"access_token": access_token, "token_type": "bearer"}

api/v1/token/auth.py

@@ -1,50 +0,0 @@
-from datetime import datetime, timedelta
-
-from jose import jwt, JWTError
-from fastapi import HTTPException, status, Depends
-from fastapi.security import OAuth2PasswordBearer
-
-from settings import *
-from api.core.users import TokenData
-from .db_utils import UserInDB, get_user
-
-load_dotenv()
-oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/token")
-
-
-def create_access_token(data: dict):
-    print(JWT_SECRET_KEY)
-    to_encode = data.copy()
-    expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
-    to_encode.update({"exp": expire})
-    encoded_jwt = jwt.encode(to_encode, JWT_SECRET_KEY, algorithm=ALGORITHM)
-    return encoded_jwt
-
-
-async def get_current_user(token: str = Depends(oauth2_scheme)):
-    credential_exception = HTTPException(
-        status_code=status.HTTP_401_UNAUTHORIZED,
-        detail="Could not validate credentials",
-        headers={"WWW-Authenticate": "Bearer"},
-    )
-    try:
-        payload = jwt.decode(token, JWT_SECRET_KEY, algorithms=[ALGORITHM])
-        username: str = payload.get("sub")
-        if username is None:
-            raise credential_exception
-        token_data = TokenData(username=username)
-    except JWTError:
-        raise credential_exception
-
-    current_user = get_user(token_data.username)
-    if current_user is None:
-        raise credential_exception
-    return current_user
-
-
-async def get_active_current_user(current_user: UserInDB = Depends(get_current_user)):
-    if current_user.disabled:
-        raise HTTPException(
-            status_code=status.HTTP_401_UNAUTHORIZED, detail="Inactive user."
-        )
-    return current_user

api/v1/token/db_utils.py

@@ -1,37 +0,0 @@
-from passlib.context import CryptContext
-
-from supabase_py import create_client, Client
-from api.core.users import UserInDB
-from settings import SUPABASE_URL, SUPABASE_KEY
-
-pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
-supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
-
-def get_user(username: str):
-    result = supabase.table('users').select().eq('username', username).execute()
-
-    if 'error' in result and result['error']:
-        print(f"Error: {result['error']['message']}")
-        return None
-    else:
-        if result['data']:
-            user_data = result['data'][0]  # get the first (and should be only) user with the matching username
-            return UserInDB(**user_data)
-        else:
-            return None
-
-def verify_password(password: str, hashed_password: str):
-    return pwd_context.verify(password, hashed_password)
-
-
-def get_password_hash(password):
-    return pwd_context.hash(password)
-
-
-def authenticate_user(username: str, password: str):
-    user = get_user(username)
-    if not user:
-        return False
-    if not verify_password(password, user.hashed_password):
-        return False
-    return user