Migrate http_user to webflow_user and dav_user.

Signed-off-by: Camila <[email protected]>
nextcloud · Aug 15, 2023 · 94b3c8c · 94b3c8c
1 parent 88e0c66
commit 94b3c8c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
@@ -397,6 +397,7 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
     }
 
     // Migrate to webflow
+    const auto previousAuthType = authType;
     if (authType == QLatin1String(httpAuthTypeC)) {
         authType = webflowAuthTypeC;
         settings.setValue(QLatin1String(authTypeC), authType);
@@ -417,7 +418,10 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
 
     acc->_serverVersion = settings.value(QLatin1String(serverVersionC)).toString();
     acc->_skipE2eeMetadataChecksumValidation = settings.value(QLatin1String(skipE2eeMetadataChecksumValidationC), {}).toBool();
-    acc->_davUser = settings.value(QLatin1String(davUserC), "").toString();
+
+    // Migration to webflow from http
+    acc->_davUser = (previousAuthType == QLatin1String(httpAuthTypeC))? settings.value(QLatin1String(webflowUserC), "").toString()
+                                                                       : settings.value(QLatin1String(davUserC), "").toString();
 
     acc->_settingsMap.insert(QLatin1String(userC), settings.value(userC));
     acc->_displayName = settings.value(QLatin1String(displayNameC), "").toString();