Merge pull request #4175 from nextcloud/feature/publicLinks

mgallien · web-flow · commit 4ac2a064d761 · 2025-10-02T17:05:13.000+02:00
Feature/public links
diff --git a/src/gui/accountmanager.cpp b/src/gui/accountmanager.cpp
@@ -368,7 +368,11 @@ void AccountManager::saveAccountHelper(const AccountPtr &account, QSettings &set
 {
     qCDebug(lcAccountManager) << "Saving settings to" << settings.fileName();
     settings.setValue(QLatin1String(versionC), maxAccountVersion);
-    settings.setValue(QLatin1String(urlC), account->_url.toString());
+    if (account->isPublicShareLink()) {
+        settings.setValue(QLatin1String(urlC), account->publicShareLinkUrl().toString());
+    } else {
+        settings.setValue(QLatin1String(urlC), account->_url.toString());
+    }
     settings.setValue(QLatin1String(davUserC), account->_davUser);
     settings.setValue(QLatin1String(displayNameC), account->davDisplayName());
     settings.setValue(QLatin1String(serverVersionC), account->_serverVersion);
diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp
@@ -272,6 +272,13 @@ void ConnectionValidator::slotCapabilitiesRecieved(const QJsonDocument &json)
     _account->fetchDirectEditors(directEditingURL, directEditingETag);
 
     checkServerTermsOfService();
+
+    if (_account->isPublicShareLink()) {
+        slotUserFetched(nullptr);
+        return;
+    }
+
+    fetchUser();
 }
 
 void ConnectionValidator::fetchUser()
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
@@ -19,6 +19,7 @@
 #include "sslerrordialog.h"
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudwizardcommon.h"
+#include "account.h"
 
 #include "creds/credentialsfactory.h"
 #include "creds/abstractcredentials.h"
@@ -300,7 +301,11 @@ void OwncloudSetupWizard::slotFoundServer(const QUrl &url, const QJsonObject &in
         qCInfo(lcWizard) << " was redirected to" << url.toString();
     }
 
-    slotDetermineAuthType();
+    if (_ocWizard->account()->isPublicShareLink()) {
+        _ocWizard->setAuthType(DetermineAuthTypeJob::Basic);
+    } else {
+        slotDetermineAuthType();
+    }
 }
 
 void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply)
@@ -352,6 +357,19 @@ void OwncloudSetupWizard::slotConnectToOCUrl(const QString &url)
         creds->persist();
     }
 
+    if (_ocWizard->account()->isPublicShareLink()) {
+        _ocWizard->account()->setDavUser(creds->user());
+        _ocWizard->account()->setDavDisplayName(creds->user());
+
+        _ocWizard->setField(QLatin1String("OCUrl"), url);
+        _ocWizard->appendToConfigurationLog(tr("Trying to connect to %1 at %2 …")
+                                                .arg(Theme::instance()->appNameGUI())
+                                                .arg(url));
+
+        testOwnCloudConnect();
+        return;
+    }
+
     const auto fetchUserNameJob = new JsonApiJob(_ocWizard->account()->sharedFromThis(), QStringLiteral("/ocs/v1.php/cloud/user"));
     connect(fetchUserNameJob, &JsonApiJob::jsonReceived, this, [this, url](const QJsonDocument &json, int statusCode) {
         if (statusCode != 100) {
@@ -786,7 +804,13 @@ AccountState *OwncloudSetupWizard::applyAccountChanges()
     auto manager = AccountManager::instance();
 
     auto newState = manager->addAccount(newAccount);
+
+    if (newAccount->isPublicShareLink()) {
+        qCInfo(lcWizard()) << "seeting up public share link account";
+    }
+
     manager->saveAccount(newAccount);
+
     return newState;
 }
 
diff --git a/src/gui/tray/UserLine.qml b/src/gui/tray/UserLine.qml
@@ -15,8 +15,8 @@ import com.nextcloud.desktopclient
 AbstractButton {
     id: userLine
 
-    signal showUserStatusSelector(int id)
-    signal showUserStatusMessageSelector(int id)
+    signal showUserStatusSelector(int id)
+    signal showUserStatusMessageSelector(int id)
 
 
     Accessible.role: Accessible.MenuItem
@@ -133,26 +133,31 @@ AbstractButton {
                 id: userMoreButtonMenu
                 closePolicy: Menu.CloseOnPressOutsideParent | Menu.CloseOnEscape
 
-                MenuItem {
-                    visible: model.isConnected && model.serverHasUserStatus
-                    height: visible ? implicitHeight : 0
-                    text: qsTr("Set status")
-                    font.pixelSize: Style.topLinePixelSize
-                    hoverEnabled: true
-                    onClicked: showUserStatusSelector(index)
-               }
-
-                MenuItem {
-                    visible: model.isConnected && model.serverHasUserStatus
-                    height: visible ? implicitHeight : 0
-                    text: qsTr("Status message")
-                    font.pixelSize: Style.topLinePixelSize
-                    hoverEnabled: true
-                    onClicked: showUserStatusMessageSelector(index)
-               }
-
-                MenuItem {
-                    text: model.isConnected ? qsTr("Log out") : qsTr("Log in")
+<<<<<<< HEAD
+                MenuItem {
+                    visible: model.isConnected && model.serverHasUserStatus
+                    height: visible ? implicitHeight : 0
+                    text: qsTr("Set status")
+                    font.pixelSize: Style.topLinePixelSize
+                    hoverEnabled: true
+                    onClicked: showUserStatusSelector(index)
+               }
+
+                MenuItem {
+                    visible: model.isConnected && model.serverHasUserStatus
+                    height: visible ? implicitHeight : 0
+                    text: qsTr("Status message")
+                    font.pixelSize: Style.topLinePixelSize
+                    hoverEnabled: true
+                    onClicked: showUserStatusMessageSelector(index)
+               }
+
+                MenuItem {
+                    text: model.isConnected ? qsTr("Log out") : qsTr("Log in")
+                    visible: model.canLogout
+                    height: visible ? implicitHeight : 0
+                    width: parent.width
+                    text: model.isConnected ? qsTr("Log out") : qsTr("Log in")
                     font.pixelSize: Style.topLinePixelSize
                     hoverEnabled: true
                     onClicked: {
@@ -175,7 +180,7 @@ AbstractButton {
 
                 MenuItem {
                     id: removeAccountButton
-                    text: qsTr("Remove account")
+                    text: model.removeAccountText
                     font.pixelSize: Style.topLinePixelSize
                     hoverEnabled: true
                     onClicked: {
diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp
@@ -900,6 +900,16 @@ const QVariantList &User::groupFolders() const
     return _trayFolderInfos;
 }
 
+bool User::canLogout() const
+{
+    return !isPublicShareLink();
+}
+
+bool User::isPublicShareLink() const
+{
+    return _account->account()->isPublicShareLink();
+}
+
 void User::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item)
 {
     auto folderInstance = FolderMan::instance()->folder(folder);
@@ -1004,17 +1014,27 @@ void User::logout() const
 
 QString User::name() const
 {
+    if (isPublicShareLink()) {
+        return tr("Public Share Link");
+    }
+
     return _account->account()->prettyName();
 }
 
 QString User::server(bool shortened) const
 {
-    QString serverUrl = _account->account()->url().toString();
+    auto serverUrl = _account->account()->url();
+
+    if (isPublicShareLink()) {
+        serverUrl.setUserName({});
+    }
+    QString stringServerUrl = serverUrl.toString();
     if (shortened) {
-        serverUrl.replace(QLatin1String("https://"), QLatin1String(""));
-        serverUrl.replace(QLatin1String("http://"), QLatin1String(""));
+        stringServerUrl.replace(QLatin1String("https://"), QLatin1String(""));
+        stringServerUrl.replace(QLatin1String("http://"), QLatin1String(""));
+
     }
-    return serverUrl;
+    return stringServerUrl;
 }
 
 UserStatus::OnlineStatus User::status() const
@@ -1579,36 +1599,54 @@ int UserModel::rowCount(const QModelIndex &parent) const
 
 QVariant UserModel::data(const QModelIndex &index, int role) const
 {
-    if (index.row() < 0 || index.row() >= _users.count()) {
-        return QVariant();
-    }
-
-    if (role == NameRole) {
-        return _users[index.row()]->name();
-    } else if (role == ServerRole) {
-        return _users[index.row()]->server();
-    } else if (role == ServerHasUserStatusRole) {
-        return _users[index.row()]->serverHasUserStatus();
-    } else if (role == StatusRole) {
-        return QVariant::fromValue(_users[index.row()]->status());
-    } else if (role == StatusIconRole) {
-        return _users[index.row()]->statusIcon();
-    } else if (role == StatusEmojiRole) {
-        return _users[index.row()]->statusEmoji();
-    } else if (role == StatusMessageRole) {
-        return _users[index.row()]->statusMessage();
-    } else if (role == DesktopNotificationsAllowedRole) {
-        return _users[index.row()]->isDesktopNotificationsAllowed();
-    } else if (role == AvatarRole) {
-        return _users[index.row()]->avatarUrl();
-    } else if (role == IsCurrentUserRole) {
-        return _users[index.row()]->isCurrentUser();
-    } else if (role == IsConnectedRole) {
-        return _users[index.row()]->isConnected();
-    } else if (role == IdRole) {
-        return index.row();
-    }
-    return QVariant();
+    auto result = QVariant{};
+    switch (static_cast<UserRoles>(role))
+    {
+    case NameRole:
+        result = _users[index.row()]->name();
+        break;
+    case ServerRole:
+        result = _users[index.row()]->server();
+        break;
+    case ServerHasUserStatusRole:
+        result = _users[index.row()]->serverHasUserStatus();
+        break;
+    case StatusRole:
+        result = QVariant::fromValue(_users[index.row()]->status());
+        break;
+    case StatusIconRole:
+        result = _users[index.row()]->statusIcon();
+        break;
+    case StatusEmojiRole:
+        result = _users[index.row()]->statusEmoji();
+        break;
+    case StatusMessageRole:
+        result = _users[index.row()]->statusMessage();
+        break;
+    case DesktopNotificationsAllowedRole:
+        result = _users[index.row()]->isDesktopNotificationsAllowed();
+        break;
+    case AvatarRole:
+        result = _users[index.row()]->avatarUrl();
+        break;
+    case IsCurrentUserRole:
+        result = _users[index.row()]->isCurrentUser();
+        break;
+    case IsConnectedRole:
+        result = _users[index.row()]->isConnected();
+        break;
+    case IdRole:
+        result = index.row();
+        break;
+    case CanLogoutRole:
+        result = _users[index.row()]->canLogout();
+        break;
+    case RemoveAccountTextRole:
+        result = _users[index.row()]->isPublicShareLink() ? tr("Leave share") : tr("Remove account");
+        break;
+    }
+
+    return result;
 }
 
 QHash<int, QByteArray> UserModel::roleNames() const
@@ -1626,6 +1664,8 @@ QHash<int, QByteArray> UserModel::roleNames() const
     roles[IsCurrentUserRole] = "isCurrentUser";
     roles[IsConnectedRole] = "isConnected";
     roles[IdRole] = "id";
+    roles[CanLogoutRole] = "canLogout";
+    roles[RemoveAccountTextRole] = "removeAccountText";
     return roles;
 }
 
diff --git a/src/gui/tray/usermodel.h b/src/gui/tray/usermodel.h
@@ -71,6 +71,7 @@ class User : public QObject
     Q_PROPERTY(bool needsToSignTermsOfService READ needsToSignTermsOfService NOTIFY accountStateChanged)
     Q_PROPERTY(UnifiedSearchResultsListModel* unifiedSearchResultsListModel READ getUnifiedSearchResultsListModel CONSTANT)
     Q_PROPERTY(QVariantList groupFolders READ groupFolders NOTIFY groupFoldersChanged)
+    Q_PROPERTY(bool canLogout READ canLogout CONSTANT)
 
 public:
     User(AccountStatePtr &account, const bool &isCurrent = false, QObject *parent = nullptr);
@@ -113,6 +114,8 @@ class User : public QObject
     [[nodiscard]] QString statusEmoji() const;
     void processCompletedSyncItem(const Folder *folder, const SyncFileItemPtr &item);
     [[nodiscard]] const QVariantList &groupFolders() const;
+    [[nodiscard]] bool canLogout() const;
+    [[nodiscard]] bool isPublicShareLink() const;
 
 signals:
     void nameChanged();
@@ -256,7 +259,9 @@ class UserModel : public QAbstractListModel
         AvatarRole,
         IsCurrentUserRole,
         IsConnectedRole,
-        IdRole
+        IdRole,
+        CanLogoutRole,
+        RemoveAccountTextRole,
     };
 
     [[nodiscard]] AccountAppList appList() const;
diff --git a/src/gui/userinfo.cpp b/src/gui/userinfo.cpp
@@ -66,7 +66,7 @@ void UserInfo::slotRequestFailed()
 
 bool UserInfo::canGetInfo() const
 {
-    if (!_accountState || !_active) {
+    if (!_accountState || !_active || !_accountState->account() || _accountState->account()->isPublicShareLink()) {
         return false;
     }
     AccountPtr account = _accountState->account();
@@ -130,7 +130,7 @@ void UserInfo::slotUpdateLastInfo(const QJsonDocument &json)
     _jobRestartTimer.start(defaultIntervalT);
     _lastInfoReceived = QDateTime::currentDateTime();
 
-    if(_fetchAvatarImage) {
+    if(_fetchAvatarImage && !account->isPublicShareLink()) {
         auto *job = new AvatarJob(account, account->davUser(), 128, this);
         job->setTimeout(20 * 1000);
         QObject::connect(job, &AvatarJob::avatarPixmap, this, &UserInfo::slotAvatarImage);
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -240,6 +240,11 @@ void OwncloudAdvancedSetupPage::fetchUserAvatar()
     if (Theme::isHidpi()) {
         avatarSize *= 2;
     }
+
+    if (account->isPublicShareLink()) {
+        return;
+    }
+
     const auto avatarJob = new AvatarJob(account, account->davUser(), avatarSize, this);
     avatarJob->setTimeout(20 * 1000);
     QObject::connect(avatarJob, &AvatarJob::avatarPixmap, this, [this](const QImage &avatarImage) {
diff --git a/src/gui/wizard/owncloudhttpcredspage.cpp b/src/gui/wizard/owncloudhttpcredspage.cpp
@@ -95,11 +95,15 @@ void OwncloudHttpCredsPage::initializePage()
         const QString user = url.userName();
         const QString password = url.password();
 
+        _ui.leUsername->setText(user);
+        _ui.lePassword->setText(password);
+
         if (!user.isEmpty()) {
-            _ui.leUsername->setText(user);
-        }
-        if (!password.isEmpty()) {
-            _ui.lePassword->setText(password);
+            _ui.errorLabel->setVisible(false);
+            startSpinner();
+
+            emit completeChanged();
+            emit connectToOCUrl(field("OCUrl").toString().simplified());
         }
     }
     _ui.tokenLabel->setText(HttpCredentialsGui::requestAppPasswordText(ocWizard->account().data()));
@@ -115,7 +119,7 @@ void OwncloudHttpCredsPage::cleanupPage()
 
 bool OwncloudHttpCredsPage::validatePage()
 {
-    if (_ui.leUsername->text().isEmpty() || _ui.lePassword->text().isEmpty()) {
+    if (_ui.leUsername->text().isEmpty()) {
         return false;
     }
 
diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp
diff --git a/src/libsync/account.h b/src/libsync/account.h
diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
