diff --git a/autotests/core/createjobtest.cpp b/autotests/core/createjobtest.cpp --- a/autotests/core/createjobtest.cpp +++ b/autotests/core/createjobtest.cpp @@ -48,7 +48,6 @@ void start() override { QNetworkRequest request(mUrl); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); enqueueRequest(request, mData); } diff --git a/autotests/core/fetchjobtest.cpp b/autotests/core/fetchjobtest.cpp --- a/autotests/core/fetchjobtest.cpp +++ b/autotests/core/fetchjobtest.cpp @@ -53,9 +53,6 @@ void start() override { QNetworkRequest request(mUrl); - if (account()) { - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - } enqueueRequest(request); } diff --git a/src/blogger/blogfetchjob.cpp b/src/blogger/blogfetchjob.cpp --- a/src/blogger/blogfetchjob.cpp +++ b/src/blogger/blogfetchjob.cpp @@ -79,9 +79,6 @@ request.setUrl(BloggerService::fetchBlogsByUserIdUrl(d->id)); break; } - if (account()) { - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - } enqueueRequest(request); } diff --git a/src/blogger/commentdeletejob.cpp b/src/blogger/commentdeletejob.cpp --- a/src/blogger/commentdeletejob.cpp +++ b/src/blogger/commentdeletejob.cpp @@ -80,7 +80,6 @@ void CommentDeleteJob::start() { QNetworkRequest request(BloggerService::deleteCommentUrl(d->blogId, d->postId, d->commentId)); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); enqueueRequest(request); } diff --git a/src/blogger/commentfetchjob.cpp b/src/blogger/commentfetchjob.cpp --- a/src/blogger/commentfetchjob.cpp +++ b/src/blogger/commentfetchjob.cpp @@ -40,8 +40,6 @@ CommentFetchJob *parent); ~Private(); - QNetworkRequest createRequest(const QUrl &url); - QString blogId; QString postId; QString commentId; @@ -71,17 +69,6 @@ { } -QNetworkRequest CommentFetchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - if (q->account()) { - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - } - request.setUrl(url); - - return request; -} - CommentFetchJob::CommentFetchJob(const QString &blogId, const AccountPtr &account, @@ -177,7 +164,7 @@ } url.setQuery(query); - const QNetworkRequest request = d->createRequest(url); + const QNetworkRequest request(url); enqueueRequest(request); } @@ -205,7 +192,7 @@ } if (feedData.nextPageUrl.isValid()) { - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + const QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } else { emitFinished(); diff --git a/src/blogger/pagecreatejob.cpp b/src/blogger/pagecreatejob.cpp --- a/src/blogger/pagecreatejob.cpp +++ b/src/blogger/pagecreatejob.cpp @@ -59,9 +59,7 @@ void PageCreateJob::start() { const QUrl url = BloggerService::createPageUrl(d->page->blogId()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = Page::toJSON(d->page); diff --git a/src/blogger/pagedeletejob.cpp b/src/blogger/pagedeletejob.cpp --- a/src/blogger/pagedeletejob.cpp +++ b/src/blogger/pagedeletejob.cpp @@ -71,7 +71,6 @@ void PageDeleteJob::start() { QNetworkRequest request(BloggerService::deletePageUrl(d->blogId, d->pageId)); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); enqueueRequest(request); } diff --git a/src/blogger/pagefetchjob.cpp b/src/blogger/pagefetchjob.cpp --- a/src/blogger/pagefetchjob.cpp +++ b/src/blogger/pagefetchjob.cpp @@ -114,9 +114,6 @@ } url.setQuery(query); QNetworkRequest request(url); - if (account()) { - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - } enqueueRequest(request); } diff --git a/src/blogger/pagemodifyjob.cpp b/src/blogger/pagemodifyjob.cpp --- a/src/blogger/pagemodifyjob.cpp +++ b/src/blogger/pagemodifyjob.cpp @@ -60,9 +60,7 @@ void PageModifyJob::start() { const QUrl url = BloggerService::modifyPageUrl(d->page->blogId(), d->page->id()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = Page::toJSON(d->page); enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/blogger/postcreatejob.cpp b/src/blogger/postcreatejob.cpp --- a/src/blogger/postcreatejob.cpp +++ b/src/blogger/postcreatejob.cpp @@ -71,9 +71,7 @@ query.addQueryItem(QStringLiteral("isDraft"), Utils::bool2Str(d->isDraft)); url.setQuery(query); } - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = Post::toJSON(d->post); diff --git a/src/blogger/postdeletejob.cpp b/src/blogger/postdeletejob.cpp --- a/src/blogger/postdeletejob.cpp +++ b/src/blogger/postdeletejob.cpp @@ -71,8 +71,8 @@ void PostDeleteJob::start() { - QNetworkRequest request(BloggerService::deletePostUrl(d->blogId, d->postId)); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + const QUrl url = BloggerService::deletePostUrl(d->blogId, d->postId); + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/blogger/postfetchjob.cpp b/src/blogger/postfetchjob.cpp --- a/src/blogger/postfetchjob.cpp +++ b/src/blogger/postfetchjob.cpp @@ -38,8 +38,6 @@ const QString &postId, PostFetchJob *parent); - QNetworkRequest createRequest(const QUrl &url); - QString blogId; QString postId; @@ -68,17 +66,6 @@ { } -QNetworkRequest PostFetchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - if (q->account()) { - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - } - request.setUrl(url); - - return request; -} - PostFetchJob::PostFetchJob(const QString &blogId, const AccountPtr &account, QObject *parent) @@ -203,7 +190,7 @@ query.addQueryItem(QStringLiteral("status"), QStringLiteral("scheduled")); } url.setQuery(query); - const QNetworkRequest request = d->createRequest(url); + const QNetworkRequest request(url); enqueueRequest(request); } @@ -229,7 +216,7 @@ } if (feedData.nextPageUrl.isValid()) { - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + const QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } else { emitFinished(); diff --git a/src/blogger/postmodifyjob.cpp b/src/blogger/postmodifyjob.cpp --- a/src/blogger/postmodifyjob.cpp +++ b/src/blogger/postmodifyjob.cpp @@ -59,9 +59,7 @@ void PostModifyJob::start() { const QUrl url = BloggerService::modifyPostUrl(d->post->blogId(), d->post->id()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = Post::toJSON(d->post); enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/blogger/postsearchjob.cpp b/src/blogger/postsearchjob.cpp --- a/src/blogger/postsearchjob.cpp +++ b/src/blogger/postsearchjob.cpp @@ -38,8 +38,6 @@ const QString &query, PostSearchJob *parent); - QNetworkRequest createRequest(const QUrl &url); - QString blogId; QString query; bool fetchBodies; @@ -58,17 +56,6 @@ { } -QNetworkRequest PostSearchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - if (q->account()) { - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - } - request.setUrl(url); - - return request; -} - PostSearchJob::PostSearchJob(const QString &blogId, const QString &query, const AccountPtr &account, @@ -100,7 +87,7 @@ query.addQueryItem(QStringLiteral("q"), d->query); query.addQueryItem(QStringLiteral("fetchBodies"), Utils::bool2Str(d->fetchBodies)); url.setQuery(query); - const QNetworkRequest request = d->createRequest(url); + const QNetworkRequest request(url); enqueueRequest(request); } @@ -124,7 +111,7 @@ } if (feedData.nextPageUrl.isValid()) { - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + const QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } else { emitFinished(); diff --git a/src/calendar/calendarcreatejob.cpp b/src/calendar/calendarcreatejob.cpp --- a/src/calendar/calendarcreatejob.cpp +++ b/src/calendar/calendarcreatejob.cpp @@ -70,10 +70,8 @@ CalendarPtr calendar = d->calendars.current(); const QUrl url = CalendarService::createCalendarUrl(); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); const QByteArray rawData = CalendarService::calendarToJSON(calendar); diff --git a/src/calendar/calendardeletejob.cpp b/src/calendar/calendardeletejob.cpp --- a/src/calendar/calendardeletejob.cpp +++ b/src/calendar/calendardeletejob.cpp @@ -83,7 +83,6 @@ const QString calendarId = d->calendarsIds.current(); const QUrl url = CalendarService::removeCalendarUrl(calendarId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); QStringList headers; diff --git a/src/calendar/calendarfetchjob.cpp b/src/calendar/calendarfetchjob.cpp --- a/src/calendar/calendarfetchjob.cpp +++ b/src/calendar/calendarfetchjob.cpp @@ -54,10 +54,8 @@ QNetworkRequest CalendarFetchJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); QStringList headers; const auto rawHeaderList = request.rawHeaderList(); diff --git a/src/calendar/calendarmodifyjob.cpp b/src/calendar/calendarmodifyjob.cpp --- a/src/calendar/calendarmodifyjob.cpp +++ b/src/calendar/calendarmodifyjob.cpp @@ -69,10 +69,8 @@ const CalendarPtr calendar = d->calendars.current(); const QUrl url = CalendarService::updateCalendarUrl(calendar->uid()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); const QByteArray rawData = CalendarService::calendarToJSON(calendar); diff --git a/src/calendar/eventcreatejob.cpp b/src/calendar/eventcreatejob.cpp --- a/src/calendar/eventcreatejob.cpp +++ b/src/calendar/eventcreatejob.cpp @@ -86,10 +86,8 @@ const EventPtr event = d->events.current(); const QUrl url = CalendarService::createEventUrl(d->calendarId, d->updatesPolicy); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); const QByteArray rawData = CalendarService::eventToJSON(event, CalendarService::EventSerializeFlag::NoID); diff --git a/src/calendar/eventdeletejob.cpp b/src/calendar/eventdeletejob.cpp --- a/src/calendar/eventdeletejob.cpp +++ b/src/calendar/eventdeletejob.cpp @@ -88,7 +88,6 @@ const QString eventId = d->eventsIds.current(); const QUrl url = CalendarService::removeEventUrl(d->calendarId, eventId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); QStringList headers; diff --git a/src/calendar/eventfetchjob.cpp b/src/calendar/eventfetchjob.cpp --- a/src/calendar/eventfetchjob.cpp +++ b/src/calendar/eventfetchjob.cpp @@ -62,10 +62,8 @@ QNetworkRequest EventFetchJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); QStringList headers; auto rawHeaderList = request.rawHeaderList(); diff --git a/src/calendar/eventmodifyjob.cpp b/src/calendar/eventmodifyjob.cpp --- a/src/calendar/eventmodifyjob.cpp +++ b/src/calendar/eventmodifyjob.cpp @@ -85,10 +85,8 @@ const EventPtr event = d->events.current(); const QUrl url = CalendarService::updateEventUrl(d->calendarId, event->id(), d->updatesPolicy); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); const QByteArray rawData = CalendarService::eventToJSON(event); diff --git a/src/calendar/eventmovejob.cpp b/src/calendar/eventmovejob.cpp --- a/src/calendar/eventmovejob.cpp +++ b/src/calendar/eventmovejob.cpp @@ -62,10 +62,8 @@ const QString eventId = eventsIds.current(); const QUrl url = CalendarService::moveEventUrl(source, destination, eventId); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); - request.setUrl(url); QStringList headers; auto rawHeaderList = request.rawHeaderList(); diff --git a/src/calendar/freebusyqueryjob.cpp b/src/calendar/freebusyqueryjob.cpp --- a/src/calendar/freebusyqueryjob.cpp +++ b/src/calendar/freebusyqueryjob.cpp @@ -93,7 +93,6 @@ const QByteArray json = document.toJson(QJsonDocument::Compact); QNetworkRequest request(CalendarService::freeBusyQueryUrl()); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); request.setRawHeader("GData-Version", CalendarService::APIVersion().toLatin1()); enqueueRequest(request, json, QStringLiteral("application/json")); } diff --git a/src/contacts/contactcreatejob.cpp b/src/contacts/contactcreatejob.cpp --- a/src/contacts/contactcreatejob.cpp +++ b/src/contacts/contactcreatejob.cpp @@ -64,10 +64,8 @@ const ContactPtr contact = contacts.current(); const QUrl url = ContactsService::createContactUrl(q->account()->accountName()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); - request.setUrl(url); QByteArray rawData = ContactsService::contactToXML(contact); rawData.prepend("enqueueRequest(request, rawData, QStringLiteral("application/atom+xml")); if (!contact->photo().isEmpty()) { - QNetworkRequest photoRequest; - photoRequest.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + const QUrl url = ContactsService::photoUrl(q->account()->accountName(), contact->uid()); + QNetworkRequest photoRequest(url); photoRequest.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("image/*")); - photoRequest.setUrl(ContactsService::photoUrl(q->account()->accountName(), contact->uid())); pendingPhoto.first = contact->photo().rawData(); pendingPhoto.second = contact->photo().type(); q->enqueueRequest(photoRequest, pendingPhoto.first, QStringLiteral("modifyImage")); diff --git a/src/contacts/contactdeletejob.cpp b/src/contacts/contactdeletejob.cpp --- a/src/contacts/contactdeletejob.cpp +++ b/src/contacts/contactdeletejob.cpp @@ -59,7 +59,6 @@ const QString contactId = contactIds.current(); const QUrl url = ContactsService::removeContactUrl(q->account()->accountName(), contactId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); QStringList headers; diff --git a/src/contacts/contactfetchjob.cpp b/src/contacts/contactfetchjob.cpp --- a/src/contacts/contactfetchjob.cpp +++ b/src/contacts/contactfetchjob.cpp @@ -58,10 +58,8 @@ QNetworkRequest ContactFetchJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); - request.setUrl(url); QStringList headers; auto rawHeaderList = request.rawHeaderList(); diff --git a/src/contacts/contactfetchphotojob.cpp b/src/contacts/contactfetchphotojob.cpp --- a/src/contacts/contactfetchphotojob.cpp +++ b/src/contacts/contactfetchphotojob.cpp @@ -60,9 +60,7 @@ const ContactPtr contact = contacts.current(); const QUrl url = ContactsService::photoUrl(q->account()->accountName(), contact->uid()); - QNetworkRequest request; - request.setUrl(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); q->enqueueRequest(request); } diff --git a/src/contacts/contactmodifyjob.cpp b/src/contacts/contactmodifyjob.cpp --- a/src/contacts/contactmodifyjob.cpp +++ b/src/contacts/contactmodifyjob.cpp @@ -65,8 +65,7 @@ const ContactPtr contact = contacts.current(); const QUrl url = ContactsService::updateContactUrl(q->account()->accountName(), contact->uid()); - QNetworkRequest request; - request.setUrl(url); + QNetworkRequest request(url); QByteArray rawData = ContactsService::contactToXML(contact); rawData.prepend("enqueueRequest(request, rawData, QStringLiteral("application/atom+xml")); - QNetworkRequest photoRequest; - photoRequest.setUrl(ContactsService::photoUrl(q->account()->accountName(), contact->uid())); + const QUrl photoUrl = ContactsService::photoUrl(q->account()->accountName(), contact->uid()); + QNetworkRequest photoRequest(photoUrl); if (!contact->photo().isEmpty()) { - QNetworkRequest photoRequest; photoRequest.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("image/*")); - photoRequest.setUrl(ContactsService::photoUrl(q->account()->accountName(), contact->uid())); pendingPhoto.first = contact->photo().rawData(); pendingPhoto.second = contact->photo().type(); q->enqueueRequest(photoRequest, pendingPhoto.first, QStringLiteral("modifyImage")); @@ -128,7 +125,6 @@ { QNetworkRequest r = request; r.setRawHeader("If-Match", "*"); - r.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); r.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); if (contentType == QLatin1String("modifyImage")) { diff --git a/src/contacts/contactsgroupcreatejob.cpp b/src/contacts/contactsgroupcreatejob.cpp --- a/src/contacts/contactsgroupcreatejob.cpp +++ b/src/contacts/contactsgroupcreatejob.cpp @@ -68,10 +68,8 @@ const ContactsGroupPtr contact = d->groups.current(); const QUrl url = ContactsService::createGroupUrl(account()->accountName()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); - request.setUrl(url); QByteArray rawData = ContactsService::contactsGroupToXML(contact); rawData.prepend("account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); - request.setUrl(url); QStringList headers; auto rawHeaderList = request.rawHeaderList(); diff --git a/src/contacts/contactsgroupfetchjob.cpp b/src/contacts/contactsgroupfetchjob.cpp --- a/src/contacts/contactsgroupfetchjob.cpp +++ b/src/contacts/contactsgroupfetchjob.cpp @@ -52,10 +52,8 @@ QNetworkRequest ContactsGroupFetchJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); - request.setUrl(url); QStringList headers; auto rawHeaderList = request.rawHeaderList(); diff --git a/src/contacts/contactsgroupmodifyjob.cpp b/src/contacts/contactsgroupmodifyjob.cpp --- a/src/contacts/contactsgroupmodifyjob.cpp +++ b/src/contacts/contactsgroupmodifyjob.cpp @@ -70,10 +70,8 @@ const ContactsGroupPtr group = d->groups.current(); const QUrl url = ContactsService::updateGroupUrl(account()->accountName(), group->id()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", ContactsService::APIVersion().toLatin1()); - request.setUrl(url); QByteArray rawData = ContactsService::contactsGroupToXML(group); rawData.prepend("accessToken().toLatin1()); + const QUrl url = QUrl(QStringLiteral("https://www.googleapis.com/oauth2/v1/userinfo")); + QNetworkRequest request(url); QStringList headers; const auto rawHeaderList = request.rawHeaderList(); diff --git a/src/core/job.h b/src/core/job.h --- a/src/core/job.h +++ b/src/core/job.h @@ -40,12 +40,13 @@ * * Usual workflow of Job subclasses is to reimplement Job::start, * Job::dispatchRequest and Job::handleReply, then enqueue a QNetworkRequest using - * Job::enqueueRequest. The request will automatically be scheduled in a queue - * and dispatched by calling Job::dispatchRequest implementation. When a reply - * is received, the Job will automatically perform error handling and if there - * is no error, the reply is passed to implementation of Job::handleReply. + * Job::enqueueRequest. Authorization headers and standard query parameters will be + * set by Job class. The request will automatically be scheduled in a queue and + * dispatched by calling Job::dispatchRequest implementation. When a reply is received, + * the Job will automatically perform error handling and if there is no error, the + * reply is passed to implementation of Job::handleReply. * - * Job is automatically when program enters an event loop. + * Job is automatically started when program enters an event loop. * * @author Daniel Vrátil * @since 2.0 @@ -72,7 +73,7 @@ * @brief Whether the job is running * * This property indicates whether the job is running or not. The value is - * set to @p true when the job is started (see Job::start) and back to + * set to @p true when the job is started (see Job::start) and back to * @p false right before Job::finished is emitted. * * @see Job::isRunning, Job::finished @@ -313,6 +314,7 @@ * * Subclasses should call this method to enqueue the @p request in main job * queue. The request is automatically dispatched, and reply is handled. + * Authorization headers and standars query parameters will be applied. * * @param request Request to enqueue * @param data Data to be send in body of the request diff --git a/src/core/job.cpp b/src/core/job.cpp --- a/src/core/job.cpp +++ b/src/core/job.cpp @@ -62,20 +62,19 @@ return sInstance; } -void FileLogger::logRequest(const KGAPI2::Request &request) +void FileLogger::logRequest(const QNetworkRequest &request, const QByteArray &rawData) { if (!mFile) { return; } QTextStream stream(mFile.data()); - stream << "C: " << request.request.url().toDisplayString() << "\n"; - stream << " Content-type: " << request.contentType << "\n"; - const auto headers = request.request.rawHeaderList(); + stream << "C: " << request.url().toDisplayString() << "\n"; + const auto headers = request.rawHeaderList(); for (const auto &header : headers) { - stream << " " << header << ": " << request.request.rawHeader(header) << "\n\n"; + stream << " " << header << ": " << request.rawHeader(header) << "\n"; } - stream << " " << request.rawData << "\n\n"; + stream << " " << rawData << "\n\n"; mFile->flush(); } @@ -89,9 +88,9 @@ stream << "S: " << reply->url().toDisplayString() << "\n"; const auto headers = reply->rawHeaderList(); for (const auto &header : headers) { - stream << " " << header << ": " << reply->rawHeader(header) << "\n\n"; + stream << " " << header << ": " << reply->rawHeader(header) << "\n"; } - stream << " " << rawData; + stream << " " << rawData << "\n\n"; mFile->flush(); } @@ -322,10 +321,14 @@ const Request r = requestQueue.dequeue(); currentRequest = r; + QNetworkRequest authorizedRequest = r.request; + if (account) { + authorizedRequest.setRawHeader("Authorization", "Bearer " + account->accessToken().toLatin1()); + } qCDebug(KGAPIDebug) << q << "Dispatching request to" << r.request.url(); - FileLogger::self()->logRequest(r); + FileLogger::self()->logRequest(authorizedRequest, r.rawData); - q->dispatchRequest(accessManager, r.request, r.rawData, r.contentType); + q->dispatchRequest(accessManager, authorizedRequest, r.rawData, r.contentType); if (requestQueue.isEmpty()) { dispatchTimer->stop(); diff --git a/src/core/job_p.h b/src/core/job_p.h --- a/src/core/job_p.h +++ b/src/core/job_p.h @@ -48,7 +48,7 @@ static FileLogger *self(); - void logRequest(const Request &request); + void logRequest(const QNetworkRequest &request, const QByteArray &rawData); void logReply(const QNetworkReply *reply, const QByteArray &rawData); private: diff --git a/src/drive/aboutfetchjob.cpp b/src/drive/aboutfetchjob.cpp --- a/src/drive/aboutfetchjob.cpp +++ b/src/drive/aboutfetchjob.cpp @@ -118,9 +118,8 @@ void AboutFetchJob::start() { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(DriveService::fetchAboutUrl(d->includeSubscribed, d->maxChangeIdCount, d->startChangeId)); + QUrl url = DriveService::fetchAboutUrl(d->includeSubscribed, d->maxChangeIdCount, d->startChangeId); + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/drive/appfetchjob.cpp b/src/drive/appfetchjob.cpp --- a/src/drive/appfetchjob.cpp +++ b/src/drive/appfetchjob.cpp @@ -61,13 +61,13 @@ void AppFetchJob::start() { - QNetworkRequest request; + QUrl url; if (d->appId.isEmpty()) { - request.setUrl(DriveService::fetchAppsUrl()); + url = DriveService::fetchAppsUrl(); } else { - request.setUrl(DriveService::fetchAppUrl(d->appId)); + url = DriveService::fetchAppUrl(d->appId); } - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/drive/changefetchjob.cpp b/src/drive/changefetchjob.cpp --- a/src/drive/changefetchjob.cpp +++ b/src/drive/changefetchjob.cpp @@ -38,7 +38,6 @@ { public: Private(ChangeFetchJob *parent); - QNetworkRequest createRequest(const QUrl &url); QString changeId; @@ -64,16 +63,6 @@ { } -QNetworkRequest ChangeFetchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); - - return request; -} - - ChangeFetchJob::ChangeFetchJob(const QString &changeId, const AccountPtr &account, QObject *parent): @@ -197,7 +186,7 @@ query.addQueryItem(QStringLiteral("supportsAllDrives"), d->supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(query); - const QNetworkRequest request = d->createRequest(url); + QNetworkRequest request(url); enqueueRequest(request); } @@ -227,7 +216,7 @@ } if (feedData.nextPageUrl.isValid()) { - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } diff --git a/src/drive/childreferencecreatejob.cpp b/src/drive/childreferencecreatejob.cpp --- a/src/drive/childreferencecreatejob.cpp +++ b/src/drive/childreferencecreatejob.cpp @@ -68,9 +68,7 @@ withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(withDriveSupportQuery); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = ChildReference::toJSON(reference); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/drive/childreferencedeletejob.cpp b/src/drive/childreferencedeletejob.cpp --- a/src/drive/childreferencedeletejob.cpp +++ b/src/drive/childreferencedeletejob.cpp @@ -99,7 +99,6 @@ const QUrl url = DriveService::deleteChildReference(d->folderId, childId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); enqueueRequest(request); } diff --git a/src/drive/childreferencefetchjob.cpp b/src/drive/childreferencefetchjob.cpp --- a/src/drive/childreferencefetchjob.cpp +++ b/src/drive/childreferencefetchjob.cpp @@ -37,7 +37,6 @@ { public: Private(ChildReferenceFetchJob *parent); - QNetworkRequest createRequest(const QUrl &url); QString folderId; QString childId; @@ -51,15 +50,6 @@ { } -QNetworkRequest ChildReferenceFetchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); - - return request; -} - ChildReferenceFetchJob::ChildReferenceFetchJob(const QString &folderId, const AccountPtr &account, QObject *parent): @@ -94,7 +84,7 @@ url = DriveService::fetchParentReferenceUrl(d->folderId, d->childId); } - const QNetworkRequest request = d->createRequest(url); + QNetworkRequest request(url); enqueueRequest(request); } @@ -121,7 +111,7 @@ if (feedData.nextPageUrl.isValid()) { - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } diff --git a/src/drive/fileabstractmodifyjob.cpp b/src/drive/fileabstractmodifyjob.cpp --- a/src/drive/fileabstractmodifyjob.cpp +++ b/src/drive/fileabstractmodifyjob.cpp @@ -60,10 +60,8 @@ const QString fileId = filesIds.takeFirst(); const QUrl url = q->url(fileId); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setHeader(QNetworkRequest::ContentLengthHeader, 0); - request.setUrl(url); q->enqueueRequest(request); } diff --git a/src/drive/fileabstractuploadjob.cpp b/src/drive/fileabstractuploadjob.cpp --- a/src/drive/fileabstractuploadjob.cpp +++ b/src/drive/fileabstractuploadjob.cpp @@ -157,7 +157,6 @@ QUrlQuery query(url); query.addQueryItem(QStringLiteral("useContentAsIndexableText"), Utils::bool2Str(useContentAsIndexableText)); - QNetworkRequest request; QByteArray rawData; QString contentType; @@ -191,8 +190,7 @@ query.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(query); - request.setUrl(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setHeader(QNetworkRequest::ContentLengthHeader, rawData.length()); request.setHeader(QNetworkRequest::ContentTypeHeader, contentType); request.setAttribute(QNetworkRequest::User, filePath); diff --git a/src/drive/filecopyjob.cpp b/src/drive/filecopyjob.cpp --- a/src/drive/filecopyjob.cpp +++ b/src/drive/filecopyjob.cpp @@ -65,7 +65,6 @@ q->updateUrl(url); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); const QByteArray rawData = File::toJSON(file); diff --git a/src/drive/filedeletejob.cpp b/src/drive/filedeletejob.cpp --- a/src/drive/filedeletejob.cpp +++ b/src/drive/filedeletejob.cpp @@ -90,8 +90,6 @@ const QUrl url = DriveService::deleteFileUrl(fileId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - enqueueRequest(request); } diff --git a/src/drive/filefetchcontentjob.cpp b/src/drive/filefetchcontentjob.cpp --- a/src/drive/filefetchcontentjob.cpp +++ b/src/drive/filefetchcontentjob.cpp @@ -86,8 +86,6 @@ void FileFetchContentJob::start() { QNetworkRequest request(d->url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - enqueueRequest(request); } diff --git a/src/drive/filefetchjob.cpp b/src/drive/filefetchjob.cpp --- a/src/drive/filefetchjob.cpp +++ b/src/drive/filefetchjob.cpp @@ -40,7 +40,6 @@ public: Private(FileFetchJob *parent); void processNext(); - QNetworkRequest createRequest(const QUrl &url); QStringList fieldsToStrings(qulonglong fields); FileSearchQuery searchQuery; @@ -67,14 +66,6 @@ { } -QNetworkRequest FileFetchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - request.setUrl(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - - return request; -} QStringList FileFetchJob::Private::fieldsToStrings(qulonglong fields) { @@ -266,7 +257,8 @@ withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(withDriveSupportQuery); - q->enqueueRequest(createRequest(url)); + QNetworkRequest request(url); + q->enqueueRequest(request); } FileFetchJob::FileFetchJob(const QString &fileId, @@ -372,7 +364,7 @@ items << File::fromJSONFeed(rawData, feedData); if (feedData.nextPageUrl.isValid()) { - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } diff --git a/src/drive/parentreferencecreatejob.cpp b/src/drive/parentreferencecreatejob.cpp --- a/src/drive/parentreferencecreatejob.cpp +++ b/src/drive/parentreferencecreatejob.cpp @@ -68,9 +68,7 @@ withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(withDriveSupportQuery); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = ParentReference::toJSON(reference); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/drive/parentreferencedeletejob.cpp b/src/drive/parentreferencedeletejob.cpp --- a/src/drive/parentreferencedeletejob.cpp +++ b/src/drive/parentreferencedeletejob.cpp @@ -101,7 +101,6 @@ const QUrl url = DriveService::deleteParentReferenceUrl(d->fileId, referenceId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); enqueueRequest(request); } diff --git a/src/drive/parentreferencefetchjob.cpp b/src/drive/parentreferencefetchjob.cpp --- a/src/drive/parentreferencefetchjob.cpp +++ b/src/drive/parentreferencefetchjob.cpp @@ -67,13 +67,13 @@ void ParentReferenceFetchJob::start() { - QNetworkRequest request; + QUrl url; if (d->referenceId.isEmpty()) { - request.setUrl(DriveService::fetchParentReferencesUrl(d->fileId)); + url = DriveService::fetchParentReferencesUrl(d->fileId); } else { - request.setUrl(DriveService::fetchParentReferenceUrl(d->fileId, d->referenceId)); + url = DriveService::fetchParentReferenceUrl(d->fileId, d->referenceId); } - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/drive/permissioncreatejob.cpp b/src/drive/permissioncreatejob.cpp --- a/src/drive/permissioncreatejob.cpp +++ b/src/drive/permissioncreatejob.cpp @@ -69,9 +69,7 @@ withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(withDriveSupportQuery); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = Permission::toJSON(permission); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/drive/permissiondeletejob.cpp b/src/drive/permissiondeletejob.cpp --- a/src/drive/permissiondeletejob.cpp +++ b/src/drive/permissiondeletejob.cpp @@ -118,7 +118,6 @@ withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), d->supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); enqueueRequest(request); } diff --git a/src/drive/permissionfetchjob.cpp b/src/drive/permissionfetchjob.cpp --- a/src/drive/permissionfetchjob.cpp +++ b/src/drive/permissionfetchjob.cpp @@ -115,10 +115,7 @@ withDriveSupportQuery.addQueryItem(QStringLiteral("supportsAllDrives"), d->supportsAllDrives ? QStringLiteral("true") : QStringLiteral("false")); url.setQuery(withDriveSupportQuery); - QNetworkRequest request; - request.setUrl(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/drive/permissionmodifyjob.cpp b/src/drive/permissionmodifyjob.cpp --- a/src/drive/permissionmodifyjob.cpp +++ b/src/drive/permissionmodifyjob.cpp @@ -70,7 +70,6 @@ url.setQuery(withDriveSupportQuery); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); const QByteArray rawData = Permission::toJSON(permission); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/drive/revisiondeletejob.cpp b/src/drive/revisiondeletejob.cpp --- a/src/drive/revisiondeletejob.cpp +++ b/src/drive/revisiondeletejob.cpp @@ -99,8 +99,6 @@ const QUrl url = DriveService::deleteRevisionUrl(d->fileId, revisionId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - enqueueRequest(request); } diff --git a/src/drive/revisionfetchjob.cpp b/src/drive/revisionfetchjob.cpp --- a/src/drive/revisionfetchjob.cpp +++ b/src/drive/revisionfetchjob.cpp @@ -66,13 +66,13 @@ void RevisionFetchJob::start() { - QNetworkRequest request; + QUrl url; if (d->revisionId.isEmpty()) { - request.setUrl(DriveService::fetchRevisionsUrl(d->fileId)); + url = DriveService::fetchRevisionsUrl(d->fileId); } else { - request.setUrl(DriveService::fetchRevisionUrl(d->fileId, d->revisionId)); + url = DriveService::fetchRevisionUrl(d->fileId, d->revisionId); } - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/drive/revisionmodifyjob.cpp b/src/drive/revisionmodifyjob.cpp --- a/src/drive/revisionmodifyjob.cpp +++ b/src/drive/revisionmodifyjob.cpp @@ -62,7 +62,6 @@ const QUrl url = DriveService::modifyRevisionUrl(fileId, revision->id()); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); const QByteArray rawData = Revision::toJSON(revision); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/drive/teamdrivecreatejob.cpp b/src/drive/teamdrivecreatejob.cpp --- a/src/drive/teamdrivecreatejob.cpp +++ b/src/drive/teamdrivecreatejob.cpp @@ -66,14 +66,13 @@ QUrl url = DriveService::fetchTeamdrivesUrl(); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); QUrlQuery query(url); if (!requestId.isEmpty()) { query.addQueryItem(RequestIdParam, requestId); } url.setQuery(query); - request.setUrl(url); + + QNetworkRequest request(url); const QByteArray rawData = Teamdrive::toJSON(teamdrive); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/drive/teamdrivedeletejob.cpp b/src/drive/teamdrivedeletejob.cpp --- a/src/drive/teamdrivedeletejob.cpp +++ b/src/drive/teamdrivedeletejob.cpp @@ -82,9 +82,8 @@ const QString teamdriveId = d->teamdrivesIds.takeFirst(); const QUrl url = DriveService::fetchTeamdriveUrl(teamdriveId); - QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); enqueueRequest(request); } diff --git a/src/drive/teamdrivefetchjob.cpp b/src/drive/teamdrivefetchjob.cpp --- a/src/drive/teamdrivefetchjob.cpp +++ b/src/drive/teamdrivefetchjob.cpp @@ -44,7 +44,6 @@ { public: Private(TeamdriveFetchJob *parent); - QNetworkRequest createRequest(const QUrl &url); TeamdriveSearchQuery searchQuery; QString teamdriveId; @@ -61,16 +60,6 @@ { } -QNetworkRequest TeamdriveFetchJob::Private::createRequest(const QUrl &url) -{ - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); - - return request; -} - - TeamdriveFetchJob::TeamdriveFetchJob(const QString &teamdriveId, const AccountPtr &account, QObject *parent): @@ -137,7 +126,7 @@ url = DriveService::fetchTeamdriveUrl(d->teamdriveId); } - const QNetworkRequest request = d->createRequest(url); + QNetworkRequest request(url); enqueueRequest(request); } @@ -169,7 +158,7 @@ if (feedData.nextPageUrl.isValid()) { // Reapply query options applyRequestParameters(feedData.nextPageUrl); - const QNetworkRequest request = d->createRequest(feedData.nextPageUrl); + QNetworkRequest request(feedData.nextPageUrl); enqueueRequest(request); } diff --git a/src/drive/teamdrivemodifyjob.cpp b/src/drive/teamdrivemodifyjob.cpp --- a/src/drive/teamdrivemodifyjob.cpp +++ b/src/drive/teamdrivemodifyjob.cpp @@ -62,7 +62,6 @@ const QUrl url = DriveService::fetchTeamdriveUrl(teamdrive->id()); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); const QByteArray rawData = Teamdrive::toJSON(teamdrive); q->enqueueRequest(request, rawData, QStringLiteral("application/json")); diff --git a/src/latitude/locationcreatejob.cpp b/src/latitude/locationcreatejob.cpp --- a/src/latitude/locationcreatejob.cpp +++ b/src/latitude/locationcreatejob.cpp @@ -69,10 +69,8 @@ url = LatitudeService::insertLocationUrl(); } - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", LatitudeService::APIVersion().toLatin1()); - request.setUrl(url); const QByteArray rawData = LatitudeService::locationToJSON(d->location); diff --git a/src/latitude/locationdeletejob.cpp b/src/latitude/locationdeletejob.cpp --- a/src/latitude/locationdeletejob.cpp +++ b/src/latitude/locationdeletejob.cpp @@ -89,7 +89,6 @@ } QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); request.setRawHeader("GData-Version", LatitudeService::APIVersion().toLatin1()); QStringList headers; diff --git a/src/latitude/locationfetchhistoryjob.cpp b/src/latitude/locationfetchhistoryjob.cpp --- a/src/latitude/locationfetchhistoryjob.cpp +++ b/src/latitude/locationfetchhistoryjob.cpp @@ -59,10 +59,8 @@ QNetworkRequest LocationFetchHistoryJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", LatitudeService::APIVersion().toLatin1()); - request.setUrl(url); return request; } diff --git a/src/latitude/locationfetchjob.cpp b/src/latitude/locationfetchjob.cpp --- a/src/latitude/locationfetchjob.cpp +++ b/src/latitude/locationfetchjob.cpp @@ -87,10 +87,8 @@ } else { url = LatitudeService::retrieveLocationUrl(d->timestamp, d->granularity); } - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); + QNetworkRequest request(url); request.setRawHeader("GData-Version", LatitudeService::APIVersion().toLatin1()); - request.setUrl(url); enqueueRequest(request); } diff --git a/src/tasks/taskcreatejob.cpp b/src/tasks/taskcreatejob.cpp --- a/src/tasks/taskcreatejob.cpp +++ b/src/tasks/taskcreatejob.cpp @@ -95,9 +95,7 @@ query.addQueryItem(QStringLiteral("parent"), d->parentId); } url.setQuery(query); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = TasksService::taskToJSON(task); diff --git a/src/tasks/taskdeletejob.cpp b/src/tasks/taskdeletejob.cpp --- a/src/tasks/taskdeletejob.cpp +++ b/src/tasks/taskdeletejob.cpp @@ -61,7 +61,6 @@ const QString taskId = tasksIds.current(); const QUrl url = TasksService::removeTaskUrl(taskListId, taskId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); QStringList headers; const auto rawHeaderList = request.rawHeaderList(); diff --git a/src/tasks/taskfetchjob.cpp b/src/tasks/taskfetchjob.cpp --- a/src/tasks/taskfetchjob.cpp +++ b/src/tasks/taskfetchjob.cpp @@ -68,9 +68,7 @@ QNetworkRequest TaskFetchJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); QStringList headers; const auto rawHeaderList = request.rawHeaderList(); diff --git a/src/tasks/tasklistcreatejob.cpp b/src/tasks/tasklistcreatejob.cpp --- a/src/tasks/tasklistcreatejob.cpp +++ b/src/tasks/tasklistcreatejob.cpp @@ -70,9 +70,7 @@ const TaskListPtr taskList = d->taskLists.current(); const QUrl url = TasksService::createTaskListUrl(); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = TasksService::taskListToJSON(taskList); diff --git a/src/tasks/tasklistdeletejob.cpp b/src/tasks/tasklistdeletejob.cpp --- a/src/tasks/tasklistdeletejob.cpp +++ b/src/tasks/tasklistdeletejob.cpp @@ -58,7 +58,6 @@ const QString taskListId = taskListsIds.current(); const QUrl url = TasksService::removeTaskListUrl(taskListId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); QStringList headers; const auto rawHeaderList = request.rawHeaderList(); diff --git a/src/tasks/tasklistfetchjob.cpp b/src/tasks/tasklistfetchjob.cpp --- a/src/tasks/tasklistfetchjob.cpp +++ b/src/tasks/tasklistfetchjob.cpp @@ -49,9 +49,7 @@ QNetworkRequest TaskListFetchJob::Private::createRequest(const QUrl& url) { - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); QStringList headers; const auto rawHeaderList = request.rawHeaderList(); diff --git a/src/tasks/tasklistmodifyjob.cpp b/src/tasks/tasklistmodifyjob.cpp --- a/src/tasks/tasklistmodifyjob.cpp +++ b/src/tasks/tasklistmodifyjob.cpp @@ -72,9 +72,7 @@ const TaskListPtr taskList = d->taskLists.current(); const QUrl url = TasksService::updateTaskListUrl(taskList->uid()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = TasksService::taskListToJSON(taskList); diff --git a/src/tasks/taskmodifyjob.cpp b/src/tasks/taskmodifyjob.cpp --- a/src/tasks/taskmodifyjob.cpp +++ b/src/tasks/taskmodifyjob.cpp @@ -73,9 +73,7 @@ const TaskPtr task = d->tasks.current(); const QUrl url = TasksService::updateTaskUrl(d->taskListId, task->uid()); - QNetworkRequest request; - request.setRawHeader("Authorization", "Bearer " + account()->accessToken().toLatin1()); - request.setUrl(url); + QNetworkRequest request(url); const QByteArray rawData = TasksService::taskToJSON(task); diff --git a/src/tasks/taskmovejob.cpp b/src/tasks/taskmovejob.cpp --- a/src/tasks/taskmovejob.cpp +++ b/src/tasks/taskmovejob.cpp @@ -62,7 +62,6 @@ const QString taskId = tasksIds.current(); const QUrl url = TasksService::moveTaskUrl(taskListId, taskId, newParentId); QNetworkRequest request(url); - request.setRawHeader("Authorization", "Bearer " + q->account()->accessToken().toLatin1()); QStringList headers; const auto rawHeaderList = request.rawHeaderList();