mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-22 05:34:33 +03:00
abfebcf291
The PropfindJob quota includes the size of shares and thus leads to confusion in regard of the real space available, as shown in the UI. This commit aims to streamline the behaviour with the Android and iOS apps, which also utilize the API. Details: - Refactor the QuotaInfo class into UserInfo - Use JsonApiJob (ocs/v1.php/cloud/user) instead of PropfindJob - Let ConnectionValidator use the new UserInfo class to fetch the user and the avatar image (to avoid code duplication) - Allow updating the avatar image upon AccountSettings visibility, using UserInfo's quota fetching Signed-off-by: Michael Schuster <michael@schuster.ms>
149 lines
4.7 KiB
C++
149 lines
4.7 KiB
C++
/*
|
|
* Copyright (C) by Klaas Freitag <freitag@owncloud.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program 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 General Public License
|
|
* for more details.
|
|
*/
|
|
|
|
#ifndef CONNECTIONVALIDATOR_H
|
|
#define CONNECTIONVALIDATOR_H
|
|
|
|
#include "owncloudlib.h"
|
|
#include <QObject>
|
|
#include <QStringList>
|
|
#include <QVariantMap>
|
|
#include <QNetworkReply>
|
|
#include "accountfwd.h"
|
|
#include "clientsideencryption.h"
|
|
|
|
namespace OCC {
|
|
|
|
/**
|
|
* This is a job-like class to check that the server is up and that we are connected.
|
|
* There are two entry points: checkServerAndAuth and checkAuthentication
|
|
* checkAuthentication is the quick version that only does the propfind
|
|
* while checkServerAndAuth is doing the 4 calls.
|
|
*
|
|
* We cannot use the capabilites call to test the login and the password because of
|
|
* https://github.com/owncloud/core/issues/12930
|
|
*
|
|
* Here follows the state machine
|
|
|
|
\code{.unparsed}
|
|
*---> checkServerAndAuth (check status.php)
|
|
Will asynchronously check for system proxy (if using system proxy)
|
|
And then invoke slotCheckServerAndAuth
|
|
CheckServerJob
|
|
|
|
|
+-> slotNoStatusFound --> X
|
|
|
|
|
+-> slotJobTimeout --> X
|
|
|
|
|
+-> slotStatusFound --+--> X (if credentials are still missing)
|
|
|
|
|
+---------------------------+
|
|
|
|
|
*-+-> checkAuthentication (PROPFIND on root)
|
|
PropfindJob
|
|
|
|
|
+-> slotAuthFailed --> X
|
|
|
|
|
+-> slotAuthSuccess --+--> X (depending if coming from checkServerAndAuth or not)
|
|
|
|
|
+---------------------------+
|
|
|
|
|
+-> checkServerCapabilities --------------v (in parallel)
|
|
JsonApiJob (cloud/capabilities) JsonApiJob (ocs/v1.php/config)
|
|
| +-> ocsConfigReceived
|
|
+-> slotCapabilitiesRecieved -+
|
|
|
|
|
+---------------------------------+
|
|
|
|
|
fetchUser
|
|
Utilizes the UserInfo class to fetch the user and avatar image
|
|
+-----------------------------------+
|
|
|
|
|
+-> Client Side Encryption Checks --+ --reportResult()
|
|
\endcode
|
|
*/
|
|
|
|
class UserInfo;
|
|
|
|
class ConnectionValidator : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ConnectionValidator(AccountStatePtr accountState, QObject *parent = nullptr);
|
|
|
|
enum Status {
|
|
Undefined,
|
|
Connected,
|
|
NotConfigured,
|
|
ServerVersionMismatch, // The server version is too old
|
|
CredentialsNotReady, // Credentials aren't ready
|
|
CredentialsWrong, // AuthenticationRequiredError
|
|
SslError, // SSL handshake error, certificate rejected by user?
|
|
StatusNotFound, // Error retrieving status.php
|
|
ServiceUnavailable, // 503 on authed request
|
|
MaintenanceMode, // maintenance enabled in status.php
|
|
Timeout // actually also used for other errors on the authed request
|
|
};
|
|
Q_ENUM(Status);
|
|
|
|
// How often should the Application ask this object to check for the connection?
|
|
enum { DefaultCallingIntervalMsec = 32 * 1000 };
|
|
|
|
public slots:
|
|
/// Checks the server and the authentication.
|
|
void checkServerAndAuth();
|
|
void systemProxyLookupDone(const QNetworkProxy &proxy);
|
|
|
|
/// Checks authentication only.
|
|
void checkAuthentication();
|
|
|
|
signals:
|
|
void connectionResult(ConnectionValidator::Status status, const QStringList &errors);
|
|
|
|
protected slots:
|
|
void slotCheckServerAndAuth();
|
|
|
|
void slotStatusFound(const QUrl &url, const QJsonObject &info);
|
|
void slotNoStatusFound(QNetworkReply *reply);
|
|
void slotJobTimeout(const QUrl &url);
|
|
|
|
void slotAuthFailed(QNetworkReply *reply);
|
|
void slotAuthSuccess();
|
|
|
|
void slotCapabilitiesRecieved(const QJsonDocument &);
|
|
void slotUserFetched(UserInfo *userInfo);
|
|
|
|
private:
|
|
#ifndef TOKEN_AUTH_ONLY
|
|
void reportConnected();
|
|
#endif
|
|
void reportResult(Status status);
|
|
void checkServerCapabilities();
|
|
void fetchUser();
|
|
static void ocsConfigReceived(const QJsonDocument &json, AccountPtr account);
|
|
|
|
/** Sets the account's server version
|
|
*
|
|
* Returns false and reports ServerVersionMismatch for very old servers.
|
|
*/
|
|
bool setAndCheckServerVersion(const QString &version);
|
|
|
|
QStringList _errors;
|
|
AccountStatePtr _accountState;
|
|
AccountPtr _account;
|
|
bool _isCheckingServerAndAuth;
|
|
};
|
|
}
|
|
|
|
#endif // CONNECTIONVALIDATOR_H
|