Skip to content

Commit 1c315e6

Browse files
authored
Merge pull request #9 from Bandwidth/release/2021-01-08-15-20-11
updated mfa schema, disabled media url encoding
2 parents 3e48176 + bfe3124 commit 1c315e6

File tree

17 files changed

+289
-133
lines changed

17 files changed

+289
-133
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ License:
33
The MIT License (MIT)
44
http://opensource.org/licenses/MIT
55

6-
Copyright (c) 2014 - 2016 APIMATIC Limited
6+
Copyright (c) 2014 - 2020 APIMATIC Limited
77

88
Permission is hereby granted, free of charge, to any person obtaining a copy
99
of this software and associated documentation files (the "Software"), to deal

bandwidth.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |s|
22
s.name = 'bandwidth-sdk'
3-
s.version = '3.13.2'
3+
s.version = '4.0.0'
44
s.summary = 'bandwidth'
55
s.description = 'Bandwidth\'s set of APIs'
66
s.authors = ['APIMatic SDK Generator']
@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
1313
s.add_dependency('certifi', '~> 2018.1', '>= 2018.01.18')
1414
s.add_dependency('faraday-http-cache', '~> 2.2')
1515
s.add_dependency('builder', '~> 3.2.4')
16-
s.required_ruby_version = '~> 2.0'
16+
s.required_ruby_version = '>= 2.0'
1717
s.files = Dir['{bin,lib,man,test,spec}/**/*', 'README*', 'LICENSE*']
1818
s.require_paths = ['lib']
1919
end

lib/bandwidth/http/api_response.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ def initialize(http_response,
2525
@errors = errors
2626
end
2727

28+
# returns true if status_code is between 200-300
2829
def success?
2930
status_code >= 200 && status_code < 300
3031
end
3132

33+
# returns true if status_code is between 400-600
3234
def error?
3335
status_code >= 400 && status_code < 600
3436
end

lib/bandwidth/http/faraday_client.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def initialize(timeout:, max_retries:, retry_interval:,
1515
@connection = Faraday.new do |faraday|
1616
faraday.use Faraday::HttpCache, serializer: Marshal if cache
1717
faraday.use FaradayMiddleware::FollowRedirects
18+
faraday.use :gzip
1819
faraday.request :multipart
1920
faraday.request :url_encoded
2021
faraday.ssl[:ca_file] = Certifi.where
@@ -34,7 +35,10 @@ def execute_as_string(http_request)
3435
http_request.query_url
3536
) do |request|
3637
request.headers = http_request.headers
37-
request.body = http_request.parameters
38+
unless http_request.http_method == HttpMethodEnum::GET &&
39+
http_request.parameters.empty?
40+
request.body = http_request.parameters
41+
end
3842
end
3943
convert_response(response, http_request)
4044
end
@@ -46,7 +50,10 @@ def execute_as_binary(http_request)
4650
http_request.query_url
4751
) do |request|
4852
request.headers = http_request.headers
49-
request.body = http_request.parameters
53+
unless http_request.http_method == HttpMethodEnum::GET &&
54+
http_request.parameters.empty?
55+
request.body = http_request.parameters
56+
end
5057
end
5158
convert_response(response, http_request)
5259
end

lib/bandwidth/messaging_lib/messaging/controllers/api_controller.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def list_media(user_id,
2222
_query_builder << '/users/{userId}/media'
2323
_query_builder = APIHelper.append_url_with_template_parameters(
2424
_query_builder,
25-
'userId' => { 'value' => user_id, 'encode' => true }
25+
'userId' => { 'value' => user_id, 'encode' => false }
2626
)
2727
_query_url = APIHelper.clean_url _query_builder
2828

@@ -93,7 +93,7 @@ def get_media(user_id,
9393
_query_builder << '/users/{userId}/media/{mediaId}'
9494
_query_builder = APIHelper.append_url_with_template_parameters(
9595
_query_builder,
96-
'userId' => { 'value' => user_id, 'encode' => true },
96+
'userId' => { 'value' => user_id, 'encode' => false },
9797
'mediaId' => { 'value' => media_id, 'encode' => false }
9898
)
9999
_query_url = APIHelper.clean_url _query_builder
@@ -165,7 +165,7 @@ def upload_media(user_id,
165165
_query_builder << '/users/{userId}/media/{mediaId}'
166166
_query_builder = APIHelper.append_url_with_template_parameters(
167167
_query_builder,
168-
'userId' => { 'value' => user_id, 'encode' => true },
168+
'userId' => { 'value' => user_id, 'encode' => false },
169169
'mediaId' => { 'value' => media_id, 'encode' => false }
170170
)
171171
_query_url = APIHelper.clean_url _query_builder
@@ -244,7 +244,7 @@ def delete_media(user_id,
244244
_query_builder << '/users/{userId}/media/{mediaId}'
245245
_query_builder = APIHelper.append_url_with_template_parameters(
246246
_query_builder,
247-
'userId' => { 'value' => user_id, 'encode' => true },
247+
'userId' => { 'value' => user_id, 'encode' => false },
248248
'mediaId' => { 'value' => media_id, 'encode' => false }
249249
)
250250
_query_url = APIHelper.clean_url _query_builder
@@ -305,7 +305,7 @@ def create_message(user_id,
305305
_query_builder << '/users/{userId}/messages'
306306
_query_builder = APIHelper.append_url_with_template_parameters(
307307
_query_builder,
308-
'userId' => { 'value' => user_id, 'encode' => true }
308+
'userId' => { 'value' => user_id, 'encode' => false }
309309
)
310310
_query_url = APIHelper.clean_url _query_builder
311311

lib/bandwidth/messaging_lib/messaging/controllers/base_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def initialize(config, http_call_back: nil)
1313
@http_call_back = http_call_back
1414

1515
@global_headers = {
16-
'user-agent' => 'ruby-sdk-refs/tags/ruby3.12.1'
16+
'user-agent' => 'ruby-sdk'
1717
}
1818
end
1919

lib/bandwidth/two_factor_auth_lib/two_factor_auth/controllers/api_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def create_voice_two_factor(account_id,
2323
_query_builder << '/accounts/{accountId}/code/voice'
2424
_query_builder = APIHelper.append_url_with_template_parameters(
2525
_query_builder,
26-
'accountId' => { 'value' => account_id, 'encode' => true }
26+
'accountId' => { 'value' => account_id, 'encode' => false }
2727
)
2828
_query_url = APIHelper.clean_url _query_builder
2929

@@ -70,7 +70,7 @@ def create_messaging_two_factor(account_id,
7070
_query_builder << '/accounts/{accountId}/code/messaging'
7171
_query_builder = APIHelper.append_url_with_template_parameters(
7272
_query_builder,
73-
'accountId' => { 'value' => account_id, 'encode' => true }
73+
'accountId' => { 'value' => account_id, 'encode' => false }
7474
)
7575
_query_url = APIHelper.clean_url _query_builder
7676

@@ -118,7 +118,7 @@ def create_verify_two_factor(account_id,
118118
_query_builder << '/accounts/{accountId}/code/verify'
119119
_query_builder = APIHelper.append_url_with_template_parameters(
120120
_query_builder,
121-
'accountId' => { 'value' => account_id, 'encode' => true }
121+
'accountId' => { 'value' => account_id, 'encode' => false }
122122
)
123123
_query_url = APIHelper.clean_url _query_builder
124124

lib/bandwidth/two_factor_auth_lib/two_factor_auth/controllers/base_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def initialize(config, http_call_back: nil)
1313
@http_call_back = http_call_back
1414

1515
@global_headers = {
16-
'user-agent' => 'ruby-sdk-refs/tags/ruby3.12.1'
16+
'user-agent' => 'ruby-sdk'
1717
}
1818
end
1919

lib/bandwidth/two_factor_auth_lib/two_factor_auth/models/two_factor_verify_request_schema.rb

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ class TwoFactorVerifyRequestSchema < BaseModel
1010
# @return [String]
1111
attr_accessor :to
1212

13-
# The application phone number, the sender of the 2fa code.
14-
# @return [String]
15-
attr_accessor :from
16-
1713
# The application unique ID, obtained from Bandwidth.
1814
# @return [String]
1915
attr_accessor :application_id
@@ -23,11 +19,6 @@ class TwoFactorVerifyRequestSchema < BaseModel
2319
# @return [String]
2420
attr_accessor :scope
2521

26-
# The number of digits for your 2fa code. The valid number ranges from 2 to
27-
# 8, inclusively.
28-
# @return [Float]
29-
attr_accessor :digits
30-
3122
# The time period, in minutes, to validate the 2fa code. By setting this to
3223
# 3 minutes, it will mean any code generated within the last 3 minutes are
3324
# still valid. The valid range for expiration time is between 0 and 15
@@ -43,27 +34,21 @@ class TwoFactorVerifyRequestSchema < BaseModel
4334
def self.names
4435
@_hash = {} if @_hash.nil?
4536
@_hash['to'] = 'to'
46-
@_hash['from'] = 'from'
4737
@_hash['application_id'] = 'applicationId'
4838
@_hash['scope'] = 'scope'
49-
@_hash['digits'] = 'digits'
5039
@_hash['expiration_time_in_minutes'] = 'expirationTimeInMinutes'
5140
@_hash['code'] = 'code'
5241
@_hash
5342
end
5443

5544
def initialize(to = nil,
56-
from = nil,
5745
application_id = nil,
58-
digits = nil,
5946
expiration_time_in_minutes = nil,
6047
code = nil,
6148
scope = nil)
6249
@to = to
63-
@from = from
6450
@application_id = application_id
6551
@scope = scope
66-
@digits = digits
6752
@expiration_time_in_minutes = expiration_time_in_minutes
6853
@code = code
6954
end
@@ -74,18 +59,14 @@ def self.from_hash(hash)
7459

7560
# Extract variables from the hash.
7661
to = hash['to']
77-
from = hash['from']
7862
application_id = hash['applicationId']
79-
digits = hash['digits']
8063
expiration_time_in_minutes = hash['expirationTimeInMinutes']
8164
code = hash['code']
8265
scope = hash['scope']
8366

8467
# Create object from extracted values.
8568
TwoFactorVerifyRequestSchema.new(to,
86-
from,
8769
application_id,
88-
digits,
8970
expiration_time_in_minutes,
9071
code,
9172
scope)

lib/bandwidth/voice_lib/voice.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
require_relative 'voice/models/api_call_state_response.rb'
1212
require_relative 'voice/models/api_create_call_request.rb'
1313
require_relative 'voice/models/api_modify_call_request.rb'
14-
require_relative 'voice/models/call_engine_modify_conference_request.rb'
14+
require_relative 'voice/models/api_modify_conference_request.rb'
1515
require_relative 'voice/models/api_transcribe_recording_request.rb'
1616
require_relative 'voice/models/conference_detail.rb'
1717
require_relative 'voice/models/conference_member_detail.rb'

0 commit comments

Comments
 (0)