braintree 4.15.0 → 4.17.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/braintree/account_updater_daily_report.rb +3 -3
- data/lib/braintree/ach_mandate.rb +1 -1
- data/lib/braintree/add_on_gateway.rb +1 -1
- data/lib/braintree/address.rb +4 -4
- data/lib/braintree/address_gateway.rb +5 -5
- data/lib/braintree/advanced_search.rb +10 -10
- data/lib/braintree/apple_pay.rb +3 -3
- data/lib/braintree/apple_pay_card.rb +3 -3
- data/lib/braintree/apple_pay_options.rb +3 -3
- data/lib/braintree/authorization_adjustment.rb +3 -3
- data/lib/braintree/base_module.rb +1 -1
- data/lib/braintree/bin_data.rb +2 -2
- data/lib/braintree/client_token_gateway.rb +1 -1
- data/lib/braintree/configuration.rb +22 -22
- data/lib/braintree/connected_merchant_paypal_status_changed.rb +1 -1
- data/lib/braintree/connected_merchant_status_transitioned.rb +1 -1
- data/lib/braintree/credit_card.rb +9 -9
- data/lib/braintree/credit_card_gateway.rb +8 -8
- data/lib/braintree/credit_card_verification.rb +3 -3
- data/lib/braintree/credit_card_verification_gateway.rb +28 -11
- data/lib/braintree/credit_card_verification_search.rb +1 -1
- data/lib/braintree/customer.rb +5 -9
- data/lib/braintree/customer_gateway.rb +7 -7
- data/lib/braintree/customer_search.rb +1 -1
- data/lib/braintree/descriptor.rb +1 -1
- data/lib/braintree/digest.rb +1 -1
- data/lib/braintree/disbursement.rb +5 -5
- data/lib/braintree/discount_gateway.rb +1 -1
- data/lib/braintree/dispute/evidence.rb +1 -1
- data/lib/braintree/dispute/paypal_message.rb +1 -1
- data/lib/braintree/dispute/status_history.rb +1 -1
- data/lib/braintree/dispute/transaction.rb +1 -1
- data/lib/braintree/dispute/transaction_details.rb +1 -1
- data/lib/braintree/dispute.rb +3 -3
- data/lib/braintree/dispute_gateway.rb +1 -1
- data/lib/braintree/dispute_search.rb +1 -1
- data/lib/braintree/document_upload.rb +2 -2
- data/lib/braintree/document_upload_gateway.rb +3 -3
- data/lib/braintree/enriched_customer_data.rb +2 -2
- data/lib/braintree/error_result.rb +2 -3
- data/lib/braintree/errors.rb +3 -3
- data/lib/braintree/exceptions.rb +1 -2
- data/lib/braintree/exchange_rate.rb +2 -2
- data/lib/braintree/exchange_rate_quote.rb +3 -3
- data/lib/braintree/exchange_rate_quote_gateway.rb +1 -1
- data/lib/braintree/exchange_rate_quote_input.rb +3 -3
- data/lib/braintree/exchange_rate_quote_request.rb +3 -3
- data/lib/braintree/exchange_rate_quote_response.rb +3 -3
- data/lib/braintree/facilitated_details.rb +1 -1
- data/lib/braintree/facilitator_details.rb +1 -1
- data/lib/braintree/google_pay_card.rb +3 -3
- data/lib/braintree/granted_payment_instrument_update.rb +1 -1
- data/lib/braintree/graphql_client.rb +1 -1
- data/lib/braintree/http.rb +5 -5
- data/lib/braintree/local_payment_completed.rb +2 -2
- data/lib/braintree/local_payment_expired.rb +2 -2
- data/lib/braintree/local_payment_funded.rb +2 -2
- data/lib/braintree/local_payment_reversed.rb +2 -2
- data/lib/braintree/merchant.rb +3 -3
- data/lib/braintree/merchant_account.rb +2 -2
- data/lib/braintree/merchant_account_gateway.rb +9 -9
- data/lib/braintree/meta_checkout_card.rb +89 -0
- data/lib/braintree/meta_checkout_token.rb +88 -0
- data/lib/braintree/modification.rb +3 -3
- data/lib/braintree/oauth_credentials.rb +3 -3
- data/lib/braintree/paginated_collection.rb +2 -2
- data/lib/braintree/paginated_result.rb +1 -1
- data/lib/braintree/payment_instrument_type.rb +2 -0
- data/lib/braintree/payment_method_customer_data_updated_metadata.rb +2 -2
- data/lib/braintree/payment_method_gateway.rb +8 -7
- data/lib/braintree/payment_method_nonce.rb +4 -4
- data/lib/braintree/payment_method_nonce_details.rb +1 -1
- data/lib/braintree/payment_method_nonce_details_payer_info.rb +1 -1
- data/lib/braintree/payment_method_nonce_gateway.rb +1 -1
- data/lib/braintree/paypal_account.rb +1 -2
- data/lib/braintree/paypal_account_gateway.rb +5 -5
- data/lib/braintree/plan.rb +1 -1
- data/lib/braintree/plan_gateway.rb +2 -2
- data/lib/braintree/resource_collection.rb +2 -2
- data/lib/braintree/revoked_payment_method_metadata.rb +1 -1
- data/lib/braintree/risk_data.rb +1 -1
- data/lib/braintree/samsung_pay_card.rb +5 -5
- data/lib/braintree/sepa_direct_debit_account.rb +2 -2
- data/lib/braintree/sepa_direct_debit_account_nonce_details.rb +1 -1
- data/lib/braintree/settlement_batch_summary_gateway.rb +1 -1
- data/lib/braintree/sha256_digest.rb +1 -1
- data/lib/braintree/subscription/status_details.rb +1 -1
- data/lib/braintree/subscription.rb +2 -2
- data/lib/braintree/subscription_gateway.rb +6 -6
- data/lib/braintree/subscription_search.rb +1 -1
- data/lib/braintree/successful_result.rb +2 -2
- data/lib/braintree/test/credit_card.rb +7 -10
- data/lib/braintree/test/merchant_account.rb +1 -1
- data/lib/braintree/test/nonce.rb +3 -0
- data/lib/braintree/test/transaction_amounts.rb +2 -3
- data/lib/braintree/testing_gateway.rb +1 -1
- data/lib/braintree/three_d_secure_info.rb +1 -1
- data/lib/braintree/transaction/address_details.rb +2 -1
- data/lib/braintree/transaction/credit_card_details.rb +1 -1
- data/lib/braintree/transaction/customer_details.rb +1 -1
- data/lib/braintree/transaction/disbursement_details.rb +1 -1
- data/lib/braintree/transaction/meta_checkout_card_details.rb +52 -0
- data/lib/braintree/transaction/meta_checkout_token_details.rb +54 -0
- data/lib/braintree/transaction/samsung_pay_card_details.rb +1 -1
- data/lib/braintree/transaction/sepa_direct_debit_account_details.rb +1 -1
- data/lib/braintree/transaction/status_details.rb +1 -1
- data/lib/braintree/transaction/subscription_details.rb +1 -1
- data/lib/braintree/transaction/us_bank_account_details.rb +1 -1
- data/lib/braintree/transaction/visa_checkout_card_details.rb +1 -1
- data/lib/braintree/transaction.rb +22 -16
- data/lib/braintree/transaction_gateway.rb +9 -10
- data/lib/braintree/transaction_line_item.rb +2 -2
- data/lib/braintree/transaction_line_item_gateway.rb +1 -1
- data/lib/braintree/transaction_review.rb +1 -1
- data/lib/braintree/transaction_search.rb +1 -1
- data/lib/braintree/unknown_payment_method.rb +1 -1
- data/lib/braintree/us_bank_account.rb +2 -2
- data/lib/braintree/us_bank_account_verification.rb +23 -15
- data/lib/braintree/us_bank_account_verification_search.rb +1 -1
- data/lib/braintree/util.rb +3 -3
- data/lib/braintree/validation_error.rb +1 -1
- data/lib/braintree/validation_error_collection.rb +3 -3
- data/lib/braintree/venmo_account.rb +3 -3
- data/lib/braintree/venmo_profile_data.rb +6 -4
- data/lib/braintree/version.rb +1 -1
- data/lib/braintree/visa_checkout_card.rb +7 -7
- data/lib/braintree/webhook_notification.rb +2 -2
- data/lib/braintree/webhook_notification_gateway.rb +4 -4
- data/lib/braintree/webhook_testing.rb +1 -1
- data/lib/braintree/webhook_testing_gateway.rb +1 -1
- data/lib/braintree/xml/generator.rb +1 -1
- data/lib/braintree/xml/libxml.rb +1 -1
- data/lib/braintree/xml/parser.rb +3 -3
- data/lib/braintree/xml/rexml.rb +2 -2
- data/lib/braintree/xml.rb +1 -1
- data/lib/braintree.rb +4 -1
- data/spec/integration/braintree/client_api/spec_helper.rb +2 -2
- data/spec/integration/braintree/credit_card_verification_spec.rb +45 -0
- data/spec/integration/braintree/dispute_search_spec.rb +0 -1
- data/spec/integration/braintree/payment_method_nonce_spec.rb +20 -0
- data/spec/integration/braintree/payment_method_us_bank_account_spec.rb +72 -0
- data/spec/integration/braintree/transaction_search_spec.rb +27 -0
- data/spec/integration/braintree/transaction_spec.rb +192 -66
- data/spec/unit/braintree/base_module_spec.rb +1 -1
- data/spec/unit/braintree/credit_card_verification_gateway_spec.rb +13 -8
- data/spec/unit/braintree/enriched_customer_data_spec.rb +9 -0
- data/spec/unit/braintree/http_spec.rb +1 -1
- data/spec/unit/braintree/meta_checkout_card_details_spec.rb +60 -0
- data/spec/unit/braintree/meta_checkout_card_spec.rb +60 -0
- data/spec/unit/braintree/meta_checkout_token_details_spec.rb +63 -0
- data/spec/unit/braintree/meta_checkout_token_spec.rb +63 -0
- data/spec/unit/braintree/transaction_gateway_spec.rb +30 -1
- data/spec/unit/braintree/us_bank_account_verification_spec.rb +5 -0
- data/spec/unit/braintree/venmo_profile_data_spec.rb +11 -0
- metadata +10 -2
@@ -1,5 +1,5 @@
|
|
1
1
|
module Braintree
|
2
|
-
class TransactionGateway
|
2
|
+
class TransactionGateway
|
3
3
|
include BaseModule
|
4
4
|
|
5
5
|
def initialize(gateway)
|
@@ -187,15 +187,14 @@ module Braintree
|
|
187
187
|
return_object_or_raise(:transaction) { void(*args) }
|
188
188
|
end
|
189
189
|
|
190
|
-
def self._clone_signature
|
190
|
+
def self._clone_signature
|
191
191
|
[:amount, :channel, {:options => [:submit_for_settlement]}]
|
192
192
|
end
|
193
193
|
|
194
|
-
|
195
194
|
# NEXT_MAJOR_VERSION Remove venmo_sdk_payment_method_code, venmo_sdk_session, and three_d_secure_token
|
196
195
|
# The old venmo SDK class has been deprecated
|
197
196
|
# three_d_secure_token has been deprecated in favor of three_d_secure_authentication_id
|
198
|
-
def self._create_signature
|
197
|
+
def self._create_signature
|
199
198
|
[
|
200
199
|
:amount, :billing_address_id, :channel, :customer_id, :device_data, :discount_amount,
|
201
200
|
:merchant_account_id, :order_id, :payment_method_nonce, :payment_method_token,
|
@@ -258,7 +257,7 @@ module Braintree
|
|
258
257
|
{:industry => [
|
259
258
|
:industry_type,
|
260
259
|
{:data => [
|
261
|
-
:folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
|
260
|
+
:country_code, :date_of_birth, :folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
|
262
261
|
:passenger_first_name, :passenger_last_name, :passenger_middle_initial, :passenger_title, :issued_date, :travel_agency_name, :travel_agency_code, :ticket_number,
|
263
262
|
:issuing_carrier_code, :customer_code, :fare_amount, :fee_amount, :tax_amount, :restricted_ticket, :no_show, :advanced_deposit, :fire_safe, :property_phone, :ticket_issuer_address, :arrival_date,
|
264
263
|
{:legs => [
|
@@ -276,14 +275,14 @@ module Braintree
|
|
276
275
|
]
|
277
276
|
end
|
278
277
|
|
279
|
-
def self._submit_for_settlement_signature
|
278
|
+
def self._submit_for_settlement_signature
|
280
279
|
[
|
281
280
|
:order_id,
|
282
281
|
{:descriptor => [:name, :phone, :url]},
|
283
282
|
{:industry => [
|
284
283
|
:industry_type,
|
285
284
|
{:data => [
|
286
|
-
:folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
|
285
|
+
:country_code, :date_of_birth, :folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate, :room_tax,
|
287
286
|
:passenger_first_name, :passenger_last_name, :passenger_middle_initial, :passenger_title, :issued_date, :travel_agency_name, :travel_agency_code, :ticket_number,
|
288
287
|
:issuing_carrier_code, :customer_code, :fare_amount, :fee_amount, :tax_amount, :restricted_ticket, :no_show, :advanced_deposit, :fire_safe, :property_phone, :ticket_issuer_address, :arrival_date,
|
289
288
|
{:legs => [
|
@@ -311,7 +310,7 @@ module Braintree
|
|
311
310
|
]
|
312
311
|
end
|
313
312
|
|
314
|
-
def self._update_details_signature
|
313
|
+
def self._update_details_signature
|
315
314
|
[
|
316
315
|
:amount,
|
317
316
|
:order_id,
|
@@ -327,7 +326,7 @@ module Braintree
|
|
327
326
|
]
|
328
327
|
end
|
329
328
|
|
330
|
-
def _do_create(path, params=nil)
|
329
|
+
def _do_create(path, params=nil)
|
331
330
|
if !params.nil?
|
332
331
|
params = Util.replace_key(params, :google_pay_card, :android_pay_card)
|
333
332
|
end
|
@@ -335,7 +334,7 @@ module Braintree
|
|
335
334
|
_handle_transaction_response(response)
|
336
335
|
end
|
337
336
|
|
338
|
-
def _fetch_transactions(search, ids)
|
337
|
+
def _fetch_transactions(search, ids)
|
339
338
|
search.ids.in ids
|
340
339
|
response = @config.http.post("#{@config.base_merchant_path}/transactions/advanced_search", {:search => search.to_hash})
|
341
340
|
attributes = response[:credit_card_transactions]
|
@@ -15,7 +15,7 @@ module Braintree
|
|
15
15
|
attr_reader :commodity_code
|
16
16
|
attr_reader :url
|
17
17
|
|
18
|
-
def initialize(gateway, attributes)
|
18
|
+
def initialize(gateway, attributes)
|
19
19
|
@gateway = gateway
|
20
20
|
set_instance_variables_from_hash(attributes)
|
21
21
|
@quantity = Util.to_big_decimal(quantity)
|
@@ -28,7 +28,7 @@ module Braintree
|
|
28
28
|
|
29
29
|
class << self
|
30
30
|
protected :new
|
31
|
-
def _new(*args)
|
31
|
+
def _new(*args)
|
32
32
|
self.new(*args)
|
33
33
|
end
|
34
34
|
end
|
@@ -14,7 +14,7 @@ module Braintree
|
|
14
14
|
attr_reader :verifications
|
15
15
|
attr_reader :verified
|
16
16
|
|
17
|
-
def initialize(gateway, attributes)
|
17
|
+
def initialize(gateway, attributes)
|
18
18
|
@gateway = gateway
|
19
19
|
set_instance_variables_from_hash(attributes)
|
20
20
|
@ach_mandate = AchMandate.new(attributes[:ach_mandate]) if attributes[:ach_mandate]
|
@@ -34,7 +34,7 @@ module Braintree
|
|
34
34
|
protected :new
|
35
35
|
end
|
36
36
|
|
37
|
-
def self._new(*args)
|
37
|
+
def self._new(*args)
|
38
38
|
self.new(*args)
|
39
39
|
end
|
40
40
|
|
@@ -22,33 +22,41 @@ module Braintree
|
|
22
22
|
All = [IndependentCheck, NetworkCheck, TokenizedCheck, MicroTransfers]
|
23
23
|
end
|
24
24
|
|
25
|
+
module VerificationAddOns
|
26
|
+
CustomerVerification = "customer_verification"
|
27
|
+
|
28
|
+
All = [CustomerVerification]
|
29
|
+
end
|
30
|
+
|
31
|
+
attr_reader :additional_processor_response
|
32
|
+
attr_reader :created_at
|
33
|
+
attr_reader :gateway_rejection_reason
|
25
34
|
attr_reader :id
|
26
|
-
attr_reader :
|
27
|
-
attr_reader :verification_determined_at
|
28
|
-
attr_reader :verification_method
|
35
|
+
attr_reader :merchant_account_id
|
29
36
|
attr_reader :processor_response_code
|
30
37
|
attr_reader :processor_response_text
|
31
|
-
attr_reader :
|
32
|
-
attr_reader :gateway_rejection_reason
|
38
|
+
attr_reader :status
|
33
39
|
attr_reader :us_bank_account
|
34
|
-
attr_reader :
|
40
|
+
attr_reader :verification_determined_at
|
41
|
+
attr_reader :verification_method
|
35
42
|
|
36
|
-
def initialize(attributes)
|
43
|
+
def initialize(attributes)
|
37
44
|
set_instance_variables_from_hash(attributes)
|
38
45
|
end
|
39
46
|
|
40
|
-
def inspect
|
47
|
+
def inspect
|
41
48
|
attr_order = [
|
42
|
-
:
|
43
|
-
:
|
44
|
-
:processor_response_text,
|
45
|
-
:merchant_account_id,
|
49
|
+
:additional_processor_response,
|
50
|
+
:created_at,
|
46
51
|
:gateway_rejection_reason,
|
47
52
|
:id,
|
53
|
+
:merchant_account_id,
|
54
|
+
:processor_response_code,
|
55
|
+
:processor_response_text,
|
56
|
+
:status,
|
48
57
|
:us_bank_account,
|
49
|
-
:verification_method,
|
50
58
|
:verification_determined_at,
|
51
|
-
:
|
59
|
+
:verification_method
|
52
60
|
]
|
53
61
|
|
54
62
|
formatted_attrs = attr_order.map do |attr|
|
@@ -62,7 +70,7 @@ module Braintree
|
|
62
70
|
protected :new
|
63
71
|
end
|
64
72
|
|
65
|
-
def self._new(*args)
|
73
|
+
def self._new(*args)
|
66
74
|
self.new(*args)
|
67
75
|
end
|
68
76
|
|
data/lib/braintree/util.rb
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
module Braintree
|
2
|
-
module Util
|
2
|
+
module Util
|
3
3
|
def self.extract_attribute_as_array(hash, attribute)
|
4
4
|
raise UnexpectedError.new("Unprocessable entity due to an invalid request") if hash.nil?
|
5
5
|
value = hash.has_key?(attribute) ? hash.delete(attribute) : []
|
@@ -195,14 +195,14 @@ module Braintree
|
|
195
195
|
end
|
196
196
|
|
197
197
|
module IdEquality
|
198
|
-
def ==(other)
|
198
|
+
def ==(other)
|
199
199
|
return false unless other.is_a?(self.class)
|
200
200
|
id == other.id
|
201
201
|
end
|
202
202
|
end
|
203
203
|
|
204
204
|
module TokenEquality
|
205
|
-
def ==(other)
|
205
|
+
def ==(other)
|
206
206
|
return false unless other.is_a?(self.class)
|
207
207
|
token == other.token
|
208
208
|
end
|
@@ -2,7 +2,7 @@ module Braintree
|
|
2
2
|
class ValidationErrorCollection
|
3
3
|
include Enumerable
|
4
4
|
|
5
|
-
def initialize(data)
|
5
|
+
def initialize(data)
|
6
6
|
return if !data.is_a? Hash
|
7
7
|
@errors = (data[:errors] || {}).map { |hash| Braintree::ValidationError.new(hash) }
|
8
8
|
@nested = {}
|
@@ -42,7 +42,7 @@ module Braintree
|
|
42
42
|
self.for("index_#{index}".to_sym)
|
43
43
|
end
|
44
44
|
|
45
|
-
def inspect
|
45
|
+
def inspect
|
46
46
|
"#<#{self.class} errors#{_inner_inspect}>"
|
47
47
|
end
|
48
48
|
|
@@ -61,7 +61,7 @@ module Braintree
|
|
61
61
|
@errors.size
|
62
62
|
end
|
63
63
|
|
64
|
-
def _inner_inspect(scope = [])
|
64
|
+
def _inner_inspect(scope = [])
|
65
65
|
all = []
|
66
66
|
scope_string = scope.join("/")
|
67
67
|
if @errors.any?
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Braintree
|
2
2
|
class VenmoAccount
|
3
|
-
include BaseModule
|
3
|
+
include BaseModule
|
4
4
|
|
5
5
|
attr_reader :created_at
|
6
6
|
attr_reader :customer_id
|
@@ -13,7 +13,7 @@ module Braintree
|
|
13
13
|
attr_reader :username
|
14
14
|
attr_reader :venmo_user_id
|
15
15
|
|
16
|
-
def initialize(gateway, attributes)
|
16
|
+
def initialize(gateway, attributes)
|
17
17
|
@gateway = gateway
|
18
18
|
set_instance_variables_from_hash(attributes)
|
19
19
|
@subscriptions = (@subscriptions || []).map { |subscription_hash| Subscription._new(@gateway, subscription_hash) }
|
@@ -27,7 +27,7 @@ module Braintree
|
|
27
27
|
protected :new
|
28
28
|
end
|
29
29
|
|
30
|
-
def self._new(*args)
|
30
|
+
def self._new(*args)
|
31
31
|
self.new(*args)
|
32
32
|
end
|
33
33
|
end
|
@@ -2,13 +2,15 @@ module Braintree
|
|
2
2
|
class VenmoProfileData
|
3
3
|
include BaseModule
|
4
4
|
|
5
|
-
attr_reader :
|
5
|
+
attr_reader :billing_address
|
6
|
+
attr_reader :email
|
6
7
|
attr_reader :first_name
|
7
8
|
attr_reader :last_name
|
8
9
|
attr_reader :phone_number
|
9
|
-
attr_reader :
|
10
|
+
attr_reader :shipping_address
|
11
|
+
attr_reader :username
|
10
12
|
|
11
|
-
def initialize(attributes)
|
13
|
+
def initialize(attributes)
|
12
14
|
set_instance_variables_from_hash(attributes)
|
13
15
|
end
|
14
16
|
|
@@ -16,7 +18,7 @@ module Braintree
|
|
16
18
|
protected :new
|
17
19
|
end
|
18
20
|
|
19
|
-
def self._new(*args)
|
21
|
+
def self._new(*args)
|
20
22
|
self.new(*args)
|
21
23
|
end
|
22
24
|
end
|
data/lib/braintree/version.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
module Braintree
|
2
2
|
class VisaCheckoutCard
|
3
|
-
include BaseModule
|
3
|
+
include BaseModule
|
4
4
|
include Braintree::Util::TokenEquality
|
5
5
|
|
6
6
|
attr_reader :billing_address
|
@@ -30,7 +30,7 @@ module Braintree
|
|
30
30
|
attr_reader :updated_at
|
31
31
|
attr_reader :verification
|
32
32
|
|
33
|
-
def initialize(gateway, attributes)
|
33
|
+
def initialize(gateway, attributes)
|
34
34
|
@gateway = gateway
|
35
35
|
set_instance_variables_from_hash(attributes)
|
36
36
|
@billing_address = attributes[:billing_address] ? Address._new(@gateway, attributes[:billing_address]) : nil
|
@@ -39,8 +39,8 @@ module Braintree
|
|
39
39
|
end
|
40
40
|
|
41
41
|
def _most_recent_verification(attributes)
|
42
|
-
|
43
|
-
CreditCardVerification._new(
|
42
|
+
sorted_verifications = (attributes[:verifications] || []).sort_by { |verification| verification[:created_at] }.reverse.first
|
43
|
+
CreditCardVerification._new(sorted_verifications) if sorted_verifications
|
44
44
|
end
|
45
45
|
|
46
46
|
def default?
|
@@ -56,7 +56,7 @@ module Braintree
|
|
56
56
|
@expired
|
57
57
|
end
|
58
58
|
|
59
|
-
def inspect
|
59
|
+
def inspect
|
60
60
|
first = [:token]
|
61
61
|
order = first + (self.class._attributes - first)
|
62
62
|
nice_attributes = order.map do |attr|
|
@@ -73,7 +73,7 @@ module Braintree
|
|
73
73
|
protected :new
|
74
74
|
end
|
75
75
|
|
76
|
-
def self._attributes
|
76
|
+
def self._attributes
|
77
77
|
[
|
78
78
|
:billing_address, :bin, :card_type, :cardholder_name, :created_at,
|
79
79
|
:customer_id, :customer_location, :expiration_month, :expiration_year,
|
@@ -83,7 +83,7 @@ module Braintree
|
|
83
83
|
]
|
84
84
|
end
|
85
85
|
|
86
|
-
def self._new(*args)
|
86
|
+
def self._new(*args)
|
87
87
|
self.new(*args)
|
88
88
|
end
|
89
89
|
end
|
@@ -92,7 +92,7 @@ module Braintree
|
|
92
92
|
Configuration.gateway.webhook_notification.verify(*args)
|
93
93
|
end
|
94
94
|
|
95
|
-
def initialize(gateway, attributes)
|
95
|
+
def initialize(gateway, attributes)
|
96
96
|
@gateway = gateway
|
97
97
|
set_instance_variables_from_hash(attributes)
|
98
98
|
@error_result = ErrorResult.new(gateway, @subject[:api_error_response]) if @subject.has_key?(:api_error_response)
|
@@ -135,7 +135,7 @@ module Braintree
|
|
135
135
|
|
136
136
|
class << self
|
137
137
|
protected :new
|
138
|
-
def _new(*args)
|
138
|
+
def _new(*args)
|
139
139
|
self.new(*args)
|
140
140
|
end
|
141
141
|
end
|
@@ -1,5 +1,5 @@
|
|
1
1
|
module Braintree
|
2
|
-
class WebhookNotificationGateway
|
2
|
+
class WebhookNotificationGateway
|
3
3
|
def initialize(gateway)
|
4
4
|
@gateway = gateway
|
5
5
|
@config = gateway.config
|
@@ -27,7 +27,7 @@ module Braintree
|
|
27
27
|
signature_pairs = signature_string.split("&")
|
28
28
|
valid_pairs = signature_pairs.select { |pair| pair.include?("|") }.map { |pair| pair.split("|") }
|
29
29
|
|
30
|
-
valid_pairs.detect do |public_key,
|
30
|
+
valid_pairs.detect do |public_key, _signature|
|
31
31
|
public_key == @config.public_key
|
32
32
|
end
|
33
33
|
end
|
@@ -36,8 +36,8 @@ module Braintree
|
|
36
36
|
public_key, signature = _matching_signature_pair(signature_string)
|
37
37
|
raise InvalidSignature, "no matching public key" if public_key.nil?
|
38
38
|
|
39
|
-
signature_matches = [payload, payload + "\n"].any? do |
|
40
|
-
payload_signature = Braintree::Digest.hexdigest(@config.private_key,
|
39
|
+
signature_matches = [payload, payload + "\n"].any? do |p|
|
40
|
+
payload_signature = Braintree::Digest.hexdigest(@config.private_key, p)
|
41
41
|
Braintree::Digest.secure_compare(signature, payload_signature)
|
42
42
|
end
|
43
43
|
raise InvalidSignature, "signature does not match payload - one has been modified" unless signature_matches
|
data/lib/braintree/xml/libxml.rb
CHANGED
data/lib/braintree/xml/parser.rb
CHANGED
@@ -1,10 +1,10 @@
|
|
1
1
|
# Portions of this code were copied and modified from Ruby on Rails, released
|
2
2
|
# under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
|
3
3
|
module Braintree
|
4
|
-
module Xml
|
4
|
+
module Xml
|
5
5
|
CONTENT_ROOT = "__content__"
|
6
6
|
|
7
|
-
module Parser
|
7
|
+
module Parser
|
8
8
|
XML_PARSING = {
|
9
9
|
"datetime" => Proc.new { |time| ::Time.parse(time).utc },
|
10
10
|
"integer" => Proc.new { |integer| integer.to_i },
|
@@ -32,7 +32,7 @@ module Braintree
|
|
32
32
|
case value.class.to_s
|
33
33
|
when "Hash"
|
34
34
|
if value["type"] == "array"
|
35
|
-
child_key, entries = value.detect { |k,
|
35
|
+
child_key, entries = value.detect { |k,_v| k != "type" } # child_key is throwaway
|
36
36
|
if entries.nil? || ((c = value[CONTENT_ROOT]) && c.strip.empty?)
|
37
37
|
[]
|
38
38
|
else
|
data/lib/braintree/xml/rexml.rb
CHANGED
@@ -1,8 +1,8 @@
|
|
1
1
|
# Portions of this code were copied and modified from Ruby on Rails, released
|
2
2
|
# under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
|
3
3
|
module Braintree
|
4
|
-
module Xml
|
5
|
-
module Rexml
|
4
|
+
module Xml
|
5
|
+
module Rexml
|
6
6
|
|
7
7
|
CONTENT_KEY = "__content__".freeze
|
8
8
|
|
data/lib/braintree/xml.rb
CHANGED
data/lib/braintree.rb
CHANGED
@@ -3,7 +3,6 @@ require "bigdecimal"
|
|
3
3
|
require "cgi"
|
4
4
|
require "date"
|
5
5
|
require "digest/sha1"
|
6
|
-
require "enumerator"
|
7
6
|
require "forwardable"
|
8
7
|
require "logger"
|
9
8
|
require "net/http"
|
@@ -91,6 +90,8 @@ require "braintree/merchant_account/individual_details"
|
|
91
90
|
require "braintree/merchant_account/business_details"
|
92
91
|
require "braintree/merchant_account/funding_details"
|
93
92
|
require "braintree/merchant_account/address_details"
|
93
|
+
require "braintree/meta_checkout_card"
|
94
|
+
require "braintree/meta_checkout_token"
|
94
95
|
require "braintree/oauth_gateway"
|
95
96
|
require "braintree/oauth_credentials"
|
96
97
|
require "braintree/payment_instrument_type"
|
@@ -153,6 +154,8 @@ require "braintree/transaction/installment/adjustment"
|
|
153
154
|
require "braintree/transaction/payment_receipt"
|
154
155
|
require "braintree/transaction/payment_receipt/card_present_data.rb"
|
155
156
|
require "braintree/transaction/payment_receipt/merchant_address.rb"
|
157
|
+
require "braintree/transaction/meta_checkout_card_details"
|
158
|
+
require "braintree/transaction/meta_checkout_token_details"
|
156
159
|
require "braintree/transaction/paypal_details"
|
157
160
|
require "braintree/transaction/paypal_here_details"
|
158
161
|
require "braintree/transaction/samsung_pay_card_details"
|
@@ -282,8 +282,8 @@ class ClientApiHttp
|
|
282
282
|
params = {:credit_card => params}
|
283
283
|
params.merge!(
|
284
284
|
:authorization_fingerprint => @options[:authorization_fingerprint],
|
285
|
-
:shared_customer_identifier =>
|
286
|
-
:shared_customer_identifier_type =>
|
285
|
+
:shared_customer_identifier => @options[:shared_customer_identifier],
|
286
|
+
:shared_customer_identifier_type => @options[:shared_customer_identifier_type],
|
287
287
|
)
|
288
288
|
|
289
289
|
post("/merchants/#{config.merchant_id}/client_api/v1/payment_methods/credit_cards", params)
|
@@ -48,6 +48,51 @@ describe Braintree::CreditCardVerification, "search" do
|
|
48
48
|
expect(result.credit_card_verification.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
|
49
49
|
end
|
50
50
|
|
51
|
+
it "creates a new verification from external vault param" do
|
52
|
+
verification_params = {
|
53
|
+
:credit_card => {
|
54
|
+
:expiration_date => "05/2029",
|
55
|
+
:number => Braintree::Test::CreditCardNumbers::Visa,
|
56
|
+
},
|
57
|
+
:external_vault => {
|
58
|
+
:status => "will_vault"
|
59
|
+
}
|
60
|
+
}
|
61
|
+
|
62
|
+
result = Braintree::CreditCardVerification.create(verification_params)
|
63
|
+
|
64
|
+
expect(result).to be_success
|
65
|
+
expect(result.credit_card_verification.id).to match(/^\w{6,}$/)
|
66
|
+
expect(result.credit_card_verification.status).to eq(Braintree::CreditCardVerification::Status::Verified)
|
67
|
+
expect(result.credit_card_verification.processor_response_code).to eq("1000")
|
68
|
+
expect(result.credit_card_verification.processor_response_text).to eq("Approved")
|
69
|
+
expect(result.credit_card_verification.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
|
70
|
+
expect(result.credit_card_verification.network_transaction_id).not_to be_nil
|
71
|
+
end
|
72
|
+
|
73
|
+
it "creates a new verification from risk data param" do
|
74
|
+
verification_params = {
|
75
|
+
:credit_card => {
|
76
|
+
:expiration_date => "05/2029",
|
77
|
+
:number => Braintree::Test::CreditCardNumbers::Visa,
|
78
|
+
},
|
79
|
+
:risk_data => {
|
80
|
+
:customer_browser => "IE7",
|
81
|
+
:customer_ip => "192.168.0.1"
|
82
|
+
}
|
83
|
+
}
|
84
|
+
|
85
|
+
result = Braintree::CreditCardVerification.create(verification_params)
|
86
|
+
|
87
|
+
expect(result).to be_success
|
88
|
+
expect(result.credit_card_verification.id).to match(/^\w{6,}$/)
|
89
|
+
expect(result.credit_card_verification.status).to eq(Braintree::CreditCardVerification::Status::Verified)
|
90
|
+
expect(result.credit_card_verification.processor_response_code).to eq("1000")
|
91
|
+
expect(result.credit_card_verification.processor_response_text).to eq("Approved")
|
92
|
+
expect(result.credit_card_verification.processor_response_type).to eq(Braintree::ProcessorResponseTypes::Approved)
|
93
|
+
expect(result.credit_card_verification.network_transaction_id).not_to be_nil
|
94
|
+
end
|
95
|
+
|
51
96
|
it "returns processor response code and text as well as the additional processor response if declined" do
|
52
97
|
verification_params = {
|
53
98
|
:credit_card => {
|
@@ -91,6 +91,26 @@ describe Braintree::PaymentMethodNonce do
|
|
91
91
|
expect(nonce.details.payer_info).to be_nil
|
92
92
|
end
|
93
93
|
|
94
|
+
it "return meta_checkout_card_details nonce if exist" do
|
95
|
+
result = Braintree::PaymentMethodNonce.find(Braintree::Test::Nonce::MetaCheckoutCard)
|
96
|
+
nonce = result.payment_method_nonce
|
97
|
+
nonce.details.bin.should == "401288"
|
98
|
+
nonce.details.last_two.should == "81"
|
99
|
+
nonce.details.card_type.should == "Visa"
|
100
|
+
nonce.details.expiration_year.should == "2024"
|
101
|
+
nonce.details.expiration_month.should == "12"
|
102
|
+
end
|
103
|
+
|
104
|
+
it "return meta_checkout_token_details nonce if exist" do
|
105
|
+
result = Braintree::PaymentMethodNonce.find(Braintree::Test::Nonce::MetaCheckoutToken)
|
106
|
+
nonce = result.payment_method_nonce
|
107
|
+
nonce.details.bin.should == "401288"
|
108
|
+
nonce.details.last_two.should == "81"
|
109
|
+
nonce.details.card_type.should == "Visa"
|
110
|
+
nonce.details.expiration_year.should == "2024"
|
111
|
+
nonce.details.expiration_month.should == "12"
|
112
|
+
end
|
113
|
+
|
94
114
|
it "return paypal details if details exist" do
|
95
115
|
result = Braintree::PaymentMethodNonce.find("fake-paypal-one-time-nonce")
|
96
116
|
nonce = result.payment_method_nonce
|