OAuth 2 updates
This commit is contained in:
parent
98426ae24a
commit
068b80b3f3
4 changed files with 10 additions and 14 deletions
|
@ -3,6 +3,7 @@
|
||||||
*
|
*
|
||||||
* Author: Johan Paul (johan.paul@d-pointer.com)
|
* Author: Johan Paul (johan.paul@d-pointer.com)
|
||||||
* http://www.d-pointer.com
|
* http://www.d-pointer.com
|
||||||
|
* This file: Kyle Fowler
|
||||||
*
|
*
|
||||||
* KQOAuth is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
*
|
*
|
||||||
* Author: Johan Paul (johan.paul@d-pointer.com)
|
* Author: Johan Paul (johan.paul@d-pointer.com)
|
||||||
* http://www.d-pointer.com
|
* http://www.d-pointer.com
|
||||||
|
* This file: Kyle Fowler
|
||||||
*
|
*
|
||||||
* KQOAuth is free software: you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
|
|
@ -311,6 +311,7 @@ void KQOAuthManager::executeAuthorizedRequest(KQOAuthRequest *request, int id) {
|
||||||
QUrl urlWithParams = networkRequest.url();
|
QUrl urlWithParams = networkRequest.url();
|
||||||
urlWithParams.setQueryItems(urlParams);
|
urlWithParams.setQueryItems(urlParams);
|
||||||
networkRequest.setUrl(urlWithParams);
|
networkRequest.setUrl(urlWithParams);
|
||||||
|
qDebug() << networkRequest.url();
|
||||||
|
|
||||||
// Submit the request including the params.
|
// Submit the request including the params.
|
||||||
QNetworkReply *reply = d->networkManager->get(networkRequest);
|
QNetworkReply *reply = d->networkManager->get(networkRequest);
|
||||||
|
@ -321,11 +322,10 @@ void KQOAuthManager::executeAuthorizedRequest(KQOAuthRequest *request, int id) {
|
||||||
|
|
||||||
networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, request->contentType());
|
networkRequest.setHeader(QNetworkRequest::ContentTypeHeader, request->contentType());
|
||||||
|
|
||||||
/*
|
|
||||||
qDebug() << networkRequest.rawHeaderList();
|
qDebug() << networkRequest.rawHeaderList();
|
||||||
qDebug() << networkRequest.rawHeader("Authorization");
|
qDebug() << networkRequest.rawHeader("Authorization");
|
||||||
qDebug() << networkRequest.rawHeader("Content-Type");
|
qDebug() << networkRequest.rawHeader("Content-Type");
|
||||||
*/
|
|
||||||
QNetworkReply *reply;
|
QNetworkReply *reply;
|
||||||
if (request->contentType() == "application/x-www-form-urlencoded") {
|
if (request->contentType() == "application/x-www-form-urlencoded") {
|
||||||
reply = d->networkManager->post(networkRequest, request->requestBody());
|
reply = d->networkManager->post(networkRequest, request->requestBody());
|
||||||
|
|
|
@ -75,14 +75,12 @@ void KQOAuthRequestPrivate::prepareRequest() {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case KQOAuthRequest::AuthorizedRequest:
|
case KQOAuthRequest::AuthorizedRequest:
|
||||||
if(requestOAuthMethod == KQOAuthRequest::OAUTH1) {
|
requestParameters.append( qMakePair( OAUTH_KEY_SIGNATURE_METHOD, oauthSignatureMethod ));
|
||||||
requestParameters.append( qMakePair( OAUTH_KEY_SIGNATURE_METHOD, oauthSignatureMethod ));
|
requestParameters.append( qMakePair( OAUTH_KEY_CONSUMER_KEY, oauthConsumerKey ));
|
||||||
requestParameters.append( qMakePair( OAUTH_KEY_CONSUMER_KEY, oauthConsumerKey ));
|
requestParameters.append( qMakePair( OAUTH_KEY_VERSION, oauthVersion ));
|
||||||
requestParameters.append( qMakePair( OAUTH_KEY_VERSION, oauthVersion ));
|
requestParameters.append( qMakePair( OAUTH_KEY_TIMESTAMP, this->oauthTimestamp() ));
|
||||||
requestParameters.append( qMakePair( OAUTH_KEY_TIMESTAMP, this->oauthTimestamp() ));
|
requestParameters.append( qMakePair( OAUTH_KEY_NONCE, this->oauthNonce() ));
|
||||||
requestParameters.append( qMakePair( OAUTH_KEY_NONCE, this->oauthNonce() ));
|
requestParameters.append( qMakePair( OAUTH_KEY_TOKEN, oauthToken ));
|
||||||
requestParameters.append( qMakePair( OAUTH_KEY_TOKEN, oauthToken ));
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -208,10 +206,6 @@ QString KQOAuthRequestPrivate::oauthTimestamp() const {
|
||||||
|
|
||||||
QString KQOAuthRequestPrivate::oauthNonce() const {
|
QString KQOAuthRequestPrivate::oauthNonce() const {
|
||||||
// This is basically for unit tests only. In most cases we don't set the nonce beforehand.
|
// 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());
|
return QString::number(qrand());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue