Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix stream unsetting auth #1312

Merged
merged 4 commits into from Sep 23, 2020
Merged

Fix stream unsetting auth #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fcaefa
Fix ASGITransport path escaping
tomchristie Sep 23, 2020
a036d00
Add failing test case for auth with streaming
tomchristie Sep 23, 2020
17cd643
Merge branch 'master' into fix-stream-unsetting-auth
tomchristie Sep 23, 2020
385519d
Fix .stream setting auth=None
tomchristie Sep 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions httpx/_client.py
View file
Open in desktop
Expand Up @@ -234,7 +234,7 @@ def stream(
params: QueryParamTypes = None,
headers: HeaderTypes = None,
cookies: CookieTypes = None,
auth: AuthTypes = None,
auth: typing.Union[AuthTypes, UnsetType] = UNSET,
allow_redirects: bool = True,
timeout: typing.Union[TimeoutTypes, UnsetType] = UNSET,
) -> "StreamContextManager":
Expand Down Expand Up @@ -1786,7 +1786,7 @@ def __init__(
client: BaseClient,
request: Request,
*,
auth: AuthTypes = None,
auth: typing.Union[AuthTypes, UnsetType] = UNSET,
allow_redirects: bool = True,
timeout: typing.Union[TimeoutTypes, UnsetType] = UNSET,
close_client: bool = False,
Expand Down
17 changes: 17 additions & 0 deletions tests/client/test_auth.py
View file
Open in desktop
Expand Up @@ -162,6 +162,23 @@ async def test_basic_auth() -> None:
assert response.json() == {"auth": "Basic dG9tY2hyaXN0aWU6cGFzc3dvcmQxMjM="}


@pytest.mark.asyncio
async def test_basic_auth_with_stream() -> None:
"""
See: https://github.com/encode/httpx/pull/1312
"""
url = "https://example.org/"
auth = ("tomchristie", "password123")
app = App()

async with httpx.AsyncClient(transport=MockTransport(app), auth=auth) as client:
async with client.stream("GET", url) as response:
response.read()

assert response.status_code == 200
assert response.json() == {"auth": "Basic dG9tY2hyaXN0aWU6cGFzc3dvcmQxMjM="}


@pytest.mark.asyncio
async def test_basic_auth_in_url() -> None:
url = "https://tomchristie:password123@example.org/"
Expand Down