From a89e442835c38f916dc79a74eea3b976dea36991 Mon Sep 17 00:00:00 2001
From: Boernsman <bernhard.trinnes@nymea.io>
Date: Wed, 21 Oct 2020 16:34:27 +0200
Subject: [PATCH] switched aqi to api key provider

---
 aqi/integrationpluginaqi.cpp  | 54 ++++-------------------------------
 aqi/integrationpluginaqi.h    |  2 --
 aqi/integrationpluginaqi.json |  2 +-
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/aqi/integrationpluginaqi.cpp b/aqi/integrationpluginaqi.cpp
index f6a21a77..88414e90 100644
--- a/aqi/integrationpluginaqi.cpp
+++ b/aqi/integrationpluginaqi.cpp
@@ -38,50 +38,13 @@ IntegrationPluginAqi::IntegrationPluginAqi()
 
 }
 
-void IntegrationPluginAqi::startPairing(ThingPairingInfo *info)
-{
-    NetworkAccessManager *network = hardwareManager()->networkManager();
-    QNetworkReply *reply = network->get(QNetworkRequest(QUrl("https://api.waqi.info")));
-    connect(reply, &QNetworkReply::finished, this, [reply, info] {
-        reply->deleteLater();
-
-        if (reply->error() == QNetworkReply::NetworkError::HostNotFoundError) {
-            info->finish(Thing::ThingErrorHardwareNotAvailable, QT_TR_NOOP("Air quality index server is not reachable."));
-        } else {
-            info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("Please enter your API token for Air Quality Index"));
-        }
-    });
-}
-
-void IntegrationPluginAqi::confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret)
-{
-    Q_UNUSED(username)
-
-    QNetworkRequest request(QUrl("https://api.waqi.info/feed/here/?token="+secret));
-    QNetworkReply *reply = hardwareManager()->networkManager()->get(request);
-    connect(reply, &QNetworkReply::finished, info, [this, reply, info, secret](){
-        reply->deleteLater();
-
-        int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-
-        // check HTTP status code
-        if (status != 200) {
-            //: Error setting up device with invalid token
-            info->finish(Thing::ThingErrorAuthenticationFailure, QT_TR_NOOP("This token is not valid."));
-            return;
-        }
-
-        pluginStorage()->beginGroup(info->thingId().toString());
-        pluginStorage()->setValue("apiKey", secret);
-        pluginStorage()->endGroup();
-        info->finish(Thing::ThingErrorNoError);
-    });
-}
-
 void IntegrationPluginAqi::discoverThings(ThingDiscoveryInfo *info)
 {
     if (!m_aqiConnection) {
-        QString apiKey = "74d31bb5ad9bcdeaed48097418b55188cb56d450"; //temporary key for discovery
+        QString apiKey = apiKeyStorage()->requestKey("aqi").data("apiKey");
+        if (apiKey.isEmpty()) {
+            return info->finish(Thing::ThingErrorHardwareNotAvailable, tr("No API key is set."));
+        }
         m_aqiConnection = new AirQualityIndex(hardwareManager()->networkManager(), apiKey, this);
         connect(m_aqiConnection, &AirQualityIndex::requestExecuted, this, &IntegrationPluginAqi::onRequestExecuted);
         connect(m_aqiConnection, &AirQualityIndex::dataReceived, this, &IntegrationPluginAqi::onAirQualityDataReceived);
@@ -105,9 +68,7 @@ void IntegrationPluginAqi::setupThing(ThingSetupInfo *info)
 {
     if (info->thing()->thingClassId() == airQualityIndexThingClassId) {
         if (!m_aqiConnection) {
-            pluginStorage()->beginGroup(info->thing()->id().toString());
-            QString apiKey = pluginStorage()->value("apiKey").toString();
-            pluginStorage()->endGroup();
+            QString apiKey = apiKeyStorage()->requestKey("aqi").data("apiKey");
             m_aqiConnection = new AirQualityIndex(hardwareManager()->networkManager(), apiKey, this);
             connect(m_aqiConnection, &AirQualityIndex::requestExecuted, this, &IntegrationPluginAqi::onRequestExecuted);
             connect(m_aqiConnection, &AirQualityIndex::dataReceived, this, &IntegrationPluginAqi::onAirQualityDataReceived);
@@ -128,11 +89,6 @@ void IntegrationPluginAqi::setupThing(ThingSetupInfo *info)
         } else {
             // An AQI connection might be setup because of an discovery request
             // or because there is already another thing using the connection
-            // In any case the API key is being updated to avoid using the discovery key.
-            pluginStorage()->beginGroup(info->thing()->id().toString());
-            QString apiKey = pluginStorage()->value("apiKey").toString();
-            pluginStorage()->endGroup();
-            m_aqiConnection->setApiKey(apiKey);
             info->finish(Thing::ThingErrorNoError);
         }
     } else {
diff --git a/aqi/integrationpluginaqi.h b/aqi/integrationpluginaqi.h
index 14808bfd..16799917 100644
--- a/aqi/integrationpluginaqi.h
+++ b/aqi/integrationpluginaqi.h
@@ -50,8 +50,6 @@ class IntegrationPluginAqi : public IntegrationPlugin
 public:
     explicit IntegrationPluginAqi();
 
-    void startPairing(ThingPairingInfo *info) override;
-    void confirmPairing(ThingPairingInfo *info, const QString &username, const QString &secret) override;
     void discoverThings(ThingDiscoveryInfo *info) override;
     void setupThing(ThingSetupInfo *info) override;
     void thingRemoved(Thing *thing) override;
diff --git a/aqi/integrationpluginaqi.json b/aqi/integrationpluginaqi.json
index 85d2c9e9..43ffc42c 100644
--- a/aqi/integrationpluginaqi.json
+++ b/aqi/integrationpluginaqi.json
@@ -2,6 +2,7 @@
     "name": "AirQualityIndex",
     "displayName": "AirQualityIndex",
     "id": "57d69b76-4d2d-41ec-bef6-949a79ffbe6b",
+    "apiKeys": ["aqi"],
     "vendors": [
         {
             "name": "airQualityIndex",
@@ -14,7 +15,6 @@
                     "displayName": "Air quality index",
                     "interfaces": ["windspeedsensor", "humiditysensor", "pressuresensor", "temperaturesensor", "connectable"],
                     "createMethods": ["discovery", "user"],
-                    "setupMethod": "displaypin",
                     "paramTypes": [
                     {
                         "id": "afd5803b-6c98-44d7-9f4a-45e91cfb062e",