sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-12 00:06:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use QgsDebugMsgLevel/QgsDebugError

Browse Source
This commit is contained in:
Nyall Dawson 2024-11-22 11:48:02 +10:00
parent 0dbf6e730b
commit c8ba38c794
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/auth/oauth2/core/qgso2.cpp
View File

@ -240,11 +240,11 @@ void QgsO2::link()
// Start listening to authentication replies // Start listening to authentication replies
if ( replyServer()->listen( QHostAddress::Any, localPort_ ) ) if ( replyServer()->listen( QHostAddress::Any, localPort_ ) )
{ {
//qDebug() << "O2::link: Reply server listening on port" << localPort(); QgsDebugMsgLevel( QStringLiteral( "O2::link: Reply server listening on port %1" ).arg( localPort() ), 2 );
} }
else else
{ {
qWarning() << "O2::link: Reply server failed to start listening on port" << localPort(); QgsDebugError( QStringLiteral( "O2::link: Reply server failed to start listening on port %1" ).arg( localPort() ) );
emit linkingFailed(); emit linkingFailed();
return; return;
} }
@ -408,7 +408,7 @@ void QgsO2::onVerificationReceived( QMap<QString, QString> response )
// Check for mandatory tokens // Check for mandatory tokens
if ( response.contains( O2_OAUTH2_ACCESS_TOKEN ) ) if ( response.contains( O2_OAUTH2_ACCESS_TOKEN ) )
{ {
qDebug() << "O2::onVerificationReceived: Access token returned for implicit flow"; QgsDebugMsgLevel( QStringLiteral( "O2::onVerificationReceived: Access token returned for implicit flow" ), 2 );
setToken( response.value( O2_OAUTH2_ACCESS_TOKEN ) ); setToken( response.value( O2_OAUTH2_ACCESS_TOKEN ) );
if ( response.contains( O2_OAUTH2_EXPIRES_IN ) ) if ( response.contains( O2_OAUTH2_EXPIRES_IN ) )
{ {
@ -416,7 +416,7 @@ void QgsO2::onVerificationReceived( QMap<QString, QString> response )
const int expiresIn = response.value( O2_OAUTH2_EXPIRES_IN ).toInt( &ok ); const int expiresIn = response.value( O2_OAUTH2_EXPIRES_IN ).toInt( &ok );
if ( ok ) if ( ok )
{ {
qDebug() << "O2::onVerificationReceived: Token expires in" << expiresIn << "seconds"; QgsDebugMsgLevel( QStringLiteral( "O2::onVerificationReceived: Token expires in %1 seconds" ).arg( expiresIn ), 2 );
setExpires( QDateTime::currentMSecsSinceEpoch() / 1000 + expiresIn ); setExpires( QDateTime::currentMSecsSinceEpoch() / 1000 + expiresIn );
} }
} }
@ -425,7 +425,7 @@ void QgsO2::onVerificationReceived( QMap<QString, QString> response )
} }
else else
{ {
qWarning() << "O2::onVerificationReceived: Access token missing from response for implicit flow"; QgsDebugError( QStringLiteral( "O2::onVerificationReceived: Access token missing from response for implicit flow" ) );
Q_EMIT linkingFailed(); Q_EMIT linkingFailed();
} }
} }
@ -448,13 +448,13 @@ static QVariantMap parseTokenResponse( const QByteArray &data )
const QJsonDocument doc = QJsonDocument::fromJson( data, &err ); const QJsonDocument doc = QJsonDocument::fromJson( data, &err );
if ( err.error != QJsonParseError::NoError ) if ( err.error != QJsonParseError::NoError )
{ {
qWarning() << "parseTokenResponse: Failed to parse token response due to err:" << err.errorString(); QgsDebugError( QStringLiteral( "parseTokenResponse: Failed to parse token response due to err: %1" ).arg( err.errorString() ) );
return QVariantMap(); return QVariantMap();
} }
if ( !doc.isObject() ) if ( !doc.isObject() )
{ {
qWarning() << "parseTokenResponse: Token response is not an object"; QgsDebugError( QStringLiteral( "parseTokenResponse: Token response is not an object" ) );
return QVariantMap(); return QVariantMap();
} }
@ -464,17 +464,17 @@ static QVariantMap parseTokenResponse( const QByteArray &data )
// Code adapted from O2::refresh(), but using QgsBlockingNetworkRequest // Code adapted from O2::refresh(), but using QgsBlockingNetworkRequest
void QgsO2::refreshSynchronous() void QgsO2::refreshSynchronous()
{ {
qDebug() << "O2::refresh: Token: ..." << refreshToken().right( 7 ); QgsDebugMsgLevel( QStringLiteral( "O2::refresh: Token: ... %1" ).arg( refreshToken().right( 7 ) ), 2 );
if ( refreshToken().isEmpty() ) if ( refreshToken().isEmpty() )
{ {
qWarning() << "O2::refresh: No refresh token"; QgsDebugError( QStringLiteral( "O2::refresh: No refresh token" ) );
onRefreshError( QNetworkReply::AuthenticationRequiredError ); onRefreshError( QNetworkReply::AuthenticationRequiredError );
return; return;
} }
if ( refreshTokenUrl_.isEmpty() ) if ( refreshTokenUrl_.isEmpty() )
{ {
qWarning() << "O2::refresh: Refresh token URL not set"; QgsDebugError( QStringLiteral( "O2::refresh: Refresh token URL not set" ) );
onRefreshError( QNetworkReply::AuthenticationRequiredError ); onRefreshError( QNetworkReply::AuthenticationRequiredError );
return; return;
} }
@ -501,7 +501,7 @@ void QgsO2::refreshSynchronous()
const QVariantMap tokens = parseTokenResponse( reply ); const QVariantMap tokens = parseTokenResponse( reply );
if ( tokens.contains( QStringLiteral( "error" ) ) ) if ( tokens.contains( QStringLiteral( "error" ) ) )
{ {
qDebug() << " Error refreshing token" << tokens.value( QStringLiteral( "error" ) ).toMap().value( QStringLiteral( "message" ) ).toString().toLocal8Bit().constData(); QgsDebugError( QStringLiteral( "Error refreshing token %1" ).arg( tokens.value( QStringLiteral( "error" ) ).toMap().value( QStringLiteral( "message" ) ).toString().toLocal8Bit().constData() ) );
unlink(); unlink();
} }
else else
@ -512,7 +512,7 @@ void QgsO2::refreshSynchronous()
if ( !refreshToken.isEmpty() ) if ( !refreshToken.isEmpty() )
setRefreshToken( refreshToken ); setRefreshToken( refreshToken );
setLinked( true ); setLinked( true );
qDebug() << " New token expires in" << expires() << "seconds"; QgsDebugMsgLevel( QStringLiteral( "New token expires in %1 seconds" ).arg( expires() ), 2 );
emit linkingSucceeded(); emit linkingSucceeded();
} }
emit refreshFinished( QNetworkReply::NoError ); emit refreshFinished( QNetworkReply::NoError );
@ -520,7 +520,7 @@ void QgsO2::refreshSynchronous()
else else
{ {
unlink(); unlink();
qDebug() << "O2::onRefreshFinished: Error" << blockingRequest.errorMessage(); QgsDebugError( QStringLiteral( "O2::onRefreshFinished: Error %1" ).arg( blockingRequest.errorMessage() ) );
emit refreshFinished( blockingRequest.reply().error() ); emit refreshFinished( blockingRequest.reply().error() );
} }
} }