aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShyamnath Premnadh <Shyamnath.Premnadh@qt.io>2022-02-11 14:12:20 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-22 15:19:24 +0000
commit000f4514df762a782e3dd6ce8044bef76e13221f (patch)
treeecc8ddc1b5f7b05783b397dc9bf7f18018a3d3f0
parent05d5940832163d8768f6999c8ebef3039f517a4c (diff)
QAbstractOAuth - add setModifyParametersFunction
- create bindigns for setModifyParametersFunction - reddit example modified to include setModifyParametersFunction() Task-number: PYSIDE-1815 Change-Id: If3573df070483f22cc46d9f95f688299e9ece420 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 535a781d534f4c9d102342a9813528e48c576ffd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--examples/networkauth/redditclient/redditwrapper.py23
-rw-r--r--sources/pyside6/PySide6/QtNetworkAuth/typesystem_networkauth.xml3
-rw-r--r--sources/pyside6/PySide6/glue/qtnetworkauth.cpp71
3 files changed, 94 insertions, 3 deletions
diff --git a/examples/networkauth/redditclient/redditwrapper.py b/examples/networkauth/redditclient/redditwrapper.py
index e069fdeb0..19dddf654 100644
--- a/examples/networkauth/redditclient/redditwrapper.py
+++ b/examples/networkauth/redditclient/redditwrapper.py
@@ -56,7 +56,6 @@ NEW_URL = "https://oauth.reddit.com/new"
HOT_URL = "https://oauth.reddit.com/hot"
LIVE_THREADS_URL = "https://oauth.reddit.com/live/XXXX/about.json"
-
class RedditWrapper(QObject):
authenticated = Signal()
@@ -66,14 +65,24 @@ class RedditWrapper(QObject):
super().__init__(parent)
self._oauth2 = QOAuth2AuthorizationCodeFlow()
- self._oauth2.statusChanged.connect(self.status_changed)
- self._oauth2.authorizeWithBrowser.connect(QDesktopServices.openUrl)
self._oauth2.setClientIdentifier(clientIdentifier)
self._reply_handler = QOAuthHttpServerReplyHandler(1337, self)
self._oauth2.setReplyHandler(self._reply_handler)
self._oauth2.setAuthorizationUrl(QUrl(AUTHORIZATION_URL))
self._oauth2.setAccessTokenUrl(QUrl(ACCESSTOKEN_URL))
self._oauth2.setScope("identity read")
+ self._permanent = True
+
+ # connect to slots
+ self._oauth2.statusChanged.connect(self.status_changed)
+ self._oauth2.authorizeWithBrowser.connect(QDesktopServices.openUrl)
+
+ def modify_parameters_function(stage, parameters):
+ if stage == QAbstractOAuth.Stage.RequestingAuthorization and self.permanent:
+ parameters["duration"] = "permanent"
+ return parameters
+
+ self._oauth2.setModifyParametersFunction(modify_parameters_function)
@Slot()
def status_changed(self, status):
@@ -84,6 +93,14 @@ class RedditWrapper(QObject):
print("Getting hot threads...")
return self._oauth2.get(QUrl(HOT_URL))
+ @property
+ def permanent(self):
+ return self._permanent
+
+ @permanent.setter
+ def permanent(self, value: bool):
+ self._permanent = value
+
def grant(self):
self._oauth2.grant()
diff --git a/sources/pyside6/PySide6/QtNetworkAuth/typesystem_networkauth.xml b/sources/pyside6/PySide6/QtNetworkAuth/typesystem_networkauth.xml
index 37d0a6573..122fe8821 100644
--- a/sources/pyside6/PySide6/QtNetworkAuth/typesystem_networkauth.xml
+++ b/sources/pyside6/PySide6/QtNetworkAuth/typesystem_networkauth.xml
@@ -52,6 +52,9 @@
<define-ownership class="target" owner="c++"/>
</modify-argument>
</modify-function>
+ <add-function signature="setModifyParametersFunction(PyObject* @modifyParametersFunction@)">
+ <inject-code class="target" position="beginning" file="../glue/qtnetworkauth.cpp" snippet="qabstractoauth-setmodifyparametersfunction"/>
+ </add-function>
</object-type>
<object-type name="QAbstractOAuth2">
<modify-function signature="head(const QUrl&amp;,const QMap&lt;QString,QVariant&gt;&amp;)">
diff --git a/sources/pyside6/PySide6/glue/qtnetworkauth.cpp b/sources/pyside6/PySide6/glue/qtnetworkauth.cpp
new file mode 100644
index 000000000..e00b7e064
--- /dev/null
+++ b/sources/pyside6/PySide6/glue/qtnetworkauth.cpp
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt for Python.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+// @snippet qabstractoauth-setmodifyparametersfunction
+auto callable = %PYARG_1;
+auto callback = [callable](QAbstractOAuth::Stage stage, QMultiMap<QString, QVariant>* dictPointer) -> void
+{
+ if (!PyCallable_Check(callable)) {
+ qWarning("Argument 1 of %FUNCTION_NAME must be a callable.");
+ return;
+ }
+ Shiboken::GilState state;
+ QMultiMap<QString, QVariant> dict = *dictPointer;
+ Shiboken::AutoDecRef arglist(PyTuple_New(2));
+ PyTuple_SET_ITEM(arglist, 0, %CONVERTTOPYTHON[QAbstractOAuth::Stage](stage));
+ PyTuple_SET_ITEM(arglist, 1, %CONVERTTOPYTHON[QMultiMap<QString, QVariant>](dict));
+ Shiboken::AutoDecRef ret(PyObject_CallObject(callable, arglist));
+
+ PyObject *key;
+ PyObject *value;
+ Py_ssize_t pos = 0;
+ while (PyDict_Next(ret, &pos, &key, &value)) {
+ QString cppKey = %CONVERTTOCPP[QString](key);
+ QVariant cppValue = %CONVERTTOCPP[QVariant](value);
+ dictPointer->replace(cppKey, cppValue);
+ }
+
+ Py_DECREF(callable);
+ return;
+
+};
+Py_INCREF(callable);
+%CPPSELF.%FUNCTION_NAME(callback);
+// @snippet qabstractoauth-setmodifyparametersfunction
+