Implement migration to spaces

Fixes: #9945

changelog/unreleased/9945

@@ -0,0 +1,6 @@
+Change: Implement server guided migration to spaces
+
+We added a feature that allows limited automatic migration of existing syncs to OCIS spaces.
+
+https://github.com/owncloud/client/issues/9945
+https://github.com/owncloud/ocis/issues/3574

src/gui/CMakeLists.txt

@@ -84,6 +84,8 @@ set(client_SRCS
     models/expandingheaderview.cpp
     models/models.cpp
     models/protocolitemmodel.cpp
+
+    spacemigration.cpp
 )
 
 set(3rdparty_SRC

src/gui/accountstate.cpp

@@ -20,6 +20,7 @@
 #include "creds/abstractcredentials.h"
 #include "creds/httpcredentials.h"
 #include "gui/settingsdialog.h"
+#include "gui/spacemigration.h"
 #include "gui/tlserrordialog.h"
 #include "logger.h"
 #include "settingsdialog.h"
@@ -410,6 +411,19 @@ void AccountState::slotConnectionValidatorResult(ConnectionValidator::Status sta
     }
     _connectionErrors = errors;
 
+    if (status == ConnectionValidator::Connected) {
+        Q_ASSERT(_account->hasCapabilities());
+        if (_account->capabilities().migration().space_migration.enabled) {
+            auto stateptr = AccountManager::instance()->account(_account->uuid());
+            auto migration = new SpaceMigration(stateptr, _account->capabilities().migration().space_migration.endpoint, this);
+            connect(migration, &SpaceMigration::finised, this, [migration, this] {
+                migration->deleteLater();
+                setState(Connected);
+            });
+            migration->start();
+            return;
+        }
+    }
     switch (status) {
     case ConnectionValidator::Connected:
         setState(Connected);

src/gui/accountstate.h

@@ -188,6 +188,7 @@ protected Q_SLOTS:
      * Milliseconds for which to delay reconnection after 503/maintenance.
      */
     std::chrono::milliseconds _maintenanceToConnectedDelay;
+    friend class SpaceMigration;
 };
 }
 

src/gui/folder.h

@@ -136,6 +136,7 @@ class FolderDefinition
     bool _deployed = false;
 
     friend class FolderMan;
+    friend class SpaceMigration;
 };
 
 /**
@@ -573,6 +574,8 @@ private slots:
      * The vfs mode instance (created by plugin) to use. Never null.
      */
     QSharedPointer<Vfs> _vfs;
+
+    friend class SpaceMigration;
 };
 }
 

src/gui/owncloudgui.cpp

@@ -81,7 +81,7 @@ void setUpInitialSyncFolder(AccountStatePtr accountStatePtr, bool useVfs)
                     for (const auto &d : drives) {
                         const QString name = GraphApi::Drives::getDriveDisplayName(d);
                         const QString folderName = FolderMan::instance()->findGoodPathForNewSyncFolder(localDir.filePath(name));
-                        addFolder(folderName, {}, QUrl::fromEncoded(d.getRoot().getWebDavUrl().toUtf8()), name);
+                        addFolder(folderName, {}, QUrl(d.getRoot().getWebDavUrl()), name);
                     }
                     finalize();
                 }

src/gui/spacemigration.cpp

@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) by Hannah von Reth <hannah.vonreth@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include "spacemigration.h"
+
+#include "common/version.h"
+#include "gui/accountmanager.h"
+#include "gui/folderman.h"
+#include "libsync/account.h"
+#include "libsync/graphapi/drives.h"
+
+#include <QJsonArray>
+
+Q_LOGGING_CATEGORY(lcMigration, "gui.migration.spaces", QtInfoMsg)
+
+using namespace OCC;
+
+SpaceMigration::SpaceMigration(const AccountStatePtr &account, const QString &path, QObject *parent)
+    : QObject(parent)
+    , _accountState(account)
+    , _path(path)
+{
+}
+
+void SpaceMigration::start()
+{
+    FolderMan::instance()->setSyncEnabled(false);
+
+    QJsonArray folders;
+    for (auto *f : FolderMan::instance()->folders()) {
+        // same account and uses the legacy dav url
+        // already migrated folders are ignored
+        if (f->accountState()->account() == _accountState->account() && f->webDavUrl() == _accountState->account()->davUrl()) {
+            folders.append(f->remotePath());
+            _migrationFolders.append(f);
+        }
+    }
+    const QJsonObject obj {
+        { QStringLiteral("version"), Version::version().toString() },
+        { QStringLiteral("user"), _accountState->account()->davUser() },
+        { QStringLiteral("remotefolder"), folders }
+    };
+    auto job = new JsonJob(_accountState->account(), _accountState->account()->url(), _path, QByteArrayLiteral("POST"), obj);
+    job->setParent(this);
+    connect(job, &JsonJob::finishedSignal, this, [job, this] {
+        const int status = job->reply()->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+        if (status == 200 && job->parseError().error == QJsonParseError::NoError) {
+            migrate(job->data().value(QStringLiteral("folders")).toObject());
+        } else {
+            qCInfo(lcMigration) << status << job->data();
+            if (job->parseError().error != QJsonParseError::NoError) {
+                qCInfo(lcMigration) << job->parseError().errorString();
+            }
+            Q_EMIT finised();
+        }
+    });
+    job->start();
+}
+
+void SpaceMigration::migrate(const QJsonObject &folders)
+{
+    auto drivesJob = new GraphApi::Drives(_accountState->account(), this);
+    connect(drivesJob, &GraphApi::Drives::finishedSignal, [drivesJob, folders, this] {
+        const auto drives = drivesJob->drives();
+        for (auto &folder : _migrationFolders) {
+            if (folder) {
+                const auto obj = folders.value(folder->remotePath()).toObject();
+                const QString error = obj.value(QStringLiteral("error")).toString();
+                if (error.isEmpty()) {
+                    const QString newPath = obj.value(QStringLiteral("path")).toString();
+                    const QString space_id = obj.value(QStringLiteral("space_id")).toString();
+                    auto it = std::find_if(drives.cbegin(), drives.cend(), [space_id](auto it) {
+                        return it.getId() == space_id;
+                    });
+                    if (it != drives.cend()) {
+                        qCDebug(lcMigration) << "Migraating:" << folder->path()
+                                             << "davUrl:" << folder->_definition._webDavUrl << "->" << it->getRoot().getWebDavUrl()
+                                             << "remotPath:" << folder->_definition._targetPath << "->" << newPath;
+                        folder->_definition._webDavUrl = QUrl(it->getRoot().getWebDavUrl());
+                        folder->_definition._targetPath = newPath;
+                        folder->saveToSettings();
+                    }
+                } else {
+                    qCInfo(lcMigration) << "No migration of" << folder->remotePath() << "reason:" << error;
+                }
+            }
+        }
+        _accountState->_supportsSpaces = true;
+        AccountManager::instance()->save();
+        FolderMan::instance()->setSyncEnabled(true);
+        Q_EMIT finised();
+    });
+    drivesJob->start();
+}

src/gui/spacemigration.h

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) by Hannah von Reth <hannah.vonreth@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#pragma once
+
+#include "libsync/networkjobs/jsonjob.h"
+
+#include <QObject>
+
+namespace OCC {
+class Folder;
+
+class SpaceMigration : public QObject
+{
+    Q_OBJECT
+public:
+    SpaceMigration(const AccountStatePtr &accountState, const QString &path, QObject *parent);
+    void start();
+
+Q_SIGNALS:
+    void finised();
+
+private:
+    void migrate(const QJsonObject &folders);
+
+    AccountStatePtr _accountState;
+    const QString _path;
+
+    QVector<QPointer<Folder>> _migrationFolders;
+};
+
+}

src/gui/spaces/CMakeLists.txt

@@ -1,5 +1,9 @@
 add_library(spaces STATIC
-	spacesmodel.cpp spacesbrowser.cpp spacesbrowser.ui)
+        spacesmodel.cpp
+        spacesbrowser.cpp
+        spacesbrowser.ui
+)
+
 target_link_libraries(spaces PUBLIC Qt5::Widgets libsync)
 set_target_properties(spaces PROPERTIES AUTOUIC ON AUTORCC ON)
 apply_common_target_settings(spaces)

src/libsync/capabilities.cpp

@@ -30,6 +30,7 @@ Capabilities::Capabilities(const QVariantMap &capabilities)
     , _spaces(_capabilities.value(QStringLiteral("spaces")).toMap())
     , _status(_capabilities.value(QStringLiteral("core")).toMap().value(QStringLiteral("status")).toMap())
     , _appProviders(AppProviders::findVersion(_capabilities.value(QStringLiteral("files")).toMap().value(QStringLiteral("app_providers")).toList(), QVersionNumber({ 1, 1, 0 })))
+    , _migration(_capabilities.value(QStringLiteral("migration")).toMap())
 {
 }
 
@@ -334,4 +335,16 @@ Capabilities::AppProviders Capabilities::AppProviders::findVersion(const QVarian
                              : Capabilities::AppProviders();
 }
 
+OCC::Migration::Migration(const QVariantMap &data)
+{
+    const auto spaces = data.value(QStringLiteral("space_migration")).toMap();
+    space_migration.enabled = spaces.value(QStringLiteral("enabled")).toBool();
+    space_migration.endpoint = spaces.value(QStringLiteral("endpoint")).toString();
+}
+
+const Migration &Capabilities::migration() const
+{
+    return _migration;
+}
+
 } // namespace OCC

src/libsync/capabilities.h

@@ -91,6 +91,19 @@ struct OWNCLOUDSYNC_EXPORT SpaceSupport
     bool isValid() const;
 };
 
+struct OWNCLOUDSYNC_EXPORT Migration
+{
+    struct SpacesMigration
+    {
+        bool enabled = false;
+        QString endpoint;
+    };
+
+    explicit Migration(const QVariantMap &spaces_support);
+
+    SpacesMigration space_migration;
+};
+
 /**
  * @brief The Capabilities class represents the capabilities of an ownCloud
  * server
@@ -254,6 +267,7 @@ class OWNCLOUDSYNC_EXPORT Capabilities
 
     const AppProviders &appProviders() const;
 
+    const Migration &migration() const;
 
     QVariantMap raw() const;
 
@@ -265,6 +279,7 @@ class OWNCLOUDSYNC_EXPORT Capabilities
     SpaceSupport _spaces;
     Status _status;
     AppProviders _appProviders;
+    Migration _migration;
 };
 }
 

test/CMakeLists.txt

@@ -58,5 +58,6 @@ configure_file(test_journal.db "${PROJECT_BINARY_DIR}/bin/test_journal.db" COPYO
 
 
 owncloud_add_test(JobQueue)
+owncloud_add_test(SpacesMigration)
 
 add_subdirectory(modeltests)