[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

authenticator/api/magic_links/routes.py

@@ -5,11 +5,11 @@
 from flask import current_app, g, redirect, request, url_for
 from flask.views import MethodView
 from fsd_utils.authentication.decorators import login_requested
+from models.account import AccountMethods
+from models.magic_link import MagicLinkMethods
 
 from api.session.auth_session import AuthSessionView
 from config import Config
-from models.account import AccountMethods
-from models.magic_link import MagicLinkMethods
 
 
 class MagicLinksView(MagicLinkMethods, MethodView):

authenticator/api/session/auth_session.py

@@ -5,12 +5,12 @@
 from flask import abort, current_app, make_response, redirect, request, session, url_for
 from flask.views import MethodView
 from fsd_utils import clear_sentry
+from models.magic_link import MagicLinkMethods
+from security.utils import create_token, decode_with_options, validate_token
 
 from api.responses import error_response
 from api.session.exceptions import SessionCreateError
 from config import Config
-from models.magic_link import MagicLinkMethods
-from security.utils import create_token, decode_with_options, validate_token
 
 if TYPE_CHECKING:
     from models.account import Account as Account

authenticator/api/sso/routes.py

@@ -5,10 +5,10 @@
 from flask import abort, current_app, make_response, redirect, request, session
 from flask.views import MethodView
 from fsd_utils import clear_sentry
+from models.account import AccountMethods
 
 from api.session.auth_session import AuthSessionView
 from config import Config
-from models.account import AccountMethods
 
 
 class SsoView(MethodView):

authenticator/app.py

@@ -6,25 +6,25 @@
 
 import connexion
 import prance
+import static_assets
 from connexion.resolver import MethodViewResolver
 from flask import Flask, request
 from flask_assets import Environment
 from flask_babel import Babel, gettext
 from flask_redis import FlaskRedis
 from flask_session import Session
 from flask_talisman import Talisman
+from frontend.magic_links.filters import datetime_format
 from fsd_utils import LanguageSelector, init_sentry
 from fsd_utils.healthchecks.checkers import FlaskRunningChecker, RedisChecker
 from fsd_utils.healthchecks.healthcheck import Healthcheck
 from fsd_utils.locale_selector.get_lang import get_lang
 from fsd_utils.logging import logging
 from fsd_utils.services.aws_extended_client import SQSExtendedClient
 from jinja2 import ChoiceLoader, PackageLoader, PrefixLoader
+from models.fund import FundMethods
 
-import static_assets
 from config import Config
-from frontend.magic_links.filters import datetime_format
-from models.fund import FundMethods
 
 redis_mlinks = FlaskRedis(config_prefix="REDIS_MLINKS")
 

authenticator/frontend/magic_links/routes.py

@@ -1,16 +1,16 @@
 import uuid
 
 from flask import Blueprint, abort, current_app, g, redirect, render_template, request, url_for
-from fsd_utils.authentication.decorators import login_requested
-
-from config import Config
 from frontend.magic_links.forms import EmailForm
+from fsd_utils.authentication.decorators import login_requested
 from models.account import AccountError, AccountMethods
 from models.data import get_round_data
 from models.fund import FundMethods
 from models.magic_link import MagicLinkError, MagicLinkMethods
 from models.notification import NotificationError
 
+from config import Config
+
 magic_links_bp = Blueprint(
     "magic_links_bp",
     __name__,

authenticator/models/magic_link.py

@@ -10,9 +10,9 @@
 
 from flask import current_app
 from flask_redis import FlaskRedis
+from security.utils import create_token
 
 from config import Config
-from security.utils import create_token
 
 if TYPE_CHECKING:
     from models.account import Account as Account

authenticator/tests/conftest.py

@@ -1,10 +1,10 @@
 import pytest
 from flask import current_app
-
-from app import create_app
 from models.account import AccountMethods
 from testing.mocks.mocks import *  # noqa
 
+from app import create_app
+
 
 @pytest.fixture
 def app_context():

authenticator/tests/test_account.py

@@ -1,5 +1,4 @@
 import pytest
-
 from models.account import Account, AccountMethods
 from models.fund import Fund
 from models.round import Round

authenticator/tests/test_filters.py

@@ -1,6 +1,6 @@
+import frontend.magic_links.filters as filters
 import pytest
 
-import frontend.magic_links.filters as filters
 from app import app
 
 

authenticator/tests/test_fund.py

@@ -1,8 +1,9 @@
 from unittest import mock
 
+from models.fund import Fund, FundMethods
+
 from config.envs.default import DefaultConfig
 from config.envs.unit_test import UnitTestConfig
-from models.fund import Fund, FundMethods
 
 
 class TestFund:

authenticator/tests/test_magic_links.py

@@ -5,16 +5,16 @@
 import unittest.mock
 from unittest import mock
 
-import pytest
-from bs4 import BeautifulSoup
-
 import frontend
+import pytest
 from api.session.auth_session import AuthSessionView
-from app import app
+from bs4 import BeautifulSoup
 from frontend.magic_links.forms import EmailForm
 from models.account import AccountMethods
 from security.utils import validate_token
 
+from app import app
+
 
 @pytest.mark.usefixtures("flask_test_client")
 @pytest.mark.usefixtures("mock_redis_magic_links")

authenticator/tests/test_notification.py

@@ -4,9 +4,8 @@
 import boto3
 import pytest
 from fsd_utils.services.aws_extended_client import SQSExtendedClient
-from moto import mock_aws
-
 from models.notification import Config, Notification, NotificationError
+from moto import mock_aws
 
 
 @pytest.fixture

authenticator/tests/test_security.py

@@ -7,7 +7,6 @@
 import pytest
 from jwt import decode
 from jwt.exceptions import ExpiredSignatureError, InvalidSignatureError
-
 from security.utils import create_token, validate_token
 
 

authenticator/tests/test_signout.py

@@ -6,9 +6,9 @@
 
 import pytest
 from bs4 import BeautifulSoup
+from security.utils import create_token, validate_token
 
 from config.envs.default import SafeAppConfig
-from security.utils import create_token, validate_token
 
 
 @pytest.mark.usefixtures("flask_test_client")

authenticator/tests/test_signout_get.py

@@ -5,9 +5,9 @@
 from unittest.mock import PropertyMock, patch
 
 import pytest
+from security.utils import validate_token
 
 from config.envs.default import SafeAppConfig
-from security.utils import validate_token
 
 
 @pytest.mark.usefixtures("flask_test_client")

authenticator/tests/test_sso.py

@@ -1,7 +1,6 @@
 import pytest
 from flask import session
 from fsd_utils.authentication.utils import validate_token_rs256
-
 from testing.mocks.mocks.msal import (
     ConfidentialClientApplication,
     HijackedConfidentialClientApplication,

messages.pot

@@ -3872,4 +3872,3 @@ msgstr ""
 #: apply/templates/apply/partials/tasklist_submit.html:12
 msgid "Submit your application"
 msgstr ""
-

translations/cy/LC_MESSAGES/messages.po

@@ -4705,4 +4705,3 @@ msgstr "Cyflwyno'ch cais"
 #~ " atodiadau drwy e-bost. Dim ond "
 #~ "drwy'r gwasanaeth hwn y byddwn yn "
 #~ "derbyn ceisiadau."
-