spacenerdmo/bb-cascades-oauth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

OAuth 2 updates

Browse source
This commit is contained in:
Kyle Fowler 2012-03-29 23:11:36 -07:00
parent 98426ae24a
commit 068b80b3f3
4 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
oauth/kqoauth2request.cpp
View file

@ -3,6 +3,7 @@
*
* Author: Johan Paul (johan.paul@d-pointer.com)
* http://www.d-pointer.com
* This file: Kyle Fowler
*
* KQOAuth is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by

1
oauth/kqoauth2request.h
View file

@ -3,6 +3,7 @@
*
* Author: Johan Paul (johan.paul@d-pointer.com)
* http://www.d-pointer.com
* This file: Kyle Fowler
*
* KQOAuth is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by

4
oauth/kqoauthmanager.cpp
View file

@ -311,6 +311,7 @@ void KQOAuthManager::executeAuthorizedRequest(KQOAuthRequest *request, int id) {
QUrl urlWithParams = networkRequest.url();
urlWithParams.setQueryItems(urlParams);
networkRequest.setUrl(urlWithParams);
qDebug() << networkRequest.url();
// Submit the request including the params.
QNetworkReply *reply = d->networkManager->get(networkRequest);
@ -321,11 +322,10 @@ void KQOAuthManager::executeAuthorizedRequest(KQOAuthRequest *request, int id) {
networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, request->contentType());
/*
qDebug() << networkRequest.rawHeaderList();
qDebug() << networkRequest.rawHeader("Authorization");
qDebug() << networkRequest.rawHeader("Content-Type");
*/
QNetworkReply *reply;
if (request->contentType() == "application/x-www-form-urlencoded") {
reply = d->networkManager->post(networkRequest, request->requestBody());

18
oauth/kqoauthrequest.cpp
View file

@ -75,14 +75,12 @@ void KQOAuthRequestPrivate::prepareRequest() {
break;
case KQOAuthRequest::AuthorizedRequest:
if(requestOAuthMethod == KQOAuthRequest::OAUTH1) {
requestParameters.append( qMakePair( OAUTH_KEY_SIGNATURE_METHOD, oauthSignatureMethod ));
requestParameters.append( qMakePair( OAUTH_KEY_CONSUMER_KEY, oauthConsumerKey ));
requestParameters.append( qMakePair( OAUTH_KEY_VERSION, oauthVersion ));
requestParameters.append( qMakePair( OAUTH_KEY_TIMESTAMP, this->oauthTimestamp() ));
requestParameters.append( qMakePair( OAUTH_KEY_NONCE, this->oauthNonce() ));
requestParameters.append( qMakePair( OAUTH_KEY_TOKEN, oauthToken ));
}
requestParameters.append( qMakePair( OAUTH_KEY_SIGNATURE_METHOD, oauthSignatureMethod ));
requestParameters.append( qMakePair( OAUTH_KEY_CONSUMER_KEY, oauthConsumerKey ));
requestParameters.append( qMakePair( OAUTH_KEY_VERSION, oauthVersion ));
requestParameters.append( qMakePair( OAUTH_KEY_TIMESTAMP, this->oauthTimestamp() ));
requestParameters.append( qMakePair( OAUTH_KEY_NONCE, this->oauthNonce() ));
requestParameters.append( qMakePair( OAUTH_KEY_TOKEN, oauthToken ));
break;
default:
@ -208,10 +206,6 @@ QString KQOAuthRequestPrivate::oauthTimestamp() const {
QString KQOAuthRequestPrivate::oauthNonce() const {
// This is basically for unit tests only. In most cases we don't set the nonce beforehand.
if (!oauthNonce_.isEmpty()) {
return oauthNonce_;
}
return QString::number(qrand());
}