mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cloud storage: enable password update

Browse source 
This now allows the user to set a new password for the cloud service.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-07-22 11:10:40 -07:00
parent 3ba3de8daf
commit ce008f52db
3 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

30
qt-ui/preferences.cpp
View file

@ -412,10 +412,28 @@ void PreferencesDialog::syncSettings()
s.beginGroup("CloudStorage"); s.beginGroup("CloudStorage");
QString email = ui.cloud_storage_email->text(); QString email = ui.cloud_storage_email->text();
QString password = ui.cloud_storage_password->text(); QString password = ui.cloud_storage_password->text();
if (prefs.cloud_verification_status == CS_UNKNOWN || QString newpassword = ui.cloud_storage_new_passwd->text();
prefs.cloud_verification_status == CS_INCORRECT_USER_PASSWD || if (prefs.cloud_verification_status == CS_VERIFIED && !newpassword.isEmpty()) {
email != prefs.cloud_storage_email || // deal with password change
password != prefs.cloud_storage_password) { if (!email.isEmpty() && !password.isEmpty()) {
// connect to backend server to check / create credentials
QRegularExpression reg("^[a-zA-Z0-9@.+_-]+$");
if (!reg.match(email).hasMatch() || (!password.isEmpty() && !reg.match(password).hasMatch())) {
report_error(qPrintable(tr("Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.")));
} else {
CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
QNetworkReply *reply = cloudAuth->backend(email, password, "", newpassword);
ui.cloud_storage_new_passwd->setText("");
ui.cloud_storage_password->setText(newpassword);
password = newpassword;
}
}
} else if (prefs.cloud_verification_status == CS_UNKNOWN ||
prefs.cloud_verification_status == CS_INCORRECT_USER_PASSWD ||
email != prefs.cloud_storage_email ||
password != prefs.cloud_storage_password) {
// different credentials - reset verification status // different credentials - reset verification status
prefs.cloud_verification_status = CS_UNKNOWN; prefs.cloud_verification_status = CS_UNKNOWN;
if (!email.isEmpty() && !password.isEmpty()) { if (!email.isEmpty() && !password.isEmpty()) {
@ -426,7 +444,7 @@ void PreferencesDialog::syncSettings()
} else { } else {
CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this); CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded())); connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
QNetworkReply *reply = cloudAuth->authenticate(email, password); QNetworkReply *reply = cloudAuth->backend(email, password);
} }
} }
} else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) { } else if (prefs.cloud_verification_status == CS_NEED_TO_VERIFY) {
@ -439,7 +457,7 @@ void PreferencesDialog::syncSettings()
} }
CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this); CloudStorageAuthenticate *cloudAuth = new CloudStorageAuthenticate(this);
connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded())); connect(cloudAuth, SIGNAL(finishedAuthenticate()), this, SLOT(cloudPinNeeded()));
QNetworkReply *reply = cloudAuth->authenticate(email, password, pin); QNetworkReply *reply = cloudAuth->backend(email, password, pin);
} }
} }
SAVE_OR_REMOVE("email", default_prefs.cloud_storage_email, email); SAVE_OR_REMOVE("email", default_prefs.cloud_storage_email, email);

8
qt-ui/subsurfacewebservices.cpp
View file

@ -988,13 +988,17 @@ CloudStorageAuthenticate::CloudStorageAuthenticate(QObject *parent) :
#define CLOUDURL QString(prefs.cloud_base_url) #define CLOUDURL QString(prefs.cloud_base_url)
#define CLOUDBACKENDSTORAGE CLOUDURL + "/storage" #define CLOUDBACKENDSTORAGE CLOUDURL + "/storage"
#define CLOUDBACKENDVERIFY CLOUDURL + "/verify" #define CLOUDBACKENDVERIFY CLOUDURL + "/verify"
#define CLOUDBACKENDUPDATE CLOUDURL + "/update"
QNetworkReply* CloudStorageAuthenticate::authenticate(QString email, QString password, QString pin) QNetworkReply* CloudStorageAuthenticate::backend(QString email, QString password, QString pin, QString newpasswd)
{ {
QString payload(email + " " + password); QString payload(email + " " + password);
QUrl requestUrl; QUrl requestUrl;
if (pin == "") { if (pin == "" && newpasswd == "") {
requestUrl = QUrl(CLOUDBACKENDSTORAGE); requestUrl = QUrl(CLOUDBACKENDSTORAGE);
} else if (newpasswd != "") {
requestUrl = QUrl(CLOUDBACKENDUPDATE);
payload += " " + newpasswd;
} else { } else {
requestUrl = QUrl(CLOUDBACKENDVERIFY); requestUrl = QUrl(CLOUDBACKENDVERIFY);
payload += " " + pin; payload += " " + pin;

2
qt-ui/subsurfacewebservices.h
View file

@ -114,7 +114,7 @@ slots:
class CloudStorageAuthenticate : public QObject { class CloudStorageAuthenticate : public QObject {
Q_OBJECT Q_OBJECT
public: public:
QNetworkReply* authenticate(QString email, QString password, QString pin = ""); QNetworkReply* backend(QString email, QString password, QString pin = "", QString newpasswd = "");
explicit CloudStorageAuthenticate(QObject *parent); explicit CloudStorageAuthenticate(QObject *parent);
signals: signals:
void finishedAuthenticate(); void finishedAuthenticate();