summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2017-06-19 09:16:41 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2017-07-14 16:46:04 +0000
commit61a1f8ee91a33734f12c14b25ceaff3ae05174e3 (patch)
tree5208af67dc5768f5d13d757792c02ae44aae5fae /examples
parent60c3a71c1828fc803b78b1a28b4d4ef2a38d2ed3 (diff)
Fix signature-generation for already-percent-encoded queries
As mentioned in RFC 5849 in section 3.4.1.3.1 queries should be treated as application/x-www-form-urlencoded and be decoded before being used in the base string. The queries located in the URL now gets fully decoded and any already-percent-encoded key-value pairs should be added to the URL. The parameters list is used for non-encoded input. [ChangeLog][OAuth1] QOAuth1 will now decode the query-segment of the URL supplied in get/post/head/deleteResource during the signature-generation phase. Any key-value-pair which needs to be passed in as percent-encoded must be passed in the query of the URL. Task-number: QTBUG-61125 Change-Id: I2ecb145f19f6c9a0031e9f00c6cb22d0fa5c96ea Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/oauth/twittertimeline/twittertimelinemodel.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/examples/oauth/twittertimeline/twittertimelinemodel.cpp b/examples/oauth/twittertimeline/twittertimelinemodel.cpp
index 87e387d..6ebe2da 100644
--- a/examples/oauth/twittertimeline/twittertimelinemodel.cpp
+++ b/examples/oauth/twittertimeline/twittertimelinemodel.cpp
@@ -133,11 +133,11 @@ void TwitterTimelineModel::updateTimeline()
QMessageBox::warning(nullptr, qApp->applicationName(), "Not authenticated");
QUrl url("https://api.twitter.com/1.1/statuses/home_timeline.json");
- QUrlQuery query;
+ QVariantMap parameters;
if (tweets.size()) {
// Tweets are time-ordered, newest first. Pass the most recent
// ID we have to request everything more recent than it:
- query.addQueryItem("since_id", QString::number(tweets.first().id));
+ parameters.insert("since_id", QString::number(tweets.first().id));
// From https://dev.twitter.com/rest/reference/get/search/tweets:
// Returns results with an ID greater than (that is, more recent than)
// the specified ID. There are limits to the number of Tweets which can
@@ -145,8 +145,7 @@ void TwitterTimelineModel::updateTimeline()
// since the since_id, the since_id will be forced to the oldest ID
// available.
}
- url.setQuery(query);
- QNetworkReply *reply = twitter.get(url);
+ QNetworkReply *reply = twitter.get(url, parameters);
connect(reply, &QNetworkReply::finished, this, &TwitterTimelineModel::parseJson);
}