Feature/public links

src/gui/accountmanager.cpp

@@ -343,7 +343,11 @@ void AccountManager::saveAccountHelper(Account *account, QSettings &settings, bo
 {
     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);

src/gui/connectionvalidator.cpp

@@ -12,7 +12,7 @@
  * for more details.
  */
 
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QJsonArray>
 #include <QLoggingCategory>
@@ -271,6 +271,13 @@
     _account->fetchDirectEditors(directEditingURL, directEditingETag);
 
     checkServerTermsOfService();
+
+    if (_account->isPublicShareLink()) {
+        slotUserFetched(nullptr);
+        return;
+    }
+
+    fetchUser();
 }
 
 void ConnectionValidator::fetchUser()

src/gui/owncloudsetupwizard.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Klaas Freitag <[email protected]>
  * Copyright (C) by Krzesimir Nowak <[email protected]>
  *
@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include <QAbstractButton>
 #include <QtCore>
 #include <QProcess>
 #include <QMessageBox>
@@ -34,6 +34,7 @@
 #include "sslerrordialog.h"
 #include "wizard/owncloudwizard.h"
 #include "wizard/owncloudwizardcommon.h"
+#include "account.h"
 
 #include "creds/credentialsfactory.h"
 #include "creds/abstractcredentials.h"
@@ -290,7 +291,11 @@
         qCInfo(lcWizard) << " was redirected to" << url.toString();
     }
 
-    slotDetermineAuthType();
+    if (_ocWizard->account()->isPublicShareLink()) {
+        _ocWizard->setAuthType(DetermineAuthTypeJob::Basic);
+    } else {
+        slotDetermineAuthType();
+    }
 }
 
 void OwncloudSetupWizard::slotNoServerFound(QNetworkReply *reply)
@@ -341,6 +346,19 @@
         _ocWizard->account()->setCredentials(creds);
     }
 
+    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) {
@@ -731,6 +749,11 @@
     auto manager = AccountManager::instance();
 
     auto newState = manager->addAccount(newAccount);
+
+    if (newAccount->isPublicShareLink()) {
+        qCInfo(lcWizard()) << "seeting up public share link account";
+    }
+
     manager->saveAccount(newAccount.data());
     return newState;
 }

src/gui/tray/UserLine.qml

@@ -152,6 +152,9 @@ AbstractButton {
                }
 
                 MenuItem {
+                    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
@@ -175,7 +178,7 @@ AbstractButton {
 
                 MenuItem {
                     id: removeAccountButton
-                    text: qsTr("Remove account")
+                    text: model.removeAccountText
                     font.pixelSize: Style.topLinePixelSize
                     hoverEnabled: true
                     onClicked: {

src/gui/tray/usermodel.cpp

@@ -1,4 +1,4 @@
 #include "notificationhandler.h"
 #include "usermodel.h"
 #include "common/filesystembase.h"
 
@@ -884,7 +884,17 @@
     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);
 
@@ -988,17 +998,27 @@
 
 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
@@ -1509,34 +1529,51 @@
 
 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 == 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 (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 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
@@ -1545,6 +1582,8 @@
     roles[NameRole] = "name";
     roles[ServerRole] = "server";
     roles[ServerHasUserStatusRole] = "serverHasUserStatus";
+    roles[CanLogoutRole] = "canLogout";
+    roles[RemoveAccountTextRole] = "removeAccountText";
     roles[StatusIconRole] = "statusIcon";
     roles[StatusEmojiRole] = "statusEmoji";
     roles[StatusMessageRole] = "statusMessage";

src/gui/tray/usermodel.h

@@ -1,7 +1,7 @@
 #ifndef USERMODEL_H
 #define USERMODEL_H
 
 #include <QAbstractListModel>
 #include <QImage>
 #include <QDateTime>
 #include <QStringList>
@@ -63,6 +63,7 @@
     Q_PROPERTY(bool isConnected READ isConnected 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);
@@ -104,6 +105,8 @@
     [[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();
@@ -236,14 +239,16 @@
         NameRole = Qt::UserRole + 1,
         ServerRole,
         ServerHasUserStatusRole,
+        CanLogoutRole,
+        RemoveAccountTextRole,
         StatusIconRole,
         StatusEmojiRole,
         StatusMessageRole,
         DesktopNotificationsAllowedRole,
         AvatarRole,
         IsCurrentUserRole,
         IsConnectedRole,
-        IdRole
+        IdRole,
     };
 
     [[nodiscard]] AccountAppList appList() const;

src/gui/userinfo.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Daniel Molkentin <[email protected]>
  * Copyright (C) by Michael Schuster <[email protected]>
  *
@@ -76,7 +76,7 @@
 
 bool UserInfo::canGetInfo() const
 {
-    if (!_accountState || !_active) {
+    if (!_accountState || !_active || !_accountState->account() || _accountState->account()->isPublicShareLink()) {
         return false;
     }
     AccountPtr account = _accountState->account();
@@ -140,8 +140,8 @@
     _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);
         job->start();

src/gui/wizard/owncloudadvancedsetuppage.cpp

@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include <QDir>
 #include <QFileDialog>
 #include <QUrl>
 #include <QTimer>
@@ -226,6 +226,11 @@
     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) {

src/gui/wizard/owncloudhttpcredspage.cpp

@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include "QProgressIndicator.h"
 
 #include "creds/httpcredentialsgui.h"
 #include "theme.h"
@@ -104,11 +104,15 @@
         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()));
@@ -124,7 +128,7 @@
 
 bool OwncloudHttpCredsPage::validatePage()
 {
-    if (_ui.leUsername->text().isEmpty() || _ui.lePassword->text().isEmpty()) {
+    if (_ui.leUsername->text().isEmpty()) {
         return false;
     }
 

src/libsync/account.cpp

@@ -104,7 +104,11 @@ QString Account::davPath() const
 
 QString Account::davPathRoot() const
 {
-    return davPathBase() + QLatin1Char('/') + davUser();
+    if (_isPublicLink) {
+        return QStringLiteral("/public.php/webdav");
+    } else {
+        return davPathBase() + QLatin1Char('/') + davUser();
+    }
 }
 
 void Account::setSharedThis(AccountPtr sharedThis)
@@ -526,10 +530,26 @@ void Account::setSslErrorHandler(AbstractSslErrorHandler *handler)
 
 void Account::setUrl(const QUrl &url)
 {
-    _url = url;
+    const QRegularExpression discoverPublicLinks(R"((http.://[^/]*).*/s/([^/]*))");
+    const auto isPublicLink = discoverPublicLinks.match(url.toString());
+    if (isPublicLink.hasMatch()) {
+        _url = QUrl::fromUserInput(isPublicLink.captured(1));
+        _url.setUserName(isPublicLink.captured(2));
+        setDavUser(isPublicLink.captured(2));
+        _isPublicLink = true;
+        _publicShareLinkUrl = url;
+    } else {
+        _url = url;
+    }
+
     _userVisibleUrl = url;
 }
 
+QUrl Account::publicShareLinkUrl() const
+{
+    return _publicShareLinkUrl;
+}
+
 void Account::setUserVisibleHost(const QString &host)
 {
     _userVisibleUrl.setHost(host);

src/libsync/account.h

@@ -165,6 +165,12 @@ class OWNCLOUDSYNC_EXPORT Account : public QObject
     /** Server url of the account */
     void setUrl(const QUrl &url);
     [[nodiscard]] QUrl url() const { return _url; }
+    [[nodiscard]] QUrl publicShareLinkUrl() const;
+
+    [[nodiscard]] bool isPublicShareLink() const
+    {
+        return _isPublicLink;
+    }
 
     /// Adjusts _userVisibleUrl once the host to use is discovered.
     void setUserVisibleHost(const QString &host);
@@ -501,6 +507,8 @@ private slots:
 #endif
     QMap<QString, QVariant> _settingsMap;
     QUrl _url;
+    QUrl _publicShareLinkUrl;
+    bool _isPublicLink = false;
 
     /** If url to use for any user-visible urls.
      *