Reset email, password, fix tokens (fix #21, #4) (#22)

Author: grigoriev-semyon

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
           docker run -d -p 5432:5432 -e POSTGRES_HOST_AUTH_METHOD=trust --name db-test postgres:15-alpine
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
       - name: Install dependencies
         run: |
           python -m ensurepip

Dockerfile

@@ -1,11 +1,11 @@
-FROM python:3.10
-WORKDIR /app
+FROM tiangolo/uvicorn-gunicorn-fastapi:python3.11
+ENV APP_NAME=auth_backend
+ENV APP_MODULE=${APP_NAME}.routes.base:app
 
 COPY ./requirements.txt /app/
-RUN pip install --no-cache-dir -r /app/requirements.txt
+RUN pip install -U -r /app/requirements.txt
 
-ADD gunicorn_conf.py alembic.ini /app/
-ADD migrations /app/migrations
-ADD auth_backend /app/auth_backend
+COPY ./alembic.ini /alembic.ini
+COPY ./migrations /migrations/
 
-CMD [ "gunicorn", "-k", "uvicorn.workers.UvicornWorker", "-c", "/app/gunicorn_conf.py", "auth_backend.routes.base:app" ]
+COPY ./${APP_NAME} /app/${APP_NAME}

auth_backend/__main__.py

@@ -1,6 +1,16 @@
+import logging
+
 import uvicorn
 
 from auth_backend.routes import app
 
 if __name__ == '__main__':
+
+    logging.basicConfig(
+        filename=f'logger_{__name__}.log',
+        level=logging.INFO,
+        format='%(asctime)s.%(msecs)03d %(levelname)s %(module)s - %(funcName)s: %(message)s',
+        datefmt='%Y-%m-%d %H:%M:%S',
+    )
+
     uvicorn.run(app)

auth_backend/auth_plugins/auth_method.py

@@ -2,14 +2,16 @@
 
 import re
 from abc import abstractmethod, ABCMeta
+from datetime import datetime
 
 from fastapi import APIRouter
+from pydantic import constr
 
-from datetime import datetime
-from auth_backend.base import Base, Token
+from auth_backend.base import Base
 
 
-class Session(Token):
+class Session(Base):
+    token: constr(min_length=1)
     expires: datetime
     id: int
     user_id: int
@@ -22,25 +24,26 @@ class AuthMethodMeta(metaclass=ABCMeta):
     router: APIRouter
     prefix: str
     tags: list[str] = []
+    fields: list[str] = []
 
     @classmethod
     def get_name(cls) -> str:
         return re.sub(r"(?<!^)(?=[A-Z])", "_", cls.__name__).lower()
 
     def __init__(self):
         self.router = APIRouter()
-        self.router.add_api_route("/registration", self.register, methods=["POST"])
-        self.router.add_api_route("/login", self.login, methods=["POST"], response_model=Session)
+        self.router.add_api_route("/registration", self._register, methods=["POST"])
+        self.router.add_api_route("/login", self._login, methods=["POST"], response_model=Session)
 
     def __init_subclass__(cls, **kwargs):
         AUTH_METHODS[cls.__name__] = cls
 
     @staticmethod
     @abstractmethod
-    async def register(**kwargs) -> object:
+    async def _register(**kwargs) -> object:
         raise NotImplementedError()
 
     @staticmethod
     @abstractmethod
-    async def login(**kwargs) -> Session:
+    async def _login(**kwargs) -> Session:
         raise NotImplementedError()