Merge branch 'master' into ECWID-150578-New-IS-Category-name-for-product

Author: EvgeniiAnishchenko

.github/workflows/pull-request.yml

@@ -48,7 +48,7 @@ jobs:
             ${{ github.workspace }}/build/reports/detekt/detekt.html
 
       - name: Upload static analysis results
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         if: always()
         with:
           sarif_file: ${{ github.workspace }}/build/reports/detekt/detekt.sarif

.github/workflows/push-to-master.yml

@@ -37,7 +37,7 @@ jobs:
           GRGIT_PASS: ${{ secrets.GRGIT_PASS }}
 
       - name: Upload static analysis results
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         if: always()
         with:
           sarif_file: ${{ github.workspace }}/build/reports/detekt/detekt.sarif

src/main/kotlin/com/ecwid/apiclient/v3/dto/order/enums/DiscountBase.kt

@@ -4,5 +4,8 @@ enum class DiscountBase {
 	ON_TOTAL,
 	ON_MEMBERSHIP,
 	ON_TOTAL_AND_MEMBERSHIP,
+	SHIPPING,
+	ITEM,
+	SUBTOTAL,
 	CUSTOM
 }

src/main/kotlin/com/ecwid/apiclient/v3/util/SecurePatterns.kt

@@ -4,7 +4,9 @@ private const val PARAM_VALUE_PATTERN = "([^;,)]+)"
 
 private val GLOBAL_SECURE_PATTERNS = listOf(
 	createKeyValueSecurePattern("email"),
+	createKeyValueSecurePattern("token"),
 	createJsonSecurePattern("email"),
+	createJsonSecurePattern("token"),
 	createJsonSecurePattern("name"),
 	createJsonSecurePattern("firstName"),
 	createJsonSecurePattern("lastName"),

src/test/kotlin/com/ecwid/apiclient/v3/util/OrderUtils.kt

@@ -73,7 +73,10 @@ fun generateTestOrder(): UpdatedOrder {
 			generateTestOnTotalDiscountInfo(),
 			generateTestOnMembershipDiscountInfo(),
 			generateTestOnTotalAndMembershipDiscountInfo(),
-			generateTestCustomDiscountInfo()
+			generateTestCustomDiscountInfo(),
+			generateTestItemDiscountInfo(),
+			generateTestShippingDiscountInfo(),
+			generateTestSubtotalDiscountInfo()
 		),
 
 		// TODO Pass real discount coupon code when API client will support this
@@ -190,6 +193,30 @@ private fun generateTestCustomDiscountInfo() = UpdatedOrder.DiscountInfo(
 	description = "Custom discount " + randomAlphanumeric(8)
 )
 
+private fun generateTestItemDiscountInfo() = UpdatedOrder.DiscountInfo(
+	value = randomPrice(),
+	type = randomEnumValue<DiscountType>(),
+	base = DiscountBase.ITEM,
+	orderTotal = randomPrice(),
+	description = "On item discount " + randomAlphanumeric(8)
+)
+
+private fun generateTestShippingDiscountInfo() = UpdatedOrder.DiscountInfo(
+	value = randomPrice(),
+	type = randomEnumValue<DiscountType>(),
+	base = DiscountBase.SHIPPING,
+	orderTotal = randomPrice(),
+	description = "On shipping discount " + randomAlphanumeric(8)
+)
+
+private fun generateTestSubtotalDiscountInfo() = UpdatedOrder.DiscountInfo(
+	value = randomPrice(),
+	type = randomEnumValue<DiscountType>(),
+	base = DiscountBase.SUBTOTAL,
+	orderTotal = randomPrice(),
+	description = "On subtotal discount " + randomAlphanumeric(8)
+)
+
 private fun generateTestOrderItem() = UpdatedOrder.OrderItem(
 	// var id: Int? = null, // TODO readonly
 	// productId = com.ecwid.api.v3.randomId(), // TODO need to pass existing product id