fix: CHALLENGE_CLOSED should be emitted only once (#178)

Author: CAMOBAP

CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+# 4.1.2
+
+- Fix: double call with CHALLENGE_CLOSED error
+- Fix: broken retryPredicate config
+
 # 4.1.1
 
 - Fix: back button should cancel hCaptcha in compose-sdk

compose-sdk/build.gradle

@@ -20,11 +20,11 @@ android {
         // See https://developer.android.com/studio/publish/versioning
         // versionCode must be integer and be incremented by one for every new update
         // android system uses this to prevent downgrades
-        versionCode 46
+        versionCode 47
 
         // version number visible to the user
         // should follow semantic versioning (See https://semver.org)
-        versionName "4.1.1"
+        versionName "4.1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

compose-sdk/src/main/java/com/hcaptcha/sdk/HCaptchaCompose.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
@@ -36,38 +37,35 @@ public fun HCaptchaCompose(config: HCaptchaConfig, onResult: (HCaptchaResponse)
             helper.value = HCaptchaWebViewHelper(
                 handler, context, config, internalConfig, verifier, this
             )
-
         }
     }
     var dismissed by remember { mutableStateOf(false) }
 
-    HCaptchaLog.d("HCaptchaCompose($config)")
-
-    DisposableEffect(dismissed) {
-        onDispose {
-            if (dismissed) {
-                verifier.onFailure(HCaptchaException(HCaptchaError.CHALLENGE_CLOSED));
-                helper.value?.destroy()
-            }
-        }
+    val onDismissRequest: () -> Unit = {
+        dismissed = true
+        verifier.onFailure(HCaptchaException(HCaptchaError.CHALLENGE_CLOSED));
+        helper.value?.destroy()
     }
 
+    HCaptchaLog.d("HCaptchaCompose($config)")
+
     if (config.hideDialog) {
         AndroidView(
             modifier = Modifier.size(0.dp),
             factory = { preloadedWebView }
         )
     } else if (!dismissed) {
         Dialog(
-            onDismissRequest = { dismissed = true }
+            onDismissRequest = onDismissRequest
         ) {
             Column(
                 modifier = Modifier
+                    .testTag("dialogRoot")
                     .fillMaxSize()
                     .clickable(
                         interactionSource = MutableInteractionSource(),
                         indication = null,
-                        onClick = { dismissed = true }
+                        onClick = onDismissRequest
                     ),
                 verticalArrangement = Arrangement.Center,
                 horizontalAlignment = Alignment.CenterHorizontally

sdk/build.gradle

@@ -28,11 +28,11 @@ android {
         // See https://developer.android.com/studio/publish/versioning
         // versionCode must be integer and be incremented by one for every new update
         // android system uses this to prevent downgrades
-        versionCode 46
+        versionCode 47
 
         // version number visible to the user
         // should follow semantic versioning (See https://semver.org)
-        versionName "4.1.1"
+        versionName "4.1.2"
 
         buildConfigField 'String', 'VERSION_NAME', "\"${defaultConfig.versionName}_${defaultConfig.versionCode}\""
 

test/src/androidTest/java/com/hcaptcha/sdk/compose/HCaptchaComposeTest.kt

@@ -9,6 +9,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -17,6 +18,7 @@ import com.hcaptcha.sdk.HCaptchaConfig
 import com.hcaptcha.sdk.HCaptchaError
 import com.hcaptcha.sdk.HCaptchaResponse
 import com.hcaptcha.sdk.HCaptchaSize
+import androidx.test.espresso.Espresso.pressBack
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.Rule
@@ -37,7 +39,9 @@ class HCaptchaComposeTest {
     @get:Rule
     val composeTestRule = createComposeRule()
 
-    fun setContent(siteKey: String = SITE_KEY, passiveSiteKey: Boolean = false) {
+    private fun setContent(siteKey: String = SITE_KEY,
+                           passiveSiteKey: Boolean = false,
+                           size: HCaptchaSize = HCaptchaSize.INVISIBLE) {
         composeTestRule.setContent {
             var text by remember { mutableStateOf("<init>") }
             Column {
@@ -47,15 +51,19 @@ class HCaptchaComposeTest {
                     .builder()
                     .siteKey(siteKey)
                     .diagnosticLog(true)
-                    .size(HCaptchaSize.INVISIBLE)
+                    .size(size)
                     .hideDialog(passiveSiteKey)
                     .build()) { result ->
                     when (result) {
                         is HCaptchaResponse.Success -> {
                             text = result.token
                         }
                         is HCaptchaResponse.Failure -> {
-                            text = result.error.name
+                            if (result.error.name == text) {
+                                text += "2"
+                            } else {
+                                text = result.error.name
+                            }
                         }
                         else -> {}
                     }
@@ -93,4 +101,56 @@ class HCaptchaComposeTest {
         composeTestRule.onNodeWithContentDescription(resultContentDescription)
             .assertTextEquals(TEST_TOKEN)
     }
+
+    @Test
+    fun passiveVisualChallengeCanceled() {
+        setContent("00000000-0000-0000-0000-000000000000", false)
+
+        runBlocking { delay(timeout) }
+
+        composeTestRule.onNodeWithTag("dialogRoot").performTouchInput {
+            val x = this.width / 2f
+            val y = this.height * 0.9f
+
+            click(Offset(x, y))
+        }
+
+        runBlocking { delay(timeout / 2) }
+
+        composeTestRule.onNodeWithContentDescription(resultContentDescription)
+            .assertTextContains(HCaptchaError.CHALLENGE_CLOSED.name)
+    }
+
+    @Test
+    fun passiveCheckboxCanceled() {
+        setContent("00000000-0000-0000-0000-000000000000", false, HCaptchaSize.COMPACT)
+
+        runBlocking { delay(timeout) }
+
+        composeTestRule.onNodeWithTag("dialogRoot").performTouchInput {
+            val x = this.width / 2f
+            val y = this.height * 0.9f
+
+            click(Offset(x, y))
+        }
+
+        runBlocking { delay(timeout / 2) }
+
+        composeTestRule.onNodeWithContentDescription(resultContentDescription)
+            .assertTextContains(HCaptchaError.CHALLENGE_CLOSED.name)
+    }
+
+    @Test
+    fun passiveCheckboxCanceledWithBack() {
+        setContent("00000000-0000-0000-0000-000000000000", false, HCaptchaSize.COMPACT)
+
+        runBlocking { delay(timeout) }
+
+        pressBack()
+
+        runBlocking { delay(timeout / 2) }
+
+        composeTestRule.onNodeWithContentDescription(resultContentDescription)
+            .assertTextContains(HCaptchaError.CHALLENGE_CLOSED.name)
+    }
 }