Replace /sessions with /paymentMethods

jest/globals.js

@@ -23,6 +23,9 @@ global.AdyenCheckout = () => {
   return Promise.resolve({
     create: () => {
       return { mount: jest.fn() };
-    }
+    },
+    createFromAction: () => {
+      return { mount: jest.fn() };
+    },
   });
 };

jest/sfccCartridgeMocks.js

@@ -53,15 +53,6 @@ jest.mock('*/cartridge/controllers/middlewares/adyen/saveExpressShopperDetails',
   return jest.fn();
 }, {virtual: true});
 
-jest.mock('*/cartridge/scripts/adyenSessions', () => {
-  return {
-    createSession: jest.fn( () => ({
-      id: 'mock_id',
-      sessionData: 'mock_session_data',
-    }))
-  }
-}, {virtual: true});
-
 jest.mock('*/cartridge/scripts/adyenGetPaymentMethods', () => {
   return {
     getMethods: jest.fn(() => ({

jest/sfccPathSetup.js

@@ -25,10 +25,6 @@ jest.mock('*/cartridge/controllers/middlewares/adyen/notify', () => {
   return require('../src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/notify');
 }, {virtual: true});
 
-jest.mock('*/cartridge/controllers/middlewares/adyen/sessions', () => {
-  return require('../src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/sessions');
-}, {virtual: true});
-
 jest.mock('*/cartridge/controllers/middlewares/adyen/paymentFromComponent', () => {
   return require('../src/cartridges/int_adyen_SFRA/cartridge/controllers/middlewares/adyen/paymentFromComponent');
 }, {virtual: true});

metadata/site_import/services.xml

@@ -15,16 +15,6 @@
         <user-id></user-id>
         <password/>
     </service-credential>
-    <service-credential service-credential-id="AdyenSessions">
-        <url>https://checkout-test.adyen.com/checkout/v71/sessions</url>
-        <user-id></user-id>
-        <password/>
-    </service-credential>
-    <service-credential service-credential-id="AdyenSessionsLive">
-        <url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/sessions</url>
-        <user-id></user-id>
-        <password/>
-    </service-credential>
     <service-credential service-credential-id="AdyenPaymentDetailsLive">
         <url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/payments/details</url>
         <user-id></user-id>
@@ -156,15 +146,6 @@
         <profile-id>Adyen</profile-id>
         <credential-id>AdyenCheckoutPaymentMethods</credential-id>
     </service>
-    <service service-id="AdyenSessions">
-        <service-type>HTTP</service-type>
-        <enabled>true</enabled>
-        <log-prefix>adyen</log-prefix>
-        <comm-log-enabled>true</comm-log-enabled>
-        <mock-mode-enabled>false</mock-mode-enabled>
-        <profile-id>Adyen</profile-id>
-        <credential-id>AdyenSessions</credential-id>
-    </service>
     <service service-id="AdyenRecurringDisable">
         <service-type>HTTP</service-type>
         <enabled>true</enabled>

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyenAccount.js

@@ -1,4 +1,4 @@
-const { onFieldValid, onBrand, createSession } = require('./commons/index');
+const { onFieldValid, onBrand } = require('./commons/index');
 const store = require('../../../store');
 
 let checkout;
@@ -53,12 +53,6 @@ store.checkoutConfiguration.onAdditionalDetails = (state) => {
 };
 
 async function initializeCardComponent() {
-  // card and checkout component creation
-  const session = await createSession();
-  store.checkoutConfiguration.session = {
-    id: session.id,
-    sessionData: session.sessionData,
-  };
   const cardNode = document.getElementById('card');
   checkout = await AdyenCheckout(store.checkoutConfiguration);
   card = checkout.create('card').mount(cardNode);
@@ -102,3 +96,8 @@ $('button[value="add-new-payment"]').on('click', (event) => {
     card?.showValidation();
   }
 });
+
+module.exports = {
+  initializeCardComponent,
+  submitAddCard,
+};

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/__tests__/__snapshots__/renderGenericComponent.test.js.snap

@@ -2,7 +2,10 @@
 
 exports[`Render Generic Component should hide giftcard container 1`] = `
 {
-  "amount": "mocked_amount",
+  "amount": {
+    "currency": "mocked_currency",
+    "value": "mocked_amount",
+  },
   "countryCode": "mocked_countrycode",
   "paymentMethodsConfiguration": {
     "amazonpay": {
@@ -18,18 +21,18 @@ exports[`Render Generic Component should hide giftcard container 1`] = `
       "configuration": undefined,
     },
   },
-  "session": {
-    "adyenDescriptions": {},
-    "id": "mock_id",
+  "paymentMethodsResponse": {
     "imagePath": "example.com",
-    "sessionData": "mock_session_data",
   },
 }
 `;
 
 exports[`Render Generic Component should render 1`] = `
 {
-  "amount": "mocked_amount",
+  "amount": {
+    "currency": "mocked_currency",
+    "value": "mocked_amount",
+  },
   "countryCode": "mocked_countrycode",
   "paymentMethodsConfiguration": {
     "amazonpay": {
@@ -45,11 +48,8 @@ exports[`Render Generic Component should render 1`] = `
       "configuration": undefined,
     },
   },
-  "session": {
-    "adyenDescriptions": {},
-    "id": "mock_id",
+  "paymentMethodsResponse": {
     "imagePath": "example.com",
-    "sessionData": "mock_session_data",
   },
 }
 `;

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/__tests__/adyenAccount.test.js

@@ -0,0 +1,86 @@
+/**
+ * @jest-environment jsdom
+ */
+
+const store = require('../../../../../store');
+const {initializeCardComponent, submitAddCard} = require('../../adyenAccount')
+$.fn.modal = jest.fn();
+
+jest.mock('../../commons');
+jest.mock('../../../../../store');
+let checkout;
+// Mocking external dependencies
+jest.mock('../../../../../store', () => ({
+  checkoutConfiguration: {
+    amount: { value: 0, currency: 'EUR' },
+    paymentMethodsConfiguration: {
+      card: {
+        onChange: jest.fn(),
+      },
+    },
+    onAdditionalDetails: jest.fn(),
+  },
+}));   
+
+describe('submitAddCard', () => {
+  beforeEach(() => {
+    store.checkoutConfiguration = {};
+
+    jest.clearAllMocks();
+  });
+
+  it('initialize card component', async () => {
+    document.body.innerHTML = `<div id="card"></div>`;
+    await initializeCardComponent();
+    expect(document.getElementById('card')).toBeDefined();
+  });
+
+  it('should send form data via ajax on submitAddCard call', () => {
+    const fakeResponse = {redirectAction : 'test'};
+    document.body.innerHTML = `<form id="payment-form" action="/fake-action">
+      <input type="text" name="fake" value="fake" />
+    </form>`;
+    $.ajax = jest.fn(({ success }) => {
+        success(fakeResponse);
+        return { fail: jest.fn() };
+      });
+    submitAddCard();
+    expect($.ajax).toHaveBeenCalledWith({
+      type: 'POST',
+      url: '/fake-action',
+      data: 'fake=fake',
+      async: false,
+      success: expect.any(Function),
+    });
+  });
+
+  it('should handle redirection action after successful form submission', () => {
+    const fakeRedirectAction = { type: 'redirect' };
+    document.body.innerHTML = `<form id="payment-form" action="/fake-action">
+      <input type="text" name="fake" value="fake" />
+    </form>`;
+    $.ajax = jest.fn(({ success }) => {
+      success({ redirectAction: fakeRedirectAction });
+      return { fail: jest.fn() };
+    });
+    window.location.href = '';
+    submitAddCard();
+    expect(window.location.href).toBe('http://localhost/');
+  }); 
+
+  it('should handle errors returned from the server during form submission', () => {
+    let formErrorsExist = false
+    const fakeErrorResponse = { error: 'Something went wrong' };
+    $.ajax = jest.fn(({ success }) => {
+      success(fakeErrorResponse);
+      return { fail: jest.fn() };
+    });
+    submitAddCard();
+    setTimeout(() => {
+        expect(formErrorsExist).toBeTruthy();
+        done();
+      }); // Timeout needed for completition of the test
+  }); 
+
+});
+

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/__tests__/renderGenericComponent.test.js

@@ -5,7 +5,7 @@ jest.mock('../../commons');
 jest.mock('../../../../../store');
 
 const { renderGenericComponent, setInstallments, renderPosTerminals, isCartModified, renderGiftCardLogo, setGiftCardContainerVisibility, applyGiftCards } = require('../renderGenericComponent');
-const { createSession } = require('../../commons');
+const { getPaymentMethods } = require('../../commons');
 const { fetchGiftCards } = require('../../commons');
 const store = require('../../../../../store');
 const giftCardHtml = `
@@ -59,19 +59,17 @@ beforeEach(() => {
       storedPaymentMethods: [{ supportedShopperInteractions: ['Ecommerce'] }],
       paymentMethods: [{ type: 'amazonpay' }],
     },
-    options: {
-      amount: 'mocked_amount',
-      countryCode: 'mocked_countrycode',
-    },
   }));
   window.installments = '[[0,2,["amex","hipercard"]]]';
   store.checkout = {
    options: {}
   };
-  createSession.mockReturnValue({
+  store.checkoutConfiguration = {
+    amount: {value : 'mocked_amount', currency : 'mocked_currency'},
+    countryCode: 'mocked_countrycode',
+  };
+  getPaymentMethods.mockReturnValue({
     adyenConnectedTerminals: { uniqueTerminalIds: ['mocked_id'] },
-    id: 'mock_id',
-    sessionData: 'mock_session_data',
     imagePath: 'example.com',
     adyenDescriptions: {},
   });
@@ -83,7 +81,7 @@ describe('Render Generic Component', () => {
     store.componentsObj = { foo: 'bar', bar: 'baz' };
     store.checkoutConfiguration.paymentMethodsConfiguration = { amazonpay: {} };
     await renderGenericComponent();
-    expect(createSession).toBeCalled();
+    expect(getPaymentMethods).toBeCalled();
     expect(store.checkoutConfiguration).toMatchSnapshot();
     expect(
         document.querySelector('input[type=radio][name=brandCode]').value,
@@ -96,7 +94,7 @@ describe('Render Generic Component', () => {
     store.componentsObj = { foo: 'bar', bar: 'baz' };
     store.checkoutConfiguration.paymentMethodsConfiguration = { amazonpay: {} };
     await renderGenericComponent();
-    expect(createSession).toBeCalled();
+    expect(getPaymentMethods).toBeCalled();
     expect(store.checkoutConfiguration).toMatchSnapshot();
     expect(
       document.querySelector('.gift-card-selection').style.display,
@@ -171,8 +169,8 @@ describe('Render Generic Component', () => {
   });
 
   it('handles errors in initializeCheckout', async () => {
-    createSession.mockRejectedValue(new Error('Session creation failed'));
-    await expect(renderGenericComponent()).rejects.toThrow('Session creation failed');
+    getPaymentMethods.mockRejectedValue(new Error('Payments method call failed'));
+    await expect(renderGenericComponent()).rejects.toThrow('Payments method call failed');
   });
 
   it('correctly sets Pos Terminals', () => {
@@ -276,7 +274,7 @@ describe('Render Generic Component', () => {
     const renderGiftCardComponent = require('*/cartridge/client/default/js/adyen_checkout/renderGiftcardComponent');
     store.checkoutConfiguration = {
       amount: { currency: 'USD', value: 50 },
-      session: {
+      paymentMethodsResponse: {
         imagePath: 'test_image_path',
       },
     };

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/__tests__/renderGiftcardComponent.test.js

@@ -35,7 +35,7 @@ beforeEach(() => {
   }));
   window.Configuration = { amount: 0 };
   store.checkoutConfiguration = {
-    session: {
+    paymentMethodsResponse: {
       imagePath: 'test_image_path',
     },
   };

src/cartridges/int_adyen_SFRA/cartridge/client/default/js/adyen_checkout/checkoutConfiguration.js

@@ -24,7 +24,7 @@ function getCardConfig() {
       store.isValid = state.isValid;
       const method = state.data.paymentMethod.storedPaymentMethodId
         ? `storedCard${state.data.paymentMethod.storedPaymentMethodId}`
-        : store.selectedMethod;
+        : constants.SCHEME;
       store.updateSelectedPayment(method, 'isValid', store.isValid);
       store.updateSelectedPayment(method, 'stateData', state.data);
     },