Skip to content

Added support of follow HTTP redirects #724

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

Merged
merged 3 commits into from
Mar 20, 2023
Merged

Added support of follow HTTP redirects #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bb99c7
Added support of follow HTTP redirects
expobrain Feb 12, 2023
3da7245
Merge branch 'main' into follow_redirect
emann Mar 20, 2023
386666b
Regenerated E2E copy
expobrain Mar 20, 2023
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 end_to_end_tests/golden-record/my_test_api_client/api/default/get_common_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/default/post_common_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/location/get_location_header_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions ...end_tests/golden-record/my_test_api_client/api/location/get_location_query_optionality.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions ...record/my_test_api_client/api/parameter_references/get_parameter_references_path_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions ...den-record/my_test_api_client/api/parameters/delete_common_parameters_overriding_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions ...golden-record/my_test_api_client/api/parameters/get_common_parameters_overriding_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions ...golden-record/my_test_api_client/api/parameters/get_same_name_multiple_locations_param.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/parameters/multiple_path_parameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions ...en-record/my_test_api_client/api/responses/post_responses_unions_simple_before_complex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tag1/get_tag_with_number.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/callback_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"json": json_json_body,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/defaults_tests_defaults_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/description_with_backslash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_booleans.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_floats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_integers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/get_basic_list_of_strings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/get_user_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/int_enum_tests_int_enum_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
1 change: 1 addition & 0 deletions ...to_end_tests/golden-record/my_test_api_client/api/tests/json_body_tests_json_body_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"json": json_json_body,
}

Expand Down
1 change: 1 addition & 0 deletions ...end_tests/golden-record/my_test_api_client/api/tests/no_response_tests_no_response_get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions ...d_tests/golden-record/my_test_api_client/api/tests/octet_stream_tests_octet_stream_get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"data": form_data.to_dict(),
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/post_form_data_inline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"data": form_data.to_dict(),
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/post_tests_json_body_string.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"json": json_json_body,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/test_inline_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"json": json_json_body,
}

Expand Down
1 change: 1 addition & 0 deletions ...olden-record/my_test_api_client/api/tests/token_with_cookie_auth_token_with_cookie_get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions ...-record/my_test_api_client/api/tests/unsupported_content_tests_unsupported_content_get.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/tests/upload_file_tests_upload_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"files": multipart_multipart_data,
}

Expand Down
1 change: 1 addition & 0 deletions ...sts/golden-record/my_test_api_client/api/tests/upload_multiple_files_tests_upload_post.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"files": multipart_multipart_data,
}

Expand Down
1 change: 1 addition & 0 deletions end_to_end_tests/golden-record/my_test_api_client/api/true_/false_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"params": params,
}

Expand Down
2 changes: 2 additions & 0 deletions end_to_end_tests/golden-record/my_test_api_client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Client:
but can be set to False for testing purposes.
raise_on_unexpected_status: Whether or not to raise an errors.UnexpectedStatus if the API returns a
status code that was not documented in the source OpenAPI document.
follow_redirects: Whether or not to follow redirects. Default value is False.
"""

base_url: str
Expand All @@ -26,6 +27,7 @@ class Client:
timeout: float = attr.ib(5.0, kw_only=True)
verify_ssl: Union[str, bool, ssl.SSLContext] = attr.ib(True, kw_only=True)
raise_on_unexpected_status: bool = attr.ib(False, kw_only=True)
follow_redirects: bool = attr.ib(False, kw_only=True)

def get_headers(self) -> Dict[str, str]:
"""Get headers to be used in all endpoints"""
Expand Down
1 change: 1 addition & 0 deletions integration-tests/integration_tests/api/body/post_body_multipart.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
"files": multipart_multipart_data,
}

Expand Down
1 change: 1 addition & 0 deletions integration-tests/integration_tests/api/parameters/post_parameters_header.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
}


Expand Down
2 changes: 2 additions & 0 deletions integration-tests/integration_tests/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Client:
but can be set to False for testing purposes.
raise_on_unexpected_status: Whether or not to raise an errors.UnexpectedStatus if the API returns a
status code that was not documented in the source OpenAPI document.
follow_redirects: Whether or not to follow redirects. Default value is False.
"""

base_url: str
Expand All @@ -26,6 +27,7 @@ class Client:
timeout: float = attr.ib(5.0, kw_only=True)
verify_ssl: Union[str, bool, ssl.SSLContext] = attr.ib(True, kw_only=True)
raise_on_unexpected_status: bool = attr.ib(False, kw_only=True)
follow_redirects: bool = attr.ib(False, kw_only=True)

def get_headers(self) -> Dict[str, str]:
"""Get headers to be used in all endpoints"""
Expand Down
2 changes: 2 additions & 0 deletions openapi_python_client/templates/client.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class Client:
but can be set to False for testing purposes.
raise_on_unexpected_status: Whether or not to raise an errors.UnexpectedStatus if the API returns a
status code that was not documented in the source OpenAPI document.
follow_redirects: Whether or not to follow redirects. Default value is False.
"""

base_url: str
Expand All @@ -24,6 +25,7 @@ class Client:
timeout: float = attr.ib(5.0, kw_only=True)
verify_ssl: Union[str, bool, ssl.SSLContext] = attr.ib(True, kw_only=True)
raise_on_unexpected_status: bool = attr.ib(False, kw_only=True)
follow_redirects: bool = attr.ib(False, kw_only=True)

def get_headers(self) -> Dict[str, str]:
""" Get headers to be used in all endpoints """
Expand Down
1 change: 1 addition & 0 deletions openapi_python_client/templates/endpoint_module.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def _get_kwargs(
"headers": headers,
"cookies": cookies,
"timeout": client.get_timeout(),
"follow_redirects": client.follow_redirects,
{% if endpoint.form_body %}
"data": form_data.to_dict(),
{% elif endpoint.multipart_body %}
Expand Down