Security provider factory refactor

p1c2u · p1c2u · commit 82fe2cabc4ae · 2021-05-15T21:17:26.000+01:00
diff --git a/openapi_core/security/factories.py b/openapi_core/security/factories.py
@@ -8,12 +8,11 @@ class SecurityProviderFactory(object):
     PROVIDERS = {
         'apiKey': ApiKeyProvider,
         'http': HttpProvider,
+        'oauth2': UnsupportedProvider,
+        'openIdConnect': UnsupportedProvider,
     }
 
     def create(self, scheme):
         scheme_type = scheme['type']
-        if scheme_type == 'apiKey':
-            return ApiKeyProvider(scheme)
-        elif scheme_type == 'http':
-            return HttpProvider(scheme)
-        return UnsupportedProvider(scheme)
+        provider_class = self.PROVIDERS[scheme_type]
+        return provider_class(scheme)
diff --git a/tests/unit/security/test_providers.py b/tests/unit/security/test_providers.py
@@ -7,38 +7,33 @@
 
 class TestHttpProvider(object):
 
-    @pytest.fixture
-    def spec(self):
-        return {
-            'type': 'http',
-            'scheme': 'bearer',
-        }
-
-    @pytest.fixture
-    def scheme(self, spec):
-        return SpecPath.from_spec(spec)
-
-    @pytest.fixture
-    def provider(self, scheme):
-        return HttpProvider(scheme)
-
     @pytest.mark.parametrize(
         'header',
         ['authorization', 'Authorization', 'AUTHORIZATION'],
     )
-    def test_header(self, provider, header):
+    @pytest.mark.parametrize(
+        'scheme',
+        ['basic', 'bearer', 'digest'],
+    )
+    def test_header(self, header, scheme):
         """Tests HttpProvider against Issue29427
         https://bugs.python.org/issue29427
         """
-        jwt = 'MQ'
+        spec = {
+            'type': 'http',
+            'scheme': scheme,
+        }
+        value = 'MQ'
         headers = {
-            header: 'Bearer {0}'.format(jwt),
+            header: ' '.join([scheme.title(), value]),
         }
         request = MockRequest(
             'http://localhost', 'GET', '/pets',
             headers=headers,
         )
+        scheme = SpecPath.from_spec(spec)
+        provider = HttpProvider(scheme)
 
         result = provider(request)
 
-        assert result == jwt
+        assert result == value
