From 7ce756f9ddd6fef6f51af2129f2a9e4c93df7166 Mon Sep 17 00:00:00 2001
From: obataku <19821199+obataku@users.noreply.github.com>
Date: Sat, 13 Jun 2020 08:44:51 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20duplicated=20headers=20set?=
 =?UTF-8?q?=20by=20indirect=20dependencies=20(#1386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Added test for repeating cookies in response headers

* update `response` headers, status code to match `sub_response` in `solve_dependencies` only if necessary; fix formatting of scottsmith2gmail's test

* restore code coverage, remove dead code from `solve_dependencies`

Co-authored-by: Scott Smith <scott.smith.2@gmail.com>
---
 fastapi/dependencies/utils.py         |  6 +----
 tests/test_repeated_cookie_headers.py | 34 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 tests/test_repeated_cookie_headers.py

diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
index 5ad5d4269..493977355 100644
--- a/fastapi/dependencies/utils.py
+++ b/fastapi/dependencies/utils.py
@@ -514,13 +514,9 @@ async def solve_dependencies(
             sub_values,
             sub_errors,
             background_tasks,
-            sub_response,
+            _,  # the subdependency returns the same response we have
             sub_dependency_cache,
         ) = solved_result
-        sub_response = cast(Response, sub_response)
-        response.headers.raw.extend(sub_response.headers.raw)
-        if sub_response.status_code:
-            response.status_code = sub_response.status_code
         dependency_cache.update(sub_dependency_cache)
         if sub_errors:
             errors.extend(sub_errors)
diff --git a/tests/test_repeated_cookie_headers.py b/tests/test_repeated_cookie_headers.py
new file mode 100644
index 000000000..4a1913a08
--- /dev/null
+++ b/tests/test_repeated_cookie_headers.py
@@ -0,0 +1,34 @@
+from fastapi import Depends, FastAPI, Response
+from fastapi.testclient import TestClient
+
+app = FastAPI()
+
+
+def set_cookie(*, response: Response):
+    response.set_cookie("cookie-name", "cookie-value")
+    return {}
+
+
+def set_indirect_cookie(*, dep: str = Depends(set_cookie)):
+    return dep
+
+
+@app.get("/directCookie")
+def get_direct_cookie(dep: str = Depends(set_cookie)):
+    return {"dep": dep}
+
+
+@app.get("/indirectCookie")
+def get_indirect_cookie(dep: str = Depends(set_indirect_cookie)):
+    return {"dep": dep}
+
+
+client = TestClient(app)
+
+
+def test_cookie_is_set_once():
+    direct_response = client.get("/directCookie")
+    indirect_response = client.get("/indirectCookie")
+    assert (
+        direct_response.headers["set-cookie"] == indirect_response.headers["set-cookie"]
+    )