Added a temp realization of authenticator.| #716

Author: DenBond7

FlowCrypt/src/main/AndroidManifest.xml

@@ -295,6 +295,17 @@
             android:exported="false"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
+        <service
+            android:name=".accounts.FlowcryptAuthenticatorService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data
+                android:name="android.accounts.AccountAuthenticator"
+                android:resource="@xml/authenticator" />
+        </service>
+
         <receiver android:name=".broadcastreceivers.MarkMessagesAsOldBroadcastReceiver" />
 
         <receiver android:name=".broadcastreceivers.CorruptedStorageBroadcastReceiver" />

FlowCrypt/src/main/java/com/flowcrypt/email/accounts/FlowcryptAccountAuthenticator.kt

@@ -0,0 +1,107 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.accounts
+
+import android.accounts.AbstractAccountAuthenticator
+import android.accounts.Account
+import android.accounts.AccountAuthenticatorResponse
+import android.accounts.AccountManager
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.text.TextUtils
+import com.flowcrypt.email.BuildConfig
+import com.flowcrypt.email.ui.activity.SignInActivity
+
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 8/12/20
+ *         Time: 4:14 PM
+ *         E-mail: [email protected]
+ */
+class FlowcryptAccountAuthenticator(val context: Context) : AbstractAccountAuthenticator(context) {
+  override fun getAuthTokenLabel(authTokenType: String?): String {
+    return ""
+  }
+
+  override fun confirmCredentials(response: AccountAuthenticatorResponse?, account: Account?, options: Bundle?): Bundle {
+    return Bundle()
+  }
+
+  override fun updateCredentials(response: AccountAuthenticatorResponse?, account: Account?, authTokenType: String?, options: Bundle?): Bundle {
+    return Bundle()
+  }
+
+  override fun getAuthToken(response: AccountAuthenticatorResponse?, account: Account?, authTokenType: String?, options: Bundle?): Bundle {
+    // Extract the username and password from the Account Manager, and ask
+    // the server for an appropriate AuthToken.
+    // Extract the username and password from the Account Manager, and ask
+    // the server for an appropriate AuthToken.
+    val accountManager = AccountManager.get(context)
+
+    var authToken = accountManager.peekAuthToken(account, authTokenType)
+
+    // Lets give another try to authenticate the user
+
+    // Lets give another try to authenticate the user
+    if (TextUtils.isEmpty(authToken)) {
+      val password = accountManager.getPassword(account)
+      if (password != null) {
+        authToken = "some token"//AuthTokenLoader.signIn(mContext, account.name, password);
+      }
+    }
+
+    // If we get an authToken - we return it
+
+    // If we get an authToken - we return it
+    if (!TextUtils.isEmpty(authToken)) {
+      val result = Bundle()
+      result.putString(AccountManager.KEY_ACCOUNT_NAME, account!!.name)
+      result.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type)
+      result.putString(AccountManager.KEY_AUTHTOKEN, authToken)
+      return result
+    }
+
+    // If we get here, then we couldn't access the user's password - so we
+    // need to re-prompt them for their credentials. We do that by creating
+    // an intent to display our AuthenticatorActivity.
+
+    // If we get here, then we couldn't access the user's password - so we
+    // need to re-prompt them for their credentials. We do that by creating
+    // an intent to display our AuthenticatorActivity.
+    val intent = Intent(context, SignInActivity::class.java)
+    //intent.putExtra(FlowcryptAuthenticatorActivity.ARG_ACCOUNT_TYPE, attr.accountType)
+    //intent.putExtra(FlowcryptAuthenticatorActivity.ARG_AUTH_TYPE, authTokenType)
+    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response)
+    val bundle = Bundle()
+    bundle.putParcelable(AccountManager.KEY_INTENT, intent)
+    return bundle
+  }
+
+  override fun hasFeatures(response: AccountAuthenticatorResponse?, account: Account?, features: Array<out String>?): Bundle {
+    return Bundle()
+  }
+
+  override fun editProperties(response: AccountAuthenticatorResponse?, accountType: String?): Bundle {
+    return Bundle()
+  }
+
+  override fun addAccount(response: AccountAuthenticatorResponse?, accountType: String?, authTokenType: String?, requiredFeatures: Array<out String>?, options: Bundle?): Bundle {
+    val intent = Intent(context, SignInActivity::class.java)
+    //intent.putExtra(FlowcryptAuthenticatorActivity.ARG_ACCOUNT_TYPE, attr.accountType)
+    //intent.putExtra(FlowcryptAuthenticatorActivity.ARG_AUTH_TYPE, authTokenType)
+    intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response)
+    val bundle = Bundle()
+    bundle.putParcelable(AccountManager.KEY_INTENT, intent)
+    return bundle
+  }
+
+  companion object {
+    val ACCOUNT_TYPE = BuildConfig.APPLICATION_ID
+    val AUTH_TOKEN_TYPE_EMAIL = "email"
+  }
+}

FlowCrypt/src/main/java/com/flowcrypt/email/accounts/FlowcryptAuthenticatorService.kt

@@ -0,0 +1,29 @@
+/*
+ * © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
+ * Contributors: DenBond7
+ */
+
+package com.flowcrypt.email.accounts
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+/**
+ * @author Denis Bondarenko
+ *         Date: 8/12/20
+ *         Time: 5:03 PM
+ *         E-mail: [email protected]
+ */
+class FlowcryptAuthenticatorService : Service() {
+  private lateinit var authenticator: FlowcryptAccountAuthenticator
+
+  override fun onCreate() {
+    super.onCreate()
+    authenticator = FlowcryptAccountAuthenticator(applicationContext)
+  }
+
+  override fun onBind(intent: Intent?): IBinder? {
+    return authenticator.iBinder
+  }
+}

FlowCrypt/src/main/java/com/flowcrypt/email/api/email/protocol/OpenStoreHelper.kt

@@ -5,7 +5,9 @@
 
 package com.flowcrypt.email.api.email.protocol
 
+import android.accounts.AccountManager
 import android.content.Context
+import com.flowcrypt.email.accounts.FlowcryptAccountAuthenticator
 import com.flowcrypt.email.api.email.EmailUtil
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.api.email.gmail.GmailConstants
@@ -145,7 +147,20 @@ class OpenStoreHelper {
               else -> session.getStore(JavaEmailConstants.PROTOCOL_IMAPS)
             }
 
-            store.connect(account.imapServer, account.username, account.password)
+            val password = if (account.useOAuth2) {
+              val accountManager = AccountManager.get(context)
+              val oauthAccount = accountManager.accounts.firstOrNull { it.name == account.email }
+              if (oauthAccount != null) {
+                accountManager.blockingGetAuthToken(oauthAccount,
+                    FlowcryptAccountAuthenticator.AUTH_TOKEN_TYPE_EMAIL, true)
+              } else {
+                account.password
+              }
+            } else {
+              account.password
+            }
+
+            store.connect(account.imapServer, account.username, password)
             store
           }
         }

FlowCrypt/src/main/java/com/flowcrypt/email/database/entity/AccountEntity.kt

@@ -67,6 +67,9 @@ data class AccountEntity constructor(
   val account: Account? = Account(this.email, accountType
       ?: this.email.substring(this.email.indexOf('@') + 1).toLowerCase(Locale.US))
 
+  val useOAuth2: Boolean
+    get() = JavaEmailConstants.AUTH_MECHANISMS_XOAUTH2 == imapAuthMechanisms
+
   constructor(googleSignInAccount: GoogleSignInAccount, uuid: String? = null,
               domainRules: List<String>? = null) :
       this(

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/AddOtherAccountFragment.kt

@@ -5,6 +5,8 @@
 
 package com.flowcrypt.email.ui.activity.fragment
 
+import android.accounts.Account
+import android.accounts.AccountManager
 import android.app.Activity
 import android.app.PendingIntent
 import android.content.Intent
@@ -29,6 +31,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import com.flowcrypt.email.Constants
 import com.flowcrypt.email.R
+import com.flowcrypt.email.accounts.FlowcryptAccountAuthenticator
 import com.flowcrypt.email.api.email.EmailProviderSettingsHelper
 import com.flowcrypt.email.api.email.JavaEmailConstants
 import com.flowcrypt.email.api.email.gmail.GmailConstants
@@ -71,8 +74,10 @@ import net.openid.appauth.AuthorizationRequest
 import net.openid.appauth.AuthorizationResponse
 import net.openid.appauth.AuthorizationService
 import java.net.SocketTimeoutException
+import java.util.*
 import java.util.regex.Pattern
 import javax.mail.AuthenticationFailedException
+import kotlin.collections.ArrayList
 
 /**
  * @author Denis Bondarenko
@@ -219,9 +224,23 @@ class AddOtherAccountFragment : BaseSingInFragment(), ProgressBehaviour,
 
   override fun runEmailManagerActivity() {
     lifecycleScope.launch {
-      val accountEntity = AccountEntity(generateAuthCreds())
+      val authCreds = generateAuthCreds()
+      val accountEntity = AccountEntity(
+          if (authCreds.useOAuth2) {
+            authCreds.copy(password = "", smtpSignInPassword = null)
+          } else {
+            authCreds
+          })
       val roomDatabase = FlowCryptRoomDatabase.getDatabase(requireContext())
       roomDatabase.accountDao().addAccountSuspend(accountEntity)
+
+      if (authCreds.useOAuth2) {
+        val accountManager = AccountManager.get(requireContext())
+        val account = Account(accountEntity.email.toLowerCase(Locale.US), FlowcryptAccountAuthenticator.ACCOUNT_TYPE)
+        accountManager.addAccountExplicitly(account, null, null)
+        accountManager.setAuthToken(account, FlowcryptAccountAuthenticator.AUTH_TOKEN_TYPE_EMAIL, authCreds.password)
+      }
+
       EmailSyncService.startEmailSyncService(requireContext())
 
       val addedAccount = roomDatabase.accountDao().getAccountSuspend(accountEntity.email)

FlowCrypt/src/main/res/xml/authenticator.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ © 2016-present FlowCrypt a.s. Limitations apply. Contact [email protected]
+  ~ Contributors: DenBond7
+  -->
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="@string/application_id"
+    android:customTokens="true"
+    android:icon="@mipmap/ic_launcher"
+    android:label="@string/app_name"
+    android:smallIcon="@mipmap/ic_launcher" />