Cleanup security imports

connexion/apis/aiohttp_api.py

@@ -18,8 +18,7 @@
 from connexion.lifecycle import ConnexionRequest, ConnexionResponse
 from connexion.problem import problem
 from connexion.utils import yamldumper
-from connexion.security.aiohttp_security_handlers_factory import \
-    AioHttpSecurityHandlerFactory
+from connexion.security import AioHttpSecurityHandlerFactory
 from werkzeug.exceptions import HTTPException as werkzeug_HTTPException
 
 

connexion/apis/flask_api.py

@@ -9,8 +9,7 @@
 from connexion.jsonifier import Jsonifier
 from connexion.lifecycle import ConnexionRequest, ConnexionResponse
 from connexion.utils import is_json_mimetype, yamldumper
-from connexion.security.flask_security_handler_factory import \
-    FlaskSecurityHandlerFactory
+from connexion.security import FlaskSecurityHandlerFactory
 from werkzeug.local import LocalProxy
 
 logger = logging.getLogger('connexion.apis.flask_api')

connexion/security/__init__.py

@@ -1 +1,7 @@
-from .security_handler_factory import SecurityHandlerFactory  # NOQA
+# abstract
+from .security_handler_factory import AbstractSecurityHandlerFactory  # NOQA
+from .async_security_handler_factory import AbstractAsyncSecurityHandlerFactory  # NOQA
+
+# concrete
+from .flask_security_handler_factory import FlaskSecurityHandlerFactory  # NOQA
+from .aiohttp_security_handler_factory import AioHttpSecurityHandlerFactory  # NOQA

connexion/security/aiohttp_security_handler_factory.py

@@ -3,14 +3,14 @@
 
 import aiohttp
 
-from .async_security_handler_factory import AsyncSecurityHandlerFactory
+from .async_security_handler_factory import AbstractAsyncSecurityHandlerFactory
 
 logger = logging.getLogger('connexion.api.security')
 
 
-class AioHttpSecurityHandlerFactory(AsyncSecurityHandlerFactory):
+class AioHttpSecurityHandlerFactory(AbstractAsyncSecurityHandlerFactory):
     def __init__(self, pass_context_arg_name):
-        AioHttpSecurityHandlerFactory.__init__(self, pass_context_arg_name)
+        super(AioHttpSecurityHandlerFactory, self).__init__(pass_context_arg_name=pass_context_arg_name)
         self.client_session = None
 
     def get_token_info_remote(self, token_info_url):

connexion/security/async_security_handler_factory.py

@@ -6,12 +6,12 @@
 import aiohttp
 
 from ..exceptions import OAuthProblem, OAuthResponseProblem, OAuthScopeProblem
-from .security_handler_factory import SecurityHandlerFactory
+from .security_handler_factory import AbstractSecurityHandlerFactory
 
 logger = logging.getLogger('connexion.api.security')
 
 
-class AsyncSecurityHandlerFactory(SecurityHandlerFactory):
+class AbstractAsyncSecurityHandlerFactory(AbstractSecurityHandlerFactory):
     def _generic_check(self, func, exception_msg):
         need_to_add_context, need_to_add_required_scopes = self._need_to_add_context_or_scopes(func)
 

connexion/security/flask_security_handler_factory.py

@@ -1,6 +1,6 @@
 import requests
 
-from .security_handler_factory import SecurityHandlerFactory
+from .security_handler_factory import AbstractSecurityHandlerFactory
 
 # use connection pool for OAuth tokeninfo
 adapter = requests.adapters.HTTPAdapter(pool_connections=100, pool_maxsize=100)
@@ -9,10 +9,7 @@
 session.mount('https://', adapter)
 
 
-class FlaskSecurityHandlerFactory(SecurityHandlerFactory):
-    def __init__(self, pass_context_arg_name):
-        SecurityHandlerFactory.__init__(self, pass_context_arg_name)
-
+class FlaskSecurityHandlerFactory(AbstractSecurityHandlerFactory):
     def get_token_info_remote(self, token_info_url):
         """
         Return a function which will call `token_info_url` to retrieve token info.

connexion/security/security_handler_factory.py

@@ -15,7 +15,7 @@
 logger = logging.getLogger('connexion.api.security')
 
 
-class SecurityHandlerFactory:
+class AbstractSecurityHandlerFactory(abc.ABC):
     no_value = object()
     required_scopes_kw = 'required_scopes'
 

tests/conftest.py

@@ -6,8 +6,7 @@
 import pytest
 
 from connexion import App
-from connexion.security.flask_security_handler_factory import \
-    FlaskSecurityHandlerFactory
+from connexion.security import FlaskSecurityHandlerFactory
 
 logging.basicConfig(level=logging.DEBUG)