Merge lp:~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Retry authentication on network errors

If the authentication fails because of a network error, show an error screen
and let the user retry the authentication from within the plugin.

This requires the BrowserRequest to emit the proper error code, and not cancel
the tiemout failure timer if the current page URL is visited again.

Retry authentication on network errors

If the authentication fails because of a network error, show an error screen
and let the user retry the authentication from within the plugin.

This requires the BrowserRequest to emit the proper error code, and not cancel
the tiemout failure timer if the current page URL is visited again.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:298
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/256/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/764/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/764/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/256/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975]

299. By Alberto Mardegan on 2015-10-01

Expect an error code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:299
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/257/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/773/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/45/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/773/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/257/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975]

300. By Alberto Mardegan on 2015-10-09

Don't stop fail timer on URL change, just restart it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:300
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/258/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/822/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/258/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975]

301. By Alberto Mardegan on 2015-10-09

fix build

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:301
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/259/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/823/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/823/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/259/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975]

302. By Alberto Mardegan on 2015-10-09

Layout adjustments

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/260/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/826/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/826/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/260/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975]

303. By Alberto Mardegan on 2015-10-29

Merge trunk

[ Alberto Mardegan ]
* Regenerate hooks whenever file time changes (LP: #1510640)
[ CI Train Bot ]
* Resync trunk. added: po/hi.po
[ Alberto Mardegan ]
* Simplify hooks, load v2api library added: click-hooks/accounts.cpp
  click-hooks/accounts.hook.in click-hooks/acl-updater.cpp click-
  hooks/acl-updater.h click-hooks/click-hooks.pro click-hooks/online-
  accounts-hooks2.pro online-accounts-
  service/com.ubuntu.OnlineAccounts.Manager.service.in tests/click-
  hooks/click-hooks.pro tests/click-hooks/fake_signond.h tests/click-
  hooks/signond.py tests/click-hooks/tst_online_accounts_hooks2.cpp
  tests/click-hooks/tst_online_accounts_hooks2.pro renamed: click-
  hooks/click-hooks.pro => click-hooks/online-accounts-hooks.pro
  tests/click-hooks/click-hooks.pro => tests/click-
  hooks/tst_online_accounts_hooks.pro
[ CI Train Bot ]
* Resync trunk. added: po/mr.po po/th.po

304. By Alberto Mardegan on 2015-11-02

merge trunk

[ Alberto Mardegan ]
* Use version 1.3 of Ubuntu.Components (LP: #1508363, #1511055)
[ CI Train Bot ]
* Resync trunk.

=== modified file 'debian/control'
--- debian/control	2015-10-30 15:41:20 +0000
+++ debian/control	2015-11-02 07:28:58 +0000
@@ -21,7 +21,7 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
-               signon-plugins-dev,
+               signon-plugins-dev (>= 8.58),
                dbus-test-runner,
                xmldiff,
                xvfb,
@@ -42,7 +42,7 @@
          libonline-accounts-daemon1,
          liboxideqt-qmlplugin (>= 1.2.0),
          qml-module-ubuntu-onlineaccounts2,
-         qtdeclarative5-accounts-plugin (>= 0.3),
+         qtdeclarative5-accounts-plugin (>= 0.6),
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          signon-ui-service,
          ubuntu-system-settings

=== modified file 'online-accounts-ui/browser-request.cpp'
--- online-accounts-ui/browser-request.cpp	2015-04-03 11:37:41 +0000
+++ online-accounts-ui/browser-request.cpp	2015-11-02 07:28:58 +0000
@@ -36,6 +36,7 @@
 #include <QStandardPaths>
 #include <QTimer>
 #include <QVariant>
+#include <SignOn/uisessiondata.h>
 #include <SignOn/uisessiondata_priv.h>
 
 using namespace SignOnUi;
@@ -179,8 +180,11 @@
 void BrowserRequestPrivate::setCurrentUrl(const QUrl &url)
 {
     DEBUG() << "Url changed:" << url;
-    m_failTimer.stop();
+    if (m_failTimer.isActive()) {
+        m_failTimer.start();
+    }
 
+    m_currentUrl = url;
     if (url.host() == m_finalUrl.host() &&
         url.path() == m_finalUrl.path()) {
         m_responseUrl = url;
@@ -258,7 +262,9 @@
 
     DEBUG() << "Page loading failed";
     closeView();
-    q->setResult(QVariantMap());
+    QVariantMap result;
+    result[SSOUI_KEY_ERROR] = SignOn::QUERY_ERROR_NETWORK;
+    q->setResult(result);
 }
 
 void BrowserRequestPrivate::onFinished()

=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
--- online-accounts-ui/qml/ProviderRequest.qml	2015-10-29 13:44:51 +0000
+++ online-accounts-ui/qml/ProviderRequest.qml	2015-11-02 07:28:58 +0000
@@ -145,8 +145,6 @@
         Item {
             ActivityIndicator {
                 anchors.centerIn: parent
-                width: units.gu(5)
-                height: width
                 running: true
             }
         }

=== added file 'plugins/module/ErrorItem.qml'
--- plugins/module/ErrorItem.qml	1970-01-01 00:00:00 +0000
+++ plugins/module/ErrorItem.qml	2015-11-02 07:28:58 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd.
+ *
+ * Contact: Alberto Mardegan <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Item {
+    id: root
+
+    signal retryRequested()
+
+    Column {
+        anchors {
+            verticalCenter: parent.verticalCenter
+            left: parent.left; right: parent.right
+        }
+        spacing: units.gu(2)
+
+        Label {
+            anchors { left: parent.left; right: parent.right }
+            text: i18n.dtr("ubuntu-system-settings-online-accounts", "This service is not available right now. Try again later.")
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+        }
+
+        Button {
+            anchors.horizontalCenter: parent.horizontalCenter
+            text: i18n.dtr("ubuntu-system-settings-online-accounts", "Try Again")
+            onClicked: root.retryRequested()
+        }
+    }
+}

=== modified file 'plugins/module/OAuth.qml'
--- plugins/module/OAuth.qml	2015-10-22 08:33:20 +0000
+++ plugins/module/OAuth.qml	2015-11-02 07:28:58 +0000
@@ -95,7 +95,7 @@
     }
 
     ListItem.Base {
-        visible: loading
+        visible: loading && !errorItem.visible
         height: units.gu(7)
         showDivider: false
         anchors.top: parent.top
@@ -136,6 +136,16 @@
         visible: !loading
     }
 
+    ErrorItem {
+        id: errorItem
+        anchors { fill: parent; margins: units.gu(4) }
+        visible: false
+        onRetryRequested: {
+            root.credentialsStored()
+            visible = false
+        }
+    }
+
     KeyboardRectangle {
         id: osk
     }
@@ -217,7 +227,15 @@
 
     onAuthenticated: completeCreation(reply)
 
-    onAuthenticationError: root.cancel()
+    onAuthenticationError: {
+        console.log("Authentication error, code " + error.code)
+        if (error.code == AccountService.NetworkError) {
+            console.log("Network error")
+            errorItem.visible = true
+            return
+        }
+        root.cancel()
+    }
 
     onFinished: loading = false
 }

=== modified file 'plugins/module/WebView.qml'
--- plugins/module/WebView.qml	2015-10-22 08:28:26 +0000
+++ plugins/module/WebView.qml	2015-11-02 07:28:58 +0000
@@ -14,7 +14,7 @@
 
     onLoadingChanged: {
         console.log("Loading changed")
-        if (loading) {
+        if (loading && !lastLoadFailed) {
             signonRequest.onLoadStarted()
         } else if (lastLoadSucceeded) {
             signonRequest.onLoadFinished(true)

=== modified file 'plugins/module/module.pro'
--- plugins/module/module.pro	2014-10-03 14:56:11 +0000
+++ plugins/module/module.pro	2015-11-02 07:28:58 +0000
@@ -34,6 +34,7 @@
 LIBS += -lonline-accounts-plugin
 
 QML_SOURCES = \
+    ErrorItem.qml \
     KeyboardRectangle.qml \
     OAuthMain.qml \
     OAuth.qml \

=== modified file 'tests/online-accounts-ui/tst_browser_request.cpp'
--- tests/online-accounts-ui/tst_browser_request.cpp	2015-01-09 10:12:03 +0000
+++ tests/online-accounts-ui/tst_browser_request.cpp	2015-11-02 07:28:58 +0000
@@ -259,7 +259,7 @@
 
     QCOMPARE(setResultCalled.count(), 1);
     QVariantMap results = setResultCalled.at(0).at(0).toMap();
-    QVERIFY(results.isEmpty());
+    QVERIFY(results.contains(SSOUI_KEY_ERROR));
 }
 
 void BrowserRequestTest::testCancelWithHandler()