Skip to content

Commit 45d271b

Browse files
committed
Rename function to reflect that our authentication details might not only be a token
1 parent b0d8848 commit 45d271b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/core/qfieldcloudconnection.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ void QFieldCloudConnection::logout()
354354
QgsNetworkAccessManager *nam = QgsNetworkAccessManager::instance();
355355
QNetworkRequest request( mUrl + QStringLiteral( "/api/v1/auth/logout/" ) );
356356
request.setHeader( QNetworkRequest::ContentTypeHeader, "application/json" );
357-
setAuthenticationToken( request );
357+
setAuthenticationDetails( request );
358358

359359
QNetworkReply *reply = nam->post( request, QByteArray() );
360360

@@ -393,7 +393,7 @@ NetworkReply *QFieldCloudConnection::post( const QString &endpoint, const QVaria
393393
{
394394
QNetworkRequest request( mUrl + endpoint );
395395
QByteArray requestBody = QJsonDocument( QJsonObject::fromVariantMap( params ) ).toJson();
396-
setAuthenticationToken( request );
396+
setAuthenticationDetails( request );
397397
request.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::RedirectPolicy::NoLessSafeRedirectPolicy );
398398

399399
if ( fileNames.isEmpty() )
@@ -464,7 +464,7 @@ NetworkReply *QFieldCloudConnection::get( const QString &endpoint, const QVarian
464464

465465
request.setHeader( QNetworkRequest::ContentTypeHeader, "application/json" );
466466
request.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::RedirectPolicy::NoLessSafeRedirectPolicy );
467-
setAuthenticationToken( request );
467+
setAuthenticationDetails( request );
468468

469469
return get( request, endpoint, params );
470470
}
@@ -567,7 +567,7 @@ void QFieldCloudConnection::setState( ConnectionState state )
567567
emit stateChanged();
568568
}
569569

570-
void QFieldCloudConnection::setAuthenticationToken( QNetworkRequest &request )
570+
void QFieldCloudConnection::setAuthenticationDetails( QNetworkRequest &request )
571571
{
572572
if ( !mToken.isNull() )
573573
{

src/core/qfieldcloudconnection.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ class QFieldCloudConnection : public QObject
201201
NetworkReply *get( QNetworkRequest &request, const QUrl &url, const QVariantMap &params = QVariantMap() );
202202

203203
/**
204-
* Sets authentication token on a \a request.
204+
* Sets authentication details on a \a request.
205205
*/
206-
void setAuthenticationToken( QNetworkRequest &request );
206+
void setAuthenticationDetails( QNetworkRequest &request );
207207

208208
/**
209209
* Uploads any pending attachments linked to the logged in user account.

src/core/qfieldcloudprojectsmodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void QFieldCloudProjectsModel::refreshProjectsList( bool shouldRefreshPublic, in
230230
request.setAttribute( static_cast<QNetworkRequest::Attribute>( ProjectsRequestAttribute::RefreshPublicProjects ), shouldRefreshPublic );
231231
request.setAttribute( static_cast<QNetworkRequest::Attribute>( ProjectsRequestAttribute::ProjectsFetchOffset ), projectFetchOffset );
232232

233-
mCloudConnection->setAuthenticationToken( request );
233+
mCloudConnection->setAuthenticationDetails( request );
234234
NetworkReply *reply = mCloudConnection->get( request, url, params );
235235
connect( reply, &NetworkReply::finished, this, &QFieldCloudProjectsModel::projectListReceived );
236236

@@ -1731,7 +1731,7 @@ NetworkReply *QFieldCloudProjectsModel::downloadFile( const QString &projectId,
17311731
{
17321732
QNetworkRequest request;
17331733
request.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::RedirectPolicy::UserVerifiedRedirectPolicy );
1734-
mCloudConnection->setAuthenticationToken( request );
1734+
mCloudConnection->setAuthenticationDetails( request );
17351735

17361736
return mCloudConnection->get( request, QStringLiteral( "/api/v1/packages/%1/latest/files/%2/" ).arg( projectId, fileName ) );
17371737
}

0 commit comments

Comments
 (0)