Merge lp:~diegosarmentero/pay-ui/pay-errors into lp:pay-ui

[Diego Sarmentero]

- Showing errors and give the user the chance to recover from them.
- Improve logging

Not quit on any error, but instead show a message to the user, and let the user decide the action to follow.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:6
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/19/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Please commit this branch with --fixes lp:1333394

Why are there no unit tests for the qml bits?

review: Needs Fixing

[lp:~diegosarmentero/pay-ui/pay-errors]

7. By Diego Sarmentero on 2014-07-03

linking bug

[Diego Sarmentero (diegosarmentero)]

> Please commit this branch with --fixes lp:1333394

Done

>
> Why are there no unit tests for the qml bits?

As I mentioned yesterday, we can't do qml tests YET, because we need to load the Purchase plugin, and there is a bug with autopilot which I already mentioned to elopio and he confirmed it that for some reason is breaking autopilot on loading those qml plugins.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:7
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/20/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

On Thu, Jul 3, 2014 at 8:29 AM, Diego Sarmentero
<email address hidden> wrote:
>> Please commit this branch with --fixes lp:1333394
>
> Done
>
>>
>> Why are there no unit tests for the qml bits?
>
> As I mentioned yesterday, we can't do qml tests YET, because we need to load the Purchase plugin, and there is a bug with autopilot which I already mentioned to elopio and he confirmed it that for some reason is breaking autopilot on loading those qml plugins.

Please link here the autopilot bug, and please open a new bug for the
missing tests in pay-ui.

[Diego Sarmentero (diegosarmentero)]

> Please commit this branch with --fixes lp:1333394
>
> Why are there no unit tests for the qml bits?

Bug created for this: https://bugs.launchpad.net/pay-ui/+bug/1337311

[dobey (dobey)]

review: Approve

[Alejandro J. Cura (alecu)]

Code looks good, and tested on mako, seems to be working ok.

review: Approve

=== modified file 'app/payui.qml'
--- app/payui.qml	2014-06-25 20:58:29 +0000
+++ app/payui.qml	2014-07-03 11:28:29 +0000
@@ -6,9 +6,12 @@
 import "ui"
 
 /*!
-    \brief MainView with Tabs element.
-           First Tab has a single Label and
-           second Tab has a single ToolbarAction.
+    states:
+        - add-payment
+        - direct
+        - buy-interaction
+        - checkout
+        - no-credentials
 */
 
 MainView {
@@ -32,6 +35,8 @@
 
     property bool loading: true
     property bool purchasing: false
+    property string errorTitle: ""
+    property string errorMessage: ""
 
 
     AccountServiceModel {
@@ -55,8 +60,10 @@
             if (payments.length == 0) {
                 webkit.title = i18n.tr("Add Payment");
                 webkit.url = purchase.getAddPaymentUrl();
+                mainView.state = "add-payment";
                 pageStack.push(webkit);
             } else {
+                mainView.state = "direct";
                 pageStack.push(direct);
             }
             hideLoading();
@@ -65,26 +72,37 @@
         onBuyItemFailed: {
             mainView.purchasing = false;
             hideLoading();
-            purchase.quitCancel();
+            var title = i18n.tr("Purchase failed");
+            var message = i18n.tr("The purchase couldn't be completed.");
+            mainView.showErrorDialog(title, message);
         }
 
         onBuyItemSucceeded: {
-            Qt.quit();
+            purchase.quitSuccess();
         }
 
         onBuyInterationRequired: {
             mainView.purchasing = false;
             webkit.title = "";
             webkit.url = url;
+            mainView.state = "buy-interaction";
             pageStack.push(webkit);
         }
 
         onError: {
-            purchase.quitCancel();
-            hideLoading();
+            hideLoading();
+            var title = i18n.tr("Error contacting the server");
+            var message = i18n.tr("Do you want to try again?");
+            mainView.showErrorDialog(title, message);
+        }
+
+        onAuthenticationError: {
+            hideLoading();
+            pageStack.currentPage.showWrongPassword();
         }
 
         onCredentialsNotFound: {
+            mainView.state = "no-credentials";
             pageStack.push(noCredentials);
             hideLoading();
         }
@@ -99,6 +117,12 @@
         mainView.loading = false;
     }
 
+    function showErrorDialog(title, message) {
+        mainView.errorTitle = title;
+        mainView.errorMessage = message;
+        PopupUtils.open(errorDialogContainer);
+    }
+
     Component {
          id: loadingDialogContainer
          Dialog {
@@ -127,6 +151,33 @@
          }
     }
 
+    Component {
+         id: errorDialogContainer
+         Dialog {
+             id: errorDialog
+             title: mainView.errorTitle
+             text: mainView.errorMessage
+
+             Button {
+                 text: i18n.tr("Retry")
+                 color: UbuntuColors.orange
+                 onClicked: {
+                     showLoading();
+                     purchase.checkCredentials();
+                     PopupUtils.close(errorDialog);
+                 }
+             }
+             Button {
+                 text: i18n.tr("Exit")
+                 color: UbuntuColors.coolGrey
+                 onClicked: {
+                     PopupUtils.close(errorDialog);
+                     purchase.quitCancel();
+                 }
+             }
+         }
+    }
+
     PageStack {
         id: pageStack
         Component.onCompleted: {
@@ -140,6 +191,7 @@
             account: accounts
 
             onShowPaymentTypes: {
+                mainView.state = "checkout";
                 pageStack.push(checkout);
             }
 
@@ -172,6 +224,7 @@
             onAddCreditCard: {
                 webkit.title = i18n.tr("Add Payment");
                 webkit.url = purchase.getAddPaymentUrl();
+                mainView.state = "add-payment";
                 pageStack.push(webkit);
             }
         }
@@ -180,16 +233,25 @@
             id: webkit
             visible: false
 
-            onPayTypeAdded: {
-                showLoading();
-                purchase.getPaymentTypes();
-                pageStack.push(checkout);
-            }
             onPurchaseCanceled: {
-                purchase.quitCancel();
+                hideLoading();
+                if (mainView.state == "add-payment") {
+                    var title = i18n.tr("Adding Credit Card failed");
+                    var message = i18n.tr("Do you want to try again?");
+                    mainView.showErrorDialog(title, message);
+                } else {
+                    var title = i18n.tr("Purchase failed");
+                    var message = i18n.tr("The purchase couldn't be completed.");
+                    mainView.showErrorDialog(title, message);
+                }
             }
             onPurchaseSucceeded: {
-                pageStack.push(success);
+                if (mainView.state == "add-payment") {
+                    showLoading();
+                    purchase.getPaymentTypes();
+                } else {
+                    purchase.quitSuccess();
+                }
             }
 
             onLoading: {
 
=== modified file 'app/ui/CheckoutPage.qml'
--- app/ui/CheckoutPage.qml	2014-06-25 20:58:29 +0000
+++ app/ui/CheckoutPage.qml	2014-07-03 11:28:29 +0000
@@ -24,6 +24,7 @@
 
     title: selector.currentlyExpanded ? i18n.tr("Payment type") : i18n.tr("Checkout")
 
+    property bool _errorVisible: false
     property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
     property alias itemTitle: titleLabel.text
     property alias itemSubtitle: subtitleLabel.text
@@ -37,11 +38,16 @@
     signal addCreditCard
 
     function launchPurchase() {
+        pageCheckout._errorVisible = false;
         var pay = selector.model[selector.selectedIndex];
         var email = accountView.currentItem.email;
         pageCheckout.buy(email, passwordField.text, pay.paymentId, pay.backendId);
     }
 
+    function showWrongPassword() {
+        pageCheckout._errorVisible = true;
+    }
+
     Flickable {
         id: checkoutFlickable
         anchors {
@@ -261,13 +267,28 @@
             Keys.onReturnPressed: launchPurchase();
         }
 
+        Label {
+            id: errorPasswordLabel
+            objectName: "errorPasswordLabel"
+            color: "red"
+            text: i18n.tr("Incorrect Password, please try again.")
+            wrapMode: Text.WordWrap
+            visible: selector.currentlyExpanded ? false : pageCheckout._errorVisible
+            anchors {
+                left: parent.left
+                right: parent.right
+                top: passwordField.bottom
+                margins: units.gu(1)
+            }
+        }
+
         Rectangle {
             id: separator
             color: "#dedede"
             anchors {
                 left: parent.left
                 right: parent.right
-                top: selector.currentlyExpanded ? manageCardLabel.bottom : passwordField.bottom
+                top: selector.currentlyExpanded ? manageCardLabel.bottom : errorPasswordLabel.bottom
                 topMargin: units.gu(2)
             }
             height: 2
 
=== modified file 'app/ui/DirectPurchase.qml'
--- app/ui/DirectPurchase.qml	2014-06-25 20:58:29 +0000
+++ app/ui/DirectPurchase.qml	2014-07-03 11:28:29 +0000
@@ -27,10 +27,15 @@
     property alias account: accountView.model
 
     function launchPurchase() {
+        errorPasswordLabel.visible = false;
         var email = accountView.currentItem.text;
         pageDirectPayment.buy(email, passwordField.text);
     }
 
+    function showWrongPassword() {
+        errorPasswordLabel.visible = true;
+    }
+
     Column {
         spacing: units.gu(2)
         anchors.fill: parent
@@ -96,6 +101,19 @@
         }
 
         Label {
+            id: errorPasswordLabel
+            objectName: "errorPasswordLabel"
+            color: "red"
+            text: i18n.tr("Incorrect Password, please try again.")
+            wrapMode: Text.WordWrap
+            visible: false
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+        }
+
+        Label {
             id: paymentTypeLabel
             objectName: "paymentTypeLabel"
             textFormat: Text.RichText
@@ -106,6 +124,7 @@
                 right: parent.right
             }
             onLinkActivated: {
+                errorPasswordLabel.visible = false;
                 pageDirectPayment.showPaymentTypes();
             }
         }
 
=== modified file 'app/ui/UbuntuPurchaseWebkit.qml'
--- app/ui/UbuntuPurchaseWebkit.qml	2014-06-23 18:20:45 +0000
+++ app/ui/UbuntuPurchaseWebkit.qml	2014-07-03 11:28:29 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
-import QtWebKit 3.0
+import com.canonical.Oxide 1.0
 
 
 Page {
@@ -26,7 +26,6 @@
 
     signal purchaseSucceeded()
     signal purchaseCanceled()
-    signal payTypeAdded()
     signal loading(bool value)
 
     property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
@@ -75,9 +74,6 @@
                 pageWebkit.closePurchase();
                 pageWebkit.purchaseCanceled();
                 return;
-            } else if(/^(purchase):\/\/payAdded/.test(request.url)) {
-                pageWebkit.payTypeAdded();
-                return;
             }
 
             request.action = WebView.AcceptRequest;
 
=== modified file 'backend/modules/payui/network.cpp'
--- backend/modules/payui/network.cpp	2014-06-25 20:58:29 +0000
+++ backend/modules/payui/network.cpp	2014-07-03 11:28:29 +0000
@@ -34,6 +34,7 @@
 #define PAY_BASE_URL "https://sc.ubuntu.com/api/2.0/click/"
 #define ACCOUNT_CREDS_URL "https://login.ubuntu.com/api/v2/tokens/oauth"
 #define ADD_PAYMENT_URL "https://sc.ubuntu.com/api/2.0/click/paymentmethods/add/"
+//<matiasb> gatox: this is the url, in staging: https://sc.staging.ubuntu.com/click/payment-method/add/
 
 #define PREFERED_PAYMENT_TYPE "0"
 #define PAYMENT_TYPES "1"
@@ -159,11 +160,14 @@
             QString state = object.value("state").toString();
 
             if (state == BUY_COMPLETE) {
+                qDebug() << "BUY STATE: complete";
                 Q_EMIT buyItemSucceeded();
             } else if (state == BUY_IN_PROGRESS) {
+                qDebug() << "BUY STATE: in progress";
                 QString redirect_to = object.value("redirect_to").toString();
                 Q_EMIT buyInteractionRequired(redirect_to);
             } else {
+                qDebug() << "BUY STATE: failed";
                 Q_EMIT buyItemFailed();
             }
         } else if (state->operation.contains(ITEM_INFO) && document.isObject()) {
@@ -190,6 +194,8 @@
             Q_EMIT error(message);
         }
 
+    } else if (httpStatus == 401 || httpStatus == 403) {
+        Q_EMIT authenticationError();
     } else {
         Q_EMIT error(QString::number(httpStatus));
     }
 
=== modified file 'backend/modules/payui/network.h'
--- backend/modules/payui/network.h	2014-06-25 20:58:29 +0000
+++ backend/modules/payui/network.h	2014-07-03 11:28:29 +0000
@@ -70,6 +70,7 @@
     void buyItemFailed();
     void buyInteractionRequired(QString url);
     void error(QString message);
+    void authenticationError();
     void credentialsNotFound();
     void credentialsFound();
     void credentialsUpdated();
 
=== modified file 'backend/modules/payui/purchase.cpp'
--- backend/modules/payui/purchase.cpp	2014-06-23 18:20:45 +0000
+++ backend/modules/payui/purchase.cpp	2014-07-03 11:28:29 +0000
@@ -26,6 +26,8 @@
                      this, &Purchase::buyInterationRequired);
     QObject::connect(&m_network, &Network::error,
                      this, &Purchase::error);
+    QObject::connect(&m_network, &Network::authenticationError,
+                     this, &Purchase::authenticationError);
     QObject::connect(&m_network, &Network::credentialsNotFound,
                      this, &Purchase::credentialsNotFound);
     QObject::connect(&m_network, &Network::credentialsFound,
@@ -55,13 +57,21 @@
 
 void Purchase::quitCancel()
 {
+    qDebug() << "Purchase Canceled: exit code 1";
     QCoreApplication::exit(1);
 }
 
+void Purchase::quitSuccess()
+{
+    qDebug() << "Purchase Succeeded: exit code 0";
+    QCoreApplication::exit(0);
+}
+
 void Purchase::checkCredentials()
 {
     if (m_appid.isEmpty() && m_itemid.isEmpty()) {
-        QCoreApplication::exit(1);
+        qDebug() << "AppId or ItemId not provided";
+        quitCancel();
     } else {
         qDebug() << "Getting Item Details";
         getItemDetails(m_appid, m_itemid);
 
=== modified file 'backend/modules/payui/purchase.h'
--- backend/modules/payui/purchase.h	2014-06-23 18:20:45 +0000
+++ backend/modules/payui/purchase.h	2014-07-03 11:28:29 +0000
@@ -21,6 +21,7 @@
     Q_INVOKABLE void checkCredentials();
     Q_INVOKABLE QString getAddPaymentUrl();
 
+    Q_INVOKABLE void quitSuccess();
     Q_INVOKABLE void quitCancel();
 
 Q_SIGNALS:
@@ -30,6 +31,7 @@
     void buyItemFailed();
     void buyInterationRequired(QString url);
     void error(QString message);
+    void authenticationError();
     void credentialsNotFound();
     void credentialsFound();
 
 
=== modified file 'backend/tests/mock_click_server.py'
--- backend/tests/mock_click_server.py	2014-06-23 18:20:45 +0000
+++ backend/tests/mock_click_server.py	2014-07-03 11:28:29 +0000
@@ -114,6 +114,12 @@
         self.end_headers()
         self.wfile.write(bytes(json.dumps(response), 'UTF-8'))
 
+    def response_auth_error(self):
+        self.send_response(401)
+        self.send_header("Content-type", "application/json")
+        self.end_headers()
+        self.wfile.write(bytes(json.dumps(dict()), 'UTF-8'))
+
     def do_POST(self):
         """Respond to a POST request."""
         #content = self.rfile.read(int(self.headers.get('content-length')))
@@ -135,6 +141,8 @@
         elif self.path.find("iteminfo/") != -1:
             fail = self.path.find("/fail/") != -1
             self.response_item_info(fail)
+        elif self.path.find("/authError/") != -1:
+            self.response_auth_error()
         elif self.path.find("shutdown") != -1:
             global KEEP_ALIVE
             KEEP_ALIVE = False
 
=== modified file 'backend/tests/test_network.cpp'
--- backend/tests/test_network.cpp	2014-06-25 20:58:29 +0000
+++ backend/tests/test_network.cpp	2014-07-03 11:28:29 +0000
@@ -40,6 +40,7 @@
 
 private slots:
     void initTestCase();
+    void testNetworkAuthenticationError();
     void testNetworkGetPaymentTypes();
     void testNetworkGetPaymentTypesFail();
     void testNetworkBuyItem();
@@ -62,7 +63,7 @@
 void TestNetwork::initTestCase()
 {
     qDebug() << "Starting Server";
-//    network.setCredentials(Token("token_key", "token_secret", "consumer_key", "consumer_secret"));
+    network.setCredentials(Token("token_key", "token_secret", "consumer_key", "consumer_secret"));
     process = new QProcess(this);
     QSignalSpy spy(process, SIGNAL(started()));
     process->setWorkingDirectory(QDir::currentPath() + "/backend/tests/");
@@ -80,6 +81,15 @@
     QTRY_COMPARE(spy2.count(), 1);
 }
 
+void TestNetwork::testNetworkAuthenticationError()
+{
+    setenv("ACCOUNT_CREDS_URL", "http://localhost:8000/authError/", 1);
+    setenv("PAY_BASE_URL", "http://localhost:8000/", 1);
+    QSignalSpy spy(&network, SIGNAL(authenticationError()));
+    network.buyItem("email", "password", "appid", "itemid", "paymentid", "backendid");
+    QTRY_COMPARE(spy.count(), 1);
+}
+
 void TestNetwork::testNetworkGetPaymentTypes()
 {
     setenv("PAY_BASE_URL", "http://localhost:8000/", 1);    
 
=== modified file 'manifest.json'
--- manifest.json	2014-06-25 20:58:29 +0000
+++ manifest.json	2014-07-03 11:28:29 +0000
@@ -10,6 +10,6 @@
             "desktop": "payui.desktop"
         }
     },
-    "version": "0.2",
+    "version": "0.2.5",
     "maintainer": "Sarmentero Diego <[e-mail]>"
 }
 \ No newline at end of file