Merge lp:~mikemc/ubuntuone-credentials/improve-warnings into lp:ubuntuone-credentials

[Mike McCracken]

- Improve logged warnings about token creation errors and JSON parsing (LP: #1241250, LP: #1241259)

- Improve logged warnings about token creation errors and JSON parsing (LP: #1241250, LP: #1241259)

Difficult to test without a broken test server to send broken replies.
Should be clear what's going on, though.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:75
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/59/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/58

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/59/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'libubuntuoneauth/identityprovider.cpp'
--- libubuntuoneauth/identityprovider.cpp	2013-07-02 18:44:51 +0000
+++ libubuntuoneauth/identityprovider.cpp	2013-10-18 17:23:26 +0000
@@ -87,8 +87,8 @@
 
     }else{
 
-        qWarning("Error occurred creating token: %d (%s)",
-                 error.code(), error.message().toUtf8().data());
+        qCritical("Error occurred creating token: %d (%s)",
+                  error.code(), error.message().toUtf8().data());
 
         emit ErrorOccurred(error);
     }

=== modified file 'libubuntuoneauth/network.cpp'
--- libubuntuoneauth/network.cpp	2013-10-03 22:48:26 +0000
+++ libubuntuoneauth/network.cpp	2013-10-18 17:23:26 +0000
@@ -69,16 +69,24 @@
         return;
     }
  
-    QJsonDocument document = QJsonDocument::fromJson(payload);
-
-    if (document.isEmpty()) {
-        QString errmsg = QString("Network::OnReply received empty document");
+    QJsonParseError jsonParseError;
+    QJsonDocument document = QJsonDocument::fromJson(payload, &jsonParseError);
+
+    if(jsonParseError.error != QJsonParseError::NoError){
+        QString errmsg = QString ("Network::OnReply: error parsing JSON reply: ");
+        errmsg += jsonParseError.errorString();
+        emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
+        return;
+    }
+
+    if (document.isEmpty() || document.isNull()) {
+        QString errmsg = QString("Network::OnReply: received empty or Null document");
         emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
         return;
     }
 
     if (!document.isObject()) {
-        QString errmsg = QString("Network::OnReply received invalid QJsonDocument");
+        QString errmsg = QString("Network::OnReply: received JSON document that isn't an object.");
         emit ErrorOccurred(ErrorResponse(0, NO_HTTP_REASON, LOGIN_FAILED, errmsg));
         return;
     }