diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2024-12-16 17:39:45 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2024-12-19 09:31:08 +0100 |
| commit | 90c7e3df75a901420f70389d16a6ebd53d6332be (patch) | |
| tree | 6f84cd00be41c07092eeac8ff291b56124542e83 /src/oauth/qoauth2authorizationcodeflow.cpp | |
| parent | b05d99c937f7ea9226314eaaae628cdfdda36bbe (diff) | |
Deprecate QOAuth2AuthorizationCodeFlow::accessTokenUrl property
... and schedule it for removal in Qt 7.
Update most of the unit-test to use the new property, leaving just some
of them with a conditional check, to make sure that the old API is
still tested.
[ChangeLog][QOAuth2AuthorizationCodeFlow] Deprecated accessTokenUrl
property and scheduled it for removal in Qt 7. Use
QAbstractOAuth2::tokenUrl instead.
Task-number: QTBUG-132106
Pick-to: 6.9
Change-Id: I0bbb32854380268f8b7226859911b6fc3bd9289e
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Diffstat (limited to 'src/oauth/qoauth2authorizationcodeflow.cpp')
| -rw-r--r-- | src/oauth/qoauth2authorizationcodeflow.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/oauth/qoauth2authorizationcodeflow.cpp b/src/oauth/qoauth2authorizationcodeflow.cpp index 2ea17fb..b75b1a1 100644 --- a/src/oauth/qoauth2authorizationcodeflow.cpp +++ b/src/oauth/qoauth2authorizationcodeflow.cpp @@ -44,8 +44,12 @@ using namespace Qt::StringLiterals; QOAuthHttpServerReplyHandler, and QOAuthUriSchemeReplyHandler. */ +#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13) /*! \property QOAuth2AuthorizationCodeFlow::accessTokenUrl + \deprecated [6.9] Use QAbstractOAuth2::tokenUrl instead. This property will + be removed in Qt 7.0. + \brief This property holds the URL used to convert the temporary code received during the authorization response. @@ -53,6 +57,7 @@ using namespace Qt::StringLiterals; \l {https://tools.ietf.org/html/rfc6749#section-4.1.3}{Access Token Request} */ +#endif QOAuth2AuthorizationCodeFlowPrivate::QOAuth2AuthorizationCodeFlowPrivate( const QUrl &authorizationUrl, const QUrl &accessTokenUrl, const QString &clientIdentifier, @@ -262,7 +267,11 @@ QOAuth2AuthorizationCodeFlow::QOAuth2AuthorizationCodeFlow(const QString &client QOAuth2AuthorizationCodeFlow::~QOAuth2AuthorizationCodeFlow() {} +#if QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13) /*! + \deprecated [6.13] Use QAbstractOAuth2::tokenUrl() instead. This method + will be removed in Qt 7.0. + Returns the URL used to request the access token. \sa setAccessTokenUrl() */ @@ -273,6 +282,9 @@ QUrl QOAuth2AuthorizationCodeFlow::accessTokenUrl() const } /*! + \deprecated [6.13] Use QAbstractOAuth2::setTokenUrl() instead. This method + will be removed in Qt 7.0. + Sets the URL used to request the access token to \a accessTokenUrl. */ @@ -283,8 +295,9 @@ void QOAuth2AuthorizationCodeFlow::setAccessTokenUrl(const QUrl &accessTokenUrl) return; setTokenUrl(accessTokenUrl); - Q_EMIT accessTokenUrlChanged(accessTokenUrl); + QT_IGNORE_DEPRECATIONS(Q_EMIT accessTokenUrlChanged(accessTokenUrl);) } +#endif // QT_REMOVAL_QT7_DEPRECATED_SINCE(6, 13) /*! \enum QOAuth2AuthorizationCodeFlow::PkceMethod |