Skip to content

Commit b8198d0

Browse files
Added params for live preview method
1 parent cb250aa commit b8198d0

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

lib/contentstack/api.rb

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,17 +87,16 @@ def self.send_request(path, q=nil)
8787

8888
elsif @proxy_details.present? && @proxy_details[:url].present? && @proxy_details[:port].present? && @proxy_details[:username].present? && @proxy_details[:password].present?
8989

90-
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}")
90+
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}/")
9191
proxy_username = @proxy_details[:username]
9292
proxy_password = @proxy_details[:password]
9393

94-
ActiveSupport::JSON.decode(URI.open("#{@host}#{@api_version}#{path}#{query}", :proxy_http_basic_authentication => [proxy_uri, proxy_username, proxy_password], "api_key" => @api_key, "authorization" => @live_preview[:management_token], "user_agent"=> "ruby-sdk/#{Contentstack::VERSION}", "x-user-agent" => "ruby-sdk/#{Contentstack::VERSION}").read)
94+
ActiveSupport::JSON.decode(URI.open("#{@host}#{@api_version}#{path}#{query}", :proxy_http_basic_authentication => [proxy_uri, proxy_username, proxy_password], "api_key" => @api_key, "access_token"=> @access_token, "user_agent"=> "ruby-sdk/#{Contentstack::VERSION}", "x-user-agent" => "ruby-sdk/#{Contentstack::VERSION}").read)
9595

9696
elsif @proxy_details.present? && @proxy_details[:url].present? && @proxy_details[:port].present? && @proxy_details[:username].empty? && @proxy_details[:password].empty?
97-
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}")
98-
proxy_auth = {"proxy" => proxy_uri}
99-
params_with_proxy = params.merge(proxy_auth)
100-
ActiveSupport::JSON.decode(open("#{@host}#{@api_version}#{path}#{query}", params_with_proxy).read)
97+
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}/")
98+
99+
ActiveSupport::JSON.decode(URI.open("#{@host}#{@api_version}#{path}#{query}", "proxy" => proxy_uri, "api_key" => @api_key, "access_token"=> @access_token, "user_agent"=> "ruby-sdk/#{Contentstack::VERSION}", "x-user-agent" => "ruby-sdk/#{Contentstack::VERSION}").read)
101100

102101
end
103102
end
@@ -125,17 +124,16 @@ def self.send_preview_request(path, q=nil)
125124

126125
elsif @proxy_details.present? && @proxy_details[:url].present? && @proxy_details[:port].present? && @proxy_details[:username].present? && @proxy_details[:password].present?
127126

128-
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}")
127+
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}/")
129128
proxy_username = @proxy_details[:username]
130129
proxy_password = @proxy_details[:password]
131130

132131
ActiveSupport::JSON.decode(URI.open("#{preview_host}#{@api_version}#{path}#{query}", :proxy_http_basic_authentication => [proxy_uri, proxy_username, proxy_password], "api_key" => @api_key, "authorization" => @live_preview[:management_token], "user_agent"=> "ruby-sdk/#{Contentstack::VERSION}", "x-user-agent" => "ruby-sdk/#{Contentstack::VERSION}").read)
133132

134133
elsif @proxy_details.present? && @proxy_details[:url].present? && @proxy_details[:port].present? && @proxy_details[:username].empty? && @proxy_details[:password].empty?
135-
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}")
136-
proxy_auth = {"proxy" => proxy_uri}
137-
params_with_proxy = params.merge(proxy_auth)
138-
ActiveSupport::JSON.decode(open("#{preview_host}#{@api_version}#{path}#{query}", params_with_proxy).read)
134+
proxy_uri = URI.parse("http://#{@proxy_details[:url]}:#{@proxy_details[:port]}/")
135+
136+
ActiveSupport::JSON.decode(open("#{preview_host}#{@api_version}#{path}#{query}", "proxy" => proxy_uri, "api_key" => @api_key, "authorization" => @live_preview[:management_token], "user_agent"=> "ruby-sdk/#{Contentstack::VERSION}", "x-user-agent" => "ruby-sdk/#{Contentstack::VERSION}").read)
139137

140138
end
141139
end

lib/contentstack/client.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def initialize(api_key, delivery_token, environment, options={})
1717
raise Contentstack::Error.new("Proxy URL Should not be Empty") if @proxy_details.present? && @proxy_details[:url].empty?
1818
raise Contentstack::Error.new("Proxy Port Should not be Empty") if @proxy_details.present? && @proxy_details[:port].empty?
1919
API.init_api(api_key, delivery_token, environment, @host, @branch, @live_preview, @proxy_details)
20-
API.init_api(api_key, delivery_token, environment, @host, @branch, @live_preview)
2120
end
2221

2322
def content_types

0 commit comments

Comments
 (0)