WIP Use WebChannels for FxA integration

mozilla-mobile · Aug 26, 2019 · a8b8b54 · a8b8b54
1 parent 153af58
commit a8b8b54
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt b/app/src/main/java/org/mozilla/fenix/AppRequestInterceptor.kt
@@ -25,8 +25,8 @@ class AppRequestInterceptor(private val context: Context) : RequestInterceptor {
         }
 
         adjustTrackingProtection(host, context, session)
-        // Accounts uses interception to check for a "success URL" in the sign-in flow to finalize authentication.
-        return context.components.services.accountsAuthFeature.interceptor.onLoadRequest(session, uri)
+
+        return null
     }
 
     private fun adjustTrackingProtection(host: String, context: Context, session: EngineSession) {

diff --git a/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt b/app/src/main/java/org/mozilla/fenix/IntentReceiverActivity.kt
@@ -62,6 +62,7 @@ class IntentReceiverActivity : Activity() {
     private fun setIntentActivity(intent: Intent) {
         val openToBrowser = when {
             components.utils.customTabIntentProcessor.matches(intent) -> {
+                // TODO This is potentially unsafe. Any app on the system can set the auth extra.
                 val activityClass = if (intent.hasExtra(getString(R.string.intent_extra_auth))) {
                     AuthCustomTabActivity::class
                 } else {

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -27,6 +27,7 @@ import kotlinx.coroutines.withContext
 import mozilla.appservices.places.BookmarkRoot
 import mozilla.components.browser.session.Session
 import mozilla.components.feature.readerview.ReaderViewFeature
+import mozilla.components.feature.accounts.WebChannelFeature
 import mozilla.components.feature.session.ThumbnailsFeature
 import mozilla.components.feature.sitepermissions.SitePermissions
 import mozilla.components.lib.state.ext.consumeFrom
@@ -63,6 +64,7 @@ class BrowserFragment : BaseBrowserFragment(), BackHandler {
 
     private val readerViewFeature = ViewBoundFeatureWrapper<ReaderViewFeature>()
     private val thumbnailsFeature = ViewBoundFeatureWrapper<ThumbnailsFeature>()
+    private val webchannelIntegration = ViewBoundFeatureWrapper<WebChannelFeature>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -102,6 +104,18 @@ class BrowserFragment : BaseBrowserFragment(), BackHandler {
                 view = view
             )
 
+            webchannelIntegration.set(
+                feature = WebChannelFeature(
+                    requireContext(),
+                    customTabSessionId,
+                    requireComponents.core.engine,
+                    requireComponents.core.sessionManager,
+                    requireComponents.backgroundServices.accountManager
+                ),
+                owner = this,
+                view = view
+            )
+
             readerViewFeature.set(
                 feature = ReaderViewFeature(
                     requireContext(),

diff --git a/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt b/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt
@@ -54,7 +54,7 @@ class BackgroundServices(
 ) {
     companion object {
         const val CLIENT_ID = "a2270f727f45f648"
-        const val REDIRECT_URL = "https://accounts.firefox.com/oauth/success/$CLIENT_ID"
+        const val REDIRECT_URL = "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel"
     }
 
     fun defaultDeviceName(context: Context): String = context.getString(
@@ -64,7 +64,9 @@ class BackgroundServices(
         Build.MODEL
     )
 
-    private val serverConfig = ServerConfig.release(CLIENT_ID, REDIRECT_URL)
+//  private val serverConfig = ServerConfig.release(CLIENT_ID, REDIRECT_URL)
+//  TODO replace with release channel ^^
+    private val serverConfig = ServerConfig("https://oauthchannel.dev.lcip.org", CLIENT_ID, REDIRECT_URL)
     private val deviceConfig = DeviceConfig(
         name = defaultDeviceName(context),
         type = DeviceType.MOBILE,

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/AuthCustomTabActivity.kt b/app/src/main/java/org/mozilla/fenix/customtabs/AuthCustomTabActivity.kt
@@ -11,7 +11,6 @@ import org.mozilla.fenix.ext.components
 
 class AuthCustomTabActivity : CustomTabActivity() {
     private lateinit var accountManager: FxaAccountManager
-
     // Navigate away from this activity when we have successful authentication
     private val accountStateObserver = object : AccountObserver {
         override fun onAuthenticated(account: OAuthAccount, newAccount: Boolean) {