Add string parsing to exception error code, remove leading groups from createGroup response.

It is not clear from the documentation that the error code is a string, so both string and integer are accepted now.

Add string parsing to exception error code, remove leading groups from createGroup response.
It is not clear from the documentation that the error code is a string, so both string and integer are accepted now.
Jojo-1000 · Moritz Wirger
1 parent b9111ceb
Showing 2 changed files with 23 additions and 4 deletions
src/Hue.cpp
src/HueException.cpp
@@ -197,10 +197,11 @@ std::string Hue::requestUsername()
             }
             else if (answer.size() > 0 && answer[0].count("error"))
             {
+                HueAPIResponseException exception = HueAPIResponseException::Create(CURRENT_FILE_INFO, answer[0]);
                 // All errors except 101: Link button not pressed
-                if (utils::safeGetMember(answer, 0, "error", "type") != 101)
+                if (exception.GetErrorNumber() != 101)
                 {
-                    throw HueAPIResponseException::Create(CURRENT_FILE_INFO, answer[0]);
+                    throw exception;
                 }
             }
@@ -353,7 +354,14 @@ int Hue::createGroup(const CreateGroup&amp; params)
     nlohmann::json id = utils::safeGetMember(response, 0, "success", "id");
     if (id.is_string())
     {
-        return std::stoi(id.get<std::string>());
+        std::string idStr = id.get<std::string>();
+        // Sometimes the response can be /groups/<id>?
+        if (idStr.find("/groups/") == 0)
+        {
+            idStr.erase(0, 8);
+        }
+        stateCache.refresh();
+        return std::stoi(idStr);
     }
     return 0;
 }
@@ -74,7 +74,18 @@ const std::string&amp; HueAPIResponseException::GetDescription() const noexcept
 HueAPIResponseException HueAPIResponseException::Create(FileInfo fileInfo, const nlohmann::json& response)
 {
     const nlohmann::json error = response.at("error");
-    int errorCode = error.value("type", -1);
+    int errorCode = -1;
+    if (error.count("type"))
+    {
+        if (error["type"].is_number_integer())
+        {
+            errorCode = error["type"].get<int>();
+        }
+        else if (error["type"].is_string())
+        {
+            errorCode = std::stoi(error["type"].get<std::string>());
+        }
+    }
     std::string address = error.value("address", "");
     std::string description = error.value("description", "");
     return HueAPIResponseException(std::move(fileInfo), errorCode, std::move(address), std::move(description));