Skip to content

Commit 7c697e2

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents d14e51a + 2d65b48 commit 7c697e2

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

src/main/kotlin/com/ecwid/apiclient/v3/dto/report/enums/ReportType.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,10 @@ enum class ReportType {
4040
abandonedCarts,
4141
topOfProductsByAddingToFavorites,
4242

43+
/** activity */
44+
siteEmailActivity,
45+
sitePhoneActivity,
46+
siteAddressActivity,
47+
siteLocationMapActivity,
48+
siteContactWidgetActivity,
4349
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,25 @@ private const val PARAM_VALUE_PATTERN = "([^;,)]+)"
44

55
private val GLOBAL_SECURE_PATTERNS = listOf(
66
createKeyValueSecurePattern("email"),
7+
createKeyValueSecurePattern("customerEmail"),
78
createKeyValueSecurePattern("token"),
9+
createKeyValueSecurePattern("customerTaxId"),
10+
createKeyValueSecurePattern("password"),
11+
createKeyValueSecurePattern("customerGroupId"),
12+
createKeyValueSecurePattern("privateAdminNotes"),
13+
createKeyValueSecurePattern("primaryPhone"),
14+
createKeyValueSecurePattern("companyName"),
15+
createKeyValueSecurePattern("street"),
16+
createKeyValueSecurePattern("city"),
17+
createKeyValueSecurePattern("countryCode"),
18+
createKeyValueSecurePattern("postalCode"),
19+
createKeyValueSecurePattern("stateOrProvinceCode"),
20+
createKeyValueSecurePattern("phone"),
21+
createKeyValueSecurePattern("name"),
22+
createKeyValueSecurePattern("contact"),
23+
createKeyValueSecurePattern("note"),
824
createJsonSecurePattern("email"),
25+
createJsonSecurePattern("customerEmail"),
926
createJsonSecurePattern("token"),
1027
createJsonSecurePattern("name"),
1128
createJsonSecurePattern("firstName"),

src/test/kotlin/com/ecwid/apiclient/v3/entity/BrandsTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.ecwid.apiclient.v3.util.randomAlphanumeric
99
import com.ecwid.apiclient.v3.util.randomPrice
1010
import org.junit.jupiter.api.Assertions.assertTrue
1111
import org.junit.jupiter.api.BeforeEach
12+
import org.junit.jupiter.api.Disabled
1213
import kotlin.test.Test
1314
import kotlin.test.assertEquals
1415

@@ -22,6 +23,7 @@ class BrandsTest : BaseEntityTest() {
2223
removeAllProducts()
2324
}
2425

26+
@Disabled("The test is temporarily disabled")
2527
@Test
2628
fun getBrands() {
2729
val brandedProductsCreateResult = createProductsWithBrands()

0 commit comments

Comments
 (0)