Merge pull request #838 from recurly/ideal-payment-method

Accept Billing Address in AlternativePaymentMethods Submit
recurly · Jul 25, 2023 · ae4a06b · ae4a06b
2 parents 83b11a2 + 848a18e
commit ae4a06b
Show file tree

Hide file tree

Showing 4 changed files with 74 additions and 6 deletions.
diff --git a/lib/recurly/alternative-payment-methods/alternative-payment-methods.js b/lib/recurly/alternative-payment-methods/alternative-payment-methods.js
@@ -32,9 +32,10 @@ class AlternativePaymentMethods extends Emitter {
  }
  }
 
- async submit () {
+ async submit ({ billingAddress } = {}) {
+ this.validateBillingAddress(billingAddress);
  try {
- const token = await this.tokenizePaymentMethod();
+ const token = await this.tokenizePaymentMethod({ billingAddress });
  this.emit('token', token);
  } catch (err) {
  this.error(err);
@@ -43,6 +44,10 @@ class AlternativePaymentMethods extends Emitter {
 
  async handleAction (paymentResponse) {
  try {
+ if (typeof (paymentResponse) === 'string') {
+ paymentResponse = JSON.parse(paymentResponse);
+ }
+
  this.gatewayStrategy.handleAction(paymentResponse);
  } catch (err) {
  this.error(err);
@@ -151,7 +156,7 @@ class AlternativePaymentMethods extends Emitter {
  return this.gatewayStrategy.createAndMountWebComponent(paymentMethodData);
  }
 
- async tokenizePaymentMethod () {
+ async tokenizePaymentMethod ({ billingAddress }) {
  return this.recurly.request.post({
  route: '/payment_methods/token',
  data: {
@@ -162,9 +167,23 @@ class AlternativePaymentMethods extends Emitter {
  channel: this.options.channel || 'Web',
  paymentMethodData: this.gatewayStrategy.data,
  gatewayType: this.gatewayType,
+ returnURL: this.options.returnURL,
+ billingAddress,
  },
  });
  }
+
+ validateBillingAddress (billingAddress) {
+ if (!billingAddress) {
+ return;
+ }
+
+ const validProperties = ['address1', 'address2', 'city', 'state', 'postalCode', 'country'];
+ const invalidProperties = Object.keys(billingAddress).filter(prop => !validProperties.includes(prop));
+ if (invalidProperties.length) {
+ throw recurlyError('invalid-billing-address-fields', { field: invalidProperties.join(', ') });
+ }
+ }
 }
 
 export default AlternativePaymentMethods;
diff --git a/lib/recurly/alternative-payment-methods/gateways/adyen.js b/lib/recurly/alternative-payment-methods/gateways/adyen.js
@@ -4,7 +4,7 @@ class AdyenGateway extends Base {
  constructor (options) {
  super(options);
 
- this.state = undefined;
+ this.state = {};
  this.webComponent = undefined;
  }
 

diff --git a/lib/recurly/errors.js b/lib/recurly/errors.js
@@ -323,6 +323,11 @@ const ERRORS = [
  code: 'risk-preflight-timeout',
  message: c => `recurly.Risk timeout out in preflight procedure for ${c.processor}. Skipping.`,
  classification: 'internal'
+ },
+ {
+ code: 'invalid-billing-address-fields',
+ message: 'The billing address provided fields are invalid.',
+ classification: 'merchant'
  }
 ];
 

diff --git a/test/unit/alternative-payment-methods/alternative-payment-methods.test.js b/test/unit/alternative-payment-methods/alternative-payment-methods.test.js
@@ -27,7 +27,8 @@ describe('Recurly.AlternativePaymentMethods', () => {
  containerSelector: 'my-div',
  adyen: {
  publicKey: '123',
- }
+ },
+ returnURL: 'https://merchant-website.test/completed',
  };
  });
 
@@ -231,6 +232,47 @@ describe('Recurly.AlternativePaymentMethods', () => {
  }));
  });
 
+ context('when a billingAddress is specified', () => {
+ beforeEach((done) => {
+ paymentMethods = recurly.AlternativePaymentMethods(params);
+ paymentMethods.start().finally(done);
+ });
+
+ it('sends billingAddress when tokenizing', (done) => {
+ sandbox.stub(recurly.request, 'post').resolves({});
+
+ const billingAddress = {
+ address1: '123 Main St',
+ address2: 'Suite 701',
+ city: 'San Francisco',
+ state: 'CA',
+ postalCode: '94105',
+ country: 'US',
+ };
+
+ const { onChange } = window.AdyenCheckout.getCall(0).args[0];
+ onChange({ data: 'payment-method-state', isValid: true });
+
+ paymentMethods.submit({ billingAddress });
+
+ nextTick(() => assertDone(done, () => {
+ assert.equal(recurly.request.post.called, true);
+ assert.deepEqual(recurly.request.post.getCall(0).args[0].route, '/payment_methods/token');
+ assert.deepEqual(recurly.request.post.getCall(0).args[0].data, {
+ currency: 'USD',
+ amount: 100,
+ countryCode: 'US',
+ locale: 'en-US',
+ channel: 'Web',
+ paymentMethodData: 'payment-method-state',
+ gatewayType: 'adyen',
+ returnURL: 'https://merchant-website.test/completed',
+ billingAddress: billingAddress,
+ });
+ }));
+ });
+ });
+
  const validateTokenization = submit => {
  it("make a POST /js/v1/payment_methods/token with the needed params", done => {
  sandbox.stub(recurly.request, 'post').resolves({ });
@@ -246,7 +288,9 @@ describe('Recurly.AlternativePaymentMethods', () => {
  locale: 'en-US',
  channel: 'Web',
  paymentMethodData: 'boleto-state',
- gatewayType: 'adyen'
+ gatewayType: 'adyen',
+ returnURL: 'https://merchant-website.test/completed',
+ billingAddress: undefined,
  });
  }));
  });