Commit 41dd2c12 authored by Jesus Fernandez's avatar Jesus Fernandez

Comments and function rename

parent e3fc27ca
......@@ -80,6 +80,7 @@ public:
QNetworkAccessManager *networkAccessManager();
void setStatus(QAbstractOAuth::Status status);
// Resource Owner Authorization: https://tools.ietf.org/html/rfc5849#section-2.2
QUrl authorizationUrl;
QVariantMap extraTokens;
QAbstractOAuth::Status status = QAbstractOAuth::Status::NotAuthenticated;
......
......@@ -83,7 +83,6 @@ public:
// private slots
void _q_onTokenRequestFinished();
void _q_onTokenRequestError(QNetworkReply::NetworkError error);
void _q_onTokenExchangeError(QNetworkReply::NetworkError error);
void _q_requestAuthorizationGrantAnswer();
void _q_tokensReceived(const QVariantMap &tokens);
......
......@@ -69,9 +69,9 @@ class OAUTH_EXPORT QOAuth2AuthorizationCodeFlowPrivate : public QAbstractOAuth2P
public:
QOAuth2AuthorizationCodeFlowPrivate(QNetworkAccessManager *manager = nullptr);
void handleCallback(const QVariantMap &data);
void accessTokenRequestFinished(QNetworkReply *reply);
void authenticate(QNetworkReply *reply, QAuthenticator *authenticator);
void _q_handleCallback(const QVariantMap &data);
void _q_accessTokenRequestFinished(QNetworkReply *reply);
void _q_authenticate(QNetworkReply *reply, QAuthenticator *authenticator);
QUrl accessTokenUrl;
QString tokenType;
......
......@@ -73,8 +73,8 @@ public:
QString text;
private:
void onClientConnected();
void answerClient();
void _q_clientConnected();
void _q_answerClient();
};
QT_END_NAMESPACE
......
......@@ -186,6 +186,13 @@ QString QAbstractOAuth::callback() const
: d->defaultReplyHandler->callback();
}
void QAbstractOAuth::resourceOwnerAuthorization(const QUrl &url, const QVariantMap &parameters)
{
QUrl u = url;
u.setQuery(QAbstractOAuthPrivate::createQuery(parameters));
Q_EMIT authorizeWithBrowser(u);
}
QT_END_NAMESPACE
#endif // QT_NO_HTTP
......@@ -116,7 +116,6 @@ public:
Status status() const;
// Resource Owner Authorization: https://tools.ietf.org/html/rfc5849#section-2.2
QUrl authorizationUrl() const;
void setAuthorizationUrl(const QUrl &url);
......@@ -148,7 +147,7 @@ Q_SIGNALS:
void extraTokensChanged(const QVariantMap &tokens);
void requestFailed(const Error error);
void authorizationRequested(const QUrl &url);
void authorizeWithBrowser(const QUrl &url);
void granted();
void finished(QNetworkReply *reply);
void replyDataReceived(const QByteArray &data);
......@@ -160,6 +159,8 @@ protected:
QString callback() const;
virtual void resourceOwnerAuthorization(const QUrl &url, const QVariantMap &parameters);
private:
Q_DISABLE_COPY(QAbstractOAuth)
Q_DECLARE_PRIVATE(QAbstractOAuth)
......
......@@ -87,12 +87,6 @@ void QOAuth1Private::_q_onTokenRequestError(QNetworkReply::NetworkError error)
Q_EMIT q->requestFailed(QAbstractOAuth::Error::NetworkError);
}
void QOAuth1Private::_q_onTokenExchangeError(QNetworkReply::NetworkError)
{
Q_Q(QOAuth1);
Q_EMIT q->requestFailed(QAbstractOAuth::Error::NetworkError);
}
void QOAuth1Private::_q_requestAuthorizationGrantAnswer()
{
Q_Q(QOAuth1);
......@@ -504,6 +498,7 @@ QNetworkReply *QOAuth1::requestTemporaryCredentials(QNetworkAccessManager::Opera
const QUrl &url,
const QVariantMap &parameters)
{
// https://tools.ietf.org/html/rfc5849#section-2.1
Q_D(QOAuth1);
if (Q_UNLIKELY(!d->networkAccessManager())) {
qCritical("QNetworkAccessManager not available");
......@@ -653,6 +648,7 @@ QByteArray QOAuth1::signatureBaseString(const QVariantMap &parameters,
const QUrl &url,
QNetworkAccessManager::Operation op)
{
// https://tools.ietf.org/html/rfc5849#section-3.4.1
QByteArray base;
base.append(QOAuth1Private::operationName(op).toUtf8() + "&");
......@@ -733,9 +729,8 @@ void QOAuth1::grant()
if (d->modifyParametersFunction)
d->modifyParametersFunction(Stage::RequestingAuthorization, &parameters);
QUrl url = d->authorizationUrl;
url.setQuery(QAbstractOAuthPrivate::createQuery(parameters));
Q_EMIT authorizationRequested(url);
// https://tools.ietf.org/html/rfc5849#section-2.2
resourceOwnerAuthorization(d->authorizationUrl, parameters);
}
else {
// try upgrading token without verifier
......
......@@ -59,7 +59,7 @@ QOAuth2AuthorizationCodeFlowPrivate::QOAuth2AuthorizationCodeFlowPrivate(
QNetworkAccessManager *manager) : QAbstractOAuth2Private(manager)
{}
void QOAuth2AuthorizationCodeFlowPrivate::handleCallback(const QVariantMap &data)
void QOAuth2AuthorizationCodeFlowPrivate::_q_handleCallback(const QVariantMap &data)
{
Q_Q(QOAuth2AuthorizationCodeFlow);
typedef QAbstractOAuth2Private::OAuth2KeyString Key;
......@@ -99,7 +99,7 @@ void QOAuth2AuthorizationCodeFlowPrivate::handleCallback(const QVariantMap &data
q->requestAccessToken(code);
}
void QOAuth2AuthorizationCodeFlowPrivate::accessTokenRequestFinished(QNetworkReply *reply)
void QOAuth2AuthorizationCodeFlowPrivate::_q_accessTokenRequestFinished(QNetworkReply *reply)
{
Q_Q(QOAuth2AuthorizationCodeFlow);
typedef QAbstractOAuth2Private::OAuth2KeyString Key;
......@@ -146,7 +146,7 @@ void QOAuth2AuthorizationCodeFlowPrivate::accessTokenRequestFinished(QNetworkRep
setStatus(QAbstractOAuth::Status::Granted);
}
void QOAuth2AuthorizationCodeFlowPrivate::authenticate(QNetworkReply *reply,
void QOAuth2AuthorizationCodeFlowPrivate::_q_authenticate(QNetworkReply *reply,
QAuthenticator *authenticator)
{
if (reply == currentReply){
......@@ -234,10 +234,7 @@ void QOAuth2AuthorizationCodeFlow::grant()
return;
}
const QUrl url = buildAuthenticateUrl();
QObjectPrivate::connect(this, &QOAuth2AuthorizationCodeFlow::authorizationCallbackReceived, d,
&QOAuth2AuthorizationCodeFlowPrivate::handleCallback);
Q_EMIT authorizationRequested(url);
resourceOwnerAuthorization(d->authorizationUrl);
}
void QOAuth2AuthorizationCodeFlow::refreshAccessToken()
......@@ -266,10 +263,10 @@ void QOAuth2AuthorizationCodeFlow::refreshAccessToken()
d->currentReply = d->networkAccessManager()->post(request, data.toUtf8());
QObjectPrivate::connect(d->networkAccessManager(), &QNetworkAccessManager::finished,
d, &QOAuth2AuthorizationCodeFlowPrivate::accessTokenRequestFinished);
d, &QOAuth2AuthorizationCodeFlowPrivate::_q_accessTokenRequestFinished);
QObjectPrivate::connect(d->networkAccessManager(),
&QNetworkAccessManager::authenticationRequired,
d, &QOAuth2AuthorizationCodeFlowPrivate::authenticate,
d, &QOAuth2AuthorizationCodeFlowPrivate::_q_authenticate,
Qt::UniqueConnection);
}
......@@ -294,9 +291,9 @@ QUrl QOAuth2AuthorizationCodeFlow::buildAuthenticateUrl(const QVariantMap &param
d->modifyParametersFunction(Stage::RequestingAuthorization, &p);
url.setQuery(d->createQuery(p));
connect(d->replyHandler.data(), &QAbstractOAuthReplyHandler::callbackReceived, this,
&QOAuth2AuthorizationCodeFlow::authorizationCallbackReceived);
&QOAuth2AuthorizationCodeFlow::authorizationCallbackReceived, Qt::UniqueConnection);
setStatus(QAbstractOAuth::Status::NotAuthenticated);
qDebug() << url;
qDebug("QOAuth2AuthorizationCodeFlow::buildAuthenticateUrl: %s", qPrintable(url.toString()));
return url;
}
......@@ -323,11 +320,23 @@ void QOAuth2AuthorizationCodeFlow::requestAccessToken(const QString &code)
const QString data = query.toString(QUrl::FullyEncoded);
d->currentReply = d->networkAccessManager()->post(request, data.toUtf8());
QObjectPrivate::connect(d->networkAccessManager(), &QNetworkAccessManager::finished,
d, &QOAuth2AuthorizationCodeFlowPrivate::accessTokenRequestFinished);
d, &QOAuth2AuthorizationCodeFlowPrivate::_q_accessTokenRequestFinished);
QObjectPrivate::connect(d->networkAccessManager(),
&QNetworkAccessManager::authenticationRequired,
d, &QOAuth2AuthorizationCodeFlowPrivate::authenticate,
d, &QOAuth2AuthorizationCodeFlowPrivate::_q_authenticate,
Qt::UniqueConnection);
}
void QOAuth2AuthorizationCodeFlow::resourceOwnerAuthorization(const QUrl &url,
const QVariantMap &parameters)
{
Q_D(QOAuth2AuthorizationCodeFlow);
Q_ASSERT(url == d->authorizationUrl);
const QUrl u = buildAuthenticateUrl(parameters);
QObjectPrivate::connect(this, &QOAuth2AuthorizationCodeFlow::authorizationCallbackReceived, d,
&QOAuth2AuthorizationCodeFlowPrivate::_q_handleCallback,
Qt::UniqueConnection);
Q_EMIT authorizeWithBrowser(u);
}
QT_END_NAMESPACE
......
......@@ -93,6 +93,8 @@ public Q_SLOTS:
protected:
QUrl buildAuthenticateUrl(const QVariantMap &parameters = QVariantMap());
void requestAccessToken(const QString &code);
virtual void resourceOwnerAuthorization(const QUrl &url,
const QVariantMap &parameters = QVariantMap()) override;
Q_SIGNALS:
void accessTokenUrlChanged(const QUrl &accessTokenUrl);
......
......@@ -90,7 +90,7 @@ void QOAuth2ImplicitGrantFlow::grant()
{
const QString state = QAbstractOAuth2Private::generateRandomState();
const QUrl url = authorizationRequestUrl(state);
Q_EMIT authorizationRequested(url);
Q_EMIT authorizeWithBrowser(url);
}
QUrl QOAuth2ImplicitGrantFlow::authorizationRequestUrl(const QString &state) const
......
......@@ -64,16 +64,16 @@ QOAuthHttpServerReplyHandlerPrivate::QOAuthHttpServerReplyHandlerPrivate(quint16
QOAuthHttpServerReplyHandlerPrivate::~QOAuthHttpServerReplyHandlerPrivate()
{}
void QOAuthHttpServerReplyHandlerPrivate::onClientConnected()
void QOAuthHttpServerReplyHandlerPrivate::_q_clientConnected()
{
QTcpSocket *socket = httpServer.nextPendingConnection();
QObject::connect(socket, &QTcpSocket::disconnected, socket, &QTcpSocket::deleteLater);
connect(socket, &QTcpSocket::readyRead,
this, &QOAuthHttpServerReplyHandlerPrivate::answerClient);
this, &QOAuthHttpServerReplyHandlerPrivate::_q_answerClient);
}
void QOAuthHttpServerReplyHandlerPrivate::answerClient()
void QOAuthHttpServerReplyHandlerPrivate::_q_answerClient()
{
Q_Q(QOAuthHttpServerReplyHandler);
QTcpSocket *socket = static_cast<QTcpSocket*>(currentSender->sender);
......@@ -108,7 +108,7 @@ QOAuthHttpServerReplyHandler::QOAuthHttpServerReplyHandler(QObject *parent)
{
Q_D(QOAuthHttpServerReplyHandler);
d->connect(&d->httpServer, &QTcpServer::newConnection,
d, &QOAuthHttpServerReplyHandlerPrivate::onClientConnected);
d, &QOAuthHttpServerReplyHandlerPrivate::_q_clientConnected);
}
QOAuthHttpServerReplyHandler::QOAuthHttpServerReplyHandler(quint16 port, QObject *parent)
......@@ -116,7 +116,7 @@ QOAuthHttpServerReplyHandler::QOAuthHttpServerReplyHandler(quint16 port, QObject
{
Q_D(QOAuthHttpServerReplyHandler);
d->connect(&d->httpServer, &QTcpServer::newConnection,
d, &QOAuthHttpServerReplyHandlerPrivate::onClientConnected);
d, &QOAuthHttpServerReplyHandlerPrivate::_q_clientConnected);
}
QOAuthHttpServerReplyHandler::~QOAuthHttpServerReplyHandler()
......
......@@ -124,8 +124,9 @@ ApplicationWindow {
scope: "https://www.googleapis.com/auth/calendar.readonly"
port: 1965
onAuthorizationRequested: {
onAuthorizeWithBrowser: {
webView.url = url;
console.log("Url: " + url);
webView.visible = true;
}
Component.onCompleted: grant();
......
......@@ -111,7 +111,7 @@ int main(int argc, char **argv)
parameters->insert("grant_type", "authorization_code");
}
});
QObject::connect(&o2, &QOAuth2AuthorizationCodeFlow::authorizationRequested,
QObject::connect(&o2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
&QDesktopServices::openUrl);
QNetworkReply *reply = nullptr;
......
......@@ -65,7 +65,7 @@ RedditWrapper::RedditWrapper(QObject *parent)
if (stage == QAbstractOAuth::Stage::RequestingAuthorization && isPermanent())
parameters->insert("duration", "permanent");
});
connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizationRequested,
connect(&oauth2, &QOAuth2AuthorizationCodeFlow::authorizeWithBrowser,
&QDesktopServices::openUrl);
}
......
......@@ -52,7 +52,7 @@ Twitter::Twitter(QObject *parent) :
setAuthorizationUrl(QUrl("https://api.twitter.com/oauth/authenticate"));
setTokenCredentialsUrl(QUrl("https://api.twitter.com/oauth/access_token"));
connect(this, &QAbstractOAuth::authorizationRequested, [&](QUrl url) {
connect(this, &QAbstractOAuth::authorizeWithBrowser, [&](QUrl url) {
QUrlQuery query(url);
query.addQueryItem("force_login", "true"); // Forces the user to enter their credentials to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment