Merge lp:~mardy/signon/packaging into lp:signon

[Alberto Mardegan]

New upstream release

New upstream release

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/signon-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-raring-amd64-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ci/21/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:564
http://jenkins.qa.ubuntu.com/job/signon-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/signon-raring-amd64-ci/5

Click here to trigger a rebuild:
http://s-jenkins:8080/job/signon-ci/22/rebuild

review: Approve (continuous-integration)

[lp:~mardy/signon/packaging]

563. By Alberto Mardegan on 2013-04-26

New upstream release. Fixes: https://bugs.launchpad.net/bugs/1156776.

Approved by PS Jenkins bot, Ken VanDine.

=== modified file 'common-project-config.pri'
--- common-project-config.pri	2013-03-25 06:55:43 +0000
+++ common-project-config.pri	2013-04-26 14:13:27 +0000
@@ -33,6 +33,15 @@
 #TODO comment this to restrict plugins to run under signon user
 DEFINES += NO_SIGNON_USER
 
+# Qt4/Qt5 common checks
+greaterThan(QT_MAJOR_VERSION, 4) {
+    LIBSIGNON = libsignon-qt5
+    LIBQTCORE = Qt5Core
+} else {
+    LIBSIGNON = libsignon-qt
+    LIBQTCORE = QtCore
+}
+
 #-----------------------------------------------------------------------------
 # setup the installation prefix
 #-----------------------------------------------------------------------------

=== modified file 'common-vars.pri'
--- common-vars.pri	2013-04-10 10:29:05 +0000
+++ common-vars.pri	2013-04-26 14:13:27 +0000
@@ -14,7 +14,7 @@
 # Project version
 # remember to update debian/* files if you changes this
 #-----------------------------------------------------------------------------
-PROJECT_VERSION = 8.50
+PROJECT_VERSION = 8.51
 
 #-----------------------------------------------------------------------------
 # Library version

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-24 14:14:10 +0000
+++ debian/changelog	2013-04-26 14:13:27 +0000
@@ -1,4 +1,6 @@
-signon (8.50-0ubuntu1) UNRELEASED; urgency=low
+signon (8.51-0ubuntu1) UNRELEASED; urgency=low
+
+  * Automatic snapshot from revision 560 (bootstrap)
 
   [ Alberto Mardegan ]
   * New upstream release.
@@ -11,7 +13,15 @@
   [ Ken VanDine ]
   * Default to Qt5 build
 
- -- Ken VanDine <[e-mail]>  Wed, 24 Apr 2013 10:07:19 -0400
+  [ Alberto Mardegan ]
+  * New upstream release.
+    - Qt5: fix SignonExtension.pc (when building with Qt5, SignonExtension.pc
+      was still requiring QtCore).
+    - Inform signon-ui of identity removals and signouts.
+    - libsignon-qt: implement ACL retrieval
+      http://code.google.com/p/accounts-sso/issues/detail?id=178
+
+ -- Alberto Mardegan <[e-mail]>  Fri, 26 Apr 2013 16:30:30 +0300
 
 signon (8.49-0ubuntu2) raring; urgency=low
 

=== modified file 'lib/SignOn/identityinfoimpl.cpp'
--- lib/SignOn/identityinfoimpl.cpp	2012-04-18 13:06:27 +0000
+++ lib/SignOn/identityinfoimpl.cpp	2013-04-26 14:13:27 +0000
@@ -168,6 +168,11 @@
     if (map.contains(SIGNOND_IDENTITY_INFO_REALMS))
         m_realms = map.value(SIGNOND_IDENTITY_INFO_REALMS).toStringList();
 
+    if (map.contains(SIGNOND_IDENTITY_INFO_ACL)) {
+        m_accessControlList =
+            map.value(SIGNOND_IDENTITY_INFO_ACL).toStringList();
+    }
+
     if (map.contains(SIGNOND_IDENTITY_INFO_AUTHMETHODS)) {
         QVariant value = map.value(SIGNOND_IDENTITY_INFO_AUTHMETHODS);
         m_authMethods = qdbus_cast<MethodMap>(value.value<QDBusArgument>());

=== modified file 'lib/plugins/signon-plugins-common/signon-plugins-common.pro'
--- lib/plugins/signon-plugins-common/signon-plugins-common.pro	2013-03-19 09:16:07 +0000
+++ lib/plugins/signon-plugins-common/signon-plugins-common.pro	2013-04-26 14:13:27 +0000
@@ -23,12 +23,6 @@
 headers.path = $${INSTALL_PREFIX}/include/signon-plugins/SignOn
 INSTALLS += headers
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBQTCORE = Qt5Core
-} else {
-    LIBQTCORE = QtCore
-}
-
 pkgconfig.files = signon-plugins-common.pc
 include($${TOP_SRC_DIR}/common-pkgconfig.pri)
 INSTALLS += pkgconfig

=== modified file 'lib/plugins/signon-plugins.pro'
--- lib/plugins/signon-plugins.pro	2013-03-19 09:16:07 +0000
+++ lib/plugins/signon-plugins.pro	2013-04-26 14:13:27 +0000
@@ -22,14 +22,6 @@
 headers.path = $${INSTALL_PREFIX}/include/signon-plugins/SignOn
 INSTALLS += headers
 
-greaterThan(QT_MAJOR_VERSION, 4) {
-    LIBSIGNON = libsignon-qt5
-    LIBQTCORE = Qt5Core
-} else {
-    LIBSIGNON = libsignon-qt
-    LIBQTCORE = QtCore
-}
-
 pkgconfig.files = signon-plugins.pc
 include($${TOP_SRC_DIR}/common-pkgconfig.pri)
 INSTALLS += pkgconfig

=== modified file 'lib/signond/SignOn/SignOnExtension.pc.in'
--- lib/signond/SignOn/SignOnExtension.pc.in	2013-01-18 12:43:35 +0000
+++ lib/signond/SignOn/SignOnExtension.pc.in	2013-04-26 14:13:27 +0000
@@ -7,6 +7,6 @@
 Name: SignOnExtension
 Description: SignOn extension development 
 Version: $$PROJECT_VERSION
-Requires: QtCore
+Requires: $${LIBQTCORE}
 Libs: -L${libdir} -lsignon-extension
 Cflags: -I${includedir}/signon-extension

=== modified file 'src/signond/signonidentity.cpp'
--- src/signond/signonidentity.cpp	2012-08-27 13:42:05 +0000
+++ src/signond/signonidentity.cpp	2013-04-26 14:13:27 +0000
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
  * Copyright (C) 2011 Intel Corporation.
+ * Copyright (C) 2013 Canonical Ltd.
  *
  * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
@@ -363,8 +364,30 @@
                        QLatin1String("Database error occurred."));
         return;
     }
+    setDelayedReply(true);
+    m_message = message();
+    setAutoDestruct(false);
+    QDBusPendingCallWatcher *watcher =
+        new QDBusPendingCallWatcher(m_signonui->removeIdentityData(m_id),
+                                    this);
+    connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
+            this, SLOT(removeCompleted(QDBusPendingCallWatcher*)));
+    keepInUse();
+}
+
+void SignonIdentity::removeCompleted(QDBusPendingCallWatcher *call)
+{
+    setAutoDestruct(true);
+    call->deleteLater();
+
+    QDBusPendingReply<> signOnUiReply = *call;
+    bool ok = !signOnUiReply.isError();
+    TRACE() << (ok ? "removeIdentityData succeeded" : "removeIdentityData failed");
+
+    QDBusMessage reply = m_message.createReply();
+    SIGNOND_BUS.send(reply);
+
     emit infoUpdated((int)SignOn::IdentityRemoved);
-    keepInUse();
 }
 
 bool SignonIdentity::signOut()
@@ -386,12 +409,35 @@
             TRACE() << "clear data failed";
         }
 
-        emit infoUpdated((int)SignOn::IdentitySignedOut);
+        setDelayedReply(true);
+        m_message = message();
+        setAutoDestruct(false);
+        QDBusPendingCallWatcher *watcher =
+            new QDBusPendingCallWatcher(m_signonui->removeIdentityData(m_id),
+                                        this);
+        connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
+                this, SLOT(signOutCompleted(QDBusPendingCallWatcher*)));
     }
     keepInUse();
     return true;
 }
 
+void SignonIdentity::signOutCompleted(QDBusPendingCallWatcher *call)
+{
+    setAutoDestruct(true);
+    call->deleteLater();
+
+    QDBusPendingReply<> signOnUiReply = *call;
+    bool ok = !signOnUiReply.isError();
+    TRACE() << (ok ? "removeIdentityData succeeded" : "removeIdentityData failed");
+
+    QDBusMessage reply = m_message.createReply();
+    reply << ok;
+    SIGNOND_BUS.send(reply);
+
+    emit infoUpdated((int)SignOn::IdentitySignedOut);
+}
+
 quint32 SignonIdentity::store(const QVariantMap &info)
 {
     keepInUse();

=== modified file 'src/signond/signonidentity.h'
--- src/signond/signonidentity.h	2012-08-27 13:42:05 +0000
+++ src/signond/signonidentity.h	2013-04-26 14:13:27 +0000
@@ -2,7 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
- * Copyright (C) 2012 Canonical Ltd.
+ * Copyright (C) 2012-2013 Canonical Ltd.
  *
  * Contact: Aurel Popirtac <[e-mail]>
  * Contact: Alberto Mardegan <[e-mail]>
@@ -78,6 +78,10 @@
     //TODO - split this into the 3 separate signals(updated, removed, signed out)
     void infoUpdated(int);
 
+private Q_SLOTS:
+    void removeCompleted(QDBusPendingCallWatcher *call);
+    void signOutCompleted(QDBusPendingCallWatcher *call);
+
 private:
     SignonIdentity(quint32 id, int timeout, SignonDaemon *parent);
     bool init();

=== modified file 'src/signond/signonui_interface.cpp'
--- src/signond/signonui_interface.cpp	2012-04-18 13:06:27 +0000
+++ src/signond/signonui_interface.cpp	2013-04-26 14:13:27 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2013 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -77,6 +78,17 @@
                          argumentList);
 }
 
+/*
+ * Remove any data associated with the given identity.
+ * */
+QDBusPendingCall SignonUiAdaptor::removeIdentityData(quint32 id)
+{
+    QList<QVariant> argumentList;
+    argumentList << id;
+    return asyncCallWithArgumentList(QLatin1String("removeIdentityData"),
+                                     argumentList);
+}
+
 QDBusPendingCall
 SignonUiAdaptor::callWithArgumentListAndBigTimeout(const QString &method,
                                                    const QList<QVariant> &args)

=== modified file 'src/signond/signonui_interface.h'
--- src/signond/signonui_interface.h	2012-04-18 13:06:27 +0000
+++ src/signond/signonui_interface.h	2013-04-26 14:13:27 +0000
@@ -2,6 +2,7 @@
  * This file is part of signon
  *
  * Copyright (C) 2009-2010 Nokia Corporation.
+ * Copyright (C) 2013 Canonical Ltd.
  *
  * Contact: Alberto Mardegan <[e-mail]>
  *
@@ -61,6 +62,7 @@
     QDBusPendingCall refreshDialog(const QVariantMap &parameters);
 
     void cancelUiRequest(const QString &requestId);
+    QDBusPendingCall removeIdentityData(quint32 id);
 
 protected:
     QDBusPendingCall callWithArgumentListAndBigTimeout(

=== modified file 'tests/libsignon-qt-tests/ssotestclient.cpp'
--- tests/libsignon-qt-tests/ssotestclient.cpp	2012-07-12 09:27:42 +0000
+++ tests/libsignon-qt-tests/ssotestclient.cpp	2013-04-26 14:13:27 +0000
@@ -648,7 +648,9 @@
                       methods);
     info.setSecret("TEST_PASSWORD_1");
     info.setRealms(QStringList() << "test_realm");
-    info.setAccessControlList(QStringList() << TEST_AEGIS_TOKEN);
+    QStringList acl;
+    acl << TEST_AEGIS_TOKEN;
+    info.setAccessControlList(acl);
 
     if (!storeCredentialsPrivate(info))
         QFAIL("Failed to initialize test for querying info.");
@@ -679,6 +681,8 @@
              TestIdentityResult::InexistentResp,
              "A response was not received.");
 
+    QCOMPARE(m_identityResult.m_idInfo.accessControlList(), acl);
+
     END_IDENTITY_TEST_IF_UNTRUSTED;
 
     if (m_identityResult.m_responseReceived == TestIdentityResult::NormalResp) {