Skip to content

Commit 5420390

Browse files
shanikantsinghshanikantsingh
authored
Merge 44ff48b into 1fafff2 
2 parents 1fafff2 + 44ff48b commit 5420390

19 files changed

Lines changed: 117 additions & 109 deletions

File tree

‎.github/workflows/E2E_SFRA.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- 'int_adyen_controllers/**'
77
- 'adyen_controllers_changes/**'
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
setup-the-cartridge:
1114
if: ${{ github.actor != 'renovate[bot]' || github.actor != 'lgtm-com[bot]' }}

‎.github/workflows/SFCC.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: SFCC.js CI
22

33
on: [push, pull_request]
44

5+
permissions:
6+
contents: read
7+
58
jobs:
69
build:
710

‎.github/workflows/cartridges-commit.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- opened
77
- synchronize
88

9+
permissions:
10+
contents: write
911

1012
jobs:
1113
commit-the-cartridge-and-project-files:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
schedule:
77
- cron: '0 3 * * 3'
88

9+
permissions:
10+
contents: read
11+
security-events: write
12+
913
jobs:
1014
CodeQL-Build:
1115

@@ -26,15 +30,15 @@ jobs:
2630

2731
# Initializes the CodeQL tools for scanning.
2832
- name: Initialize CodeQL
29-
uses: github/codeql-action/init@v2
33+
uses: github/codeql-action/init@v3
3034
# Override language selection by uncommenting this and choosing your languages
3135
# with:
3236
# languages: go, javascript, csharp, python, cpp, java
3337

3438
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3539
# If this step fails, then you should remove it and run the build manually (see below)
3640
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v2
41+
uses: github/codeql-action/autobuild@v3
3842

3943
# ℹ️ Command-line programs to run using the OS shell.
4044
# 📚 https://git.io/JvXDl
@@ -48,4 +52,4 @@ jobs:
4852
# make release
4953

5054
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@v2
55+
uses: github/codeql-action/analyze@v3

‎.github/workflows/metadata-upload.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
pull_request:
55
paths:
66
- 'metadata/**'
7+
8+
permissions:
9+
contents: read
10+
711
jobs:
812
upload-metadata:
913
runs-on: ubuntu-latest

‎.github/workflows/release-upload.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ name: Release upload
33
on:
44
pull_request:
55

6+
permissions:
7+
contents: read
8+
69
jobs:
710
upload-release:
811
if: |

‎metadata/site_import/meta/system-objecttype-extensions.xml‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -249,19 +249,6 @@
249249
</attribute-definition>
250250
</system-attribute-definitions>
251251
<custom-attribute-definitions>
252-
<attribute-definition attribute-id="AmountPaid">
253-
<display-name xml:lang="x-default">Amount Paid</display-name>
254-
<type>double</type>
255-
<mandatory-flag>false</mandatory-flag>
256-
<externally-managed-flag>false</externally-managed-flag>
257-
</attribute-definition>
258-
<attribute-definition attribute-id="approvalStatus">
259-
<display-name xml:lang="x-default">Approval Status</display-name>
260-
<type>string</type>
261-
<mandatory-flag>false</mandatory-flag>
262-
<externally-managed-flag>false</externally-managed-flag>
263-
<min-length>0</min-length>
264-
</attribute-definition>
265252
<attribute-definition attribute-id="authAmount">
266253
<display-name xml:lang="x-default">Auth Amount</display-name>
267254
<type>string</type>
@@ -283,20 +270,6 @@
283270
<externally-managed-flag>false</externally-managed-flag>
284271
<min-length>0</min-length>
285272
</attribute-definition>
286-
<attribute-definition attribute-id="requestId">
287-
<display-name xml:lang="x-default">Request ID</display-name>
288-
<type>string</type>
289-
<mandatory-flag>false</mandatory-flag>
290-
<externally-managed-flag>false</externally-managed-flag>
291-
<min-length>0</min-length>
292-
</attribute-definition>
293-
<attribute-definition attribute-id="requestToken">
294-
<display-name xml:lang="x-default">Request Token</display-name>
295-
<type>string</type>
296-
<mandatory-flag>false</mandatory-flag>
297-
<externally-managed-flag>false</externally-managed-flag>
298-
<min-length>0</min-length>
299-
</attribute-definition>
300273
<attribute-definition attribute-id="Adyen_log">
301274
<display-name xml:lang="x-default">Adyen Log</display-name>
302275
<type>text</type>
@@ -321,12 +294,6 @@
321294
<mandatory-flag>false</mandatory-flag>
322295
<externally-managed-flag>false</externally-managed-flag>
323296
</attribute-definition>
324-
<attribute-definition attribute-id="Adyen_merchantReturnData">
325-
<display-name xml:lang="x-default">Adyen_merchantReturnData</display-name>
326-
<type>string</type>
327-
<mandatory-flag>false</mandatory-flag>
328-
<externally-managed-flag>false</externally-managed-flag>
329-
</attribute-definition>
330297
<attribute-definition attribute-id="Adyen_merchantSig">
331298
<display-name xml:lang="x-default">Adyen_merchantSig</display-name>
332299
<type>string</type>
@@ -729,6 +696,10 @@
729696
<attribute attribute-id="Adyen_Mode"/>
730697
<attribute attribute-id="Adyen_Frontend_Region"/>
731698
<attribute attribute-id="Adyen_ClientKey"/>
699+
<attribute attribute-id="Adyen_LivePrefix"/>
700+
<attribute attribute-id="Adyen_ApplePay_DomainAssociation"/>
701+
<attribute attribute-id="Adyen_Hmac_Key"/>
702+
<attribute attribute-id="Adyen_klarnaWidget"/>
732703
<attribute attribute-id="Adyen_SFRA6_Compatibility"/>
733704
<attribute attribute-id="Adyen_notification_user"/>
734705
<attribute attribute-id="Adyen_notification_password"/>

‎metadata/site_import/services.xml‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- IMPORTANT: YOUR_LIVE_PREFIX and CHECKOUT_API_VERSION get populated in the code, hence there is not need to change them in this file. -->
23
<services xmlns="http://www.demandware.com/xml/impex/services/2014-09-26">
34
<service-credential service-credential-id="AdyenPayment">
4-
<url>https://checkout-test.adyen.com/checkout/v71/payments</url>
5+
<url>https://checkout-test.adyen.com/checkout/[CHECKOUT_API_VERSION]/payments</url>
56
<user-id></user-id>
67
<password/>
78
</service-credential>
89
<service-credential service-credential-id="AdyenPaymentLive">
9-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/payments</url>
10+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/payments</url>
1011
<user-id></user-id>
1112
<password/>
1213
</service-credential>
1314
<service-credential service-credential-id="AdyenPaymentDetails">
14-
<url>https://checkout-test.adyen.com/checkout/v71/payments/details</url>
15+
<url>https://checkout-test.adyen.com/checkout/[CHECKOUT_API_VERSION]/payments/details</url>
1516
<user-id></user-id>
1617
<password/>
1718
</service-credential>
1819
<service-credential service-credential-id="AdyenPaymentDetailsLive">
19-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/payments/details</url>
20+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/payments/details</url>
2021
<user-id></user-id>
2122
<password/>
2223
</service-credential>
2324
<service-credential service-credential-id="AdyenCheckoutPaymentMethods">
24-
<url>https://checkout-test.adyen.com/v71/paymentMethods</url>
25+
<url>https://checkout-test.adyen.com/[CHECKOUT_API_VERSION]/paymentMethods</url>
2526
<user-id></user-id>
2627
<password/>
2728
</service-credential>
2829
<service-credential service-credential-id="AdyenCheckoutPaymentMethodsLive">
29-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/paymentMethods</url>
30+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/paymentMethods</url>
3031
<user-id></user-id>
3132
<password/>
3233
</service-credential>
@@ -61,52 +62,52 @@
6162
<password/>
6263
</service-credential>
6364
<service-credential service-credential-id="AdyenGiving">
64-
<url>https://checkout-test.adyen.com/v71/donations</url>
65+
<url>https://checkout-test.adyen.com/[CHECKOUT_API_VERSION]/donations</url>
6566
<user-id></user-id>
6667
<password/>
6768
</service-credential>
6869
<service-credential service-credential-id="AdyenGivingLive">
69-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/donations</url>
70+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/donations</url>
7071
<user-id></user-id>
7172
<password/>
7273
</service-credential>
7374
<service-credential service-credential-id="AdyenPartialPaymentsOrder">
74-
<url>https://checkout-test.adyen.com/v71/orders</url>
75+
<url>https://checkout-test.adyen.com/[CHECKOUT_API_VERSION]/orders</url>
7576
<user-id></user-id>
7677
<password/>
7778
</service-credential>
7879
<service-credential service-credential-id="AdyenPartialPaymentsOrderLive">
79-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/orders</url>
80+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/orders</url>
8081
<user-id></user-id>
8182
<password/>
8283
</service-credential>
8384
<service-credential service-credential-id="AdyenCancelPartialPaymentOrder">
84-
<url>https://checkout-test.adyen.com/v71/orders/cancel</url>
85+
<url>https://checkout-test.adyen.com/[CHECKOUT_API_VERSION]/orders/cancel</url>
8586
<user-id></user-id>
8687
<password/>
8788
</service-credential>
8889
<service-credential service-credential-id="AdyenCancelPartialPaymentOrderLive">
89-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/orders/cancel</url>
90+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/orders/cancel</url>
9091
<user-id></user-id>
9192
<password/>
9293
</service-credential>
9394
<service-credential service-credential-id="AdyenCheckBalance">
94-
<url>https://checkout-test.adyen.com/v71/paymentMethods/balance</url>
95+
<url>https://checkout-test.adyen.com/[CHECKOUT_API_VERSION]/paymentMethods/balance</url>
9596
<user-id></user-id>
9697
<password/>
9798
</service-credential>
9899
<service-credential service-credential-id="AdyenCheckBalanceLive">
99-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/paymentMethods/balance</url>
100+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/paymentMethods/balance</url>
100101
<user-id></user-id>
101102
<password/>
102103
</service-credential>
103104
<service-credential service-credential-id="AdyenPaypalUpdateOrder">
104-
<url>https://checkout-test.adyen.com/v71/paypal/updateOrder</url>
105+
<url>https://checkout-test.adyen.com/[CHECKOUT_API_VERSION]/paypal/updateOrder</url>
105106
<user-id></user-id>
106107
<password/>
107108
</service-credential>
108109
<service-credential service-credential-id="AdyenPaypalUpdateOrderLive">
109-
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/v71/paypal/updateOrder</url>
110+
<url>https://[YOUR_LIVE_PREFIX]-checkout-live.adyenpayments.com/checkout/[CHECKOUT_API_VERSION]/paypal/updateOrder</url>
110111
<user-id></user-id>
111112
<password/>
112113
</service-credential>
@@ -148,15 +149,6 @@
148149
<profile-id>Adyen</profile-id>
149150
<credential-id>AdyenPaymentDetails</credential-id>
150151
</service>
151-
<service service-id="AdyenRecurring">
152-
<service-type>HTTP</service-type>
153-
<enabled>true</enabled>
154-
<log-prefix>adyen</log-prefix>
155-
<comm-log-enabled>true</comm-log-enabled>
156-
<mock-mode-enabled>false</mock-mode-enabled>
157-
<profile-id>Adyen</profile-id>
158-
<credential-id>AdyenRecurring</credential-id>
159-
</service>
160152
<service service-id="AdyenCheckoutPaymentMethods">
161153
<service-type>HTTP</service-type>
162154
<enabled>true</enabled>
@@ -172,7 +164,7 @@
172164
<log-prefix>adyen</log-prefix>
173165
<comm-log-enabled>true</comm-log-enabled>
174166
<mock-mode-enabled>false</mock-mode-enabled>
175-
<profile-id></profile-id>
167+
<profile-id>Adyen</profile-id>
176168
<credential-id>AdyenRecurringDisable</credential-id>
177169
</service>
178170
<service service-id="AdyenPosPayment">

‎package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "app_adyen_SFRA",
3-
"version": "25.2.1",
3+
"version": "25.2.2",
44
"description": "Adyen's official cartridge for SFRA",
55
"main": "index.js",
66
"paths": {

0 commit comments

Comments
 (0)