Merge pull request #1194 from RocketChat/new/custom-oauth

[NEW] Support to login using Custom OAuth

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -207,6 +207,31 @@ class LoginPresenter @Inject constructor(
                         }
                     }
 
+                    getCustomOauthServices(services).let {
+                        for (service in it) {
+                            val serviceName = getCustomOauthServiceName(service)
+
+                            val customOauthUrl = OauthHelper.getCustomOauthUrl(
+                                getCustomOauthHost(service),
+                                getCustomOauthAuthorizePath(service),
+                                getCustomOauthClientId(service),
+                                currentServer,
+                                serviceName,
+                                state,
+                                getCustomOauthScope(service)
+                            )
+
+                            view.addCustomOauthServiceButton(
+                                customOauthUrl,
+                                state,
+                                serviceName,
+                                getCustomOauthServiceNameColor(service),
+                                getCustomOauthButtonColor(service)
+                            )
+                            totalSocialAccountsEnabled++
+                        }
+                    }
+
                     if (totalSocialAccountsEnabled > 0) {
                         view.enableOauthView()
                         if (totalSocialAccountsEnabled > 3) {
@@ -299,6 +324,38 @@ class LoginPresenter @Inject constructor(
         }.toString()
     }
 
+    private fun getCustomOauthServices(listMap: List<Map<String, Any>>): List<Map<String, Any>>  {
+        return listMap.filter { map -> map["custom"] == true }
+    }
+
+    private fun getCustomOauthHost(service: Map<String, Any>): String {
+        return service["serverURL"].toString()
+    }
+
+    private fun getCustomOauthAuthorizePath(service: Map<String, Any>): String {
+        return service["authorizePath"].toString()
+    }
+
+    private fun getCustomOauthClientId(service: Map<String, Any>): String {
+        return service["clientId"].toString()
+    }
+
+    private fun getCustomOauthServiceName(service: Map<String, Any>): String {
+        return service["service"].toString()
+    }
+
+    private fun getCustomOauthScope(service: Map<String, Any>): String {
+        return service["scope"].toString()
+    }
+
+    private fun getCustomOauthButtonColor(service: Map<String, Any>): Int {
+        return service["buttonColor"].toString().parseColor()
+    }
+
+    private fun getCustomOauthServiceNameColor(service: Map<String, Any>): Int {
+        return service["buttonLabelColor"].toString().parseColor()
+    }
+
     private suspend fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt

 package chat.rocket.android.authentication.login.presentation
 
-import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 
@@ -75,7 +74,7 @@ interface LoginView : LoadingView, MessageView {
      * Enables and shows the oauth view if there is login via social accounts enabled by the server settings.
      *
      * REMARK: We must show at maximum *three* social accounts views ([enableLoginByFacebook], [enableLoginByGithub], [enableLoginByGoogle],
-     * [enableLoginByLinkedin], [enableLoginByMeteor], [enableLoginByTwitter] or [enableLoginByGitlab]) for the oauth view.
+     * [enableLoginByLinkedin], [enableLoginByMeteor], [enableLoginByTwitter], [enableLoginByGitlab] or [addCustomOauthServiceButton]) for the oauth view.
      * If the possibility of login via social accounts exceeds 3 different ways we should set up the FAB ([setupFabListener]) to show the remaining view(s).
      */
     fun enableOauthView()
@@ -178,6 +177,24 @@ interface LoginView : LoadingView, MessageView {
      */
     fun setupGitlabButtonListener(gitlabUrl: String, state: String)
 
+    /**
+     * Adds a custom OAuth button in the oauth view.
+     *
+     * @customOauthUrl The custom OAuth url to sets up the button (the listener).
+     * @state A random string generated by the app, which you'll verify later (to protect against forgery attacks).
+     * @serviceName The custom OAuth service name.
+     * @serviceNameColor The custom OAuth service name color (just stylizing).
+     * @buttonColor The color of the custom OAuth button (just stylizing).
+     * @see [enableOauthView]
+     */
+    fun addCustomOauthServiceButton(
+        customOauthUrl: String,
+        state: String,
+        serviceName: String,
+        serviceNameColor: Int,
+        buttonColor: Int
+    )
+
     /**
      * Setups the FloatingActionButton to show more social accounts views (expanding the oauth view interface to show the remaining view(s)).
      */

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -3,6 +3,7 @@ package chat.rocket.android.authentication.login.ui
 import DrawableHelper
 import android.app.Activity
 import android.content.Intent
+import android.graphics.PorterDuff
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
@@ -11,7 +12,9 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
+import android.widget.Button
 import android.widget.ImageButton
+import android.widget.LinearLayout
 import android.widget.ScrollView
 import androidx.core.view.isVisible
 import androidx.core.view.postDelayed
@@ -374,6 +377,27 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
+    override fun addCustomOauthServiceButton(
+        customOauthUrl: String,
+        state: String,
+        serviceName: String,
+        serviceNameColor: Int,
+        buttonColor: Int
+    ) {
+        ui { activity ->
+            val button = getCustomOauthButton(serviceName, serviceNameColor, buttonColor)
+            social_accounts_container.addView(button)
+
+            button.setOnClickListener {
+                startActivityForResult(
+                    activity.oauthWebViewIntent(customOauthUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
+                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
+            }
+        }
+    }
+
     override fun setupFabListener() {
         ui {
             button_fab.isVisible = true
@@ -460,7 +484,9 @@ class LoginFragment : Fragment(), LoginView {
     private fun showOauthView() {
         if (isOauthViewEnable) {
             social_accounts_container.isVisible = true
-            button_fab.isVisible = true
+            if (enabledSocialAccounts() > 3) {
+                button_fab.isVisible = true
+            }
         }
     }
 
@@ -470,4 +496,46 @@ class LoginFragment : Fragment(), LoginView {
             button_fab.isVisible = false
         }
     }
+
+    private fun enabledSocialAccounts(): Int {
+        return enabledOauthAccountsImageButtons() + enabledServicesAccountsButtons()
+    }
+
+    private fun enabledOauthAccountsImageButtons(): Int {
+        return (0..social_accounts_container.childCount)
+            .mapNotNull { social_accounts_container.getChildAt(it) as? ImageButton }
+            .filter { it.isClickable }
+            .size
+    }
+
+    private fun enabledServicesAccountsButtons(): Int {
+        return (0..social_accounts_container.childCount)
+            .mapNotNull { social_accounts_container.getChildAt(it) as? Button }
+            .size
+    }
+
+    /**
+     * Gets a stylized custom OAuth button.
+     */
+    private fun getCustomOauthButton(
+        buttonText: String,
+        buttonTextColor: Int,
+        buttonBgColor: Int
+    ): Button {
+        val params: LinearLayout.LayoutParams = LinearLayout.LayoutParams(
+            LinearLayout.LayoutParams.MATCH_PARENT,
+            LinearLayout.LayoutParams.WRAP_CONTENT
+        )
+
+        val margin = resources.getDimensionPixelSize(R.dimen.screen_edge_left_and_right_margins)
+        params.setMargins(margin, margin, margin, 0)
+
+        val button = Button(context)
+        button.layoutParams = params
+        button.text = buttonText
+        button.setTextColor(buttonTextColor)
+        button.background.setColorFilter(buttonBgColor, PorterDuff.Mode.MULTIPLY)
+
+        return button
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/helper/OauthHelper.kt

@@ -91,4 +91,34 @@ object OauthHelper {
                 "&response_type=code" +
                 "&scope=email"
     }
+
+    /**
+     * Returns the Custom Oauth URL.
+     *
+     * @param host The custom OAuth host.
+     * @param authorizePath The OAuth authorization path.
+     * @param clientId The custom OAuth client ID.
+     * @param serverUrl The server URL.
+     * @param serviceName The service name.
+     * @param state An unguessable random string used to protect against forgery attacks.
+     * @param scope The custom OAuth scope.
+     * @return The Custom Oauth URL.
+     */
+    fun getCustomOauthUrl(
+        host: String,
+        authorizePath: String,
+        clientId: String,
+        serverUrl: String,
+        serviceName: String,
+        state: String,
+        scope: String
+    ): String {
+        return host +
+                authorizePath +
+                "?client_id=$clientId" +
+                "&redirect_uri=${serverUrl.removeTrailingSlash()}/_oauth/$serviceName" +
+                "&state=$state" +
+                "&scope=$scope" +
+                "&response_type=code"
+    }
 }

app/src/main/java/chat/rocket/android/util/extensions/String.kt

 package chat.rocket.android.util.extensions
 
+import android.graphics.Color
 import android.util.Patterns
+import timber.log.Timber
 
 fun String.removeTrailingSlash(): String {
     return if (isNotEmpty() && this[length - 1] == '/') {
@@ -32,4 +34,14 @@ fun String.termsOfServiceUrl() = "${removeTrailingSlash()}/terms-of-service"
 
 fun String.privacyPolicyUrl() = "${removeTrailingSlash()}/privacy-policy"
 
-fun String.isValidUrl(): Boolean = Patterns.WEB_URL.matcher(this).matches()
\ No newline at end of file
+fun String.isValidUrl(): Boolean = Patterns.WEB_URL.matcher(this).matches()
+
+fun String.parseColor(): Int {
+    return try {
+        Color.parseColor(this)
+    } catch (exception: IllegalArgumentException) {
+        // Log the exception and get the white color.
+        Timber.e(exception)
+        Color.parseColor("white")
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/webview/oauth/ui/OauthWebViewActivity.kt

@@ -78,6 +78,7 @@ class OauthWebViewActivity : AppCompatActivity() {
     private fun setupWebView() {
         with(web_view.settings) {
             javaScriptEnabled = true
+            domStorageEnabled = true
             // TODO Remove this workaround that is required to make Google OAuth to work. We should use Custom Tabs instead. See https://github.com/RocketChat/Rocket.Chat.Android/issues/968
             if (webPageUrl.contains("google")) {
                 userAgentString = "Mozilla/5.0 (Linux; Android 4.1.1; Galaxy Nexus Build/JRO03C) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/43.0.2357.65 Mobile Safari/535.19"

build.gradle

@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
         classpath 'com.google.gms:google-services:3.2.0'

dependencies.gradle

@@ -4,7 +4,7 @@ ext {
             compileSdk            : 27,
             targetSdk             : 27,
             buildTools            : '27.0.3',
-            kotlin                : '1.2.31',
+            kotlin                : '1.2.40',
             coroutine             : '0.22.5',
             dokka                 : '0.9.16',