microsoft_kiota_faraday 0.25.2 → 0.25.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bf827c3c00c790ef7ddea6079399cbd147c7978d6e2c48464026fc41ec182207
4
- data.tar.gz: ecc44cd814959e0b3bef392ad9e42078cb46a44be9b06306e0cbf2ccdb771d71
3
+ metadata.gz: ed21b9e1882f1f2086769231e4a544442e6a2f2169240e4625ae4797de18f3a7
4
+ data.tar.gz: d74c7e248098dd0d5841ebcbaf717d0bded7934241b083353840fa932bc1f802
5
5
  SHA512:
6
- metadata.gz: 96b5db11f49fc15b866cd6e49b109044b5ef8a38397d1a2cf5be6c1c3951161643a7c062f90dfaf99ff49f845b0cd7843178c95b0c369ed111d569c049699cd1
7
- data.tar.gz: 4a803aedfc5e02b2c008e680209d170c6d60f5244d42ab25f35204b5c26a892e4672db775ed8af19e287e5869f1009d6458d54ec1b0366fab3ae092755bbe3e3
6
+ metadata.gz: 951ebd35d5161532bc1f1ea0893a9db2384adfaf87d319b9e29402cbf1b16e7468ad3af473c82a75e07b5ef1b587b2ec3580e1b1892cd6ac6e90624641467139
7
+ data.tar.gz: 52cfdac4f9410bbdca065cfb3bc4c9f347e2698c54249d56e52ea28c823932db1d2383b1c67cb5d1fc38fc6db5922253e5f90fc3144fc437dd4131a39f551ed8
@@ -21,16 +21,9 @@ module MicrosoftKiotaFaraday
21
21
 
22
22
  @authentication_provider = authentication_provider
23
23
  @content_type_header_key = 'Content-Type'
24
- @parse_node_factory = parse_node_factory
25
- if @parse_node_factory.nil?
26
- @parse_node_factory = MicrosoftKiotaAbstractions::ParseNodeFactoryRegistry.default_instance
27
- end
28
- @serialization_writer_factory = serialization_writer_factory
29
- if @serialization_writer_factory.nil?
30
- @serialization_writer_factory = MicrosoftKiotaAbstractions::SerializationWriterFactoryRegistry.default_instance
31
- end
32
- @client = client
33
- @client = KiotaClientFactory.get_default_http_client if @client.nil?
24
+ @parse_node_factory = parse_node_factory || MicrosoftKiotaAbstractions::ParseNodeFactoryRegistry.default_instance
25
+ @serialization_writer_factory = serialization_writer_factory || MicrosoftKiotaAbstractions::SerializationWriterFactoryRegistry.default_instance
26
+ @client = client || KiotaClientFactory.get_default_http_client
34
27
  @base_url = ''
35
28
  end
36
29
 
@@ -117,17 +110,20 @@ module MicrosoftKiotaFaraday
117
110
  response = @client.run_request(request.http_method, request.path, request.body, request.headers)
118
111
 
119
112
  response_handler = get_response_handler(request_info)
120
- response_handler&.call(response)&.resume
121
- throw_if_failed_reponse(response, errors_mapping)
122
- yield response
113
+ if response_handler
114
+ response_handler.call(response)&.resume
115
+ else
116
+ throw_if_failed_reponse(response, errors_mapping)
117
+ yield response
118
+ end
123
119
  end
124
120
  end
125
121
 
126
122
  def get_response_handler(request_info)
127
- unless request_info.nil?
128
- option = request_info.get_request_option(MicrosoftKiotaFaraday::Middleware::ResponseHandlerOption::RESPONSE_HANDLER_KEY)
129
- end
130
- option.async_callback unless !option || option.nil?
123
+ return nil if request_info.nil?
124
+
125
+ option = request_info.get_request_option(MicrosoftKiotaFaraday::Middleware::ResponseHandlerOption::RESPONSE_HANDLER_KEY)
126
+ option&.async_callback
131
127
  end
132
128
 
133
129
  def get_root_parse_node(response)
@@ -147,14 +143,7 @@ module MicrosoftKiotaFaraday
147
143
  status_code = response.status
148
144
  return if status_code < 400
149
145
 
150
- error_factory = errors_mapping[status_code.to_s] unless errors_mapping.nil?
151
- error_factory = errors_mapping['4XX'] unless !error_factory.nil? || errors_mapping.nil? || status_code >= 500
152
- unless !error_factory.nil? || errors_mapping.nil? || status_code < 500 || status_code >= 600
153
- error_factory = errors_mapping['5XX']
154
- end
155
- unless !error_factory.nil? || errors_mapping.nil? || status_code < 400 || status_code >= 600
156
- error_factory = errors_mapping['XXX']
157
- end
146
+ error_factory = resolve_error_factory(errors_mapping, status_code)
158
147
  if error_factory.nil?
159
148
  raise MicrosoftKiotaAbstractions::ApiError.new(
160
149
  "The server returned an unexpected status code and no error factory is registered for this code:#{status_code}",
@@ -162,8 +151,12 @@ module MicrosoftKiotaFaraday
162
151
  )
163
152
  end
164
153
 
165
- root_node = get_root_parse_node(response)
166
- error = root_node.get_object_value(error_factory) unless root_node.nil?
154
+ begin
155
+ root_node = get_root_parse_node(response)
156
+ error = root_node.get_object_value(error_factory) unless root_node.nil?
157
+ rescue StandardError
158
+ error = nil
159
+ end
167
160
  if error.nil?
168
161
  raise MicrosoftKiotaAbstractions::ApiError.new("The server returned an unexpected status code:#{status_code}",
169
162
  response_status_code: status_code, response_headers: response.headers)
@@ -184,19 +177,14 @@ module MicrosoftKiotaFaraday
184
177
  unless request_info.headers.nil?
185
178
  request.headers = Faraday::Utils::Headers.new
186
179
  request_info.headers.get_all.select do |k, v|
187
- request.headers[k] = if v.is_a? Array
188
- v.join(',')
189
- elsif v.is_a? String
190
- v
191
- else
192
- v.to_s
193
- end
180
+ request.headers[k.to_s] = v.is_a?(Array) ? v.join(',') : v.to_s
194
181
  end
195
182
  end
196
183
  RequestBody.apply(request, request_info.content)
197
184
  request_options = request_info.get_request_options
198
185
  if !request_options.nil? && !request_options.empty?
199
186
  request.options = Faraday::RequestOptions.new if request.options.nil?
187
+ request.options.context ||= {}
200
188
  request_options.each do |value|
201
189
  request.options.context[value.get_key] = value
202
190
  end
@@ -216,7 +204,7 @@ module MicrosoftKiotaFaraday
216
204
  Fiber.new do
217
205
  set_base_url_for_request_information(request_info)
218
206
  @authentication_provider.authenticate_request(request_info).resume
219
- return get_request_from_request_info(request_info)
207
+ get_request_from_request_info(request_info)
220
208
  end
221
209
  end
222
210
 
@@ -226,6 +214,15 @@ module MicrosoftKiotaFaraday
226
214
  request_info.path_parameters['baseurl'] = @base_url
227
215
  end
228
216
 
217
+ def resolve_error_factory(errors_mapping, status_code)
218
+ return nil if errors_mapping.nil?
219
+
220
+ errors_mapping[status_code.to_s] ||
221
+ (errors_mapping['4XX'] if (400...500).cover?(status_code)) ||
222
+ (errors_mapping['5XX'] if (500...600).cover?(status_code)) ||
223
+ (errors_mapping['XXX'] if (400...600).cover?(status_code))
224
+ end
225
+
229
226
  # an error the factory built learns the response details only once it is deserialized
230
227
  def add_response_details(error, response)
231
228
  return error unless error.is_a?(MicrosoftKiotaAbstractions::ApiError)
@@ -2,25 +2,56 @@
2
2
 
3
3
  require 'faraday'
4
4
  require_relative 'parameters_name_decoding_option'
5
+
5
6
  module MicrosoftKiotaFaraday
6
7
  module Middleware
7
8
  class ParametersNameDecodingHandler < Faraday::Middleware
8
9
  @@default_option = ParametersNameDecodingOption.new
10
+
9
11
  def call(request_env)
10
12
  unless request_env[:request].nil? || request_env[:request][:context].nil?
11
13
  request_option = request_env[:request][:context][@@default_option.get_key]
12
14
  end
13
15
  request_option = @@default_option if request_option.nil?
14
- unless request_env[:url].nil? || !request_option.enabled || request_option.characters_to_decode.nil? || request_option.characters_to_decode.empty?
15
- request_url = request_env[:url].to_s
16
- request_option.characters_to_decode.each do |character|
17
- request_url = request_url.gsub(get_regex_for_character(character), character)
16
+ if request_env[:url] && request_option.enabled && request_option.characters_to_decode && !request_option.characters_to_decode.empty?
17
+ uri = request_env[:url].is_a?(URI) ? request_env[:url] : URI.parse(request_env[:url].to_s)
18
+ query = uri.query
19
+ if query && !query.empty? && query.include?('%')
20
+ decoded_query = decode_uri_encoded_string(query, request_option.characters_to_decode)
21
+ if decoded_query != query
22
+ uri = uri.dup
23
+ uri.query = decoded_query
24
+ request_env[:url] = uri
25
+ end
18
26
  end
19
- request_env[:url] = URI.parse(request_url)
20
27
  end
21
28
  @app&.call(request_env)
22
29
  end
23
30
 
31
+ def decode_uri_encoded_string(original, characters_to_decode)
32
+ return original if original.nil? || original.empty? || characters_to_decode.nil? || characters_to_decode.empty?
33
+
34
+ original.split('&', -1).map do |part|
35
+ next part if part.empty?
36
+
37
+ if part.include?('=')
38
+ name, value = part.split('=', 2)
39
+ decoded_name = decode_parameter_name(name, characters_to_decode)
40
+ "#{decoded_name}=#{value}"
41
+ else
42
+ decode_parameter_name(part, characters_to_decode)
43
+ end
44
+ end.join('&')
45
+ end
46
+
47
+ def decode_parameter_name(name, characters_to_decode)
48
+ decoded = name.dup
49
+ characters_to_decode.each do |character|
50
+ decoded.gsub!(get_regex_for_character(character), character)
51
+ end
52
+ decoded
53
+ end
54
+
24
55
  def get_regex_for_character(character)
25
56
  @regex_cache ||= {}
26
57
  @regex_cache[character] = Regexp.new("%#{character.ord.to_s(16)}", true) if @regex_cache[character].nil?
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module MicrosoftKiotaFaraday
4
- VERSION = '0.25.2' # x-release-please-version
4
+ VERSION = '0.25.3' # x-release-please-version
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: microsoft_kiota_faraday
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.25.2
4
+ version: 0.25.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Microsoft Corporation
@@ -35,14 +35,14 @@ dependencies:
35
35
  requirements:
36
36
  - - '='
37
37
  - !ruby/object:Gem::Version
38
- version: 0.25.2
38
+ version: 0.25.3
39
39
  type: :runtime
40
40
  prerelease: false
41
41
  version_requirements: !ruby/object:Gem::Requirement
42
42
  requirements:
43
43
  - - '='
44
44
  - !ruby/object:Gem::Version
45
- version: 0.25.2
45
+ version: 0.25.3
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: rake
48
48
  requirement: !ruby/object:Gem::Requirement