Merge pull request #2525 from RocketChat/bug/auth_flow_connection.2515

[FIX] Fixed issue on connecting to a server & having an invalid server after all in some edge cases

Author: rafaelks

Rocket.Chat/Controllers/Auth/ConnectServerViewController.swift

@@ -107,6 +107,9 @@ final class ConnectServerViewController: BaseViewController {
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(hideKeyboard))
         view.addGestureRecognizer(tapGesture)
 
+        SocketManager.sharedInstance.socket?.disconnect()
+        DatabaseManager.cleanInvalidDatabases()
+
         if shouldAutoConnect {
             connect()
         }
@@ -115,9 +118,6 @@ final class ConnectServerViewController: BaseViewController {
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
 
-        SocketManager.sharedInstance.socket?.disconnect()
-        DatabaseManager.cleanInvalidDatabases()
-
         if let applicationServerURL = AppManager.applicationServerURL {
             textFieldServerURL.isEnabled = false
             textFieldServerURL.text = applicationServerURL.host