lib/sendgrid4r/rest/ip_access_management.rb in sendgrid4r-1.7.0 vs lib/sendgrid4r/rest/ip_access_management.rb in sendgrid4r-1.7.1

- old
+ new

@@ -14,12 +14,14 @@ :allowed, :auth_method, :first_at, :ip, :last_at, :location ) WhitelistedIps = Struct.new(:result) - WhitelistedIp = Struct.new(:id, :ip, :created_at, :updated_at) + WhitelistedIp = Struct.new(:result) + WhitelistedIpResult = Struct.new(:id, :ip, :created_at, :updated_at) + def self.url_activity "#{BASE_URL}/access_settings/activity" end def self.url_whitelist(rule_id = nil) @@ -56,23 +58,32 @@ def self.create_whitelisted_ips(resp) return resp if resp.nil? result = [] resp['result'].each do |whitelisted_ip| result.push( - SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip( + SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip_result( whitelisted_ip ) ) end WhitelistedIps.new(result) end def self.create_whitelisted_ip(resp) return resp if resp.nil? + WhitelistedIp.new( + SendGrid4r::REST::IpAccessManagement.create_whitelisted_ip_result( + resp['result'] + ) + ) + end + + def self.create_whitelisted_ip_result(resp) + return resp if resp.nil? created_at = Time.at(resp['created_at']) unless resp['created_at'].nil? updated_at = Time.at(resp['updated_at']) unless resp['updated_at'].nil? - WhitelistedIp.new(resp['id'], resp['ip'], created_at, updated_at) + WhitelistedIpResult.new(resp['id'], resp['ip'], created_at, updated_at) end def get_ip_activities(limit: nil, &block) endpoint = SendGrid4r::REST::IpAccessManagement.url_activity params = {} @@ -87,26 +98,26 @@ SendGrid4r::REST::IpAccessManagement.create_whitelisted_ips(resp) end def post_whitelisted_ips(ips:, &block) endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist - ips = [] + ips_param = [] ips.each do |ip| - ip = {} - ip['ip'] = ip - ip.push(ip) + ip_param = {} + ip_param['ip'] = ip + ips_param.push(ip_param) end params = {} - params['ips'] = ips + params['ips'] = ips_param resp = post(@auth, endpoint, params, &block) SendGrid4r::REST::IpAccessManagement.create_whitelisted_ips(resp) end def delete_whitelisted_ips(ids:, &block) endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist - params = {} - params['ids'] = ids - delete(@auth, endpoint, params, &block) + payload = {} + payload['ids'] = ids + delete(@auth, endpoint, nil, payload, &block) end def get_whitelisted_ip(rule_id:, &block) endpoint = SendGrid4r::REST::IpAccessManagement.url_whitelist(rule_id) resp = get(@auth, endpoint, nil, &block)