Merge pull request #1003 from RocketChat/fix/oauth-crashes-when-using-new-user

[FIX] Alerts the user about username creation using the web version.

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

@@ -218,12 +218,16 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
                             throw IllegalStateException("Expected TYPE_LOGIN_USER_EMAIL, TYPE_LOGIN_CAS or TYPE_LOGIN_OAUTH")
                         }
                     }
-                    val me = client.me()
-                    localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, me.username)
-                    saveAccount(me)
+                    val username = client.me().username
+                    if (username != null) {
+                        localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, username)
+                        saveAccount(username)
                         saveToken(token)
                         registerPushToken()
                         navigator.toChatList()
+                    } else if (loginType == TYPE_LOGIN_OAUTH) {
+                        view.alertRequiresUsername()
+                    }
                 } catch (exception: RocketChatException) {
                     when (exception) {
                         is RocketChatTwoFactorException -> {
@@ -247,32 +251,32 @@ class LoginPresenter @Inject constructor(private val view: LoginView,
         }
     }
 
-    private fun saveToken(token: Token) {
-        tokenRepository.save(currentServer, token)
-    }
-
-    private suspend fun registerPushToken() {
-        localRepository.get(LocalRepository.KEY_PUSH_TOKEN)?.let {
-            client.registerPushToken(it, getAccountsInteractor.get(), factory)
-        }
-        // TODO: When the push token is null, at some point we should receive it with
-        // onTokenRefresh() on FirebaseTokenService, we need to confirm it.
-    }
-
     private fun getOauthClientId(listMap: List<Map<String, String>>, serviceName: String): String? {
         return listMap.find { map -> map.containsValue(serviceName) }
                 ?.get("appId")
     }
 
-    private suspend fun saveAccount(me: Myself) {
+    private suspend fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             UrlHelper.getServerLogoUrl(currentServer, it)
         }
         val logo = settings.wideTile()?.let {
             UrlHelper.getServerLogoUrl(currentServer, it)
         }
-        val thumb = UrlHelper.getAvatarUrl(currentServer, me.username!!)
-        val account = Account(currentServer, icon, logo, me.username!!, thumb)
+        val thumb = UrlHelper.getAvatarUrl(currentServer, username)
+        val account = Account(currentServer, icon, logo, username, thumb)
         saveAccountInteractor.save(account)
     }
+
+    private fun saveToken(token: Token) {
+        tokenRepository.save(currentServer, token)
+    }
+
+    private suspend fun registerPushToken() {
+        localRepository.get(LocalRepository.KEY_PUSH_TOKEN)?.let {
+            client.registerPushToken(it, getAccountsInteractor.get(), factory)
+        }
+        // TODO: When the push token is null, at some point we should receive it with
+        // onTokenRefresh() on FirebaseTokenService, we need to confirm it.
+    }
 }
\ No newline at end of file

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

@@ -187,4 +187,9 @@ interface LoginView : LoadingView, MessageView, InternetView, VersionCheckView {
      * Alerts the user about a wrong inputted password.
      */
     fun alertWrongPassword()
+
+    /**
+     * Alerts the user about the need of creating an username using the web app when creating an user through OAuth.
+     */
+    fun alertRequiresUsername()
 }
\ No newline at end of file

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

@@ -292,6 +292,10 @@ class LoginFragment : Fragment(), LoginView {
         text_password.requestFocus()
     }
 
+    override fun alertRequiresUsername() {
+        showToast(getString(R.string.msg_requires_username), Toast.LENGTH_LONG)
+    }
+
     override fun alertNotRecommendedVersion() {
         context?.let {
             AlertDialog.Builder(it)

app/src/main/res/values-hi-rIN/strings.xml

@@ -73,6 +73,7 @@
     <string name="msg_preview_photo">तस्वीरें</string>
     <string name="msg_unread_messages">अपठित संदेश</string>
     <string name="msg_no_messages_yet">अभी तक कोई पोस्ट नहीं</string>
+    <string name="msg_requires_username">उपयोगकर्ता नाम आवश्यक है: कृपया, वेब संस्करण के माध्यम से एक उपयोगकर्ता नाम बनाएं और लॉग इन करने के लिए वापस आएँ</string>
     <string name="msg_ok">OK</string>
     <string name="msg_ver_not_recommended">
         ऐसा लगता है कि आपका सर्वर संस्करण अनुशंसित संस्करण %1$s के नीचे है।\nआप अभी भी लॉगिन कर सकते हैं लेकिन आप अप्रत्याशित व्यवहार का अनुभव कर सकते हैं

app/src/main/res/values-pt-rBR/strings.xml

@@ -27,7 +27,6 @@
     <string name="action_join_chat">Entrar no Chat</string>
     <string name="action_add_account">Adicionar Conta</string>
 
-
     <!-- Settings List -->
     <string-array name="settings_actions">
         <item name="item_password">Alterar senha</item>
@@ -74,6 +73,7 @@
     <string name="msg_preview_audio">Audio</string>
     <string name="msg_preview_photo">Foto</string>
     <string name="msg_no_messages_yet">Nenhuma mensagem ainda</string>
+    <string name="msg_requires_username">Nome de usuário requerido: Por favor, crie um nome de usuário através da versão web e volte para fazer login.</string>
     <string name="msg_ok">OK</string>
     <string name="msg_ver_not_recommended">
         Parece que a versão do seu servidor está abaixo da recomendada %1$s.\nVocê ainda assim pode logar e continuar mas podem ocorrer alguns problemas inesperados.

app/src/main/res/values/strings.xml

@@ -75,6 +75,7 @@
     <string name="msg_preview_audio">Audio</string>
     <string name="msg_preview_photo">Photo</string>
     <string name="msg_no_messages_yet">No messages yet</string>
+    <string name="msg_requires_username">Username required: Please, create an username through the web version and come back to log in.</string>
     <string name="msg_ok">OK</string>
     <string name="msg_ver_not_recommended">
         Looks like your server version is below the recommended version %1$s.\nYou can still login but you may experience unexpected behaviors.</string>