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

Bump postcss and @angular-devkit/build-angular in /samples/client/petstore/typescript-angular-v7-provided-in-root #81

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump postcss and @angular-devkit/build-angular in /samples/client/petstore/typescript-angular-v7-provided-in-root #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f8fd46
Expose proxy settings for Ruby Faraday
sirwolfgang Feb 22, 2022
fb38668
Bump postcss and @angular-devkit/build-angular
dependabot[bot] Oct 6, 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
16 changes: 8 additions & 8 deletions modules/openapi-generator/src/main/resources/ruby-client/api_client_faraday_partial.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
}

connection = Faraday.new(:url => config.base_url, :ssl => ssl_options) do |conn|
conn.proxy = config.proxy if config.proxy
conn.request(:basic_auth, config.username, config.password)
@config.configure_middleware(conn)
if opts[:header_params]["Content-Type"] == "multipart/form-data"
Expand Down Expand Up @@ -62,7 +63,7 @@
# @option opts [Hash] :query_params Query parameters
# @option opts [Hash] :form_params Query parameters
# @option opts [Object] :body HTTP body (JSON/XML)
# @return [Typhoeus::Request] A Typhoeus Request
# @return [Faraday::Request] A Faraday Request
def build_request(http_method, path, request, opts = {})
url = build_request_url(path, opts)
http_method = http_method.to_sym.downcase
Expand All @@ -73,12 +74,6 @@

update_params_for_auth! header_params, query_params, opts[:auth_names]

req_opts = {
:params_encoding => @config.params_encoding,
:timeout => @config.timeout,
:verbose => @config.debugging
}

if [:post, :patch, :put, :delete].include?(http_method)
req_body = build_request_body(header_params, form_params, opts[:body])
if @config.debugging
Expand All @@ -87,7 +82,12 @@
end
request.headers = header_params
request.body = req_body
request.options = OpenStruct.new(req_opts)

# Overload default options only if provided
request.options.params_encoding = @config.params_encoding if @config.params_encoding
request.options.timeout = @config.timeout if @config.timeout
request.options.verbose = @config.debugging if @config.debugging

request.url url
request.params = query_params
download_file(request) if opts[:return_type] == 'File'
Expand Down
4 changes: 4 additions & 0 deletions ...enapi-generator/src/main/resources/ruby-client/configuration_tls_faraday_partial.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@
### TLS/SSL setting
# Client private key file (for client certificate)
attr_accessor :ssl_client_key

### Proxy setting
# HTTP Proxy settings
attr_accessor :proxy
Loading
Loading