Add support for multiple accounts

Added support for multiple accounts and a list of servers where the user can switch between the accounts. Future patches will make the list widget to use server avatars with user status. Upon startup the client will reconnect with all previous accounts. If the user log outs with any of the accounts then it will not login automatically for future sessions, the credential though will be available to the user. Upon upgrading from previous versions, the client will migrate the account that was previously marked to auto-login to the new configuration and enable it. After the migration the autologin setting will be set to false. Some of the settings and command line arguments have been made obsolete due to these changes and removed, including SSO support, which will be re-introduced in a future patch. Test-Information: Tested the changes in Windows and Linux, tested adding and removing accounts, and switching between them. Tested the new configuration for accounts, the upgrade behaviour when an account is marked/not marked to autojoin, and the migration to the new configuration. Verified that the auto-login setting is set to false after the migration, and that the migrated account can be disabled (currently only by signing out). Change-Id: I63662f80e006112fde6f418f9743e2b420e81870
author: Thanos Doukoudakis <thanos.doukoudakis@isode.com> 2018-07-12 22:58:02 (GMT)
committer: Kevin Smith <kevin.smith@isode.com> 2018-07-18 17:11:33 (GMT)
commit: 0d5cd98d372c6b9235b55cd8d16e93647c9d017f (patch)
tree: 9f8ade0f540e35c49e1dd390bc3efe56de0b6b25 /Swift/Controllers
parent: 0d3c4298f0818cb377fcfc8409e89fe6327ab036 (diff)
download: swift-0d5cd98d372c6b9235b55cd8d16e93647c9d017f.zip
swift-0d5cd98d372c6b9235b55cd8d16e93647c9d017f.tar.bz2
4 files changed, 6 insertions, 104 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index f678c0d..91140c2 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -173,36 +173,6 @@ MainController::MainController(
 
     xmppURIController_ = new XMPPURIController(uriHandler_, uiEventStream_);
 
-    std::string selectedLoginJID = settings_->getSetting(SettingConstants::LAST_LOGIN_JID);
-    bool loginAutomatically = settings_->getSetting(SettingConstants::LOGIN_AUTOMATICALLY);
-    std::string cachedPassword;
-    std::string cachedCertificate;
-    ClientOptions cachedOptions;
-    bool eagle = settings_->getSetting(SettingConstants::FORGET_PASSWORDS);
-    if (!eagle) {
-        for (auto&& profile : settings->getAvailableProfiles()) {
-            ProfileSettingsProvider profileSettings(profile, settings);
-            std::string password = profileSettings.getStringSetting("pass");
-            std::string certificate = profileSettings.getStringSetting("certificate");
-            std::string jid = profileSettings.getStringSetting("jid");
-            ClientOptions clientOptions = parseClientOptions(profileSettings.getStringSetting("options"));
-
-#ifdef SWIFTEN_PLATFORM_WIN32
-            clientOptions.singleSignOn = settings_->getSetting(SettingConstants::SINGLE_SIGN_ON);
-#endif
-
-            loginWindow_->addAvailableAccount(jid, password, certificate, clientOptions);
-            if (jid == selectedLoginJID) {
-                cachedPassword = password;
-                cachedCertificate = certificate;
-                cachedOptions = clientOptions;
-            }
-        }
-        loginWindow_->selectUser(selectedLoginJID);
-        loginWindow_->setLoginAutomatically(loginAutomatically);
-    }
-
-
     loginWindow_->onLoginRequest.connect(boost::bind(&MainController::handleLoginRequest, this, _1, _2, _3, _4, _5, _6, _7));
     loginWindow_->onPurgeSavedLoginRequest.connect(boost::bind(&MainController::handlePurgeSavedLoginRequest, this, _1));
     loginWindow_->onCancelLoginRequest.connect(boost::bind(&MainController::handleCancelLoginRequest, this));
@@ -217,13 +187,6 @@ MainController::MainController(
 
     settings_->onSettingChanged.connect(boost::bind(&MainController::handleSettingChanged, this, _1));
 
-    if (loginAutomatically) {
-        profileSettings_ = new ProfileSettingsProvider(selectedLoginJID, settings_);
-        /* FIXME: deal with autologin with a cert*/
-        handleLoginRequest(selectedLoginJID, cachedPassword, cachedCertificate, CertificateWithKey::ref(), cachedOptions, true, true);
-    } else {
-        profileSettings_ = nullptr;
-    }
 }
 
 MainController::~MainController() {
@@ -559,8 +522,7 @@ void MainController::handleLoginRequest(const std::string &username, const std::
             profileSettings_->storeString("pass", (remember || loginAutomatically) ? password : "");
             std::string optionString = serializeClientOptions(options);
             profileSettings_->storeString("options", optionString);
-            settings_->storeSetting(SettingConstants::LAST_LOGIN_JID, username);
-            settings_->storeSetting(SettingConstants::LOGIN_AUTOMATICALLY, loginAutomatically);
+            profileSettings_->storeInt("enabled", 1);
             loginWindow_->addAvailableAccount(profileSettings_->getStringSetting("jid"), profileSettings_->getStringSetting("pass"), profileSettings_->getStringSetting("certificate"), options);
         }
 
@@ -760,6 +722,7 @@ void MainController::signOut() {
     if (settings_->getSetting(SettingConstants::FORGET_PASSWORDS)) {
         purgeCachedCredentials();
     }
+    profileSettings_->storeInt("enabled", 0);
     eventController_->clear();
     logout();
     loginWindow_->loggedOut();
@@ -864,6 +827,8 @@ void MainController::handleQuitRequest() {
     }
 }
 
+//FIXME: Switch all this to boost::serialise
+
 #define SERIALIZE_BOOL(option) result += options.option ? "1" : "0"; result += ",";
 #define SERIALIZE_INT(option) result += boost::lexical_cast<std::string>(options.option); result += ",";
 #define SERIALIZE_STRING(option) result += Base64::encode(createByteArray(options.option)); result += ",";
@@ -898,55 +863,7 @@ std::string MainController::serializeClientOptions(const ClientOptions& options)
     SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID);
     SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);
     SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround);
-    return result;
-}
-
-#define CHECK_PARSE_LENGTH if (i >= segments.size()) {return result;}
-#define PARSE_INT_RAW(defaultValue) CHECK_PARSE_LENGTH intVal = defaultValue; try {intVal = boost::lexical_cast<int>(segments[i]);} catch(const boost::bad_lexical_cast&) {};i++;
-#define PARSE_STRING_RAW CHECK_PARSE_LENGTH stringVal = byteArrayToString(Base64::decode(segments[i]));i++;
-
-#define PARSE_BOOL(option, defaultValue) PARSE_INT_RAW(defaultValue); result.option = (intVal == 1);
-#define PARSE_INT(option, defaultValue) PARSE_INT_RAW(defaultValue); result.option = intVal;
-#define PARSE_STRING(option) PARSE_STRING_RAW; result.option = stringVal;
-#define PARSE_SAFE_STRING(option) PARSE_STRING_RAW; result.option = SafeString(createSafeByteArray(stringVal));
-#define PARSE_URL(option) {PARSE_STRING_RAW; result.option = URL::fromString(stringVal);}
-
-
-ClientOptions MainController::parseClientOptions(const std::string& optionString) {
-    ClientOptions result;
-    size_t i = 0;
-    int intVal = 0;
-    std::string stringVal;
-    std::vector<std::string> segments = String::split(optionString, ',');
-
-    PARSE_BOOL(useStreamCompression, 1);
-    PARSE_INT_RAW(-1);
-    switch (intVal) {
-        case 1: result.useTLS = ClientOptions::NeverUseTLS;break;
-        case 2: result.useTLS = ClientOptions::UseTLSWhenAvailable;break;
-        case 3: result.useTLS = ClientOptions::RequireTLS;break;
-        default:;
-    }
-    PARSE_BOOL(allowPLAINWithoutTLS, 0);
-    PARSE_BOOL(useStreamResumption, 0);
-    PARSE_BOOL(useAcks, 1);
-    PARSE_STRING(manualHostname);
-    PARSE_INT(manualPort, -1);
-    PARSE_INT_RAW(-1);
-    switch (intVal) {
-        case 1: result.proxyType = ClientOptions::NoProxy;break;
-        case 2: result.proxyType = ClientOptions::SystemConfiguredProxy;break;
-        case 3: result.proxyType = ClientOptions::SOCKS5Proxy;break;
-        case 4: result.proxyType = ClientOptions::HTTPConnectProxy;break;
-    }
-    PARSE_STRING(manualProxyHostname);
-    PARSE_INT(manualProxyPort, -1);
-    PARSE_URL(boshURL);
-    PARSE_URL(boshHTTPConnectProxyURL);
-    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthID);
-    PARSE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);
-    PARSE_BOOL(tlsOptions.schannelTLS1_0Workaround, false);
-
+    SERIALIZE_BOOL(singleSignOn);
     return result;
 }
 
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index 8b62415..7a06a0b 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -132,7 +132,6 @@ namespace Swift {
             void handleForceQuit();
             void purgeCachedCredentials();
             std::string serializeClientOptions(const ClientOptions& options);
-            ClientOptions parseClientOptions(const std::string& optionString);
 
         private:
             EventLoop* eventLoop_;
@@ -146,7 +145,7 @@ namespace Swift {
             bool clientInitialized_;
             std::shared_ptr<Client> client_;
             SettingsProvider *settings_;
-            ProfileSettingsProvider* profileSettings_;
+            ProfileSettingsProvider* profileSettings_ = nullptr;
             Dock* dock_;
             URIHandler* uriHandler_;
             IdleDetector* idleDetector_;
diff --git a/Swift/Controllers/SettingConstants.cpp b/Swift/Controllers/SettingConstants.cpp
index 1191c28..8336200 100644
--- a/Swift/Controllers/SettingConstants.cpp
+++ b/Swift/Controllers/SettingConstants.cpp
@@ -14,8 +14,6 @@ const SettingsProvider::Setting<bool> SettingConstants::SHOW_NOTIFICATIONS = Set
 const SettingsProvider::Setting<bool> SettingConstants::REQUEST_DELIVERYRECEIPTS = SettingsProvider::Setting<bool>("requestDeliveryReceipts", false);
 const SettingsProvider::Setting<bool> SettingConstants::FORGET_PASSWORDS = SettingsProvider::Setting<bool>("forgetPasswords", false);
 const SettingsProvider::Setting<bool> SettingConstants::REMEMBER_RECENT_CHATS = SettingsProvider::Setting<bool>("rememberRecentChats", true);
-const SettingsProvider::Setting<std::string> SettingConstants::LAST_LOGIN_JID = SettingsProvider::Setting<std::string>("lastLoginJID", "");
-const SettingsProvider::Setting<bool> SettingConstants::LOGIN_AUTOMATICALLY = SettingsProvider::Setting<bool>("loginAutomatically", false);
 const SettingsProvider::Setting<bool> SettingConstants::SHOW_OFFLINE("showOffline", false);
 const SettingsProvider::Setting<std::string> SettingConstants::EXPANDED_ROSTER_GROUPS("GroupExpandiness", "");
 const SettingsProvider::Setting<bool> SettingConstants::PLAY_SOUNDS("playSounds", true);
@@ -23,7 +21,6 @@ const SettingsProvider::Setting<std::string> SettingConstants::HIGHLIGHT_RULES("
 const SettingsProvider::Setting<std::string> SettingConstants::HIGHLIGHT_RULES_V2("highlightRulesV2", "@");
 const SettingsProvider::Setting<std::string> SettingConstants::INVITE_AUTO_ACCEPT_MODE("inviteAutoAcceptMode", "presence");
 const SettingsProvider::Setting<bool> SettingConstants::DISCONNECT_ON_CARD_REMOVAL("disconnectOnCardRemoval", true);
-const SettingsProvider::Setting<bool> SettingConstants::SINGLE_SIGN_ON("singleSignOn", false);
 const SettingsProvider::Setting<bool> SettingConstants::MUC_MARKING_ELISION("mucMarkingElision", true);
 const SettingsProvider::Setting<bool> SettingConstants::FUTURE("future", false);
 
diff --git a/Swift/Controllers/SettingConstants.h b/Swift/Controllers/SettingConstants.h
index f82dfb5..68c22b7 100644
--- a/Swift/Controllers/SettingConstants.h
+++ b/Swift/Controllers/SettingConstants.h
@@ -34,8 +34,6 @@ namespace Swift {
             static const SettingsProvider::Setting<bool> REQUEST_DELIVERYRECEIPTS;
             static const SettingsProvider::Setting<bool> FORGET_PASSWORDS;
             static const SettingsProvider::Setting<bool> REMEMBER_RECENT_CHATS;
-            static const SettingsProvider::Setting<std::string> LAST_LOGIN_JID;
-            static const SettingsProvider::Setting<bool> LOGIN_AUTOMATICALLY;
             /**
              * The #SHOW_OFFLINE setting specifies whether or not to show offline contacts in the
              * roster.
@@ -85,15 +83,6 @@ namespace Swift {
              */
             static const SettingsProvider::Setting<bool> DISCONNECT_ON_CARD_REMOVAL;
             /**
-             * The #SINGLE_SIGN_ON setting
-             * specifies whether to log in using Single Sign On.
-             * This is currently supported on Windows.
-             *
-             * If set true Swift will use GSSAPI authentication to
-             * log in the user; else not.
-             */
-            static const SettingsProvider::Setting<bool> SINGLE_SIGN_ON;
-            /**
              * The #MUC_MARKING_ELISION setting
              * specifies whether or not messages with the default muc
              * marking display their marking, and whether unmarked messages
author	Thanos Doukoudakis <thanos.doukoudakis@isode.com>	2018-07-12 22:58:02 (GMT)
committer	Kevin Smith <kevin.smith@isode.com>	2018-07-18 17:11:33 (GMT)
commit	0d5cd98d372c6b9235b55cd8d16e93647c9d017f (patch)
tree	9f8ade0f540e35c49e1dd390bc3efe56de0b6b25 /Swift/Controllers
parent	0d3c4298f0818cb377fcfc8409e89fe6327ab036 (diff)
download	swift-0d5cd98d372c6b9235b55cd8d16e93647c9d017f.zip swift-0d5cd98d372c6b9235b55cd8d16e93647c9d017f.tar.bz2