From 62eb9d5af6aff1fdf965b8d00106ba0a0b03fe21 Mon Sep 17 00:00:00 2001 From: Christian Henz Date: Tue, 17 Dec 2024 13:42:02 +0100 Subject: [PATCH 1/2] Fix token expiration log message --- src/o2.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/o2.cpp b/src/o2.cpp index ebbb7b3..e87de25 100644 --- a/src/o2.cpp +++ b/src/o2.cpp @@ -596,7 +596,8 @@ void O2::onRefreshFinished() { else { setToken(tokens.value(O2_OAUTH2_ACCESS_TOKEN).toString()); - setExpires(QDateTime::currentMSecsSinceEpoch() / 1000 + static_cast(tokens.value(O2_OAUTH2_EXPIRES_IN).toInt())); + const int expiresIn = tokens.value(O2_OAUTH2_EXPIRES_IN).toInt(); + setExpires(QDateTime::currentMSecsSinceEpoch() / 1000 + expiresIn); QString refreshToken = tokens.value(O2_OAUTH2_REFRESH_TOKEN).toString(); if(!refreshToken.isEmpty()) { setRefreshToken(refreshToken); @@ -608,7 +609,7 @@ void O2::onRefreshFinished() { setLinked(true); Q_EMIT linkingSucceeded(); Q_EMIT refreshFinished(QNetworkReply::NoError); - log( QStringLiteral(" New token expires in %1 seconds").arg( expires() ) ); + log( QStringLiteral(" New token expires in %1 seconds").arg( expiresIn ) ); } } else { log( QStringLiteral( "O2::onRefreshFinished: Error %1 %2" ).arg( (int)refreshReply->error() ).arg( refreshReply->errorString() ) ); From 349119217b8406f545da4244938e5138693429ca Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 19 Dec 2024 08:57:08 +1000 Subject: [PATCH 2/2] Update src/o2.cpp --- src/o2.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/o2.cpp b/src/o2.cpp index e87de25..661b501 100644 --- a/src/o2.cpp +++ b/src/o2.cpp @@ -597,7 +597,7 @@ void O2::onRefreshFinished() { { setToken(tokens.value(O2_OAUTH2_ACCESS_TOKEN).toString()); const int expiresIn = tokens.value(O2_OAUTH2_EXPIRES_IN).toInt(); - setExpires(QDateTime::currentMSecsSinceEpoch() / 1000 + expiresIn); + setExpires(QDateTime::currentMSecsSinceEpoch() / 1000 + static_cast(expiresIn)); QString refreshToken = tokens.value(O2_OAUTH2_REFRESH_TOKEN).toString(); if(!refreshToken.isEmpty()) { setRefreshToken(refreshToken);