added template_fastapi_users, changes in project structure

Author: rafsaf

{{cookiecutter.project_name}}/template_fastapi_users/alembic/versions/2021_11_09_1736_init__cefce371682e.py

@@ -0,0 +1,39 @@
+"""initial_fastapi_users_model
+
+Revision ID: 57b460a916d4
+Revises: 
+Create Date: 2022-01-09 19:52:37.810574
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from fastapi_users_db_sqlalchemy import guid
+
+# revision identifiers, used by Alembic.
+revision = "57b460a916d4"
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "user",
+        sa.Column("id", guid.GUID(), nullable=False),
+        sa.Column("email", sa.String(length=320), nullable=False),
+        sa.Column("hashed_password", sa.String(length=72), nullable=False),
+        sa.Column("is_active", sa.Boolean(), nullable=False),
+        sa.Column("is_superuser", sa.Boolean(), nullable=False),
+        sa.Column("is_verified", sa.Boolean(), nullable=False),
+        sa.PrimaryKeyConstraint("id"),
+    )
+    op.create_index(op.f("ix_user_email"), "user", ["email"], unique=True)
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f("ix_user_email"), table_name="user")
+    op.drop_table("user")
+    # ### end Alembic commands ###

{{cookiecutter.project_name}}/template_fastapi_users/alembic/versions/2022_01_09_1952_initial_fastapi_users_model__57b460a916d4.py

@@ -1,7 +1,31 @@
+"""
+Users and auth routers 'for free' from FastAPI Users.
+https://fastapi-users.github.io/fastapi-users/configuration/routers/
+
+You can include more of them + oauth login endpoints.
+
+fastapi_users in defined in deps, because it also
+includes useful dependencies.
+"""
+
 from fastapi import APIRouter
 
-from app.api.endpoints import auth, users
+from app.api.deps import fastapi_users
+from app.core import security
 
 api_router = APIRouter()
-api_router.include_router(auth.router, prefix="/auth", tags=["auth"])
-api_router.include_router(users.router, prefix="/users", tags=["users"])
+api_router.include_router(
+    fastapi_users.get_auth_router(security.AUTH_BACKEND),
+    prefix="/auth/jwt",
+    tags=["auth"],
+)
+api_router.include_router(
+    fastapi_users.get_register_router(),
+    prefix="/auth",
+    tags=["auth"],
+)
+api_router.include_router(
+    fastapi_users.get_users_router(),
+    prefix="/users",
+    tags=["users"],
+)

{{cookiecutter.project_name}}/template_fastapi_users/app/api/api.py

@@ -1,15 +1,14 @@
-from typing import AsyncGenerator, Optional
+from typing import AsyncGenerator
 
-from fastapi import Depends, HTTPException, status
+from fastapi import Depends
 from fastapi.security import OAuth2PasswordBearer
-from jose import jwt
-from pydantic import ValidationError
-from sqlalchemy import select
+from fastapi_users.fastapi_users import FastAPIUsers
+from fastapi_users_db_sqlalchemy import SQLAlchemyUserDatabase
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app import schemas
-from app.core import security, config
-from app.models import User
+from app.core import security
+from app.models import UserTable
 from app.session import async_session
 
 reusable_oauth2 = OAuth2PasswordBearer(tokenUrl="auth/access-token")
@@ -20,24 +19,24 @@ async def get_session() -> AsyncGenerator[AsyncSession, None]:
         yield session
 
 
-async def get_current_user(
-    session: AsyncSession = Depends(get_session), token: str = Depends(reusable_oauth2)
-) -> User:
+async def get_user_db(session: AsyncSession = Depends(get_session)):
+    yield SQLAlchemyUserDatabase(schemas.UserDB, session, UserTable)
 
-    try:
-        payload = jwt.decode(
-            token, config.settings.SECRET_KEY, algorithms=[security.ALGORITHM]
-        )
-        token_data = schemas.TokenPayload(**payload)
-    except (jwt.JWTError, ValidationError):
-        raise HTTPException(
-            status_code=status.HTTP_403_FORBIDDEN,
-            detail="Could not validate credentials",
-        )
 
-    result = await session.execute(select(User).where(User.id == token_data.sub))
-    user: Optional[User] = result.scalars().first()
+async def get_user_manager(user_db: SQLAlchemyUserDatabase = Depends(get_user_db)):
+    yield security.UserManager(user_db)
 
-    if not user:
-        raise HTTPException(status_code=404, detail="User not found")
-    return user
+
+fastapi_users = FastAPIUsers(
+    get_user_manager,  # type: ignore
+    [security.AUTH_BACKEND],
+    schemas.User,
+    schemas.UserCreate,
+    schemas.UserUpdate,
+    schemas.UserDB,
+)
+
+
+get_current_user = fastapi_users.current_user()
+get_current_active_user = fastapi_users.current_user(active=True)
+get_current_superuser = fastapi_users.current_user(active=True, superuser=True)

{{cookiecutter.project_name}}/template_fastapi_users/app/api/deps.py

@@ -20,29 +20,27 @@
 """
 
 from pathlib import Path
-from typing import Union, Literal
+from typing import Literal, Union
 
 import toml
 from pydantic import AnyHttpUrl, AnyUrl, BaseSettings, EmailStr, validator
 
-
 PROJECT_DIR = Path(__file__).parent.parent.parent
-pyproject_content = toml.load(f"{PROJECT_DIR}/pyproject.toml")["tool"]["poetry"]
+PYPROJECT_CONTENT = toml.load(f"{PROJECT_DIR}/pyproject.toml")["tool"]["poetry"]
 
 
 class Settings(BaseSettings):
     # CORE SETTINGS
     SECRET_KEY: str
     ENVIRONMENT: Literal["DEV", "PYTEST", "STAGE", "PRODUCTION"]
     ACCESS_TOKEN_EXPIRE_MINUTES: int
-    SECURITY_BCRYPT_DEFAULT_ROUNDS: int = 12
     REFRESH_TOKEN_EXPIRE_MINUTES: int
     BACKEND_CORS_ORIGINS: Union[str, list[AnyHttpUrl]]
 
     # PROJECT NAME, VERSION AND DESCRIPTION
-    PROJECT_NAME: str = pyproject_content["name"]
-    VERSION: str = pyproject_content["version"]
-    DESCRIPTION: str = pyproject_content["description"]
+    PROJECT_NAME: str = PYPROJECT_CONTENT["name"]
+    VERSION: str = PYPROJECT_CONTENT["version"]
+    DESCRIPTION: str = PYPROJECT_CONTENT["description"]
 
     # POSTGRESQL DEFAULT DATABASE
     DEFAULT_DATABASE_HOSTNAME: str