Skip to content

Commit

Permalink
Merge branch 'VT-4683' of github.com:plivo/plivo-ruby into VT-4683
Browse files Browse the repository at this point in the history
� Conflicts:
�	CHANGELOG.md
�	lib/plivo/resources/calls.rb
  • Loading branch information
prashantp-plivo committed Sep 27, 2022
2 parents 65e64f0 + d94735c commit 5d0248b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
# Change Log


## [4.31.0](https://github.com/plivo/plivo-go/tree/v4.31.0) (2022-09-29)
**Feature - Audio Streaming**
- Added functionality to start, stop and fetch audio streams

## [4.30.1](https://github.com/plivo/plivo-go/tree/v4.30.1) (2022-09-20)
**stability - faraday upgrade**
- faraday version upgrade

## [4.30.0](https://github.com/plivo/plivo-go/tree/v4.30.0) (2022-08-26)
**Feature - 10DLC APIs**
- Added new 10DLC APIs
Expand Down
14 changes: 7 additions & 7 deletions lib/plivo/base_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def configure_connection
# DANGER: Basic auth should always come after headers, else
# The headers will replace the basic_auth

faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand All @@ -150,7 +150,7 @@ def configure_connection
# DANGER: Basic auth should always come after headers, else
# The headers will replace the basic_auth

faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand All @@ -163,7 +163,7 @@ def configure_connection
# DANGER: Basic auth should always come after headers, else
# The headers will replace the basic_auth

faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand All @@ -176,7 +176,7 @@ def configure_connection
# DANGER: Basic auth should always come after headers, else
# The headers will replace the basic_auth

faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand All @@ -189,7 +189,7 @@ def configure_connection
# DANGER: Basic auth should always come after headers, else
# The headers will replace the basic_auth

faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand All @@ -202,7 +202,7 @@ def configure_connection
# DANGER: Basic auth should always come after headers, else
# The headers will replace the basic_auth

faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand Down Expand Up @@ -255,7 +255,7 @@ def send_post(resource_path, data, timeout, use_multipart_conn, options = nil)

faraday.request :multipart
faraday.request :url_encoded
faraday.basic_auth(auth_id, auth_token)
faraday.request(:basic_auth, auth_id, auth_token)

faraday.proxy=@proxy_hash if @proxy_hash
faraday.response :json, content_type: /\bjson$/
Expand Down
4 changes: 2 additions & 2 deletions plivo.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ Gem::Specification.new do |spec|

spec.required_ruby_version = '>= 2.0.0'

spec.add_dependency 'faraday', '~> 1.0.1'
spec.add_dependency 'faraday_middleware', '~> 1.0.0'
spec.add_dependency 'faraday', '~> 1.0'
spec.add_dependency 'faraday_middleware', '~> 1.0'
spec.add_dependency 'htmlentities'
spec.add_dependency 'jwt'

Expand Down

0 comments on commit 5d0248b

Please sign in to comment.