From 1d5875c45b92f6683d25b902f55dab93ef5ceff1 Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa@highfidelity.io>
Date: Wed, 6 Dec 2017 17:40:39 -0800
Subject: [PATCH] removed key

---
 .../scripting/GooglePolyScriptingInterface.cpp    | 15 ++++++++++-----
 .../src/scripting/GooglePolyScriptingInterface.h  |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/interface/src/scripting/GooglePolyScriptingInterface.cpp b/interface/src/scripting/GooglePolyScriptingInterface.cpp
index 20e83fd14e..78cf6e1fc7 100644
--- a/interface/src/scripting/GooglePolyScriptingInterface.cpp
+++ b/interface/src/scripting/GooglePolyScriptingInterface.cpp
@@ -39,12 +39,11 @@ void GooglePolyScriptingInterface::setAPIKey(QString key) {
 }
 
 void GooglePolyScriptingInterface::getAssetList() {
-    authCode = "AIzaSyDamk7Vth52j7aU9JVKn3ungFS0kGJYc8A";
     //authCode = "broke";
     QUrl url(listPolyUrl + "key=" + authCode);
     QByteArray jsonString = getHTTPRequest(url);
     qCDebug(scriptengine) << "the list: " << jsonString;
-    QJsonObject json = makeJSONObject(&jsonString, true);
+    QJsonObject json = makeJSON(&jsonString, true).toJsonObject;
 
 }
 
@@ -60,7 +59,8 @@ QByteArray GooglePolyScriptingInterface::getHTTPRequest(QUrl url) {
     
 }
 
-QJsonObject GooglePolyScriptingInterface::makeJSONObject(QByteArray* response, bool isList) {
+// since the list is a QJsonArray and a single model is a QJsonObject
+QVariant GooglePolyScriptingInterface::makeJSON(QByteArray* response, bool isList) {
     //QString firstItem = QString::fromUtf8(response->readAll());
     QJsonDocument doc = QJsonDocument::fromJson(*response);
     qCDebug(scriptengine) << "json doc is empty: " << doc.isEmpty();
@@ -71,8 +71,13 @@ QJsonObject GooglePolyScriptingInterface::makeJSONObject(QByteArray* response, b
         qCDebug(scriptengine) << "Invalid API key";
         return obj;
     }
-    qCDebug(scriptengine) << "total size: " << obj.value("totalSize").toString();
-    qCDebug(scriptengine) << "in assets: " << obj.value("assets");
+    qCDebug(scriptengine) << "total size: " << obj.value("totalSize");
+    qCDebug(scriptengine) << "the assets: " << obj.value("assets");
+    QJsonArray arr = obj.value("assets").toArray();
+    qCDebug(scriptengine) << "in array: " << arr;
+    QJsonObject first = arr.takeAt(0).toObject();
+    qCDebug(scriptengine) << "first asset: " << first;
+    qCDebug(scriptengine) << "first asset description: " << first.value("description");
     return obj;
 }
 
diff --git a/interface/src/scripting/GooglePolyScriptingInterface.h b/interface/src/scripting/GooglePolyScriptingInterface.h
index 37b7395914..707eabc0af 100644
--- a/interface/src/scripting/GooglePolyScriptingInterface.h
+++ b/interface/src/scripting/GooglePolyScriptingInterface.h
@@ -29,7 +29,7 @@ public slots:
 
 private:
     QByteArray getHTTPRequest(QUrl url);
-    QJsonObject makeJSONObject(QByteArray* response, bool isList);
+    QVariant makeJSON(QByteArray* response, bool isList);
     //void onResult(QNetworkReply* reply);
 
     QString authCode;