Fix 3DS2 Whitelisting Encoding Issue

3ds2sdk/src/main/kotlin/com/stripe/android/stripe3ds2/transaction/ChallengeAction.kt

@@ -7,7 +7,7 @@ internal sealed class ChallengeAction : Parcelable {
     @Parcelize
     data class NativeForm(
         internal val userEntry: String,
-        internal val whitelistingValue: Boolean
+        internal val whitelistingValue: Boolean?
     ) : ChallengeAction()
 
     @Parcelize
@@ -17,7 +17,7 @@ internal sealed class ChallengeAction : Parcelable {
 
     @Parcelize
     data class Oob(
-        internal val whitelistingValue: Boolean
+        internal val whitelistingValue: Boolean?
     ) : ChallengeAction()
 
     @Parcelize

3ds2sdk/src/main/kotlin/com/stripe/android/stripe3ds2/views/ChallengeFragment.kt

@@ -102,10 +102,16 @@ internal class ChallengeFragment(
 
     private val challengeAction: ChallengeAction
         get() {
+            val whitelistingSelection = if (cresData.whitelistingInfoText.isNullOrEmpty()) {
+                null
+            } else {
+                challengeZoneView.whitelistingSelection
+            }
+
             return when (cresData.uiType) {
-                UiType.OutOfBand -> ChallengeAction.Oob(challengeZoneView.whitelistingSelection)
+                UiType.OutOfBand -> ChallengeAction.Oob(whitelistingSelection)
                 UiType.Html -> ChallengeAction.HtmlForm(userEntry)
-                else -> ChallengeAction.NativeForm(userEntry, challengeZoneView.whitelistingSelection)
+                else -> ChallengeAction.NativeForm(userEntry, whitelistingSelection)
             }
         }
 

3ds2sdk/src/test/kotlin/com/stripe/android/stripe3ds2/views/ChallengeFragmentTest.kt

@@ -91,7 +91,7 @@ class ChallengeFragmentTest {
 
             assertThat(challengeActionHandler.actions)
                 .containsExactly(
-                    ChallengeAction.NativeForm("123456", whitelistingValue = false)
+                    ChallengeAction.NativeForm("123456", whitelistingValue = null)
                 )
         }
     }
@@ -273,6 +273,90 @@ class ChallengeFragmentTest {
         }
     }
 
+    @Test
+    fun `native form whitelisting value is true if whitelistingInfoText is present and button checked`() {
+        createFragment(
+            cres = CRES_TEXT_DATA
+        ) { fragment ->
+            fragment.challengeZoneView.setWhitelistChecked(true)
+            fragment.clickSubmitButton()
+            val action = challengeActionHandler
+                .actions[challengeActionHandler.actions.lastIndex] as? ChallengeAction.NativeForm
+
+            assertThat(action?.whitelistingValue).isTrue()
+        }
+    }
+
+    @Test
+    fun `oob whitelisting value is true if whitelistingInfoText is present and button checked`() {
+        createFragment(
+            cres = CRES_OOB_DATA.copy(whitelistingInfoText = "Whitelisting text is present")
+        ) { fragment ->
+            fragment.challengeZoneView.setWhitelistChecked(true)
+            fragment.clickSubmitButton()
+            val action = challengeActionHandler
+                .actions[challengeActionHandler.actions.lastIndex] as? ChallengeAction.Oob
+
+            assertThat(action?.whitelistingValue).isTrue()
+        }
+    }
+
+    @Test
+    fun `native form whitelisting value is null if whitelistingInfoText is null and button checked`() {
+        createFragment(
+            cres = CRES_TEXT_DATA.copy(whitelistingInfoText = null)
+        ) { fragment ->
+            fragment.challengeZoneView.setWhitelistChecked(true)
+            fragment.clickSubmitButton()
+            val action = challengeActionHandler
+                .actions[challengeActionHandler.actions.lastIndex] as? ChallengeAction.NativeForm
+
+            assertThat(action?.whitelistingValue).isNull()
+        }
+    }
+
+    @Test
+    fun `OOB whitelisting value is null if whitelistingInfoText is null and button checked`() {
+        createFragment(
+            cres = CRES_OOB_DATA.copy(whitelistingInfoText = null)
+        ) { fragment ->
+            fragment.challengeZoneView.setWhitelistChecked(true)
+            fragment.clickSubmitButton()
+            val action = challengeActionHandler
+                .actions[challengeActionHandler.actions.lastIndex] as? ChallengeAction.Oob
+
+            assertThat(action?.whitelistingValue).isNull()
+        }
+    }
+
+    @Test
+    fun `native form whitelisting value is false if whitelistingInfoText is present and button not checked`() {
+        createFragment(
+            cres = CRES_TEXT_DATA
+        ) { fragment ->
+            fragment.challengeZoneView.setWhitelistChecked(false)
+            fragment.clickSubmitButton()
+            val action = challengeActionHandler
+                .actions[challengeActionHandler.actions.lastIndex] as? ChallengeAction.NativeForm
+
+            assertThat(action?.whitelistingValue).isFalse()
+        }
+    }
+
+    @Test
+    fun `oob whitelisting value is false if whitelistingInfoText is present and button not checked`() {
+        createFragment(
+            cres = CRES_OOB_DATA.copy(whitelistingInfoText = "Whitelisting text exists")
+        ) { fragment ->
+            fragment.challengeZoneView.setWhitelistChecked(false)
+            fragment.clickSubmitButton()
+            val action = challengeActionHandler
+                .actions[challengeActionHandler.actions.lastIndex] as? ChallengeAction.Oob
+
+            assertThat(action?.whitelistingValue).isFalse()
+        }
+    }
+
     private fun createFragment(
         cres: ChallengeResponseData? = ChallengeMessageFixtures.CRES_TEXT_DATA,
         onFragment: (ChallengeFragment) -> Unit