From 0a588f7b5ef133303f0b389f6f1cd6fef9222c43 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Thu, 25 Feb 2021 12:21:07 +0100
Subject: [PATCH] big changes to simplify account dialog flows

---
 src/librssguard/core/feedsmodel.cpp           |  1 +
 .../miscellaneous/databasequeries.cpp         | 32 ------------
 src/librssguard/network-web/oauth2service.cpp | 42 ++++++++++++++--
 src/librssguard/network-web/oauth2service.h   | 12 +++++
 .../abstract/gui/formaccountdetails.cpp       | 37 +++++++++++---
 .../abstract/gui/formaccountdetails.h         | 48 ++++--------------
 .../services/abstract/serviceroot.cpp         |  2 +-
 .../feedly/gui/formeditfeedlyaccount.cpp      | 12 ++---
 .../feedly/gui/formeditfeedlyaccount.h        |  2 +-
 .../services/gmail/gmailserviceroot.cpp       | 19 +++----
 .../gmail/gui/formeditgmailaccount.cpp        | 50 ++++++-------------
 .../services/gmail/gui/formeditgmailaccount.h |  2 +-
 .../gmail/gui/gmailaccountdetails.cpp         |  8 +--
 .../services/gmail/gui/gmailaccountdetails.h  |  6 +--
 .../gmail/network/gmailnetworkfactory.cpp     |  9 ++++
 .../greader/gui/formeditgreaderaccount.cpp    | 10 ++--
 .../greader/gui/formeditgreaderaccount.h      |  2 +-
 .../gui/formeditinoreaderaccount.cpp          | 12 ++---
 .../inoreader/gui/formeditinoreaderaccount.h  |  2 +-
 .../owncloud/gui/formeditowncloudaccount.cpp  | 10 ++--
 .../owncloud/gui/formeditowncloudaccount.h    |  2 +-
 .../standard/gui/formeditstandardaccount.cpp  |  2 +-
 .../tt-rss/gui/formeditttrssaccount.cpp       | 12 ++---
 .../tt-rss/gui/formeditttrssaccount.h         |  2 +-
 24 files changed, 164 insertions(+), 172 deletions(-)

diff --git a/src/librssguard/core/feedsmodel.cpp b/src/librssguard/core/feedsmodel.cpp
index 84dcf8a11..76bd0d19e 100644
--- a/src/librssguard/core/feedsmodel.cpp
+++ b/src/librssguard/core/feedsmodel.cpp
@@ -481,6 +481,7 @@ bool FeedsModel::addServiceAccount(ServiceRoot* root, bool freshly_activated) {
   connect(root, &ServiceRoot::reloadMessageListRequested, this, &FeedsModel::reloadMessageListRequested);
   connect(root, &ServiceRoot::itemExpandRequested, this, &FeedsModel::itemExpandRequested);
   connect(root, &ServiceRoot::itemExpandStateSaveRequested, this, &FeedsModel::itemExpandStateSaveRequested);
+
   root->start(freshly_activated);
 
   return true;
diff --git a/src/librssguard/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp
index d6a654e01..326f2c7f9 100755
--- a/src/librssguard/miscellaneous/databasequeries.cpp
+++ b/src/librssguard/miscellaneous/databasequeries.cpp
@@ -2798,24 +2798,8 @@ bool DatabaseQueries::overwriteGmailAccount(const QSqlDatabase& db, const QStrin
                 "redirect_url = :redirect_url, refresh_token = :refresh_token , msg_limit = :msg_limit "
                 "WHERE id = :id;");
   query.bindValue(QSL(":username"), username);
-
-#if defined(GMAIL_OFFICIAL_SUPPORT)
-  const QString official_app_id = TextFactory::decrypt(GMAIL_CLIENT_ID, OAUTH_DECRYPTION_KEY);
-  const QString official_app_key = TextFactory::decrypt(GMAIL_CLIENT_SECRET, OAUTH_DECRYPTION_KEY);
-
-  if (official_app_id == app_id) {
-    query.bindValue(QSL(":app_id"), {});
-    query.bindValue(QSL(":app_key"), {});
-  }
-  else {
-    query.bindValue(QSL(":app_id"), app_id);
-    query.bindValue(QSL(":app_key"), app_key);
-  }
-#else
   query.bindValue(QSL(":app_id"), app_id);
   query.bindValue(QSL(":app_key"), app_key);
-#endif
-
   query.bindValue(QSL(":redirect_url"), redirect_url);
   query.bindValue(QSL(":refresh_token"), refresh_token);
   query.bindValue(QSL(":id"), account_id);
@@ -2842,24 +2826,8 @@ bool DatabaseQueries::createGmailAccount(const QSqlDatabase& db, int id_to_assig
             "VALUES (:id, :username, :app_id, :app_key, :redirect_url, :refresh_token, :msg_limit);");
   q.bindValue(QSL(":id"), id_to_assign);
   q.bindValue(QSL(":username"), username);
-
-#if defined(GMAIL_OFFICIAL_SUPPORT)
-  const QString official_app_id = TextFactory::decrypt(GMAIL_CLIENT_ID, OAUTH_DECRYPTION_KEY);
-  const QString official_app_key = TextFactory::decrypt(GMAIL_CLIENT_SECRET, OAUTH_DECRYPTION_KEY);
-
-  if (official_app_id == app_id) {
-    q.bindValue(QSL(":app_id"), {});
-    q.bindValue(QSL(":app_key"), {});
-  }
-  else {
-    q.bindValue(QSL(":app_id"), app_id);
-    q.bindValue(QSL(":app_key"), app_key);
-  }
-#else
   q.bindValue(QSL(":app_id"), app_id);
   q.bindValue(QSL(":app_key"), app_key);
-#endif
-
   q.bindValue(QSL(":redirect_url"), redirect_url);
   q.bindValue(QSL(":refresh_token"), refresh_token);
   q.bindValue(QSL(":msg_limit"), batch_size <= 0 ? GMAIL_DEFAULT_BATCH_SIZE : batch_size);
diff --git a/src/librssguard/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp
index 272c83100..cd69de977 100644
--- a/src/librssguard/network-web/oauth2service.cpp
+++ b/src/librssguard/network-web/oauth2service.cpp
@@ -54,6 +54,7 @@ OAuth2Service::OAuth2Service(const QString& auth_url, const QString& token_url,
 
   m_clientId = client_id;
   m_clientSecret = client_secret;
+  m_clientSecretId = m_clientSecretSecret = QString();
   m_scope = scope;
 
   connect(&m_networkManager, &QNetworkAccessManager::finished, this, &OAuth2Service::tokenRequestFinished);
@@ -127,6 +128,22 @@ void OAuth2Service::timerEvent(QTimerEvent* event) {
   QObject::timerEvent(event);
 }
 
+QString OAuth2Service::clientSecretSecret() const {
+  return m_clientSecretSecret;
+}
+
+void OAuth2Service::setClientSecretSecret(const QString& client_secret_secret) {
+  m_clientSecretSecret = client_secret_secret;
+}
+
+QString OAuth2Service::clientSecretId() const {
+  return m_clientSecretId;
+}
+
+void OAuth2Service::setClientSecretId(const QString& client_secret_id) {
+  m_clientSecretId = client_secret_id;
+}
+
 QString OAuth2Service::id() const {
   return m_id;
 }
@@ -145,8 +162,10 @@ void OAuth2Service::retrieveAccessToken(const QString& auth_code) {
                             "client_secret=%2&"
                             "code=%3&"
                             "redirect_uri=%5&"
-                            "grant_type=%4").arg(m_clientId, m_clientSecret,
-                                                 auth_code, m_tokenGrantType,
+                            "grant_type=%4").arg(properClientId(),
+                                                 properClientSecret(),
+                                                 auth_code,
+                                                 m_tokenGrantType,
                                                  m_redirectionHandler->listenAddressPort());
 
   qDebugNN << LOGSEC_OAUTH << "Posting data for access token retrieval:" << QUOTE_W_SPACE_DOT(content);
@@ -163,7 +182,10 @@ void OAuth2Service::refreshAccessToken(const QString& refresh_token) {
   QString content = QString("client_id=%1&"
                             "client_secret=%2&"
                             "refresh_token=%3&"
-                            "grant_type=%4").arg(m_clientId, m_clientSecret, real_refresh_token, QSL("refresh_token"));
+                            "grant_type=%4").arg(properClientId(),
+                                                 properClientSecret(),
+                                                 real_refresh_token,
+                                                 QSL("refresh_token"));
 
   qApp->showGuiMessage(tr("Logging in via OAuth 2.0..."),
                        tr("Refreshing login tokens for '%1'...").arg(m_tokenUrl.toString()),
@@ -213,6 +235,18 @@ void OAuth2Service::tokenRequestFinished(QNetworkReply* network_reply) {
   network_reply->deleteLater();
 }
 
+QString OAuth2Service::properClientId() const {
+  return m_clientId.simplified().isEmpty()
+      ? m_clientSecretId
+      : m_clientId;
+}
+
+QString OAuth2Service::properClientSecret() const {
+  return m_clientSecret.simplified().isEmpty()
+      ? m_clientSecretSecret
+      : m_clientSecret;
+}
+
 QString OAuth2Service::accessToken() const {
   return m_accessToken;
 }
@@ -326,7 +360,7 @@ void OAuth2Service::retrieveAuthCode() {
                                          "response_type=code&"
                                          "state=%4&"
                                          "prompt=consent&"
-                                         "access_type=offline").arg(m_clientId,
+                                         "access_type=offline").arg(properClientId(),
                                                                     m_scope,
                                                                     m_redirectionHandler->listenAddressPort(),
                                                                     m_id);
diff --git a/src/librssguard/network-web/oauth2service.h b/src/librssguard/network-web/oauth2service.h
index bf91517de..a0e7ef47f 100644
--- a/src/librssguard/network-web/oauth2service.h
+++ b/src/librssguard/network-web/oauth2service.h
@@ -71,6 +71,13 @@ class OAuth2Service : public QObject {
     QString id() const;
     void setId(const QString& id);
 
+    // Super secret fallback client ID/SECRET.
+    QString clientSecretId() const;
+    void setClientSecretId(const QString& client_secret_id);
+
+    QString clientSecretSecret() const;
+    void setClientSecretSecret(const QString& client_secret_secret);
+
   signals:
     void tokensRetrieved(QString access_token, QString refresh_token, int expires_in);
     void tokensRetrieveError(QString error, QString error_description);
@@ -103,6 +110,9 @@ class OAuth2Service : public QObject {
     void tokenRequestFinished(QNetworkReply* network_reply);
 
   private:
+    QString properClientId() const;
+    QString properClientSecret() const;
+
     void timerEvent(QTimerEvent* event);
 
   private:
@@ -114,6 +124,8 @@ class OAuth2Service : public QObject {
     QString m_tokenGrantType;
     QString m_clientId;
     QString m_clientSecret;
+    QString m_clientSecretId;
+    QString m_clientSecretSecret;
     QUrl m_tokenUrl;
     QString m_authUrl;
     QString m_scope;
diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.cpp b/src/librssguard/services/abstract/gui/formaccountdetails.cpp
index 874c923fe..b81e8bb27 100644
--- a/src/librssguard/services/abstract/gui/formaccountdetails.cpp
+++ b/src/librssguard/services/abstract/gui/formaccountdetails.cpp
@@ -8,7 +8,7 @@
 #include "services/abstract/serviceroot.h"
 
 FormAccountDetails::FormAccountDetails(const QIcon& icon, QWidget* parent)
-  : QDialog(parent), m_proxyDetails(new NetworkProxyDetails(this)), m_account(nullptr) {
+  : QDialog(parent), m_proxyDetails(new NetworkProxyDetails(this)), m_account(nullptr), m_creatingNew(false) {
   m_ui.setupUi(this);
 
   insertCustomTab(m_proxyDetails, tr("Network proxy"), 0);
@@ -16,8 +16,19 @@ FormAccountDetails::FormAccountDetails(const QIcon& icon, QWidget* parent)
                                       ? qApp->icons()->fromTheme(QSL("emblem-system"))
                                       : icon);
   createConnections();
+}
 
-  m_proxyDetails->setProxy(QNetworkProxy());
+void FormAccountDetails::apply() {
+  QSqlDatabase database = qApp->database()->connection(QSL("FormAccountDetails"));
+
+  if (m_creatingNew) {
+    m_account->setAccountId(DatabaseQueries::createBaseAccount(database, m_account->code()));
+  }
+
+  m_account->setNetworkProxy(m_proxyDetails->proxy());
+
+  // NOTE: We edit account common attributes here directly.
+  DatabaseQueries::editBaseAccount(database, m_account);
 }
 
 void FormAccountDetails::insertCustomTab(QWidget* custom_tab, const QString& title, int index) {
@@ -32,13 +43,23 @@ void FormAccountDetails::clearTabs() {
   m_ui.m_tabWidget->clear();
 }
 
-void FormAccountDetails::setEditableAccount(ServiceRoot* editable_account) {
-  setWindowTitle(tr("Edit account '%1'").arg(editable_account->title()));
-  m_account = editable_account;
-
-  if (m_account != nullptr) {
-    m_proxyDetails->setProxy(m_account->networkProxy());
+void FormAccountDetails::loadAccountData() {
+  if (m_creatingNew) {
+    setWindowTitle(tr("Add new account"));
   }
+  else {
+    setWindowTitle(tr("Edit account '%1'").arg(m_account->title()));
+
+    // Perform last-time operations before account is changed.
+    auto* cached_account = dynamic_cast<CacheForServiceRoot*>(m_account);
+
+    if (cached_account != nullptr) {
+      qWarningNN << LOGSEC_CORE << "Last-time account cache saving before account could be edited.";
+      cached_account->saveAllCachedData(true);
+    }
+  }
+
+  m_proxyDetails->setProxy(m_account->networkProxy());
 }
 
 void FormAccountDetails::createConnections() {
diff --git a/src/librssguard/services/abstract/gui/formaccountdetails.h b/src/librssguard/services/abstract/gui/formaccountdetails.h
index 8a9ee25fa..054e806ca 100644
--- a/src/librssguard/services/abstract/gui/formaccountdetails.h
+++ b/src/librssguard/services/abstract/gui/formaccountdetails.h
@@ -31,15 +31,10 @@ class FormAccountDetails : public QDialog {
     // Applies changes.
     // NOTE: This must be reimplemented in subclasses. Also, every
     // subclass must call applyInternal() method as first statement.
-    virtual void apply() = 0;
+    virtual void apply();
 
   protected:
 
-    // Performs some common operations and returns true if creating
-    // new account or false if editing existing account.
-    template<class T>
-    bool applyInternal();
-
     void activateTab(int index);
     void clearTabs();
     void insertCustomTab(QWidget* custom_tab, const QString& title, int index);
@@ -47,7 +42,7 @@ class FormAccountDetails : public QDialog {
     // Sets the account which will be edited.
     // NOTE: This must be reimplemented in subclasses. Also this
     // base implementation must be called first.
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private:
     void createConnections();
@@ -56,44 +51,23 @@ class FormAccountDetails : public QDialog {
     Ui::FormAccountDetails m_ui;
     NetworkProxyDetails* m_proxyDetails;
     ServiceRoot* m_account;
+    bool m_creatingNew;
 };
 
-template<class T>
-inline bool FormAccountDetails::applyInternal() {
-  if (m_account != nullptr) {
-    // Perform last-time operations before account is changed.
-    auto* cached_account = dynamic_cast<CacheForServiceRoot*>(m_account);
-
-    if (cached_account != nullptr) {
-      qWarningNN << LOGSEC_CORE << "Last-time account cache saving before account gets changed.";
-      cached_account->saveAllCachedData(true);
-    }
-  }
-
-  QSqlDatabase database = qApp->database()->connection(QSL("FormAccountDetails"));
-  bool creating = m_account == nullptr;
-
-  if (creating) {
-    m_account = new T();
-    m_account->setAccountId(DatabaseQueries::createBaseAccount(database, m_account->code()));
-  }
-
-  m_account->setNetworkProxy(m_proxyDetails->proxy());
-
-  // NOTE: We edit account common attributes here directly.
-  DatabaseQueries::editBaseAccount(database, m_account);
-  return creating;
-}
-
 template<class T>
 inline T* FormAccountDetails::addEditAccount(T* account_to_edit) {
-  if (account_to_edit == nullptr) {
-    setWindowTitle(tr("Add new account"));
+  m_creatingNew = account_to_edit == nullptr;
+
+  if (m_creatingNew) {
+    m_account = new T();
   }
   else {
-    setEditableAccount(static_cast<ServiceRoot*>(account_to_edit));
+    m_account = account_to_edit;
   }
 
+  // Load custom logic for account data loading.
+  loadAccountData();
+
   if (exec() == QDialog::DialogCode::Accepted) {
     return account<T>();
   }
diff --git a/src/librssguard/services/abstract/serviceroot.cpp b/src/librssguard/services/abstract/serviceroot.cpp
index dbacf4bbb..e1c07c454 100644
--- a/src/librssguard/services/abstract/serviceroot.cpp
+++ b/src/librssguard/services/abstract/serviceroot.cpp
@@ -18,7 +18,7 @@
 
 ServiceRoot::ServiceRoot(RootItem* parent)
   : RootItem(parent), m_recycleBin(new RecycleBin(this)), m_importantNode(new ImportantNode(this)),
-  m_labelsNode(new LabelsNode(this)), m_accountId(NO_PARENT_CATEGORY) {
+  m_labelsNode(new LabelsNode(this)), m_accountId(NO_PARENT_CATEGORY), m_networkProxy(QNetworkProxy()) {
   setKind(RootItem::Kind::ServiceRoot);
   setCreationDate(QDateTime::currentDateTime());
 }
diff --git a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp
index 5e8a1d6e2..167d7f1a8 100755
--- a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp
+++ b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.cpp
@@ -24,10 +24,10 @@ FormEditFeedlyAccount::FormEditFeedlyAccount(QWidget* parent)
 }
 
 void FormEditFeedlyAccount::apply() {
-  bool editing_account = !applyInternal<FeedlyServiceRoot>();
+  FormAccountDetails::apply();
 
 #if defined(FEEDLY_OFFICIAL_SUPPORT)
-  if (!editing_account) {
+  if (!m_creatingNew) {
     // We transfer refresh token to avoid the need to login once more,
     // then we delete testing OAuth service.
     account<FeedlyServiceRoot>()->network()->oauth()->setAccessToken(m_details->m_oauth->accessToken());
@@ -48,17 +48,17 @@ void FormEditFeedlyAccount::apply() {
   account<FeedlyServiceRoot>()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value());
   account<FeedlyServiceRoot>()->network()->setDeveloperAccessToken(m_details->m_ui.m_txtDeveloperAccessToken->lineEdit()->text());
 
-  account<FeedlyServiceRoot>()->saveAccountDataToDatabase(!editing_account);
+  account<FeedlyServiceRoot>()->saveAccountDataToDatabase(m_creatingNew);
   accept();
 
-  if (editing_account) {
+  if (!m_creatingNew) {
     account<FeedlyServiceRoot>()->completelyRemoveAllData();
     account<FeedlyServiceRoot>()->syncIn();
   }
 }
 
-void FormEditFeedlyAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
+void FormEditFeedlyAccount::loadAccountData() {
+  FormAccountDetails::loadAccountData();
 
 #if defined(FEEDLY_OFFICIAL_SUPPORT)
   if (m_details->m_oauth != nullptr) {
diff --git a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h
index 4d86a091f..dec8c4742 100755
--- a/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h
+++ b/src/librssguard/services/feedly/gui/formeditfeedlyaccount.h
@@ -18,7 +18,7 @@ class FormEditFeedlyAccount : public FormAccountDetails {
     virtual void apply();
 
   protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private slots:
     void performTest();
diff --git a/src/librssguard/services/gmail/gmailserviceroot.cpp b/src/librssguard/services/gmail/gmailserviceroot.cpp
index 543f91e6e..967847a7b 100644
--- a/src/librssguard/services/gmail/gmailserviceroot.cpp
+++ b/src/librssguard/services/gmail/gmailserviceroot.cpp
@@ -166,17 +166,16 @@ bool GmailServiceRoot::supportsCategoryAdding() const {
 }
 
 void GmailServiceRoot::start(bool freshly_activated) {
-  Q_UNUSED(freshly_activated)
+  if (!freshly_activated) {
+    loadFromDatabase();
+    loadCacheFromFile();
+  }
 
-  loadFromDatabase();
-  loadCacheFromFile();
-
-  if (childCount() <= 3) {
+  if (getSubTreeFeeds().isEmpty()) {
     syncIn();
   }
-  else {
-    m_network->oauth()->login();
-  }
+
+  m_network->oauth()->login();
 }
 
 QString GmailServiceRoot::code() const {
@@ -185,7 +184,9 @@ QString GmailServiceRoot::code() const {
 
 QString GmailServiceRoot::additionalTooltip() const {
   return tr("Authentication status: %1\n"
-            "Login tokens expiration: %2").arg(network()->oauth()->isFullyLoggedIn() ? tr("logged-in") : tr("NOT logged-in"),
+            "Login tokens expiration: %2").arg(network()->oauth()->isFullyLoggedIn()
+                                               ? tr("logged-in")
+                                               : tr("NOT logged-in"),
                                                network()->oauth()->tokensExpireIn().isValid() ?
                                                network()->oauth()->tokensExpireIn().toString() : QSL("-"));
 }
diff --git a/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp b/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp
index 1972852f2..77f77bfa6 100644
--- a/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp
+++ b/src/librssguard/services/gmail/gui/formeditgmailaccount.cpp
@@ -20,57 +20,37 @@ FormEditGmailAccount::FormEditGmailAccount(QWidget* parent)
 }
 
 void FormEditGmailAccount::apply() {
-  bool editing_account = !applyInternal<GmailServiceRoot>();
+  FormAccountDetails::apply();
 
-  if (!editing_account) {
-    // We transfer refresh token to avoid the need to login once more,
-    // then we delete testing OAuth service.
-    account<GmailServiceRoot>()->network()->oauth()->setRefreshToken(m_details->m_oauth->refreshToken());
-    account<GmailServiceRoot>()->network()->oauth()->setAccessToken(m_details->m_oauth->accessToken());
-    account<GmailServiceRoot>()->network()->oauth()->setTokensExpireIn(m_details->m_oauth->tokensExpireIn());
-    m_details->m_oauth->logout(true);
-    m_details->m_oauth->deleteLater();
+  if (!m_creatingNew) {
+    // Disable "Cancel" button because all changes made to
+    // existing account are always saved anyway.
+    m_ui.m_buttonBox->button(QDialogButtonBox::StandardButton::Cancel)->setVisible(false);
   }
 
-#if defined(GMAIL_OFFICIAL_SUPPORT)
-  if (m_details->m_ui.m_txtAppId->lineEdit()->text().isEmpty() ||
-      m_details->m_ui.m_txtAppKey->lineEdit()->text().isEmpty()) {
-    account<GmailServiceRoot>()->network()->oauth()->setClientId(TextFactory::decrypt(GMAIL_CLIENT_ID,
-                                                                                      OAUTH_DECRYPTION_KEY));
-    account<GmailServiceRoot>()->network()->oauth()->setClientSecret(TextFactory::decrypt(GMAIL_CLIENT_SECRET,
-                                                                                          OAUTH_DECRYPTION_KEY));
-  }
-  else {
-#endif
+  // Make sure that the data copied from GUI are used for brand new login.
+  account<GmailServiceRoot>()->network()->oauth()->logout(false);
   account<GmailServiceRoot>()->network()->oauth()->setClientId(m_details->m_ui.m_txtAppId->lineEdit()->text());
   account<GmailServiceRoot>()->network()->oauth()->setClientSecret(m_details->m_ui.m_txtAppKey->lineEdit()->text());
-
-#if defined(GMAIL_OFFICIAL_SUPPORT)
-}
-#endif
-
   account<GmailServiceRoot>()->network()->oauth()->setRedirectUrl(m_details->m_ui.m_txtRedirectUrl->lineEdit()->text());
 
   account<GmailServiceRoot>()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text());
   account<GmailServiceRoot>()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value());
 
-  account<GmailServiceRoot>()->saveAccountDataToDatabase(!editing_account);
+  account<GmailServiceRoot>()->saveAccountDataToDatabase(m_creatingNew);
   accept();
 
-  if (editing_account) {
+  if (!m_creatingNew) {
     account<GmailServiceRoot>()->completelyRemoveAllData();
-    account<GmailServiceRoot>()->syncIn();
+
+    // Account data are erased, it is similar to situation
+    // where we start the account after it was freshly added.
+    account<GmailServiceRoot>()->start(true);
   }
 }
 
-void FormEditGmailAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
-
-  if (m_details->m_oauth != nullptr) {
-    // We will use live OAuth service for testing.
-    m_details->m_oauth->logout(true);
-    m_details->m_oauth->deleteLater();
-  }
+void FormEditGmailAccount::loadAccountData() {
+  FormAccountDetails::loadAccountData();
 
   m_details->m_oauth = account<GmailServiceRoot>()->network()->oauth();
   m_details->hookNetwork();
diff --git a/src/librssguard/services/gmail/gui/formeditgmailaccount.h b/src/librssguard/services/gmail/gui/formeditgmailaccount.h
index 45f552ed8..475dd2d37 100644
--- a/src/librssguard/services/gmail/gui/formeditgmailaccount.h
+++ b/src/librssguard/services/gmail/gui/formeditgmailaccount.h
@@ -20,7 +20,7 @@ class FormEditGmailAccount : public FormAccountDetails {
     virtual void apply();
 
   protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private:
     GmailAccountDetails* m_details;
diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp
index b806086ba..8cdea4d3f 100644
--- a/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp
+++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.cpp
@@ -10,8 +10,7 @@
 #include "services/gmail/network/gmailnetworkfactory.h"
 
 GmailAccountDetails::GmailAccountDetails(QWidget* parent)
-  : QWidget(parent), m_oauth(new OAuth2Service(GMAIL_OAUTH_AUTH_URL, GMAIL_OAUTH_TOKEN_URL,
-                                               {}, {}, GMAIL_OAUTH_SCOPE, this)) {
+  : QWidget(parent), m_oauth(nullptr) {
   m_ui.setupUi(this);
 
   GuiUtilities::setLabelAsNotice(*m_ui.m_lblInfo, true);
@@ -52,10 +51,7 @@ GmailAccountDetails::GmailAccountDetails(QWidget* parent)
   emit m_ui.m_txtUsername->lineEdit()->textChanged(m_ui.m_txtUsername->lineEdit()->text());
   emit m_ui.m_txtAppId->lineEdit()->textChanged(m_ui.m_txtAppId->lineEdit()->text());
   emit m_ui.m_txtAppKey->lineEdit()->textChanged(m_ui.m_txtAppKey->lineEdit()->text());
-
-  m_ui.m_txtRedirectUrl->lineEdit()->setText(QString(OAUTH_REDIRECT_URI) +
-                                             QL1C(':') +
-                                             QString::number(OAUTH_REDIRECT_URI_PORT));
+  emit m_ui.m_txtRedirectUrl->lineEdit()->textChanged(m_ui.m_txtAppKey->lineEdit()->text());
 
   hookNetwork();
 }
diff --git a/src/librssguard/services/gmail/gui/gmailaccountdetails.h b/src/librssguard/services/gmail/gui/gmailaccountdetails.h
index 503cd6a68..c99979fd9 100644
--- a/src/librssguard/services/gmail/gui/gmailaccountdetails.h
+++ b/src/librssguard/services/gmail/gui/gmailaccountdetails.h
@@ -32,11 +32,7 @@ class GmailAccountDetails : public QWidget {
   private:
     Ui::GmailAccountDetails m_ui;
 
-    // Testing OAuth service. This object is not ever copied
-    // to new living account instance, instead only its properties
-    // like tokens are copied.
-    // If editing existing account, then the pointer points
-    // directly to existing OAuth from the account.
+    // Pointer to live OAuth.
     OAuth2Service* m_oauth;
 };
 
diff --git a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
index fc3ba637b..08c7ac42c 100644
--- a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
+++ b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp
@@ -118,6 +118,15 @@ QString GmailNetworkFactory::sendEmail(Mimesis::Message msg, const QNetworkProxy
 }
 
 void GmailNetworkFactory::initializeOauth() {
+#if defined(GMAIL_OFFICIAL_SUPPORT)
+  m_oauth2->setClientSecretId(TextFactory::decrypt(GMAIL_CLIENT_ID, OAUTH_DECRYPTION_KEY));
+  m_oauth2->setClientSecretSecret(TextFactory::decrypt(GMAIL_CLIENT_SECRET, OAUTH_DECRYPTION_KEY));
+#endif
+
+  m_oauth2->setRedirectUrl(QString(OAUTH_REDIRECT_URI) +
+                           QL1C(':') +
+                           QString::number(OAUTH_REDIRECT_URI_PORT));
+
   connect(m_oauth2, &OAuth2Service::tokensRetrieveError, this, &GmailNetworkFactory::onTokensError);
   connect(m_oauth2, &OAuth2Service::authFailed, this, &GmailNetworkFactory::onAuthFailed);
   connect(m_oauth2, &OAuth2Service::tokensRetrieved, this, [this](QString access_token, QString refresh_token, int expires_in) {
diff --git a/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp b/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp
index ac83ff9bd..bdcd93543 100755
--- a/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp
+++ b/src/librssguard/services/greader/gui/formeditgreaderaccount.cpp
@@ -21,7 +21,7 @@ FormEditGreaderAccount::FormEditGreaderAccount(QWidget* parent)
 }
 
 void FormEditGreaderAccount::apply() {
-  bool editing_account = !applyInternal<GreaderServiceRoot>();
+  FormAccountDetails::apply();
 
   account<GreaderServiceRoot>()->network()->setBaseUrl(m_details->m_ui.m_txtUrl->lineEdit()->text());
   account<GreaderServiceRoot>()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text());
@@ -29,17 +29,17 @@ void FormEditGreaderAccount::apply() {
   account<GreaderServiceRoot>()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value());
   account<GreaderServiceRoot>()->network()->setService(m_details->service());
 
-  account<GreaderServiceRoot>()->saveAccountDataToDatabase(!editing_account);
+  account<GreaderServiceRoot>()->saveAccountDataToDatabase(m_creatingNew);
   accept();
 
-  if (editing_account) {
+  if (!m_creatingNew) {
     account<GreaderServiceRoot>()->completelyRemoveAllData();
     account<GreaderServiceRoot>()->syncIn();
   }
 }
 
-void FormEditGreaderAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
+void FormEditGreaderAccount::loadAccountData() {
+  FormAccountDetails::loadAccountData();
 
   GreaderServiceRoot* existing_root = account<GreaderServiceRoot>();
 
diff --git a/src/librssguard/services/greader/gui/formeditgreaderaccount.h b/src/librssguard/services/greader/gui/formeditgreaderaccount.h
index 2a267d21f..7bee096bd 100755
--- a/src/librssguard/services/greader/gui/formeditgreaderaccount.h
+++ b/src/librssguard/services/greader/gui/formeditgreaderaccount.h
@@ -18,7 +18,7 @@ class FormEditGreaderAccount : public FormAccountDetails {
     virtual void apply();
 
   protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private slots:
     void performTest();
diff --git a/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp
index 5fa1744d4..613b640ac 100644
--- a/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp
+++ b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.cpp
@@ -23,9 +23,9 @@ FormEditInoreaderAccount::FormEditInoreaderAccount(QWidget* parent)
 }
 
 void FormEditInoreaderAccount::apply() {
-  bool editing_account = !applyInternal<InoreaderServiceRoot>();
+  FormAccountDetails::apply();
 
-  if (!editing_account) {
+  if (m_creatingNew) {
     // We transfer refresh token to avoid the need to login once more,
     // then we delete testing OAuth service.
     account<InoreaderServiceRoot>()->network()->oauth()->setRefreshToken(m_details->m_oauth->refreshToken());
@@ -42,17 +42,17 @@ void FormEditInoreaderAccount::apply() {
   account<InoreaderServiceRoot>()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text());
   account<InoreaderServiceRoot>()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value());
 
-  account<InoreaderServiceRoot>()->saveAccountDataToDatabase(!editing_account);
+  account<InoreaderServiceRoot>()->saveAccountDataToDatabase(m_creatingNew);
   accept();
 
-  if (editing_account) {
+  if (!m_creatingNew) {
     account<InoreaderServiceRoot>()->completelyRemoveAllData();
     account<InoreaderServiceRoot>()->syncIn();
   }
 }
 
-void FormEditInoreaderAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
+void FormEditInoreaderAccount::loadAccountData() {
+  FormAccountDetails::loadAccountData();
 
   if (m_details->m_oauth != nullptr) {
     // We will use live OAuth service for testing.
diff --git a/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.h b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.h
index 8f4ed08dd..c885bd912 100644
--- a/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.h
+++ b/src/librssguard/services/inoreader/gui/formeditinoreaderaccount.h
@@ -18,7 +18,7 @@ class FormEditInoreaderAccount : public FormAccountDetails {
     virtual void apply();
 
   protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private:
     InoreaderAccountDetails* m_details;
diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
index c4fef1fda..632bdf52a 100644
--- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
+++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
@@ -21,7 +21,7 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
 }
 
 void FormEditOwnCloudAccount::apply() {
-  bool editing_account = !applyInternal<OwnCloudServiceRoot>();
+  FormAccountDetails::apply();
 
   account<OwnCloudServiceRoot>()->network()->setUrl(m_details->m_ui.m_txtUrl->lineEdit()->text());
   account<OwnCloudServiceRoot>()->network()->setAuthUsername(m_details->m_ui.m_txtUsername->lineEdit()->text());
@@ -30,17 +30,17 @@ void FormEditOwnCloudAccount::apply() {
   account<OwnCloudServiceRoot>()->network()->setBatchSize(m_details->m_ui.m_spinLimitMessages->value());
   account<OwnCloudServiceRoot>()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked());
 
-  account<OwnCloudServiceRoot>()->saveAccountDataToDatabase(!editing_account);
+  account<OwnCloudServiceRoot>()->saveAccountDataToDatabase(m_creatingNew);
   accept();
 
-  if (editing_account) {
+  if (!m_creatingNew) {
     account<OwnCloudServiceRoot>()->completelyRemoveAllData();
     account<OwnCloudServiceRoot>()->syncIn();
   }
 }
 
-void FormEditOwnCloudAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
+void FormEditOwnCloudAccount::loadAccountData() {
+  FormAccountDetails::loadAccountData();
 
   OwnCloudServiceRoot* existing_root = account<OwnCloudServiceRoot>();
 
diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h
index 74aaec176..013aee425 100644
--- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h
+++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.h
@@ -18,7 +18,7 @@ class FormEditOwnCloudAccount : public FormAccountDetails {
     virtual void apply();
 
   protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private slots:
     void performTest();
diff --git a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
index ad624aa51..cb0d28a49 100755
--- a/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
+++ b/src/librssguard/services/standard/gui/formeditstandardaccount.cpp
@@ -12,6 +12,6 @@ FormEditStandardAccount::FormEditStandardAccount(QWidget* parent)
   : FormAccountDetails(qApp->icons()->fromTheme(QSL("rssguard")), parent) {}
 
 void FormEditStandardAccount::apply() {
-  applyInternal<StandardServiceRoot>();
+  FormAccountDetails::apply();
   accept();
 }
diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp
index cd67f975c..7d250aee7 100644
--- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp
+++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.cpp
@@ -18,7 +18,7 @@ FormEditTtRssAccount::FormEditTtRssAccount(QWidget* parent)
 }
 
 void FormEditTtRssAccount::apply() {
-  bool editing_account = !applyInternal<TtRssServiceRoot>();
+  FormAccountDetails::apply();
 
   account<TtRssServiceRoot>()->network()->setUrl(m_details->m_ui.m_txtUrl->lineEdit()->text());
   account<TtRssServiceRoot>()->network()->setUsername(m_details->m_ui.m_txtUsername->lineEdit()->text());
@@ -29,20 +29,20 @@ void FormEditTtRssAccount::apply() {
   account<TtRssServiceRoot>()->network()->setForceServerSideUpdate(m_details->m_ui.m_checkServerSideUpdate->isChecked());
   account<TtRssServiceRoot>()->network()->setDownloadOnlyUnreadMessages(m_details->m_ui.m_checkDownloadOnlyUnreadMessages->isChecked());
 
-  account<TtRssServiceRoot>()->saveAccountDataToDatabase(!editing_account);
+  account<TtRssServiceRoot>()->saveAccountDataToDatabase(m_creatingNew);
   accept();
 
-  if (editing_account) {
+  if (!m_creatingNew) {
     account<TtRssServiceRoot>()->network()->logout(m_account->networkProxy());
     account<TtRssServiceRoot>()->completelyRemoveAllData();
     account<TtRssServiceRoot>()->syncIn();
   }
 }
 
-void FormEditTtRssAccount::setEditableAccount(ServiceRoot* editable_account) {
-  FormAccountDetails::setEditableAccount(editable_account);
+void FormEditTtRssAccount::loadAccountData() {
+  FormAccountDetails::loadAccountData();
 
-  TtRssServiceRoot* existing_root = qobject_cast<TtRssServiceRoot*>(editable_account);
+  TtRssServiceRoot* existing_root = account<TtRssServiceRoot>();
 
   m_details->m_ui.m_gbHttpAuthentication->setChecked(existing_root->network()->authIsUsed());
   m_details->m_ui.m_txtHttpPassword->lineEdit()->setText(existing_root->network()->authPassword());
diff --git a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h
index 942efda9c..9563d1756 100644
--- a/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h
+++ b/src/librssguard/services/tt-rss/gui/formeditttrssaccount.h
@@ -19,7 +19,7 @@ class FormEditTtRssAccount : public FormAccountDetails {
     virtual void apply();
 
   protected:
-    virtual void setEditableAccount(ServiceRoot* editable_account);
+    virtual void loadAccountData();
 
   private slots:
     void performTest();