Close #1340: Add support for WebAuthnFeature

app/build.gradle

@@ -479,6 +479,7 @@ dependencies {
     implementation Deps.mozilla_feature_top_sites
     implementation Deps.mozilla_feature_share
     implementation Deps.mozilla_feature_accounts_push
+    implementation Deps.mozilla_feature_webauthn
     implementation Deps.mozilla_feature_webcompat
     implementation Deps.mozilla_feature_webnotifications
     implementation Deps.mozilla_feature_webcompat_reporter

app/src/main/java/org/mozilla/fenix/FeatureFlags.kt

@@ -48,7 +48,7 @@ object FeatureFlags {
     val newMediaSessionApi = true
 
     /**
-     * Enables experimental WebAuthn support. This implementation should never reach release!
+     * Enables WebAuthn support.
      */
     val webAuthFeature = Config.channel.isNightlyOrDebug
 }

app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt

@@ -81,6 +81,7 @@ import mozilla.components.support.ktx.android.view.exitImmersiveModeIfNeeded
 import mozilla.components.support.ktx.android.view.hideKeyboard
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged
+import org.mozilla.fenix.BuildConfig
 import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
@@ -125,6 +126,7 @@ import org.mozilla.fenix.utils.allowUndo
 import org.mozilla.fenix.wifi.SitePermissionsWifiIntegration
 import java.lang.ref.WeakReference
 import mozilla.components.feature.media.fullscreen.MediaFullscreenOrientationFeature
+import mozilla.components.feature.webauthn.WebAuthnFeature
 import org.mozilla.fenix.FeatureFlags.newMediaSessionApi
 
 /**
@@ -643,7 +645,8 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             view = view
         )
 
-        if (FeatureFlags.webAuthFeature) {
+        // This component feature only works on Fenix when built on Mozilla infrastructure.
+        if (FeatureFlags.webAuthFeature && BuildConfig.MOZILLA_OFFICIAL) {
             webAuthnFeature.set(
                 feature = WebAuthnFeature(
                     engine = requireComponents.core.engine,

app/src/main/java/org/mozilla/fenix/browser/WebAuthnFeature.kt

@@ -1,62 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.fenix.browser
-
-import android.app.Activity
-import android.content.Intent
-import android.content.IntentSender
-import mozilla.components.concept.engine.Engine
-import mozilla.components.concept.engine.activity.ActivityDelegate
-import mozilla.components.support.base.feature.ActivityResultHandler
-import mozilla.components.support.base.feature.LifecycleAwareFeature
-import mozilla.components.support.base.log.logger.Logger
-import org.mozilla.fenix.FeatureFlags
-
-/**
- * This implementation of the WebAuthnFeature is only for testing in a nightly signed build.
- *
- * ⚠️ This should always be behind the [FeatureFlags.webAuthFeature] nightly flag.
- */
-class WebAuthnFeature(
-    private val engine: Engine,
-    private val activity: Activity
-) : LifecycleAwareFeature, ActivityResultHandler {
-    val logger = Logger("WebAuthnFeature")
-    var requestCode = ACTIVITY_REQUEST_CODE
-    var resultCallback: ((Intent?) -> Unit)? = null
-    private val delegate = object : ActivityDelegate {
-        override fun startIntentSenderForResult(intent: IntentSender, onResult: (Intent?) -> Unit) {
-            val code = requestCode++
-            logger.info("Received activity delegate request with code: $code intent: $intent")
-            activity.startIntentSenderForResult(intent, code, null, 0, 0, 0)
-            resultCallback = onResult
-        }
-    }
-
-    override fun start() {
-        logger.info("Feature started.")
-        engine.registerActivityDelegate(delegate)
-    }
-
-    override fun stop() {
-        logger.info("Feature stopped.")
-        engine.unregisterActivityDelegate()
-    }
-
-    override fun onActivityResult(requestCode: Int, data: Intent?, resultCode: Int): Boolean {
-        logger.info("Received activity result with code: $requestCode\ndata: $data")
-        if (this.requestCode == requestCode) {
-            logger.info("Invoking callback!")
-            resultCallback?.invoke(data)
-            return true
-        }
-
-        return false
-    }
-
-    companion object {
-        const val ACTIVITY_REQUEST_CODE = 10
-    }
-}

buildSrc/src/main/java/Dependencies.kt

@@ -124,6 +124,7 @@ object Deps {
     const val mozilla_feature_accounts_push = "org.mozilla.components:feature-accounts-push:${Versions.mozilla_android_components}"
     const val mozilla_feature_top_sites = "org.mozilla.components:feature-top-sites:${Versions.mozilla_android_components}"
     const val mozilla_feature_share = "org.mozilla.components:feature-share:${Versions.mozilla_android_components}"
+    const val mozilla_feature_webauthn = "org.mozilla.components:feature-webauthn:${Versions.mozilla_android_components}"
     const val mozilla_feature_webcompat = "org.mozilla.components:feature-webcompat:${Versions.mozilla_android_components}"
     const val mozilla_feature_webnotifications = "org.mozilla.components:feature-webnotifications:${Versions.mozilla_android_components}"
     const val mozilla_feature_webcompat_reporter = "org.mozilla.components:feature-webcompat-reporter:${Versions.mozilla_android_components}"