diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-07-24 19:06:46 +0200 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-07-24 19:06:46 +0200 |
| commit | 02ff13b56c35dc7f17ee5ec6897961e89425850f (patch) | |
| tree | 66cbb5dd29b81b28f17d4af0bcd06e1104ae125e | |
| parent | e44e943c6605ad7dc612ef4622845e37fe585709 (diff) | |
| download | qxmpp-02ff13b56c35dc7f17ee5ec6897961e89425850f.tar.gz | |
fix regression in X-FACEBOOK-PLATFORM auth (api_key / access_token swapped)
| -rw-r--r-- | src/base/QXmppSasl.cpp | 4 | ||||
| -rw-r--r-- | tests/sasl.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp index 8333d5db..9e593cc0 100644 --- a/src/base/QXmppSasl.cpp +++ b/src/base/QXmppSasl.cpp @@ -438,8 +438,8 @@ bool QXmppSaslClientFacebook::respond(const QByteArray &challenge, QByteArray &r // build response QUrl responseUrl; - responseUrl.addQueryItem("access_token", username()); - responseUrl.addQueryItem("api_key", password()); + responseUrl.addQueryItem("access_token", password()); + responseUrl.addQueryItem("api_key", username()); responseUrl.addQueryItem("call_id", 0); responseUrl.addQueryItem("method", requestUrl.queryItemValue("method")); responseUrl.addQueryItem("nonce", requestUrl.queryItemValue("nonce")); diff --git a/tests/sasl.cpp b/tests/sasl.cpp index e874e120..c8211814 100644 --- a/tests/sasl.cpp +++ b/tests/sasl.cpp @@ -235,7 +235,7 @@ void tst_QXmppSaslClient::testFacebook() // challenge response QVERIFY(client->respond(QByteArray("version=1&method=auth.xmpp_login&nonce=AA4EFEE16F2AB64B131EEFFE6EACDDB8"), response)); - QCOMPARE(response, QByteArray("access_token=123456789012345&api_key=abcdefghijlkmno&call_id=&method=auth.xmpp_login&nonce=AA4EFEE16F2AB64B131EEFFE6EACDDB8&v=1.0")); + QCOMPARE(response, QByteArray("access_token=abcdefghijlkmno&api_key=123456789012345&call_id=&method=auth.xmpp_login&nonce=AA4EFEE16F2AB64B131EEFFE6EACDDB8&v=1.0")); // any further step is an error QVERIFY(!client->respond(QByteArray(), response)); |