FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix functor crash

Browse Source
This commit is contained in:
Martin Rotter 2021-02-25 20:08:09 +01:00 committed by Martin Rotter
parent 6dda15eb00
commit b8da3afffb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/librssguard/network-web/oauth2service.cpp
View File

@ -48,7 +48,7 @@ OAuth2Service::OAuth2Service(const QString& auth_url, const QString& token_url,
: QObject(parent), : QObject(parent),
m_id(QString::number(QRandomGenerator::global()->generate())), m_timerId(-1), m_id(QString::number(QRandomGenerator::global()->generate())), m_timerId(-1),
m_redirectionHandler(new OAuthHttpHandler(tr("You can close this window now. Go back to %1.").arg(APP_NAME), this)), m_redirectionHandler(new OAuthHttpHandler(tr("You can close this window now. Go back to %1.").arg(APP_NAME), this)),
m_functorOnLogin({}) { m_functorOnLogin(std::function<void()>()) {
m_tokenGrantType = QSL("authorization_code"); m_tokenGrantType = QSL("authorization_code");
m_tokenUrl = QUrl(token_url); m_tokenUrl = QUrl(token_url);
m_authUrl = auth_url; m_authUrl = auth_url;
@ -230,7 +230,10 @@ void OAuth2Service::tokenRequestFinished(QNetworkReply* network_reply) {
<< "Obtained refresh token" << QUOTE_W_SPACE(refreshToken()) << "Obtained refresh token" << QUOTE_W_SPACE(refreshToken())
<< "- expires on date/time" << QUOTE_W_SPACE_DOT(tokensExpireIn()); << "- expires on date/time" << QUOTE_W_SPACE_DOT(tokensExpireIn());
m_functorOnLogin(); if (m_functorOnLogin != nullptr) {
m_functorOnLogin();
}
emit tokensRetrieved(accessToken(), refreshToken(), expires); emit tokensRetrieved(accessToken(), refreshToken(), expires);
} }
@ -300,7 +303,7 @@ void OAuth2Service::setRefreshToken(const QString& refresh_token) {
} }
bool OAuth2Service::login(const std::function<void()>& functor_when_logged_in) { bool OAuth2Service::login(const std::function<void()>& functor_when_logged_in) {
m_functorOnLogin = {}; m_functorOnLogin = functor_when_logged_in;
if (!m_redirectionHandler->isListening()) { if (!m_redirectionHandler->isListening()) {
qCriticalNN << LOGSEC_OAUTH qCriticalNN << LOGSEC_OAUTH
@ -316,8 +319,6 @@ bool OAuth2Service::login(const std::function<void()>& functor_when_logged_in) {
bool did_token_expire = tokensExpireIn().isNull() || tokensExpireIn() < QDateTime::currentDateTime().addSecs(-120); bool did_token_expire = tokensExpireIn().isNull() || tokensExpireIn() < QDateTime::currentDateTime().addSecs(-120);
bool does_token_exist = !refreshToken().isEmpty(); bool does_token_exist = !refreshToken().isEmpty();
m_functorOnLogin = functor_when_logged_in;
// We refresh current tokens only if: // We refresh current tokens only if:
// 1. We have some existing refresh token. // 1. We have some existing refresh token.
// AND // AND

2
src/librssguard/network-web/oauth2service.h
View File

@ -99,7 +99,7 @@ class OAuth2Service : public QObject {
// //
// Returns true, if user is already logged in (final state). // Returns true, if user is already logged in (final state).
// Returns false, if user is NOT logged in (asynchronous flow). // Returns false, if user is NOT logged in (asynchronous flow).
bool login(const std::function<void()>& functor_when_logged_in = {}); bool login(const std::function<void()>& functor_when_logged_in = std::function<void()>());
// Removes all state data and stops redirection handler. // Removes all state data and stops redirection handler.
void logout(bool stop_redirection_handler = true); void logout(bool stop_redirection_handler = true);