finished tests for login and probably all tasks done

Author: rafsaf

{{cookiecutter.project_name}}/.flake8

@@ -1,3 +1,14 @@
 [flake8]
 max-line-length = 88
-exclude = .git,__pycache__,__init__.py,.mypy_cache,.pytest_cache
+select = C,E,F,W,B,B9
+ignore = E203, E501, W503
+exclude = 
+    __init__.py,
+    .venv,
+    __pycache__,
+    .github,
+    .vscode,
+    config,
+    locale,
+    webhook
+    app/tests/conftest.py

{{cookiecutter.project_name}}/.gitignore

@@ -4,11 +4,13 @@
 # postgresql
 data
 data-debug
+tests_data
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
 *$py.class
+.env
 
 # C extensions
 *.so

{{cookiecutter.project_name}}/Dockerfile

@@ -13,10 +13,8 @@ RUN mkdir build
 WORKDIR /build
 
 COPY ./app ./app
-COPY ./pytest.ini .
-COPY ./aerich.ini .
+COPY ./alembic.ini .
 COPY ./requirements.txt .
-COPY ./.env .
 
 # We copy our app folder to the /build
 

{{cookiecutter.project_name}}/alembic/versions/20211023121450_3c44f0828d4f_init.py

@@ -1,16 +1,16 @@
 """init
 
-Revision ID: b6b74331d700
+Revision ID: e2318cba28d4
 Revises: 
-Create Date: 2021-10-23 02:25:23.653930
+Create Date: 2021-10-23 16:15:04.828924
 
 """
 from alembic import op
 import sqlalchemy as sa
 
 
 # revision identifiers, used by Alembic.
-revision = 'b6b74331d700'
+revision = 'e2318cba28d4'
 down_revision = None
 branch_labels = None
 depends_on = None

…ions/20211023022523_b6b74331d700_init.py …ions/20211023161504_e2318cba28d4_init.py{{cookiecutter.project_name}}/alembic/versions/20211023022523_b6b74331d700_init.py renamed to {{cookiecutter.project_name}}/alembic/versions/20211023161504_e2318cba28d4_init.py {{cookiecutter.project_name}}/alembic/versions/20211023022523_b6b74331d700_init.py renamed to {{cookiecutter.project_name}}/alembic/versions/20211023161504_e2318cba28d4_init.py

@@ -46,21 +46,21 @@ async def login_access_token(
 @router.post("/test-token", response_model=schemas.User)
 async def test_token(current_user: User = Depends(deps.get_current_user)):
     """
-    Test access token
+    Test access token for current user
     """
     return current_user
 
 
 @router.post("/refresh-token", response_model=schemas.Token)
 async def refresh_token(
-    refresh_token: str, session: AsyncSession = Depends(deps.get_session)
+    input: schemas.TokenRefresh, session: AsyncSession = Depends(deps.get_session)
 ):
     """
     OAuth2 compatible token, get an access token for future requests using refresh token
     """
     try:
         payload = jwt.decode(
-            refresh_token, settings.SECRET_KEY, algorithms=[security.ALGORITHM]
+            input.refresh_token, settings.SECRET_KEY, algorithms=[security.ALGORITHM]
         )
         token_data = schemas.TokenPayload(**payload)
     except (jwt.JWTError, ValidationError):

{{cookiecutter.project_name}}/app/api/endpoints/auth.py

@@ -17,7 +17,7 @@ async def update_user_me(
     current_user: models.User = Depends(deps.get_current_active_user),
 ) -> Any:
     """
-    Update me.
+    Update current user.
     """
     if user_update.password is not None:
         current_user.hashed_password = get_password_hash(user_update.password)

{{cookiecutter.project_name}}/app/api/endpoints/users.py

@@ -1,4 +1,5 @@
 import logging
+from asyncio import get_event_loop
 from typing import Optional
 
 from sqlalchemy import select
@@ -7,7 +8,6 @@
 from app.core.config import settings
 from app.models import User
 from app.session import async_session
-from asyncio import get_event_loop
 
 
 async def main() -> None:

{{cookiecutter.project_name}}/app/initial_data.py

@@ -1,2 +1,2 @@
-from .token import Token, TokenPayload
+from .token import Token, TokenPayload, TokenRefresh
 from .user import User, UserCreate, UserUpdate

{{cookiecutter.project_name}}/app/schemas/__init__.py

@@ -15,3 +15,7 @@ class Token(BaseModel):
 class TokenPayload(BaseModel):
     sub: Optional[int] = None
     refresh: Optional[bool] = None
+
+
+class TokenRefresh(BaseModel):
+    refresh_token: str