extra/cookies - cleanups

Author: commonism

aiopenapi3/extra/cookies.py

@@ -21,11 +21,9 @@ def __init__(self, ctx: aiopenapi3.plugin.Message.Context) -> None:
             self.ctx = ctx
 
         def add_unredirected_header(self, key: str, value: str) -> None:
-            if key.lower() == "cookie":
-                name, _, value = value.partition("=")
-                self.ctx.cookies[name] = value
-            else:
-                self.ctx.headers[key] = value
+            assert key.lower() == "cookie"
+            name, _, value = value.partition("=")
+            self.ctx.cookies[name] = value
 
     class _Response:
         """
@@ -45,22 +43,23 @@ def info(self) -> email.message.Message:
     def __init__(
         self, cookiejar: http.cookiejar.CookieJar = None, policy: Literal["jar", "securitySchemes"] = "jar"
     ) -> None:
-        self.cookiejar = cookiejar or http.cookiejar.CookieJar()
-        self.policy = policy
-        self.schemes: dict[str, str] = None
+        self.cookiejar: http.cookiejar.CookieJar = cookiejar or http.cookiejar.CookieJar()
+        self.policy: Literal["jar", "securitySchemes"] = policy
+        self.schemes: dict[str, str] = dict()
+
+        if policy not in ["jar", "securitySchemes"]:
+            raise ValueError(f"policy {self.policy} is not a valid policy")
+
         super().__init__()
 
     def initialized(self, ctx: "aiopenapi3.plugin.Init.Context") -> "aiopenapi3.plugin.Init.Context":
-        if self.policy in ["securitySchemes", "jar"]:
-            self.schemes = {
-                v.root.name: k
-                for k, v in filter(
-                    lambda x: (x[1].root.type.lower(), x[1].root.in_) == ("apikey", "cookie"),
-                    self.api.components.securitySchemes.items(),
-                )
-            }
-        else:
-            raise ValueError(f"policy {self.policy} is not a valid policy")
+        self.schemes = {
+            v.root.name: k
+            for k, v in filter(
+                lambda x: (x[1].root.type.lower(), x[1].root.in_) == ("apikey", "cookie"),
+                self.api.components.securitySchemes.items(),
+            )
+        }
         return ctx
 
     def received(self, ctx: "aiopenapi3.plugin.Message.Context") -> "aiopenapi3.plugin.Message.Context":

tests/extra_test.py

@@ -239,9 +239,4 @@ def test_cookies(httpx_mock, with_extra_cookie, cookie):
 
 def test_cookies_policy(with_extra_cookie):
     with pytest.raises(ValueError, match="policy … is not a valid policy"):
-        OpenAPI(
-            "http://127.0.0.1/api.yaml",
-            with_extra_cookie,
-            session_factory=httpx.Client,
-            plugins=[Cookies(policy="…")],
-        )
+        Cookies(policy="…")