From ea1d64f4bc26a65ac39206eebbd9f77da6e1751f Mon Sep 17 00:00:00 2001
From: Douglas Lise <dlise@recurly.com>
Date: Thu, 27 Jul 2023 08:55:30 -0300
Subject: [PATCH] Return Adyen checkout state for active payment method

---
 .../gateways/adyen.js                         |  5 ++++-
 .../alternative-payment-methods.test.js       | 20 +++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/recurly/alternative-payment-methods/gateways/adyen.js b/lib/recurly/alternative-payment-methods/gateways/adyen.js
index 9ed4c79b5..c6aedc45c 100644
--- a/lib/recurly/alternative-payment-methods/gateways/adyen.js
+++ b/lib/recurly/alternative-payment-methods/gateways/adyen.js
@@ -69,7 +69,10 @@ class AdyenGateway extends Base {
   }
 
   get data () {
-    return this.state.data;
+    const methodState = this.state.data;
+    const componentState = this.webComponent?.activePaymentMethod?.data;
+
+    return { ...methodState, ...componentState };
   }
 
   async handleAction (action) {
diff --git a/test/unit/alternative-payment-methods/alternative-payment-methods.test.js b/test/unit/alternative-payment-methods/alternative-payment-methods.test.js
index ba21d3773..81fe02866 100644
--- a/test/unit/alternative-payment-methods/alternative-payment-methods.test.js
+++ b/test/unit/alternative-payment-methods/alternative-payment-methods.test.js
@@ -251,7 +251,7 @@ describe('Recurly.AlternativePaymentMethods', () => {
             };
 
             const { onChange } = window.AdyenCheckout.getCall(0).args[0];
-            onChange({ data: 'payment-method-state', isValid: true });
+            onChange({ data: { myState: 1 }, isValid: true });
 
             paymentMethods.submit({ billingAddress });
 
@@ -264,7 +264,7 @@ describe('Recurly.AlternativePaymentMethods', () => {
                 countryCode: 'US',
                 locale: 'en-US',
                 channel: 'Web',
-                paymentMethodData: 'payment-method-state',
+                paymentMethodData: { myState: 1 },
                 gatewayType: 'adyen',
                 returnURL: 'https://merchant-website.test/completed',
                 billingAddress: billingAddress,
@@ -274,20 +274,20 @@ describe('Recurly.AlternativePaymentMethods', () => {
         });
 
         const validateTokenization = submit => {
-          it("make a POST /js/v1/payment_methods/token with the needed params", done => {
+          it('make a POST /js/v1/payment_methods/token with the needed params', done => {
             sandbox.stub(recurly.request, 'post').resolves({ });
             submit();
 
             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].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: 'boleto-state',
+                paymentMethodData: { myState: 2 },
                 gatewayType: 'adyen',
                 returnURL: 'https://merchant-website.test/completed',
                 billingAddress: undefined,
@@ -358,7 +358,7 @@ describe('Recurly.AlternativePaymentMethods', () => {
 
           validateTokenization(() => {
             const { onSubmit } = window.AdyenCheckout.getCall(0).args[0];
-            onSubmit({ data: 'boleto-state' });
+            onSubmit({ data: { myState: 2 } });
           });
         });
 
@@ -375,7 +375,7 @@ describe('Recurly.AlternativePaymentMethods', () => {
             }));
 
             const { onChange } = window.AdyenCheckout.getCall(0).args[0];
-            onChange({ data: 'boleto-state-2', isValid: true });
+            onChange({ data: { myState: 3 }, isValid: true });
           });
         });
 
@@ -388,8 +388,8 @@ describe('Recurly.AlternativePaymentMethods', () => {
 
           validateTokenization(() => {
             const { onChange } = window.AdyenCheckout.getCall(0).args[0];
-            onChange({ data: 'boleto-state-2' });
-            onChange({ data: 'boleto-state' });
+            onChange({ data: { myState: 3 } });
+            onChange({ data: { myState: 2 } });
 
             paymentMethods.submit();
           });
@@ -401,7 +401,7 @@ describe('Recurly.AlternativePaymentMethods', () => {
             paymentMethods.start()
               .finally(() => {
                 const { onChange } = window.AdyenCheckout.getCall(0).args[0];
-                onChange({ data: 'boleto-state' });
+                onChange({ data: { myState: 2 } });
 
                 paymentMethods.submit();
                 done();