diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml index ef7c58ca..f40b9152 100644 --- a/.github/workflows/build_and_publish.yml +++ b/.github/workflows/build_and_publish.yml @@ -92,9 +92,11 @@ jobs: --env ROOT_PATH='/auth' \ --env EMAIL='${{ secrets.EMAIL }}' \ --env EMAIL_PASS='${{ secrets.EMAIL_PASS }}' \ + --env SMTP_PASS='${{ secrets.SMTP_PASS }}' \ --env ENABLED_AUTH_METHODS='${{ vars.ENABLED_AUTH_METHODS }}' \ - --env SMTP_HOST='mail.profcomff.com' \ - --env SMTP_PORT='465' \ + --env SMTP_HOST='${{ vars.SMTP_HOST }}' \ + --env SMTP_PORT='${{ vars.SMTP_PORT }}' \ + --env SMTP_LOGIN='${{ secrets.SMTP_LOGIN }}' \ --env APPLICATION_HOST='${{ vars.HOST }}' \ --env GOOGLE_REDIRECT_URL='${{ vars.GOOGLE_REDIRECT_URL }}' \ --env GOOGLE_CREDENTIALS='${{ secrets.GOOGLE_CREDENTIALS }}' \ @@ -190,9 +192,11 @@ jobs: --env ROOT_PATH='/auth' \ --env EMAIL='${{ secrets.EMAIL }}' \ --env EMAIL_PASS='${{ secrets.EMAIL_PASS }}' \ + --env SMTP_PASS='${{ secrets.SMTP_PASS }}' \ --env ENABLED_AUTH_METHODS='${{ vars.ENABLED_AUTH_METHODS }}' \ - --env SMTP_HOST='mail.profcomff.com' \ - --env SMTP_PORT='465' \ + --env SMTP_HOST='${{ vars.SMTP_HOST }}' \ + --env SMTP_PORT='${{ vars.SMTP_PORT }}' \ + --env SMTP_LOGIN='${{ secrets.SMTP_LOGIN }}' \ --env APPLICATION_HOST='${{ vars.HOST }}' \ --env GOOGLE_REDIRECT_URL='${{ vars.GOOGLE_REDIRECT_URL }}' \ --env GOOGLE_CREDENTIALS='${{ secrets.GOOGLE_CREDENTIALS }}' \ diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 6ae1a676..cbd53189 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -70,7 +70,7 @@ jobs: - uses: isort/isort-action@master with: requirementsFiles: "requirements.txt requirements.dev.txt" - - uses: psf/black@23.11.0 + - uses: psf/black@stable - name: Comment if linting failed if: failure() uses: thollander/actions-comment-pull-request@v2 diff --git a/auth_backend/__init__.py b/auth_backend/__init__.py index fa9c0989..ebcaeac8 100644 --- a/auth_backend/__init__.py +++ b/auth_backend/__init__.py @@ -1,4 +1,3 @@ import os - __version__ = os.getenv('APP_VERSION', 'dev') diff --git a/auth_backend/__main__.py b/auth_backend/__main__.py index 6d8bd9fa..1cd7a947 100644 --- a/auth_backend/__main__.py +++ b/auth_backend/__main__.py @@ -1,5 +1,4 @@ from auth_backend.cli.process import process - if __name__ == '__main__': process() diff --git a/auth_backend/admin/auth.py b/auth_backend/admin/auth.py index b6065633..487348cc 100644 --- a/auth_backend/admin/auth.py +++ b/auth_backend/admin/auth.py @@ -6,7 +6,6 @@ from auth_backend.settings import get_settings - settings = get_settings() diff --git a/auth_backend/auth_method/__init__.py b/auth_backend/auth_method/__init__.py index fe1ccccf..142640d7 100644 --- a/auth_backend/auth_method/__init__.py +++ b/auth_backend/auth_method/__init__.py @@ -5,7 +5,6 @@ from .session import Session from .userdata_mixin import UserdataMixin - __all__ = [ "Session", "AUTH_METHODS", diff --git a/auth_backend/auth_method/base.py b/auth_backend/auth_method/base.py index 6dc58aa7..d204e534 100644 --- a/auth_backend/auth_method/base.py +++ b/auth_backend/auth_method/base.py @@ -12,7 +12,6 @@ from auth_backend.models.db import AuthMethod, User, UserSession from auth_backend.settings import get_settings - logger = logging.getLogger(__name__) settings = get_settings() diff --git a/auth_backend/auth_method/oauth.py b/auth_backend/auth_method/oauth.py index 961e2767..9adabfbf 100644 --- a/auth_backend/auth_method/oauth.py +++ b/auth_backend/auth_method/oauth.py @@ -15,7 +15,6 @@ from .method_mixins import LoginableMixin, RegistrableMixin from .userdata_mixin import UserdataMixin - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_method/outer.py b/auth_backend/auth_method/outer.py index 26b1ab02..e2ba485b 100644 --- a/auth_backend/auth_method/outer.py +++ b/auth_backend/auth_method/outer.py @@ -12,7 +12,6 @@ from auth_backend.models.db import AuthMethod, UserSession from auth_backend.utils.security import UnionAuth - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/__init__.py b/auth_backend/auth_plugins/__init__.py index 480835a1..0b648632 100644 --- a/auth_backend/auth_plugins/__init__.py +++ b/auth_backend/auth_plugins/__init__.py @@ -16,7 +16,6 @@ from .vk import VkAuth from .yandex import YandexAuth - __all__ = [ "AUTH_METHODS", "AuthPluginMeta", diff --git a/auth_backend/auth_plugins/airflow.py b/auth_backend/auth_plugins/airflow.py index 6988011f..be723cf3 100644 --- a/auth_backend/auth_plugins/airflow.py +++ b/auth_backend/auth_plugins/airflow.py @@ -6,7 +6,6 @@ from auth_backend.auth_method.outer import ConnectionIssue, OuterAuthMeta from auth_backend.settings import Settings - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/authentic.py b/auth_backend/auth_plugins/authentic.py index 003c81bd..d19724dd 100644 --- a/auth_backend/auth_plugins/authentic.py +++ b/auth_backend/auth_plugins/authentic.py @@ -20,7 +20,6 @@ from auth_backend.settings import Settings from auth_backend.utils.security import UnionAuth - AUTH_METHOD_ID_PARAM_NAME = 'user_id' logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/coder.py b/auth_backend/auth_plugins/coder.py index 2c1ecef2..5a29cd5e 100644 --- a/auth_backend/auth_plugins/coder.py +++ b/auth_backend/auth_plugins/coder.py @@ -6,7 +6,6 @@ from auth_backend.auth_method.outer import ConnectionIssue, OuterAuthMeta from auth_backend.settings import Settings - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/email.py b/auth_backend/auth_plugins/email.py index abf0b3c2..799188aa 100644 --- a/auth_backend/auth_plugins/email.py +++ b/auth_backend/auth_plugins/email.py @@ -22,7 +22,6 @@ from auth_backend.utils.smtp import SendEmailMessage from auth_backend.utils.string import random_string - settings = get_settings() logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/github.py b/auth_backend/auth_plugins/github.py index 126168a5..5e82525c 100644 --- a/auth_backend/auth_plugins/github.py +++ b/auth_backend/auth_plugins/github.py @@ -18,7 +18,6 @@ from auth_backend.settings import Settings from auth_backend.utils.security import UnionAuth - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/google.py b/auth_backend/auth_plugins/google.py index 686eaa3d..a5e97e24 100644 --- a/auth_backend/auth_plugins/google.py +++ b/auth_backend/auth_plugins/google.py @@ -20,7 +20,6 @@ from auth_backend.settings import Settings from auth_backend.utils.security import UnionAuth - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/keycloak.py b/auth_backend/auth_plugins/keycloak.py index 6759f8c9..81a2e5a3 100644 --- a/auth_backend/auth_plugins/keycloak.py +++ b/auth_backend/auth_plugins/keycloak.py @@ -18,7 +18,6 @@ from auth_backend.settings import Settings from auth_backend.utils.security import UnionAuth - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/lkmsu.py b/auth_backend/auth_plugins/lkmsu.py index 4b170daa..bc9b9950 100644 --- a/auth_backend/auth_plugins/lkmsu.py +++ b/auth_backend/auth_plugins/lkmsu.py @@ -20,7 +20,6 @@ from auth_backend.utils.security import UnionAuth from auth_backend.utils.string import concantenate_strings - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/mailu.py b/auth_backend/auth_plugins/mailu.py index cd1eab58..7f88f613 100644 --- a/auth_backend/auth_plugins/mailu.py +++ b/auth_backend/auth_plugins/mailu.py @@ -6,7 +6,6 @@ from auth_backend.auth_method.outer import ConnectionIssue, OuterAuthMeta from auth_backend.settings import Settings - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/postgres.py b/auth_backend/auth_plugins/postgres.py index 94def5ba..12f5873a 100644 --- a/auth_backend/auth_plugins/postgres.py +++ b/auth_backend/auth_plugins/postgres.py @@ -10,7 +10,6 @@ from auth_backend.auth_method import OuterAuthMeta from auth_backend.settings import Settings - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/telegram.py b/auth_backend/auth_plugins/telegram.py index ad45be0b..a421eecb 100644 --- a/auth_backend/auth_plugins/telegram.py +++ b/auth_backend/auth_plugins/telegram.py @@ -20,7 +20,6 @@ from auth_backend.utils.security import UnionAuth from auth_backend.utils.string import concantenate_strings - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/vk.py b/auth_backend/auth_plugins/vk.py index 7bb2bdd8..5d06e6f3 100644 --- a/auth_backend/auth_plugins/vk.py +++ b/auth_backend/auth_plugins/vk.py @@ -20,7 +20,6 @@ from ..schemas.types.scopes import Scope - logger = logging.getLogger(__name__) diff --git a/auth_backend/auth_plugins/yandex.py b/auth_backend/auth_plugins/yandex.py index 96f1239f..d1d81753 100644 --- a/auth_backend/auth_plugins/yandex.py +++ b/auth_backend/auth_plugins/yandex.py @@ -19,7 +19,6 @@ from auth_backend.utils.security import UnionAuth from auth_backend.utils.string import concantenate_strings - logger = logging.getLogger(__name__) diff --git a/auth_backend/cli/process.py b/auth_backend/cli/process.py index 1c8357d7..0db371ff 100644 --- a/auth_backend/cli/process.py +++ b/auth_backend/cli/process.py @@ -11,7 +11,6 @@ from .user import create_user from .user_group import create_user_group - settings = get_settings() engine = create_engine(str(settings.DB_DSN)) Session = sessionmaker(bind=engine) diff --git a/auth_backend/kafka/kafka.py b/auth_backend/kafka/kafka.py index 7437e9e3..e11c1c90 100644 --- a/auth_backend/kafka/kafka.py +++ b/auth_backend/kafka/kafka.py @@ -9,7 +9,6 @@ from auth_backend.kafka.kafkameta import KafkaMeta from auth_backend.settings import get_settings - log = logging.getLogger(__name__) diff --git a/auth_backend/models/__init__.py b/auth_backend/models/__init__.py index 0531fd11..6d382725 100644 --- a/auth_backend/models/__init__.py +++ b/auth_backend/models/__init__.py @@ -2,5 +2,4 @@ from .db import AuthMethod, User, UserSession from .dynamic_settings import DynamicOption - __all__ = ["Base", "User", "UserSession", "AuthMethod", "DynamicOption"] diff --git a/auth_backend/models/db.py b/auth_backend/models/db.py index 3727d0cc..8b0786ba 100644 --- a/auth_backend/models/db.py +++ b/auth_backend/models/db.py @@ -15,7 +15,6 @@ from auth_backend.settings import get_settings from auth_backend.utils.user_session_basics import session_expires_date - settings = get_settings() logger = logging.getLogger(__name__) diff --git a/auth_backend/routes/__init__.py b/auth_backend/routes/__init__.py index 5e4fcb10..e53b88c8 100644 --- a/auth_backend/routes/__init__.py +++ b/auth_backend/routes/__init__.py @@ -1,5 +1,4 @@ from . import exc_handlers from .base import app - __all__ = ["app", "exc_handlers"] diff --git a/auth_backend/routes/groups.py b/auth_backend/routes/groups.py index 5ff507ad..cfc851c8 100644 --- a/auth_backend/routes/groups.py +++ b/auth_backend/routes/groups.py @@ -10,7 +10,6 @@ from auth_backend.schemas.models import Group, GroupGet, GroupPatch, GroupPost, GroupsGet from auth_backend.utils.security import UnionAuth - groups = APIRouter(prefix="/group", tags=["Groups"]) diff --git a/auth_backend/routes/oidc.py b/auth_backend/routes/oidc.py index 5ec56dc0..fda459c7 100644 --- a/auth_backend/routes/oidc.py +++ b/auth_backend/routes/oidc.py @@ -13,7 +13,6 @@ from auth_backend.utils.jwt import create_jwks from auth_backend.utils.oidc_token import OidcGrantType, token_by_client_credentials, token_by_refresh_token - settings = get_settings() router = APIRouter(prefix="/openid", tags=["OpenID"]) logger = logging.getLogger(__name__) diff --git a/auth_backend/routes/scopes.py b/auth_backend/routes/scopes.py index ba252b6d..937939dd 100644 --- a/auth_backend/routes/scopes.py +++ b/auth_backend/routes/scopes.py @@ -8,7 +8,6 @@ from auth_backend.schemas.models import ScopeGet, ScopePatch, ScopePost from auth_backend.utils.security import UnionAuth - scopes = APIRouter(prefix="/scope", tags=["Scopes"]) diff --git a/auth_backend/routes/user.py b/auth_backend/routes/user.py index 1e1ae254..f7897db8 100644 --- a/auth_backend/routes/user.py +++ b/auth_backend/routes/user.py @@ -23,7 +23,6 @@ ) from auth_backend.utils.security import UnionAuth - logger = logging.getLogger(__name__) user = APIRouter(prefix="/user", tags=["User"]) diff --git a/auth_backend/routes/user_session.py b/auth_backend/routes/user_session.py index 37927f73..ef844ff9 100644 --- a/auth_backend/routes/user_session.py +++ b/auth_backend/routes/user_session.py @@ -26,7 +26,6 @@ from auth_backend.utils import user_session_control from auth_backend.utils.security import UnionAuth - user_session = APIRouter(prefix="", tags=["User session"]) logger = logging.getLogger(__name__) diff --git a/auth_backend/settings.py b/auth_backend/settings.py index 388b2cb4..1e75ac99 100644 --- a/auth_backend/settings.py +++ b/auth_backend/settings.py @@ -29,8 +29,10 @@ class Settings(BaseSettings): EMAIL: str | None = None APPLICATION_HOST: str = "localhost" EMAIL_PASS: str | None = None + SMTP_PASS: str | None = None SMTP_HOST: str = 'smtp.gmail.com' SMTP_PORT: int = 587 + SMTP_LOGIN: str | None = None ENABLED_AUTH_METHODS: list[str] | None = None TOKEN_LENGTH: Annotated[int, Gt(8)] = 64 SESSION_TIME_IN_DAYS: int = 30 diff --git a/auth_backend/utils/jwt.py b/auth_backend/utils/jwt.py index 9221910f..dc7bf9c4 100644 --- a/auth_backend/utils/jwt.py +++ b/auth_backend/utils/jwt.py @@ -12,7 +12,6 @@ from auth_backend.settings import get_settings - settings = get_settings() diff --git a/auth_backend/utils/security.py b/auth_backend/utils/security.py index aa3eb103..135a0892 100644 --- a/auth_backend/utils/security.py +++ b/auth_backend/utils/security.py @@ -12,7 +12,6 @@ from auth_backend.utils.user_session_basics import session_expires_date from auth_backend.utils.user_session_control import SESSION_UPDATE_SCOPE - settings = get_settings() diff --git a/auth_backend/utils/smtp.py b/auth_backend/utils/smtp.py index 5d9a305d..6d47adcf 100644 --- a/auth_backend/utils/smtp.py +++ b/auth_backend/utils/smtp.py @@ -12,7 +12,6 @@ from auth_backend.models.db import UserMessageDelay from auth_backend.settings import Settings, get_settings - logger = logging.getLogger(__name__) @@ -115,8 +114,9 @@ def email_task(cls, to_email: str, file_name: str, subject: str, **kwargs): text = MIMEText(tmp, "html") msgAlternative.attach(text) - with smtplib.SMTP_SSL(cls.settings.SMTP_HOST, 465) as smtp: - smtp.login(cls.settings.EMAIL, cls.settings.EMAIL_PASS) + with smtplib.SMTP(cls.settings.SMTP_HOST, cls.settings.SMTP_PORT) as smtp: + smtp.starttls() + smtp.login(cls.settings.SMTP_LOGIN, cls.settings.SMTP_PASS) smtp.sendmail(cls.settings.EMAIL, to_email, message.as_string()) @classmethod diff --git a/auth_backend/utils/user_session_basics.py b/auth_backend/utils/user_session_basics.py index 9bfb938d..b3136cb7 100644 --- a/auth_backend/utils/user_session_basics.py +++ b/auth_backend/utils/user_session_basics.py @@ -2,7 +2,6 @@ from auth_backend.settings import get_settings - settings = get_settings() diff --git a/auth_backend/utils/user_session_control.py b/auth_backend/utils/user_session_control.py index 4f3b5255..b03be2e2 100644 --- a/auth_backend/utils/user_session_control.py +++ b/auth_backend/utils/user_session_control.py @@ -13,7 +13,6 @@ from auth_backend.utils.string import random_string from auth_backend.utils.user_session_basics import session_expires_date - SESSION_UPDATE_SCOPE = 'auth.session.update' settings = get_settings() diff --git a/migrations/env.py b/migrations/env.py index 6fd58532..4316dfb2 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -6,7 +6,6 @@ from auth_backend.models.base import Base from auth_backend.settings import get_settings - # this is the Alembic Config object, which provides # access to the values within the .ini file in use. config = context.config diff --git a/migrations/versions/2d29fc132e89_fix_base_users_group.py b/migrations/versions/2d29fc132e89_fix_base_users_group.py index a6841202..851e50c3 100644 --- a/migrations/versions/2d29fc132e89_fix_base_users_group.py +++ b/migrations/versions/2d29fc132e89_fix_base_users_group.py @@ -12,7 +12,6 @@ from auth_backend.models.db import Group, User - # revision identifiers, used by Alembic. revision = '2d29fc132e89' down_revision = 'dcb89e72d446' diff --git a/migrations/versions/586cf0e784e5_scopes.py b/migrations/versions/586cf0e784e5_scopes.py index d3d65185..e4b8c0c9 100644 --- a/migrations/versions/586cf0e784e5_scopes.py +++ b/migrations/versions/586cf0e784e5_scopes.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '586cf0e784e5' down_revision = 'b07c0ca33c2b' diff --git a/migrations/versions/5d71a2a2405d_verified_user_group.py b/migrations/versions/5d71a2a2405d_verified_user_group.py index f80b69ab..74162cbf 100644 --- a/migrations/versions/5d71a2a2405d_verified_user_group.py +++ b/migrations/versions/5d71a2a2405d_verified_user_group.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '5d71a2a2405d' down_revision = '2d29fc132e89' diff --git a/migrations/versions/6c27352ee53b_unique_scopes.py b/migrations/versions/6c27352ee53b_unique_scopes.py index b3626953..972cf24c 100644 --- a/migrations/versions/6c27352ee53b_unique_scopes.py +++ b/migrations/versions/6c27352ee53b_unique_scopes.py @@ -7,7 +7,6 @@ from alembic import op - revision = '6c27352ee53b' down_revision = '586cf0e784e5' branch_labels = None diff --git a/migrations/versions/6dffd8e42152_193_add_unbounded_sessions.py b/migrations/versions/6dffd8e42152_193_add_unbounded_sessions.py index d2940e86..0c8d5d3c 100644 --- a/migrations/versions/6dffd8e42152_193_add_unbounded_sessions.py +++ b/migrations/versions/6dffd8e42152_193_add_unbounded_sessions.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = '6dffd8e42152' down_revision = '2d29fc132e89' diff --git a/migrations/versions/7c1cd7ceacd8_dynamic_option_model.py b/migrations/versions/7c1cd7ceacd8_dynamic_option_model.py index 466c8e7f..96a9bb75 100644 --- a/migrations/versions/7c1cd7ceacd8_dynamic_option_model.py +++ b/migrations/versions/7c1cd7ceacd8_dynamic_option_model.py @@ -12,7 +12,6 @@ from auth_backend.models.db import Group, Scope, User - # revision identifiers, used by Alembic. revision = '7c1cd7ceacd8' down_revision = 'bda218c91211' diff --git a/migrations/versions/b07c0ca33c2b_groups.py b/migrations/versions/b07c0ca33c2b_groups.py index ecf93169..efccc85e 100644 --- a/migrations/versions/b07c0ca33c2b_groups.py +++ b/migrations/versions/b07c0ca33c2b_groups.py @@ -10,7 +10,6 @@ from alembic import op from sqlalchemy.dialects import postgresql - # revision identifiers, used by Alembic. revision = 'b07c0ca33c2b' down_revision = 'bd7ac9cbdfc8' diff --git a/migrations/versions/bd7ac9cbdfc8_init.py b/migrations/versions/bd7ac9cbdfc8_init.py index 74a6285d..9cc09b55 100644 --- a/migrations/versions/bd7ac9cbdfc8_init.py +++ b/migrations/versions/bd7ac9cbdfc8_init.py @@ -3,7 +3,6 @@ import sqlalchemy as sa from alembic import op - revision = 'bd7ac9cbdfc8' down_revision = None branch_labels = None diff --git a/migrations/versions/bda218c91211_user_session_ts.py b/migrations/versions/bda218c91211_user_session_ts.py index 564b3441..d69ec9d5 100644 --- a/migrations/versions/bda218c91211_user_session_ts.py +++ b/migrations/versions/bda218c91211_user_session_ts.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'bda218c91211' down_revision = 'fa4691ad1054' diff --git a/migrations/versions/c03c6b509881_rollback_unique_scopes.py b/migrations/versions/c03c6b509881_rollback_unique_scopes.py index 8d3ac576..3c5b9098 100644 --- a/migrations/versions/c03c6b509881_rollback_unique_scopes.py +++ b/migrations/versions/c03c6b509881_rollback_unique_scopes.py @@ -8,7 +8,6 @@ from alembic import op - revision = 'c03c6b509881' down_revision = '6c27352ee53b' branch_labels = None diff --git a/migrations/versions/dcb89e72d446_session_security_scopes.py b/migrations/versions/dcb89e72d446_session_security_scopes.py index 033b8bea..fe6f050a 100644 --- a/migrations/versions/dcb89e72d446_session_security_scopes.py +++ b/migrations/versions/dcb89e72d446_session_security_scopes.py @@ -9,7 +9,6 @@ from alembic import op from sqlalchemy.sql import text - # revision identifiers, used by Alembic. revision = 'dcb89e72d446' down_revision = '7c1cd7ceacd8' diff --git a/migrations/versions/fa4691ad1054_email_delay.py b/migrations/versions/fa4691ad1054_email_delay.py index 90dd32c0..b34233f6 100644 --- a/migrations/versions/fa4691ad1054_email_delay.py +++ b/migrations/versions/fa4691ad1054_email_delay.py @@ -9,7 +9,6 @@ import sqlalchemy as sa from alembic import op - # revision identifiers, used by Alembic. revision = 'fa4691ad1054' down_revision = 'c03c6b509881' diff --git a/pyproject.toml b/pyproject.toml index 2368eb97..7be5d91c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,12 +1,12 @@ [tool.black] line-length = 120 -target-version = ['py310'] +target-version = ['py311'] skip-string-normalization = true [tool.isort] line_length = 120 multi_line_output = 3 -lines_after_imports = 2 +profile = "black" include_trailing_comma = true [tool.pytest.ini_options] diff --git a/requirements.dev.txt b/requirements.dev.txt index 4827b7dc..0436cc34 100644 --- a/requirements.dev.txt +++ b/requirements.dev.txt @@ -3,6 +3,6 @@ pytest-cov requests httpx flake8 -black==23.11.0 +black autoflake isort diff --git a/tests/test_routes/test_change_email.py b/tests/test_routes/test_change_email.py index b15e59e9..4e239807 100644 --- a/tests/test_routes/test_change_email.py +++ b/tests/test_routes/test_change_email.py @@ -6,7 +6,6 @@ from auth_backend.models.db import AuthMethod, UserSession - url = "/email/reset/email" diff --git a/tests/test_routes/test_change_password.py b/tests/test_routes/test_change_password.py index da6925a8..df03504f 100644 --- a/tests/test_routes/test_change_password.py +++ b/tests/test_routes/test_change_password.py @@ -5,7 +5,6 @@ from auth_backend.auth_plugins.email import Email from auth_backend.models.db import AuthMethod - url = "/email/reset/password" diff --git a/tests/test_routes/test_delete_last_auth_method.py b/tests/test_routes/test_delete_last_auth_method.py index a3e3836c..fe38781e 100644 --- a/tests/test_routes/test_delete_last_auth_method.py +++ b/tests/test_routes/test_delete_last_auth_method.py @@ -4,7 +4,6 @@ from auth_backend.exceptions import LastAuthMethodDelete from auth_backend.settings import get_settings - pytest_plugins = ('pytest_asyncio',) settings = get_settings() diff --git a/tests/test_routes/test_email_message_delay.py b/tests/test_routes/test_email_message_delay.py index ebc9b9de..9d6cd3a0 100644 --- a/tests/test_routes/test_email_message_delay.py +++ b/tests/test_routes/test_email_message_delay.py @@ -5,7 +5,6 @@ from auth_backend.models.db import AuthMethod, User from auth_backend.settings import get_settings - settings = get_settings() diff --git a/tests/test_routes/test_login.py b/tests/test_routes/test_login.py index 111e8242..c4e4fcce 100644 --- a/tests/test_routes/test_login.py +++ b/tests/test_routes/test_login.py @@ -6,7 +6,6 @@ from auth_backend.models.db import AuthMethod, Group, GroupScope, Scope, User, UserGroup, UserSession - url = "/email/login" diff --git a/tests/test_routes/test_logout.py b/tests/test_routes/test_logout.py index ae99a68c..9a979a34 100644 --- a/tests/test_routes/test_logout.py +++ b/tests/test_routes/test_logout.py @@ -6,7 +6,6 @@ from auth_backend.models.db import AuthMethod, User, UserSession - url = "/logout" diff --git a/tests/test_routes/test_oidc.py b/tests/test_routes/test_oidc.py index 3e9519ef..2037308d 100644 --- a/tests/test_routes/test_oidc.py +++ b/tests/test_routes/test_oidc.py @@ -7,7 +7,6 @@ from auth_backend.models.db import AuthMethod from auth_backend.settings import get_settings - settings = get_settings() diff --git a/tests/test_routes/test_registration.py b/tests/test_routes/test_registration.py index 6326c366..169f44a6 100644 --- a/tests/test_routes/test_registration.py +++ b/tests/test_routes/test_registration.py @@ -8,7 +8,6 @@ from auth_backend.models.db import AuthMethod, User, UserSession - url = "/email/registration" diff --git a/tests/test_routes/test_user_sessions.py b/tests/test_routes/test_user_sessions.py index 8fc934cb..09f4c2af 100644 --- a/tests/test_routes/test_user_sessions.py +++ b/tests/test_routes/test_user_sessions.py @@ -7,7 +7,6 @@ from auth_backend.models.db import Group, GroupScope, Scope, UserGroup, UserSession, UserSessionScope - logger = logging.getLogger(__name__) diff --git a/tests/test_unit/test_jwt.py b/tests/test_unit/test_jwt.py index 714b5cf7..8e694fc6 100644 --- a/tests/test_unit/test_jwt.py +++ b/tests/test_unit/test_jwt.py @@ -5,7 +5,6 @@ from auth_backend.settings import get_settings from auth_backend.utils.jwt import create_jwks, decode_jwt, generate_jwt - settings = get_settings() diff --git a/tests/test_unit/test_update_user.py b/tests/test_unit/test_update_user.py index a2e3ebe9..66501601 100644 --- a/tests/test_unit/test_update_user.py +++ b/tests/test_unit/test_update_user.py @@ -5,7 +5,6 @@ from auth_backend.auth_method import AUTH_METHODS, AuthPluginMeta - if TYPE_CHECKING: from unittest.mock import _patch_default_new as patch_type