From 7c86a32cb50d8d823e0ce38b4f0dc7210e321122 Mon Sep 17 00:00:00 2001 From: Kate Kolmakova Date: Wed, 19 Feb 2025 13:13:37 +0400 Subject: [PATCH] ECWID-156368 mask fields in params and json at once --- .../ecwid/apiclient/v3/util/SecurePatterns.kt | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/kotlin/com/ecwid/apiclient/v3/util/SecurePatterns.kt b/src/main/kotlin/com/ecwid/apiclient/v3/util/SecurePatterns.kt index f9bcf0dd..4e90732c 100644 --- a/src/main/kotlin/com/ecwid/apiclient/v3/util/SecurePatterns.kt +++ b/src/main/kotlin/com/ecwid/apiclient/v3/util/SecurePatterns.kt @@ -3,17 +3,20 @@ package com.ecwid.apiclient.v3.util 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"), - createJsonSecurePattern("street"), - createJsonSecurePattern("city"), - createJsonSecurePattern("postalCode"), - createJsonSecurePattern("phone"), + createSecurePatterns("email"), + createSecurePatterns("token"), + createSecurePatterns("name"), + createSecurePatterns("firstName"), + createSecurePatterns("lastName"), + createSecurePatterns("street"), + createSecurePatterns("city"), + createSecurePatterns("postalCode"), + createSecurePatterns("phone"), +).flatten() + +fun createSecurePatterns(paramName: String): List = listOf( + createKeyValueSecurePattern(paramName), + createJsonSecurePattern(paramName), ) fun createKeyValueSecurePattern(paramName: String) = SecurePattern( @@ -26,6 +29,4 @@ fun createJsonSecurePattern(paramName: String) = SecurePattern( unmaskedLength = 6 ) -fun createSecurePatterns() = mutableListOf().apply { - addAll(GLOBAL_SECURE_PATTERNS) -}.toList() +fun createSecurePatterns() = GLOBAL_SECURE_PATTERNS.toMutableList()