Merge pull request #1093 from RocketChat/new/auth-deep-link

[NEW] Auth deep link

app/build.gradle

@@ -124,6 +124,10 @@ kotlin {
     }
 }
 
+androidExtensions {
+    experimental = true
+}
+
 // FIXME - build and install the sdk into the app/libs directory
 // We were having some issues with the kapt generated files from the sdk when importing as a module
 task compileSdk(type:Exec) {

app/src/main/AndroidManifest.xml

@@ -35,6 +35,19 @@
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
+
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data
+                    android:host="auth"
+                    android:scheme="rocketchat" />
+                <data
+                    android:host="go.rocket.chat"
+                    android:path="/auth"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
         <activity

app/src/main/java/chat/rocket/android/authentication/domain/model/LoginDeepLinkInfo.kt

+package chat.rocket.android.authentication.domain.model
+
+import android.content.Intent
+import android.net.Uri
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+import timber.log.Timber
+
+@Parcelize
+data class LoginDeepLinkInfo(
+    val url: String,
+    val userId: String,
+    val token: String
+) : Parcelable
+
+fun Intent.getLoginDeepLinkInfo(): LoginDeepLinkInfo? {
+    val uri = data
+    return if (action == Intent.ACTION_VIEW && uri != null && uri.isAuthenticationDeepLink()) {
+        val host = uri.getQueryParameter("host")
+        val url = if (host.startsWith("http")) host else "https://$host"
+        val userId = uri.getQueryParameter("userId")
+        val token = uri.getQueryParameter("token")
+        try {
+            LoginDeepLinkInfo(url, userId, token)
+        } catch (ex: Exception) {
+            Timber.d(ex, "Error parsing login deeplink")
+            null
+        }
+    } else null
+}
+
+private inline fun Uri.isAuthenticationDeepLink(): Boolean {
+    if (host == "auth")
+        return true
+    else if (host == "go.rocket.chat" && path == "/auth")
+        return true
+    return false
+}
\ No newline at end of file

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

 package chat.rocket.android.authentication.login.presentation
 
+import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.OauthHelper
@@ -10,6 +11,7 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extensions.*
 import chat.rocket.android.util.retryIO
+import chat.rocket.common.RocketChatAuthException
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.RocketChatTwoFactorException
 import chat.rocket.common.model.Token
@@ -24,6 +26,7 @@ import javax.inject.Inject
 private const val TYPE_LOGIN_USER_EMAIL = 0
 private const val TYPE_LOGIN_CAS = 1
 private const val TYPE_LOGIN_OAUTH = 2
+private const val TYPE_LOGIN_DEEP_LINK = 3
 private const val SERVICE_NAME_GITHUB = "github"
 private const val SERVICE_NAME_GOOGLE = "google"
 private const val SERVICE_NAME_LINKEDIN = "linkedin"
@@ -35,26 +38,31 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                                          private val tokenRepository: TokenRepository,
                                          private val localRepository: LocalRepository,
                                          private val getAccountsInteractor: GetAccountsInteractor,
-                                         settingsInteractor: GetSettingsInteractor,
+                                         private val settingsInteractor: GetSettingsInteractor,
                                          serverInteractor: GetCurrentServerInteractor,
                                          private val saveAccountInteractor: SaveAccountInteractor,
                                          private val factory: RocketChatClientFactory)
-    : CheckServerPresenter(strategy, factory.create(serverInteractor.get()!!), view) {
+    : CheckServerPresenter(strategy, factory, view) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private val currentServer = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(currentServer)
-    private val settings: PublicSettings = settingsInteractor.get(currentServer)
+    private lateinit var client: RocketChatClient
+    private lateinit var settings: PublicSettings
+    //private val client: RocketChatClient = factory.create(currentServer)
+    //private val settings: PublicSettings = settingsInteractor.get(currentServer)
     private lateinit var usernameOrEmail: String
     private lateinit var password: String
     private lateinit var credentialToken: String
     private lateinit var credentialSecret: String
+    private lateinit var deepLinkUserId: String
+    private lateinit var deepLinkToken: String
 
     fun setupView() {
+        setupConnectionInfo(currentServer)
         setupLoginView()
         setupUserRegistrationView()
         setupCasView()
         setupOauthServicesView()
-        checkServerInfo()
+        checkServerInfo(currentServer)
     }
 
     fun authenticateWithUserAndPassword(usernameOrEmail: String, password: String) {
@@ -84,6 +92,32 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
         doAuthentication(TYPE_LOGIN_OAUTH)
     }
 
+    fun authenticadeWithDeepLink(deepLinkInfo: LoginDeepLinkInfo) {
+        val serverUrl = deepLinkInfo.url
+        setupConnectionInfo(serverUrl)
+        deepLinkUserId = deepLinkInfo.userId
+        deepLinkToken = deepLinkInfo.token
+        tokenRepository.save(serverUrl, Token(deepLinkUserId, deepLinkToken))
+        launchUI(strategy) {
+            try {
+                val version = checkServerVersion(serverUrl).await()
+                when (version) {
+                    is Version.OutOfDateError -> {
+                        view.blockAndAlertNotRequiredVersion()
+                    }
+                    else -> doAuthentication(TYPE_LOGIN_DEEP_LINK)
+                }
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error performing deep link login")
+            }
+        }
+    }
+
+    private fun setupConnectionInfo(serverUrl: String) {
+        client = factory.create(serverUrl)
+        settings = settingsInteractor.get(serverUrl)
+    }
+
     fun signup() = navigator.toSignUp()
 
     private fun setupLoginView() {
@@ -212,8 +246,16 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                         TYPE_LOGIN_OAUTH -> {
                             client.loginWithOauth(credentialToken, credentialSecret)
                         }
+                        TYPE_LOGIN_DEEP_LINK -> {
+                            val myself = client.me() // Just checking if the credentials worked.
+                            if (myself.id == deepLinkUserId) {
+                                Token(deepLinkUserId, deepLinkToken)
+                            } else {
+                                throw RocketChatAuthException("Invalid Authentication Deep Link Credentials...")
+                            }
+                        }
                         else -> {
-                            throw IllegalStateException("Expected TYPE_LOGIN_USER_EMAIL, TYPE_LOGIN_CAS or TYPE_LOGIN_OAUTH")
+                            throw IllegalStateException("Expected TYPE_LOGIN_USER_EMAIL, TYPE_LOGIN_CAS, TYPE_LOGIN_OAUTH or TYPE_LOGIN_DEEP_LINK")
                         }
                     }
                 }

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

@@ -17,6 +17,7 @@ import android.widget.ScrollView
 import androidx.core.view.postDelayed
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
+import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.login.presentation.LoginPresenter
 import chat.rocket.android.authentication.login.presentation.LoginView
 import chat.rocket.android.helper.KeyboardHelper
@@ -27,6 +28,7 @@ import chat.rocket.android.webview.cas.ui.casWebViewIntent
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_SECRET
 import chat.rocket.android.webview.oauth.ui.INTENT_OAUTH_CREDENTIAL_TOKEN
 import chat.rocket.android.webview.oauth.ui.oauthWebViewIntent
+import chat.rocket.common.util.ifNull
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_log_in.*
 import javax.inject.Inject
@@ -41,14 +43,22 @@ class LoginFragment : Fragment(), LoginView {
         areLoginOptionsNeeded()
     }
     private var isGlobalLayoutListenerSetUp = false
+    private var deepLinkInfo: LoginDeepLinkInfo? = null
 
     companion object {
-        fun newInstance() = LoginFragment()
+        private const val DEEP_LINK_INFO = "DeepLinkInfo"
+
+        fun newInstance(deepLinkInfo: LoginDeepLinkInfo? = null) = LoginFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(DEEP_LINK_INFO, deepLinkInfo)
+            }
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
+        deepLinkInfo = arguments?.getParcelable(DEEP_LINK_INFO)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
@@ -61,8 +71,12 @@ class LoginFragment : Fragment(), LoginView {
             tintEditTextDrawableStart()
         }
 
+        deepLinkInfo?.let {
+            presenter.authenticadeWithDeepLink(it)
+        }.ifNull {
             presenter.setupView()
         }
+    }
 
     override fun onDestroyView() {
         super.onDestroyView()

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

@@ -2,6 +2,7 @@ package chat.rocket.android.authentication.presentation
 
 import android.content.Intent
 import chat.rocket.android.R
+import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.login.ui.LoginFragment
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
 import chat.rocket.android.authentication.signup.ui.SignupFragment
@@ -21,6 +22,12 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         }
     }
 
+    fun toLogin(deepLinkInfo: LoginDeepLinkInfo) {
+        activity.addFragmentBackStack("LoginFragment", R.id.fragment_container) {
+            LoginFragment.newInstance(deepLinkInfo)
+        }
+    }
+
     fun toTwoFA(username: String, password: String) {
         activity.addFragmentBackStack("TwoFAFragment", R.id.fragment_container) {
             TwoFAFragment.newInstance(username, password)

app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt

 package chat.rocket.android.authentication.server.presentation
 
+import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
+import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
@@ -18,6 +20,12 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
                                           private val getAccountsInteractor: GetAccountsInteractor) {
 
     fun connect(server: String) {
+        connectToServer(server) {
+            navigator.toLogin()
+        }
+    }
+
+    fun connectToServer(server: String, block: () -> Unit) {
         if (!server.isValidUrl()) {
             view.showInvalidServerUrlMessage()
         } else {
@@ -33,17 +41,19 @@ class ServerPresenter @Inject constructor(private val view: ServerView,
                 try {
                     refreshSettingsInteractor.refresh(server)
                     serverInteractor.save(server)
-                    navigator.toLogin()
+                    block()
                 } catch (ex: Exception) {
-                    ex.message?.let {
-                        view.showMessage(it)
-                    }.ifNull {
-                        view.showGenericErrorMessage()
-                    }
+                    view.showMessage(ex)
                 } finally {
                     view.hideLoading()
                 }
             }
         }
     }
+
+    fun deepLink(deepLinkInfo: LoginDeepLinkInfo) {
+        connectToServer(deepLinkInfo.url) {
+            navigator.toLogin(deepLinkInfo)
+        }
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -7,6 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
 import chat.rocket.android.R
+import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.server.presentation.ServerPresenter
 import chat.rocket.android.authentication.server.presentation.ServerView
 import chat.rocket.android.helper.KeyboardHelper
@@ -17,17 +18,26 @@ import javax.inject.Inject
 
 class ServerFragment : Fragment(), ServerView {
     @Inject lateinit var presenter: ServerPresenter
+    private var deepLinkInfo: LoginDeepLinkInfo? = null
     private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
         text_server_url.isCursorVisible = KeyboardHelper.isSoftKeyboardShown(relative_layout.rootView)
     }
 
     companion object {
-        fun newInstance() = ServerFragment()
+        private const val DEEP_LINK_INFO = "DeepLinkInfo"
+
+        fun newInstance(deepLinkInfo: LoginDeepLinkInfo?) = ServerFragment().apply {
+            arguments = Bundle().apply {
+                putParcelable(DEEP_LINK_INFO, deepLinkInfo)
+            }
+        }
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
+
+        deepLinkInfo = arguments?.getParcelable(DEEP_LINK_INFO)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
@@ -37,6 +47,10 @@ class ServerFragment : Fragment(), ServerView {
         super.onViewCreated(view, savedInstanceState)
         relative_layout.viewTreeObserver.addOnGlobalLayoutListener(layoutListener)
         setupOnClickListener()
+
+        deepLinkInfo?.let {
+            presenter.deepLink(it)
+        }
     }
 
     override fun onDestroyView() {

app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt

@@ -28,7 +28,7 @@ class TwoFAFragment : Fragment(), TwoFAView {
         private const val PASSWORD = "password"
 
         fun newInstance(username: String, password: String) = TwoFAFragment().apply {
-            arguments = Bundle(1).apply {
+            arguments = Bundle(2).apply {
                 putString(USERNAME, username)
                 putString(PASSWORD, password)
             }

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

@@ -6,10 +6,11 @@ import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
 import chat.rocket.android.R
+import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
+import chat.rocket.android.authentication.domain.model.getLoginDeepLinkInfo
 import chat.rocket.android.authentication.presentation.AuthenticationPresenter
 import chat.rocket.android.authentication.server.ui.ServerFragment
 import chat.rocket.android.util.extensions.addFragment
-import chat.rocket.android.util.extensions.launchUI
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
@@ -30,11 +31,13 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         setTheme(R.style.AuthenticationTheme)
         super.onCreate(savedInstanceState)
 
+        val deepLinkInfo = intent.getLoginDeepLinkInfo()
         launch(UI + job) {
             val newServer = intent.getBooleanExtra(INTENT_ADD_NEW_SERVER, false)
-            presenter.loadCredentials(newServer) { authenticated ->
+            // if we got authenticadeWithDeepLink information, pass true to newServer also
+            presenter.loadCredentials(newServer || deepLinkInfo != null) { authenticated ->
                 if (!authenticated) {
-                    showServerInput(savedInstanceState)
+                    showServerInput(savedInstanceState, deepLinkInfo)
                 }
             }
         }
@@ -49,9 +52,9 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
         return fragmentDispatchingAndroidInjector
     }
 
-    fun showServerInput(savedInstanceState: Bundle?) {
+    fun showServerInput(savedInstanceState: Bundle?, deepLinkInfo: LoginDeepLinkInfo?) {
         addFragment("ServerFragment", R.id.fragment_container) {
-            ServerFragment.newInstance()
+            ServerFragment.newInstance(deepLinkInfo)
         }
     }
 }

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -233,9 +233,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             // if y is positive the keyboard is up else it's down
             recycler_view.post {
                 if (y > 0 || Math.abs(verticalScrollOffset.get()) >= Math.abs(y)) {
-                    recycler_view.scrollBy(0, y)
+                    ui { recycler_view.scrollBy(0, y) }
                 } else {
-                    recycler_view.scrollBy(0, verticalScrollOffset.get())
+                    ui { recycler_view.scrollBy(0, verticalScrollOffset.get()) }
                 }
             }
         }

app/src/main/java/chat/rocket/android/core/behaviours/MessageView.kt

 package chat.rocket.android.core.behaviours
 
 import android.support.annotation.StringRes
+import chat.rocket.common.util.ifNull
 
 interface MessageView {
 
@@ -15,3 +16,11 @@ interface MessageView {
 
     fun showGenericErrorMessage()
 }
+
+fun MessageView.showMessage(ex: Exception) {
+    ex.message?.let {
+        showMessage(it)
+    }.ifNull {
+        showGenericErrorMessage()
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -41,7 +41,7 @@ class MainPresenter @Inject constructor(
     private val factory: RocketChatClientFactory,
     getSettingsInteractor: GetSettingsInteractor,
     managerFactory: ConnectionManagerFactory
-) : CheckServerPresenter(strategy, client = factory.create(serverInteractor.get()!!), view = view) {
+) : CheckServerPresenter(strategy, factory, view = view) {
     private val currentServer = serverInteractor.get()!!
     private val manager = managerFactory.create(currentServer)
     private val client: RocketChatClient = factory.create(currentServer)
@@ -56,7 +56,7 @@ class MainPresenter @Inject constructor(
     fun toSettings() = navigator.toSettings()
 
     fun loadCurrentInfo() {
-        checkServerInfo()
+        checkServerInfo(currentServer)
         launchUI(strategy) {
             try {
                 val me = retryIO("me") {

app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt

 package chat.rocket.android.server.domain
 
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.settings
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.async
@@ -27,7 +28,9 @@ class RefreshSettingsInteractor @Inject constructor(private val factory: RocketC
     suspend fun refresh(server: String) {
         withContext(CommonPool) {
             factory.create(server).let { client ->
-                val settings = client.settings(*settingsFilter)
+                val settings = retryIO(description = "settings", times = 5) {
+                    client.settings(*settingsFilter)
+                }
                 repository.save(server, settings)
             }
         }

app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt

@@ -3,19 +3,51 @@ package chat.rocket.android.server.presentation
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.authentication.server.presentation.VersionCheckView
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.serverInfo
+import kotlinx.coroutines.experimental.Deferred
+import kotlinx.coroutines.experimental.Job
+import kotlinx.coroutines.experimental.async
 import timber.log.Timber
 
 abstract class CheckServerPresenter constructor(private val strategy: CancelStrategy,
-                                                private val client: RocketChatClient,
+                                                private val factory: RocketChatClientFactory,
                                                 private val view: VersionCheckView) {
-    internal fun checkServerInfo() {
-        launchUI(strategy) {
+    private lateinit var currentServer: String
+    private val client: RocketChatClient by lazy {
+        factory.create(currentServer)
+    }
+
+    internal fun checkServerInfo(serverUrl: String): Job {
+        return launchUI(strategy) {
             try {
+                val version = checkServerVersion(serverUrl).await()
+                when (version) {
+                    is Version.VersionOk -> {
+                        Timber.i("Your version is nice! (Requires: 0.62.0, Yours: ${version.version})")
+                    }
+                    is Version.RecommendedVersionWarning -> {
+                        Timber.i("Your server ${version.version} is bellow recommended version ${BuildConfig.RECOMMENDED_SERVER_VERSION}")
+                        view.alertNotRecommendedVersion()
+                    }
+                    is Version.OutOfDateError -> {
+                        Timber.i("Oops. Looks like your server ${version.version} is out-of-date! Minimum server version required ${BuildConfig.REQUIRED_SERVER_VERSION}!")
+                        view.blockAndAlertNotRequiredVersion()
+                    }
+                }
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error getting server info")
+            }
+        }
+    }
+
+    internal fun checkServerVersion(serverUrl: String): Deferred<Version> {
+        currentServer = serverUrl
+        return async {
             val serverInfo = retryIO(description = "serverInfo", times = 5) { client.serverInfo() }
             val thisServerVersion = serverInfo.version
             val isRequiredVersion = isRequiredServerVersion(thisServerVersion)
@@ -23,17 +55,12 @@ abstract class CheckServerPresenter constructor(private val strategy: CancelStra
             if (isRequiredVersion) {
                 if (isRecommendedVersion) {
                     Timber.i("Your version is nice! (Requires: 0.62.0, Yours: $thisServerVersion)")
+                    return@async Version.VersionOk(thisServerVersion)
                 } else {
-                        view.alertNotRecommendedVersion()
+                    return@async Version.RecommendedVersionWarning(thisServerVersion)
                 }
             } else {
-                    if (!isRecommendedVersion) {
-                        view.blockAndAlertNotRequiredVersion()
-                        Timber.i("Oops. Looks like your server is out-of-date! Minimum server version required ${BuildConfig.REQUIRED_SERVER_VERSION}!")
-                    }
-                }
-            } catch (ex: Exception) {
-                Timber.d(ex, "Error getting server info")
+                return@async Version.OutOfDateError(thisServerVersion)
             }
         }
     }
@@ -92,4 +119,10 @@ abstract class CheckServerPresenter constructor(private val strategy: CancelStra
             0
         }
     }
+
+    sealed class Version(val version: String) {
+        data class VersionOk(private val currentVersion: String) : Version(currentVersion)
+        data class RecommendedVersionWarning(private val currentVersion: String) : Version(currentVersion)
+        data class OutOfDateError(private val currentVersion: String) : Version(currentVersion)
+    }
 }
\ No newline at end of file