Merge #827(tobias): Fix saving access token to keychain

quotient-im · Nov 10, 2024 · 8f5b4ea · 8f5b4ea
2 parents 294d8a5 + 362a9ad
commit 8f5b4ea
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Quotient/connection.cpp b/Quotient/connection.cpp
@@ -296,7 +296,6 @@ void Connection::Private::loginToServer(LoginArgTs&&... loginArgs)
     q->callApi<LoginJob>(std::forward<LoginArgTs>(loginArgs)...)
         .onResult([this](const LoginJob* loginJob) {
             if (loginJob->status().good()) {
-                saveAccessTokenToKeychain();
                 completeSetup(loginJob->userId(), true, loginJob->deviceId(),
                               loginJob->accessToken());
             } else
@@ -315,6 +314,10 @@ void Connection::Private::completeSetup(const QString& mxId, bool newLogin,
                   << "from device" << data->deviceId();
     connect(qApp, &QCoreApplication::aboutToQuit, q, &Connection::saveState);
 
+    if (newLogin) {
+        saveAccessTokenToKeychain();
+    }
+
     if (accessToken.has_value()) {
         q->loadVersions();
         q->loadCapabilities();