Merge lp:~diegosarmentero/pay-ui/handle-payment-issues into lp:pay-ui

[Diego Sarmentero]

- Build properly redirect to url.
- Handle no preferred payment method situations.

[lp:~diegosarmentero/pay-ui/handle-payment-issues]

24. By Diego Sarmentero on 2014-08-20

change signal name for no preferred payment methods

[Alejandro J. Cura (alecu)]

Seems to work now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'app/payui.qml'
--- app/payui.qml	2014-08-20 13:24:39 +0000
+++ app/payui.qml	2014-08-20 20:09:34 +0000
@@ -57,7 +57,7 @@
     property bool purchasing: false
     property bool recentLogin: false
 
-    backgroundColor: "white"
+    backgroundColor: "transparent"
 
     onStateChanged: {
         if (mainView.state == "direct") {
@@ -127,6 +127,10 @@
             hideLoading();
         }
 
+        onNoPreferredPaymentMethod: {
+            direct.hasPreferredPayment = false;
+        }
+
         onPasswordValid: {
             hideLoading();
             mainView.state = "checkout";
@@ -343,13 +347,13 @@
             }
 
             onBuy: {
-                if (direct.hasPayments) {
+                if (direct.hasPayments && direct.hasPreferredPayment) {
                     mainView.purchasing = true;
                     purchase.buyItemWithPreferredPayment(email, password);
                     showLoading();
                 } else {
-                    mainView.state = "payment";
-                    pageStack.push(payment);
+                    mainView.state = "checkout";
+                    pageStack.push(checkout);
                 }
             }
         }

=== modified file 'app/ui/DirectPurchase.qml'
--- app/ui/DirectPurchase.qml	2014-08-13 19:54:12 +0000
+++ app/ui/DirectPurchase.qml	2014-08-20 20:09:34 +0000
@@ -28,6 +28,7 @@
     property bool hasPayments: false
     property alias password: passwordField.text
     property int keyboardSize: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+    property bool hasPreferredPayment: true
 
     function launchPurchase() {
         errorPasswordLabel.visible = false;
@@ -174,7 +175,7 @@
                 Button {
                     id: buyButton
                     objectName: "buyButtonDirect"
-                    text: i18n.tr("Buy Now")
+                    text: pageDirectPayment.hasPreferredPayment ? i18n.tr("Buy Now") : i18n.tr("Confirm")
                     color: UbuntuColors.orange
                     width: parent.buttonsWidth
                     enabled: passwordField.text.length > 7 ? true : false

=== modified file 'backend/modules/payui/network.cpp'
--- backend/modules/payui/network.cpp	2014-08-05 14:55:51 +0000
+++ backend/modules/payui/network.cpp	2014-08-20 20:09:34 +0000
@@ -52,7 +52,8 @@
 Network::Network(QObject *parent) :
     QObject(parent),
     m_nam(this),
-    m_service(this)
+    m_service(this),
+    m_preferred(nullptr)
 {
     connect(&m_nam, SIGNAL(finished(QNetworkReply*)),
                      this, SLOT(onReply(QNetworkReply*)));
@@ -146,7 +147,7 @@
                 for (int j = 0; j < choices.size(); j++) {
                     QJsonObject choice = choices.at(j).toObject();
                     QString name = choice.value("description").toString();
-                    QString paymentId = choice.value("id").toString();
+                    QString paymentId = QString::number(choice.value("id").toInt());
                     bool requiresInteracion = choice.value("requires_interaction").toBool();
                     bool preferred = choice.value("preferred").toBool() && preferredBackend;
                     PayInfo* pay = new PayInfo();
@@ -158,6 +159,9 @@
                 }
             }
             Q_EMIT paymentTypesObtained(listPays);
+            if (m_preferred == nullptr) {
+                Q_EMIT noPreferredPaymentMethod();
+            }
         } else if (state->operation.contains(BUY_ITEM) && document.isObject()) {
             qDebug() << "Reply state:" << BUY_ITEM;
             QJsonObject object = document.object();
@@ -167,9 +171,12 @@
                 qDebug() << "BUY STATE: complete";
                 Q_EMIT buyItemSucceeded();
             } else if (state == BUY_IN_PROGRESS) {
+                QString baseUrl = getAPIUrl(PAY_BASE_URL_ENVVAR, QString(PAY_BASE_URL)) + object.value("redirect_to").toString();
                 qDebug() << "BUY STATE: in progress";
-                QString redirect_to = object.value("redirect_to").toString();
-                Q_EMIT buyInteractionRequired(redirect_to);
+                QString sign = m_token.signUrl(baseUrl, "GET", true);
+                QUrl redirectTo(baseUrl);
+                redirectTo.setQuery(sign);
+                Q_EMIT buyInteractionRequired(redirectTo.toString());
             } else {
                 qDebug() << "BUY STATE: failed";
                 Q_EMIT buyItemFailed();
@@ -275,7 +282,7 @@
     serializer.insert("device_id", getDeviceId());
     serializer.insert("name", m_selectedAppId);
     serializer.insert("backend_id", m_selectedBackendId);
-    serializer.insert("method", m_selectedPaymentId);
+    serializer.insert("method_id", m_selectedPaymentId);
     QJsonDocument doc(serializer);
 
     QByteArray content = doc.toJson();

=== modified file 'backend/modules/payui/network.h'
--- backend/modules/payui/network.h	2014-07-29 17:32:50 +0000
+++ backend/modules/payui/network.h	2014-08-20 20:09:34 +0000
@@ -82,6 +82,7 @@
     void credentialsFound();
     void credentialsUpdated();
     void passwordValid();
+    void noPreferredPaymentMethod();
 
 private Q_SLOTS:
     void onReply(QNetworkReply*);

=== modified file 'backend/modules/payui/purchase.cpp'
--- backend/modules/payui/purchase.cpp	2014-07-29 17:32:50 +0000
+++ backend/modules/payui/purchase.cpp	2014-08-20 20:09:34 +0000
@@ -32,6 +32,8 @@
                      this, &Purchase::credentialsFound);
     connect(&m_network, &Network::passwordValid,
                      this, &Purchase::passwordValid);
+    connect(&m_network, &Network::noPreferredPaymentMethod,
+                     this, &Purchase::noPreferredPaymentMethod);
 
     QCoreApplication* instance = QCoreApplication::instance();
     Logger::setupLogging();

=== modified file 'backend/modules/payui/purchase.h'
--- backend/modules/payui/purchase.h	2014-07-29 17:32:50 +0000
+++ backend/modules/payui/purchase.h	2014-08-20 20:09:34 +0000
@@ -36,6 +36,7 @@
     void credentialsNotFound();
     void credentialsFound();
     void passwordValid();
+    void noPreferredPaymentMethod();
 
 private:
     Network m_network;

=== modified file 'backend/tests/mock_click_server.py'
--- backend/tests/mock_click_server.py	2014-08-01 14:21:55 +0000
+++ backend/tests/mock_click_server.py	2014-08-20 20:09:34 +0000
@@ -76,7 +76,7 @@
             "state": state,
         }
         if interaction:
-            response["redirect_to"] = "http://redirect.url"
+            response["redirect_to"] = "redirect.url"
         if fail:
             response = {}
         self.send_response(200)
@@ -162,4 +162,4 @@
     t.start()
 
 
-run_mocked_settings()
\ No newline at end of file
+run_mocked_settings()

=== modified file 'backend/tests/test_network.cpp'
--- backend/tests/test_network.cpp	2014-08-01 14:21:55 +0000
+++ backend/tests/test_network.cpp	2014-08-20 20:09:34 +0000
@@ -145,7 +145,9 @@
     network.buyItem("email", "password", "appid", "itemid", "paymentid", "backendid", false);
     QTRY_COMPARE(spy.count(), 1);
     QList<QVariant> arguments = spy.takeFirst();
-    QVERIFY(arguments.at(0).toString() == "http://redirect.url");
+    QString url(arguments.at(0).toString());
+    QString expected("http://localhost:8000/interaction/redirect.url");
+    QVERIFY(url.startsWith(expected));
 }
 
 void TestNetwork::testNetworkBuyItemFail()

=== modified file 'manifest.json'
--- manifest.json	2014-08-20 13:24:05 +0000
+++ manifest.json	2014-08-20 20:09:34 +0000
@@ -11,6 +11,6 @@
             "desktop": "payui_payui.desktop"
         }
     },
-    "version": "0.3.11",
+    "version": "0.3.12",
     "maintainer": "Diego Sarmentero <[e-mail]>"
 }
\ No newline at end of file

=== modified file 'payui_payui.desktop.in.in'
--- payui_payui.desktop.in.in	2014-08-13 12:59:48 +0000
+++ payui_payui.desktop.in.in	2014-08-20 20:09:34 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 _Name=Pay UI
 _Comment=The application for completing a purchase.
-Exec=@EXEC@ %u
+Exec=@EXEC@ --transparent %u
 Icon=graphics/[e-mail]
 Terminal=false
 Type=Application