Merge lp:~mardy/online-accounts-api/fix-initialization into lp:online-accounts-api

[Alberto Mardegan]

If the applicationId is not set, force using APP_ID

Because the m_applicationIdChanged variable was not set, we were not
initializing the Manager at all.

If the applicationId is not set, force using APP_ID

Because the m_applicationIdChanged variable was not set, we were not
initializing the Manager at all.

[lp:~mardy/online-accounts-api/fix-initialization]

16. By Alberto Mardegan on 2015-11-03

Pass auth data back to the client

17. By Alberto Mardegan on 2015-11-03

Tests

=== modified file 'src/lib/OnlineAccountsDaemon/authenticator.cpp'
--- src/lib/OnlineAccountsDaemon/authenticator.cpp	2015-09-03 10:41:07 +0000
+++ src/lib/OnlineAccountsDaemon/authenticator.cpp	2015-11-03 14:45:24 +0000
@@ -72,6 +72,7 @@
     SignOn::Identity *m_identity;
     QVariantMap m_parameters;
     QVariantMap m_reply;
+    QVariantMap m_extraReplyData;
     QString m_errorName;
     QString m_errorMessage;
     Authenticator *q_ptr;
@@ -106,13 +107,25 @@
 
     QVariantMap allSessionData =
         mergeMaps(authData.parameters(), mergeMaps(parameters, m_parameters));
-    m_authSession->process(allSessionData, authData.mechanism());
+    QString mechanism = authData.mechanism();
+
+    m_extraReplyData.clear();
+    if (mechanism == "HMAC-SHA1" || mechanism == "PLAINTEXT") {
+        /* For OAuth 1.0, let's return also the Consumer key and secret along
+         * with the reply. */
+        m_extraReplyData[ONLINE_ACCOUNTS_AUTH_KEY_CONSUMER_KEY] =
+            allSessionData.value("ConsumerKey");
+        m_extraReplyData[ONLINE_ACCOUNTS_AUTH_KEY_CONSUMER_SECRET] =
+            allSessionData.value("ConsumerSecret");
+    }
+
+    m_authSession->process(allSessionData, mechanism);
 }
 
 void AuthenticatorPrivate::onAuthSessionResponse(const SignOn::SessionData &sessionData)
 {
     Q_Q(Authenticator);
-    m_reply = sessionData.toMap();
+    m_reply = mergeMaps(m_extraReplyData, sessionData.toMap());
     Q_EMIT q->finished();
 }
 
 
=== modified file 'src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp'
--- src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2015-09-23 08:23:49 +0000
+++ src/lib/Ubuntu/OnlineAccounts.2/account_model.cpp	2015-11-03 14:45:24 +0000
@@ -134,6 +134,11 @@
         QStringList parts = QString::fromUtf8(qgetenv("APP_ID")).split('_');
         if (parts.count() == 3) {
             m_applicationId = QStringList(parts.mid(0, 2)).join('_');
+            m_applicationIdChanged = true;
+        } else {
+            qWarning() << "Ubuntu.OnlineAccounts: No APP_ID defined "
+                "and no applicationId given!";
+            return;
         }
     }
 
 
=== added file 'tests/daemon/functional_tests/data/oauth1auth.service'
--- tests/daemon/functional_tests/data/oauth1auth.service	1970-01-01 00:00:00 +0000
+++ tests/daemon/functional_tests/data/oauth1auth.service	2015-11-03 14:45:24 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service id="oauth1auth">
+  <type>e-mail</type>
+  <name>OAuth 1 test</name>
+  <icon>general_myservice</icon>
+  <provider>cool</provider>
+
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">HMAC-SHA1</setting>
+      <group name="oauth2/HMAC-SHA1">
+        <setting name="ConsumerKey">c0nsum3rk3y</setting>
+        <setting name="ConsumerSecret">c0nsum3rs3cr3t</setting>
+      </group>
+    </group>
+  </template>
+</service>
 
=== modified file 'tests/daemon/functional_tests/functional_tests.cpp'
--- tests/daemon/functional_tests/functional_tests.cpp	2015-09-23 12:40:40 +0000
+++ tests/daemon/functional_tests/functional_tests.cpp	2015-11-03 14:45:24 +0000
@@ -196,6 +196,7 @@
     Accounts::Manager *manager = new Accounts::Manager(this);
     Accounts::Service coolMail = manager->service("coolmail");
     Accounts::Service coolShare = manager->service("com.ubuntu.tests_coolshare");
+    Accounts::Service oauth1auth = manager->service("oauth1auth");
     Accounts::Account *account1 = manager->createAccount("cool");
     QVERIFY(account1 != 0);
     account1->setEnabled(true);
@@ -226,6 +227,8 @@
     account3->setCredentialsId(m_account3CredentialsId);
     account3->selectService(coolMail);
     account3->setEnabled(true);
+    account3->selectService(oauth1auth);
+    account3->setEnabled(true);
     account3->syncAndBlock();
 
     delete manager;
@@ -344,6 +347,33 @@
         authParams <<
         credentials <<
         QString();
+
+    authParams.clear();
+    credentials.clear();
+    credentials["UiPolicy"] = 0;
+    credentials["ConsumerKey"] = "c0nsum3rk3y";
+    credentials["ConsumerSecret"] = "c0nsum3rs3cr3t";
+    QTest::newRow("OAuth1 client data") <<
+        3 <<
+        "oauth1auth" <<
+        true << false <<
+        authParams <<
+        credentials <<
+        QString();
+
+    authParams.clear();
+    authParams["ConsumerKey"] = "overridden";
+    credentials.clear();
+    credentials["UiPolicy"] = 0;
+    credentials["ConsumerKey"] = "overridden";
+    credentials["ConsumerSecret"] = "c0nsum3rs3cr3t";
+    QTest::newRow("OAuth1 client data, overridden") <<
+        3 <<
+        "oauth1auth" <<
+        true << false <<
+        authParams <<
+        credentials <<
+        QString();
 }
 
 void FunctionalTests::testAuthenticate()
 
=== modified file 'tests/lib/qml_module/tst_qml_module.cpp'
--- tests/lib/qml_module/tst_qml_module.cpp	2015-08-28 14:25:23 +0000
+++ tests/lib/qml_module/tst_qml_module.cpp	2015-11-03 14:45:24 +0000
@@ -26,6 +26,7 @@
 #include <QObject>
 #include <QQmlComponent>
 #include <QQmlEngine>
+#include <QRegularExpression>
 #include <QSignalSpy>
 #include <QTest>
 #include <libqtdbusmock/DBusMock.h>
@@ -98,6 +99,8 @@
     void testModelRequestAccess();
     void testAccountAuthentication_data();
     void testAccountAuthentication();
+    void testInitialization_data();
+    void testInitialization();
 
 private:
     QtDBusTest::DBusTestRunner m_dbus;
@@ -561,5 +564,55 @@
     delete object;
 }
 
+void ModuleTest::testInitialization_data()
+{
+    QTest::addColumn<QString>("appId");
+    QTest::addColumn<bool>("errorExpected");
+
+    QTest::newRow("empty APP_ID") <<
+        "" <<
+        true;
+
+    QTest::newRow("invalid APP_ID") <<
+        "" <<
+        true;
+
+    QTest::newRow("valid APP_ID") <<
+        "my.package_app_0.2" <<
+        false;
+}
+
+void ModuleTest::testInitialization()
+{
+    QFETCH(QString, appId);
+    QFETCH(bool, errorExpected);
+
+    qputenv("APP_ID", appId.toUtf8());
+
+    if (errorExpected) {
+        QTest::ignoreMessage(QtWarningMsg,
+                             QRegularExpression("Ubuntu.OnlineAccounts:.*"));
+    }
+
+    QQmlEngine engine;
+    QQmlComponent component(&engine);
+    component.setData("import Ubuntu.OnlineAccounts 2.0\n"
+                      "AccountModel {}",
+                      QUrl());
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    if (!errorExpected) {
+        /* We just want to check that invoking this method won't cause a crash */
+        QString serviceId = "bar";
+        QVariantMap params;
+        bool ok = QMetaObject::invokeMethod(object, "requestAccess",
+                                            Q_ARG(QString, serviceId),
+                                            Q_ARG(QVariantMap, params));
+        QVERIFY(ok);
+    }
+    delete object;
+}
+
 QTEST_MAIN(ModuleTest)
 #include "tst_qml_module.moc"