From 5c2e2889993ce915ac333cc5dc09028facf48b11 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 28 Jul 2019 01:35:48 +0200 Subject: [PATCH] Add support for OAuth when setting up things --- libnymea-app-core/devicemanager.cpp | 11 ++++ libnymea-app-core/devicemanager.h | 1 + libnymea-app-core/jsonrpc/jsontypes.cpp | 2 + libnymea-common/types/deviceclass.h | 3 +- .../ui/thingconfiguration/SetupWizard.qml | 58 +++++++++++++++++-- 5 files changed, 70 insertions(+), 5 deletions(-) diff --git a/libnymea-app-core/devicemanager.cpp b/libnymea-app-core/devicemanager.cpp index 4c17657d..32e4e680 100644 --- a/libnymea-app-core/devicemanager.cpp +++ b/libnymea-app-core/devicemanager.cpp @@ -297,6 +297,7 @@ void DeviceManager::pairDeviceResponse(const QVariantMap ¶ms) void DeviceManager::confirmPairingResponse(const QVariantMap ¶ms) { + qDebug() << "ConfirmPairingResponse" << params; emit confirmPairingReply(params.value("params").toMap()); } @@ -362,6 +363,16 @@ void DeviceManager::pairDevice(const QUuid &deviceClassId, const QUuid &deviceDe m_jsonClient->sendCommand("Devices.PairDevice", params, this, "pairDeviceResponse"); } +void DeviceManager::pairDevice(const QUuid &deviceClassId, const QString &name, const QVariantList &deviceParams) +{ + qDebug() << "JsonRpc: pair device " << deviceClassId.toString(); + QVariantMap params; + params.insert("name", name); + params.insert("deviceClassId", deviceClassId.toString()); + params.insert("deviceParams", deviceParams); + m_jsonClient->sendCommand("Devices.PairDevice", params, this, "pairDeviceResponse"); +} + void DeviceManager::confirmPairing(const QUuid &pairingTransactionId, const QString &secret) { qDebug() << "JsonRpc: confirm pairing" << pairingTransactionId.toString(); diff --git a/libnymea-app-core/devicemanager.h b/libnymea-app-core/devicemanager.h index 57ae3777..a0029bf0 100644 --- a/libnymea-app-core/devicemanager.h +++ b/libnymea-app-core/devicemanager.h @@ -69,6 +69,7 @@ public: Q_INVOKABLE void addDevice(const QUuid &deviceClassId, const QString &name, const QVariantList &deviceParams); Q_INVOKABLE void addDiscoveredDevice(const QUuid &deviceClassId, const QUuid &deviceDescriptorId, const QString &name, const QVariantList &deviceParams); Q_INVOKABLE void pairDevice(const QUuid &deviceClassId, const QUuid &deviceDescriptorId, const QString &name); + Q_INVOKABLE void pairDevice(const QUuid &deviceClassId, const QString &name, const QVariantList &deviceParams); Q_INVOKABLE void confirmPairing(const QUuid &pairingTransactionId, const QString &secret = QString()); Q_INVOKABLE void removeDevice(const QUuid &deviceId, RemovePolicy policy = RemovePolicyNone); Q_INVOKABLE void editDevice(const QUuid &deviceId, const QString &name); diff --git a/libnymea-app-core/jsonrpc/jsontypes.cpp b/libnymea-app-core/jsonrpc/jsontypes.cpp index 2c4374a3..288e68e1 100644 --- a/libnymea-app-core/jsonrpc/jsontypes.cpp +++ b/libnymea-app-core/jsonrpc/jsontypes.cpp @@ -492,6 +492,8 @@ DeviceClass::SetupMethod JsonTypes::stringToSetupMethod(const QString &setupMeth return DeviceClass::SetupMethodEnterPin; } else if (setupMethodString == "SetupMethodPushButton") { return DeviceClass::SetupMethodPushButton; + } else if (setupMethodString == "SetupMethodOAuth") { + return DeviceClass::SetupMethodOAuth; } return DeviceClass::SetupMethodJustAdd; } diff --git a/libnymea-common/types/deviceclass.h b/libnymea-common/types/deviceclass.h index 686e613e..0041bdca 100644 --- a/libnymea-common/types/deviceclass.h +++ b/libnymea-common/types/deviceclass.h @@ -61,7 +61,8 @@ public: SetupMethodJustAdd, SetupMethodDisplayPin, SetupMethodEnterPin, - SetupMethodPushButton + SetupMethodPushButton, + SetupMethodOAuth, }; Q_ENUM(SetupMethod) diff --git a/nymea-app/ui/thingconfiguration/SetupWizard.qml b/nymea-app/ui/thingconfiguration/SetupWizard.qml index 1fd99780..4b9d3334 100644 --- a/nymea-app/ui/thingconfiguration/SetupWizard.qml +++ b/nymea-app/ui/thingconfiguration/SetupWizard.qml @@ -3,6 +3,8 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import Nymea 1.0 +import QtWebView 1.1 + import "../components" import "../delegates" @@ -60,18 +62,29 @@ Page { target: engine.deviceManager onPairDeviceReply: { busyOverlay.shown = false + if (params["deviceError"] !== "DeviceErrorNoError") { + busyOverlay.shown = false; + internalPageStack.push(resultsPage, {success: false}) + return; + + } + + d.pairingTransactionId = params["pairingTransactionId"]; + switch (params["setupMethod"]) { case "SetupMethodPushButton": - d.pairingTransactionId = params["pairingTransactionId"]; print("response", params["displayMessage"], d.pairingTransactionId) internalPageStack.push(pairingPageComponent, {text: params["displayMessage"]}) break; case "SetupMethodDisplayPin": - d.pairingTransactionId = params["pairingTransactionId"]; internalPageStack.push(pairingPageComponent, {text: params["displayMessage"], setupMethod: params["setupMethod"]}) break; + case "SetupMethodOAuth": + print("OAuth URL:", params["oAuthUrl"]); + internalPageStack.push(oAuthPageComponent, {oAuthUrl: params["oAuthUrl"]}) + break; default: - print("Setup method", params["setupMethod"], "not handled"); + print("Setup method reply not handled:", JSON.stringify(params)); } } onConfirmPairingReply: { @@ -364,7 +377,23 @@ Page { case 1: case 2: case 3: - engine.deviceManager.pairDevice(root.deviceClass.id, d.deviceDescriptor.id, nameTextField.text); + case 4: + if (root.device) { +// if (d.deviceDescriptor) { +// engine.deviceManager.pairDevice(root.deviceClass.id, d.deviceDescriptor.id, nameTextField.text); +// } else { +// engine.deviceManager.pairDevice(root.deviceClass.id, nameTextField.text, params); +// } + console.warn("Unhandle setupMethod!") + return; + } else { + if (d.deviceDescriptor) { + engine.deviceManager.pairDevice(root.deviceClass.id, d.deviceDescriptor.id, nameTextField.text); + } else { + engine.deviceManager.pairDevice(root.deviceClass.id, nameTextField.text, params); + } + } + break; } @@ -422,6 +451,27 @@ Page { } } + Component { + id: oAuthPageComponent + Page { + id: oAuthPage + property alias oAuthUrl: oAuthWebView.url + + WebView { + id: oAuthWebView + anchors.fill: parent + + onUrlChanged: { + print("OAUTH URL changed", url) + if (url.toString().indexOf("https://127.0.0.1") == 0) { + print("Redirect URL detected!"); + engine.deviceManager.confirmPairing(d.pairingTransactionId, url) + } + } + } + } + } + Component { id: resultsPage