HCaptcha support. #5953
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package org.wikipedia.captcha | ||
|
|
||
| import androidx.core.net.toUri | ||
| import androidx.fragment.app.FragmentActivity | ||
| import com.hcaptcha.sdk.HCaptcha | ||
| import com.hcaptcha.sdk.HCaptchaConfig | ||
| import com.hcaptcha.sdk.HCaptchaDialogFragment | ||
| import com.hcaptcha.sdk.HCaptchaTheme | ||
| import org.wikipedia.WikipediaApp | ||
| import org.wikipedia.settings.RemoteConfig | ||
| import org.wikipedia.util.log.L | ||
| import kotlin.String | ||
|
|
||
| class HCaptchaHelper( | ||
| private val activity: FragmentActivity, | ||
| private val callback: Callback | ||
| ) { | ||
| interface Callback { | ||
| fun onSuccess(token: String) | ||
| fun onError(e: Exception) | ||
| } | ||
|
|
||
| private var hCaptcha: HCaptcha? = null | ||
|
|
||
| private val configDefault get() = RemoteConfig.RemoteConfigHCaptcha( | ||
| baseURL = "https://meta.wikimedia.org", | ||
| jsSrc = "https://assets-hcaptcha.wikimedia.org/1/api.js", | ||
| endpoint = "https://hcaptcha.wikimedia.org", | ||
| assetHost = "https://assets-hcaptcha.wikimedia.org", | ||
| imgHost = "https://imgs-hcaptcha.wikimedia.org", | ||
| reportApi = "https://report-hcaptcha.wikimedia.org", | ||
| sentry = false, | ||
| siteKey = "e11698d6-51ca-4980-875c-72309c6678cc" | ||
|
Collaborator
There was a problem hiding this comment. Looks like the
Member
Author
There was a problem hiding this comment. Hmm curious, looking into this with the other team...
Member
Author
There was a problem hiding this comment. This should be fixed now on the backend. |
||
| ) | ||
|
|
||
| private val dialogCancelableRunnable = MakeHCaptchaDialogCancelable() | ||
|
|
||
| fun show() { | ||
| if (hCaptcha == null) { | ||
| val config = RemoteConfig.config.androidv1?.hCaptcha ?: configDefault | ||
| hCaptcha = HCaptcha.getClient(activity) | ||
| hCaptcha?.setup( | ||
| HCaptchaConfig.builder() | ||
| .theme(if (WikipediaApp.instance.currentTheme.isDark) HCaptchaTheme.DARK else HCaptchaTheme.LIGHT) | ||
| .siteKey(config.siteKey) | ||
| .host(config.baseURL.toUri().host) | ||
| .jsSrc(config.jsSrc) | ||
| .endpoint(config.endpoint) | ||
| .assethost(config.assetHost) | ||
| .imghost(config.imgHost) | ||
| .reportapi(config.reportApi) | ||
| .sentry(config.sentry) | ||
| .loading(false) | ||
| .build() | ||
| ) | ||
|
|
||
| hCaptcha?.addOnSuccessListener { response -> | ||
| callback.onSuccess(response.tokenResult) | ||
| }?.addOnFailureListener { e -> | ||
| L.e("hCaptcha failed: ${e.message} (${e.statusCode})") | ||
| callback.onError(e) | ||
| }?.addOnOpenListener { | ||
| L.d("hCaptcha opened") | ||
| } | ||
| } | ||
| hCaptcha?.verifyWithHCaptcha() | ||
|
|
||
| // This works around an issue in the hCaptcha library where the "loading" dialog, even when | ||
| // it's not visible, still allows itself to be "canceled" by touching anywhere outside its | ||
| // bounds. We work around this by explicitly finding its DialogFragment and setting it to | ||
| // be non-cancelable, and then setting it back to cancelable after a short delay, so that | ||
| // the user doesn't accidentally tap the screen while hCaptcha is loading. | ||
| activity.window.decorView.post(MakeHCaptchaDialogCancelable(false)) | ||
| activity.window.decorView.postDelayed(dialogCancelableRunnable, 10000) | ||
| } | ||
|
|
||
| fun cleanup() { | ||
| if (!activity.isDestroyed) { | ||
| activity.window.decorView.removeCallbacks(dialogCancelableRunnable) | ||
| } | ||
| hCaptcha?.removeAllListeners() | ||
| hCaptcha?.reset() | ||
| hCaptcha = null | ||
| } | ||
|
|
||
| inner class MakeHCaptchaDialogCancelable(val cancelable: Boolean = true) : Runnable { | ||
| override fun run() { | ||
| if (!activity.isDestroyed) { | ||
| activity.supportFragmentManager.fragments.filterIsInstance<HCaptchaDialogFragment>().forEach { | ||
| it.isCancelable = cancelable | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note: even though these parameters are served by our remote configuration, we still want to hardcode some defaults here, in case the network call to fetch remote configuration fails.