Skip to content

feat: Add support for cookie parameters #326

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.

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

Merged
merged 4 commits into from
Feb 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixes `Enum` deserialization when the value is `UNSET`.
- Add handling of application/vnd.api+json media type.
- Support passing models into query parameters (#316). Thanks @forest-benchling!
- Add support for cookie parameters (#326).

### Changes

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
from typing import Optional

import httpx

from ...types import Response

Client = httpx.Client


def _parse_response(*, response: httpx.Response) -> Optional[Union[None, None]]:
if response.status_code == 200:
response_200 = None

return response_200
if response.status_code == 401:
response_401 = None

return response_401
return None


def _build_response(*, response: httpx.Response) -> Response[Union[None, None]]:
return Response(
status_code=response.status_code,
content=response.content,
headers=response.headers,
parsed=_parse_response(response=response),
)


def httpx_request(
*,
client: Client,
my_token: str,
) -> Response[Union[None, None]]:

response = client.request(
"get",
"/auth/token_with_cookie",
)

return _build_response(response=response)
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def _get_kwargs(
url = "{}/tests/defaults".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

json_datetime_prop: Union[Unset, str] = UNSET
if not isinstance(datetime_prop, Unset):
Expand Down Expand Up @@ -94,7 +95,7 @@ def _get_kwargs(
return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"params": params,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ def _get_kwargs(
url = "{}/tests/basic_lists/booleans".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ def _get_kwargs(
url = "{}/tests/basic_lists/floats".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ def _get_kwargs(
url = "{}/tests/basic_lists/integers".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ def _get_kwargs(
url = "{}/tests/basic_lists/strings".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def _get_kwargs(
url = "{}/tests/".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

json_an_enum_value = []
for an_enum_value_item_data in an_enum_value:
Expand All @@ -40,7 +41,7 @@ def _get_kwargs(
return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"params": params,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ def _get_kwargs(
url = "{}/tests/int_enum".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

json_int_enum = int_enum.value

Expand All @@ -27,7 +28,7 @@ def _get_kwargs(
return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"params": params,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ def _get_kwargs(
url = "{}/tests/json_body".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

json_json_body = json_body.to_dict()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"json": json_json_body,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ def _get_kwargs(
url = "{}/tests/no_response".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ def _get_kwargs(
url = "{}/tests/octet_stream".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ def _get_kwargs(
url = "{}/tests/optional_query_param/".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

json_query_param: Union[Unset, List[Any]] = UNSET
if not isinstance(query_param, Unset):
Expand All @@ -28,7 +29,7 @@ def _get_kwargs(
return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"params": params,
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ def _get_kwargs(
url = "{}/tests/inline_objects".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

json_json_body = json_body.to_dict()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"json": json_json_body,
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
from typing import Any, Dict, Optional, Union

import httpx

from ...client import Client
from ...types import Response


def _get_kwargs(
*,
client: Client,
my_token: str,
) -> Dict[str, Any]:
url = "{}/auth/token_with_cookie".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

cookies["MyToken"] = my_token

return {
"url": url,
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
}


def _parse_response(*, response: httpx.Response) -> Optional[Union[None, None]]:
if response.status_code == 200:
response_200 = None

return response_200
if response.status_code == 401:
response_401 = None

return response_401
return None


def _build_response(*, response: httpx.Response) -> Response[Union[None, None]]:
return Response(
status_code=response.status_code,
content=response.content,
headers=response.headers,
parsed=_parse_response(response=response),
)


def sync_detailed(
*,
client: Client,
my_token: str,
) -> Response[Union[None, None]]:
kwargs = _get_kwargs(
client=client,
my_token=my_token,
)

response = httpx.get(
**kwargs,
)

return _build_response(response=response)


def sync(
*,
client: Client,
my_token: str,
) -> Optional[Union[None, None]]:
""" Test optional cookie parameters """

return sync_detailed(
client=client,
my_token=my_token,
).parsed


async def asyncio_detailed(
*,
client: Client,
my_token: str,
) -> Response[Union[None, None]]:
kwargs = _get_kwargs(
client=client,
my_token=my_token,
)

async with httpx.AsyncClient() as _client:
response = await _client.get(**kwargs)

return _build_response(response=response)


async def asyncio(
*,
client: Client,
my_token: str,
) -> Optional[Union[None, None]]:
""" Test optional cookie parameters """

return (
await asyncio_detailed(
client=client,
my_token=my_token,
)
).parsed
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ def _get_kwargs(
url = "{}/tests/unsupported_content".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ def _get_kwargs(
url = "{}/tests/upload".format(client.base_url)

headers: Dict[str, Any] = client.get_headers()
cookies: Dict[str, Any] = client.get_cookies()

if keep_alive is not UNSET:
headers["keep-alive"] = keep_alive

return {
"url": url,
"headers": headers,
"cookies": client.get_cookies(),
"cookies": cookies,
"timeout": client.get_timeout(),
"files": multipart_data.to_dict(),
}
Expand Down
Loading