Moved duplicated code portion to the staticmethod in the super class

ShahriyarR · ShahriyarR · commit 4a80d029a6ac · 2021-04-29T11:24:18.000+04:00
diff --git a/fastapi/security/api_key.py b/fastapi/security/api_key.py
@@ -8,7 +8,17 @@
 
 
 class APIKeyBase(SecurityBase):
-    pass
+
+    @staticmethod
+    def check_api_key(api_key: str, auto_error: bool) -> Optional[str]:
+        if not api_key:
+            if auto_error:
+                raise HTTPException(
+                    status_code=HTTP_403_FORBIDDEN, detail="Not authenticated"
+                )
+            else:
+                return None
+        return api_key
 
 
 class APIKeyQuery(APIKeyBase):
@@ -21,14 +31,7 @@ def __init__(
 
     async def __call__(self, request: Request) -> Optional[str]:
         api_key: str = request.query_params.get(self.model.name)
-        if not api_key:
-            if self.auto_error:
-                raise HTTPException(
-                    status_code=HTTP_403_FORBIDDEN, detail="Not authenticated"
-                )
-            else:
-                return None
-        return api_key
+        return self.check_api_key(api_key, self.auto_error)
 
 
 class APIKeyHeader(APIKeyBase):
@@ -41,14 +44,7 @@ def __init__(
 
     async def __call__(self, request: Request) -> Optional[str]:
         api_key: str = request.headers.get(self.model.name)
-        if not api_key:
-            if self.auto_error:
-                raise HTTPException(
-                    status_code=HTTP_403_FORBIDDEN, detail="Not authenticated"
-                )
-            else:
-                return None
-        return api_key
+        return self.check_api_key(api_key, self.auto_error)
 
 
 class APIKeyCookie(APIKeyBase):
@@ -60,12 +56,5 @@ def __init__(
         self.auto_error = auto_error
 
     async def __call__(self, request: Request) -> Optional[str]:
-        api_key = request.cookies.get(self.model.name)
-        if not api_key:
-            if self.auto_error:
-                raise HTTPException(
-                    status_code=HTTP_403_FORBIDDEN, detail="Not authenticated"
-                )
-            else:
-                return None
-        return api_key
+        api_key: str = request.cookies.get(self.model.name)
+        return self.check_api_key(api_key, self.auto_error)
