From d169b6cc5079b4bc89abd8e579375060383b810e Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 26 Oct 2017 14:42:53 +0200 Subject: [PATCH] Remove unique id from constructor. --- src/network-web/oauth2service.cpp | 12 ++---------- src/network-web/oauth2service.h | 5 +++-- src/services/gmail/gui/formeditgmailaccount.cpp | 2 +- src/services/gmail/network/gmailnetworkfactory.cpp | 2 +- .../inoreader/gui/formeditinoreaderaccount.cpp | 2 +- .../inoreader/network/inoreadernetworkfactory.cpp | 2 +- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/network-web/oauth2service.cpp b/src/network-web/oauth2service.cpp index 83b97724f..8a2185ed0 100755 --- a/src/network-web/oauth2service.cpp +++ b/src/network-web/oauth2service.cpp @@ -43,17 +43,9 @@ Q_GLOBAL_STATIC(OAuthHttpHandler, qz_silent_acmanager) #include #include -OAuth2Service::OAuth2Service(const QString& id_string, const QString& auth_url, const QString& token_url, const QString& client_id, +OAuth2Service::OAuth2Service(const QString& auth_url, const QString& token_url, const QString& client_id, const QString& client_secret, const QString& scope, QObject* parent) - : QObject(parent), m_timerId(-1), m_tokensExpireIn(QDateTime()) { - - if (id_string.isEmpty()) { - m_id = QString::number(std::rand()); - } - else { - m_id = id_string; - } - + : QObject(parent), m_id(QString::number(std::rand())), m_timerId(-1), m_tokensExpireIn(QDateTime()) { m_redirectUrl = QSL(LOCALHOST_ADDRESS); m_tokenGrantType = QSL("authorization_code"); m_tokenUrl = QUrl(token_url); diff --git a/src/network-web/oauth2service.h b/src/network-web/oauth2service.h index 382ce8c23..daade8828 100755 --- a/src/network-web/oauth2service.h +++ b/src/network-web/oauth2service.h @@ -37,8 +37,9 @@ class OAuth2Service : public QObject { Q_OBJECT public: - explicit OAuth2Service(const QString& id_string, const QString& auth_url, const QString& token_url, - const QString& client_id, const QString& client_secret, const QString& scope, QObject* parent = 0); + explicit OAuth2Service(const QString& auth_url, const QString& token_url, + const QString& client_id, const QString& client_secret, + const QString& scope, QObject* parent = 0); // Returns bearer HTTP header value. // NOTE: Only call this if isFullyLoggedIn() diff --git a/src/services/gmail/gui/formeditgmailaccount.cpp b/src/services/gmail/gui/formeditgmailaccount.cpp index 37b8a0c4a..312a1e177 100755 --- a/src/services/gmail/gui/formeditgmailaccount.cpp +++ b/src/services/gmail/gui/formeditgmailaccount.cpp @@ -10,7 +10,7 @@ #include "services/gmail/gmailserviceroot.h" FormEditGmailAccount::FormEditGmailAccount(QWidget* parent) : QDialog(parent), - m_oauth(new OAuth2Service(QString(), GMAIL_OAUTH_AUTH_URL, GMAIL_OAUTH_TOKEN_URL, + m_oauth(new OAuth2Service(GMAIL_OAUTH_AUTH_URL, GMAIL_OAUTH_TOKEN_URL, QString(), QString(), GMAIL_OAUTH_SCOPE)), m_editableRoot(nullptr) { m_ui.setupUi(this); diff --git a/src/services/gmail/network/gmailnetworkfactory.cpp b/src/services/gmail/network/gmailnetworkfactory.cpp index faab9a383..7fbae14fd 100755 --- a/src/services/gmail/network/gmailnetworkfactory.cpp +++ b/src/services/gmail/network/gmailnetworkfactory.cpp @@ -26,7 +26,7 @@ GmailNetworkFactory::GmailNetworkFactory(QObject* parent) : QObject(parent), m_service(nullptr), m_username(QString()), m_batchSize(GMAIL_DEFAULT_BATCH_SIZE), - m_oauth2(new OAuth2Service(QString(), GMAIL_OAUTH_AUTH_URL, GMAIL_OAUTH_TOKEN_URL, + m_oauth2(new OAuth2Service(GMAIL_OAUTH_AUTH_URL, GMAIL_OAUTH_TOKEN_URL, QString(), QString(), GMAIL_OAUTH_SCOPE)) { initializeOauth(); } diff --git a/src/services/inoreader/gui/formeditinoreaderaccount.cpp b/src/services/inoreader/gui/formeditinoreaderaccount.cpp index 11f93c3ac..fe8d61893 100755 --- a/src/services/inoreader/gui/formeditinoreaderaccount.cpp +++ b/src/services/inoreader/gui/formeditinoreaderaccount.cpp @@ -10,7 +10,7 @@ #include "services/inoreader/inoreaderserviceroot.h" FormEditInoreaderAccount::FormEditInoreaderAccount(QWidget* parent) : QDialog(parent), - m_oauth(new OAuth2Service(QString(), INOREADER_OAUTH_AUTH_URL, INOREADER_OAUTH_TOKEN_URL, + m_oauth(new OAuth2Service(INOREADER_OAUTH_AUTH_URL, INOREADER_OAUTH_TOKEN_URL, INOREADER_OAUTH_CLI_ID, INOREADER_OAUTH_CLI_KEY, INOREADER_OAUTH_SCOPE)), m_editableRoot(nullptr) { m_ui.setupUi(this); diff --git a/src/services/inoreader/network/inoreadernetworkfactory.cpp b/src/services/inoreader/network/inoreadernetworkfactory.cpp index 08e9d4530..61b1e09eb 100755 --- a/src/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/services/inoreader/network/inoreadernetworkfactory.cpp @@ -24,7 +24,7 @@ InoreaderNetworkFactory::InoreaderNetworkFactory(QObject* parent) : QObject(parent), m_service(nullptr), m_username(QString()), m_batchSize(INOREADER_DEFAULT_BATCH_SIZE), - m_oauth2(new OAuth2Service(QString(), INOREADER_OAUTH_AUTH_URL, INOREADER_OAUTH_TOKEN_URL, + m_oauth2(new OAuth2Service(INOREADER_OAUTH_AUTH_URL, INOREADER_OAUTH_TOKEN_URL, INOREADER_OAUTH_CLI_ID, INOREADER_OAUTH_CLI_KEY, INOREADER_OAUTH_SCOPE)) { initializeOauth(); }