From 797cdb55edbc6b2ac578c4e0e4cb416bdabd0b2b Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 1 Feb 2021 11:09:21 +0100 Subject: [PATCH] New default port 14488 for oauth applications + extra predefined credentials for Inoreader. --- src/librssguard/definitions/definitions.h | 2 +- src/librssguard/network-web/oauth2service.cpp | 2 +- src/librssguard/services/inoreader/definitions.h | 4 ++-- .../services/inoreader/gui/inoreaderaccountdetails.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/librssguard/definitions/definitions.h b/src/librssguard/definitions/definitions.h index f8c7ef97b..a9d2241b9 100755 --- a/src/librssguard/definitions/definitions.h +++ b/src/librssguard/definitions/definitions.h @@ -57,7 +57,7 @@ #define ELLIPSIS_LENGTH 3 #define MIN_CATEGORY_NAME_LENGTH 1 #define DEFAULT_AUTO_UPDATE_INTERVAL 15 -#define OAUTH_REDIRECT_URI_PORT 13377 +#define OAUTH_REDIRECT_URI_PORT 14488 #define OAUTH_REDIRECT_URI "http://localhost" #define AUTO_UPDATE_INTERVAL 60000 #define STARTUP_UPDATE_DELAY 15.0 // In seconds. diff --git a/src/librssguard/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp index d52843ed3..cef8e7ceb 100644 --- a/src/librssguard/network-web/oauth2service.cpp +++ b/src/librssguard/network-web/oauth2service.cpp @@ -267,7 +267,7 @@ bool OAuth2Service::login() { qCriticalNN << LOGSEC_OAUTH << "Cannot log-in because OAuth redirection handler is not listening."; - emit tokensRetrieveError(QString(), tr("Failed to starting OAuth " + emit tokensRetrieveError(QString(), tr("Failed to start OAuth " "redirection listener. Maybe your " "rights are not high enough.")); diff --git a/src/librssguard/services/inoreader/definitions.h b/src/librssguard/services/inoreader/definitions.h index 2195a9fdc..7f688d30c 100644 --- a/src/librssguard/services/inoreader/definitions.h +++ b/src/librssguard/services/inoreader/definitions.h @@ -8,8 +8,8 @@ #define INOREADER_OAUTH_AUTH_URL "https://www.inoreader.com/oauth2/auth" #define INOREADER_REG_API_URL "https://www.inoreader.com/developers/register-app" -#define INOREADER_OAUTH_CLI_ID "1000000604" -#define INOREADER_OAUTH_CLI_KEY "gsStoZ3aAoQJCgQxoFSuXkWI7Sly87yK" +#define INOREADER_OAUTH_CLI_ID "999999019" +#define INOREADER_OAUTH_CLI_KEY "k4bkOJ5Jj1erc52tmniluKtU6lZdNoZc" #define INOREADER_REFRESH_TOKEN_KEY "refresh_token" #define INOREADER_ACCESS_TOKEN_KEY "access_token" diff --git a/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp b/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp index 0bb1888b5..beae440a8 100755 --- a/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp +++ b/src/librssguard/services/inoreader/gui/inoreaderaccountdetails.cpp @@ -50,7 +50,7 @@ InoreaderAccountDetails::InoreaderAccountDetails(QWidget* parent) m_ui.m_txtAppId->lineEdit()->setText(INOREADER_OAUTH_CLI_ID); m_ui.m_txtAppKey->lineEdit()->setText(INOREADER_OAUTH_CLI_KEY); - m_ui.m_txtRedirectUrl->lineEdit()->setText(OAUTH_REDIRECT_URI); + m_ui.m_txtRedirectUrl->lineEdit()->setText(m_oauth->redirectUrl()); hookNetwork(); }