Merge lp:~mterry/unity8/slim_greeter_select_user into lp:~josharenson/unity8/slim_greeter_real_lightdm

[Michael Terry]

Support selectUserHint.

Support selectUserHint.

I also stuck some unrelated fixes in here, that we probably want in the base slim greeter branch.

[lp:~mterry/unity8/slim_greeter_select_user]

1993. By Michael Terry on 2016-06-08

Add pkla and nerf indicators as much as possible until we have proper app launching

1994. By Michael Terry on 2016-06-09

Use cmake install locations rather than hardcoding them

[Josh Arenson (josharenson)]

Please add a test for a non-existent user and see the 1 inline comment

review: Needs Fixing

[lp:~mterry/unity8/slim_greeter_select_user]

1995. By Michael Terry on 2016-06-09

Add more tests for selectUser

[Michael Terry (mterry)]

Added test for non-existent user. (And we agreed to not worry about your inline comment.)

I'm looking at a failure in Greeter::test_promptless right now. It's not because of this branch. But I may squeeze it in, depending on when this gets merged in.

[Michael Terry (mterry)]

Oh, that was easy. Fixed test_promptless.

[lp:~mterry/unity8/slim_greeter_select_user]

1996. By Michael Terry on 2016-06-09

Fix test_promptless

[Josh Arenson (josharenson)]

Looks good to me, now that my internet is fast enough to clone and test locally.

review: Approve

=== modified file 'data/51-unity8-greeter.conf'
--- data/51-unity8-greeter.conf	2016-06-07 16:20:53 +0000
+++ data/51-unity8-greeter.conf	2016-06-09 21:56:24 +0000
@@ -1,5 +1,2 @@
 [Seat:*]
 greeter-session=unity8-greeter
-
-# When unity8 can be run under mir on the desktop, change this to unity.
-type=unity
 
=== modified file 'data/unity8-greeter.desktop.in'
--- data/unity8-greeter.desktop.in	2016-01-22 15:41:14 +0000
+++ data/unity8-greeter.desktop.in	2016-06-09 21:56:24 +0000
@@ -2,6 +2,6 @@
 Type=Application
 Name=Unity 8 Greeter
 Comment=The converged Unity shell's Greeter
-Exec=/usr/bin/unity8-greeter-wrapper /usr/bin/unity8 --mode=greeter
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter
 X-LightDM-Session-Type=mir
 X-Ubuntu-Touch=true
 
=== added file 'data/unity8-greeter.pkla'
--- data/unity8-greeter.pkla	1970-01-01 00:00:00 +0000
+++ data/unity8-greeter.pkla	2016-06-09 21:56:24 +0000
@@ -0,0 +1,44 @@
+# DO NOT EDIT THIS FILE, it will be overwritten on update
+# Place your local configurations under /etc/polkit-1/localauthority/
+
+[Disable Controlling of Network Devices]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable Sleep and Wake]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.sleep-wake
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable WiFi Sharing]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable Settings Modifications]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Disable User Connections]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.use-user-connections
+ResultActive=no
+ResultInactive=no
+ResultsAny=no
+
+[Enable Controlling of Network Connections]
+Identity=unix-user:lightdm
+Action=org.freedesktop.NetworkManager.network-control
+ResultActive=yes
+ResultInactive=no
+ResultsAny=no
 
=== modified file 'debian/unity8-greeter.install'
--- debian/unity8-greeter.install	2016-01-22 15:24:02 +0000
+++ debian/unity8-greeter.install	2016-06-09 21:56:24 +0000
@@ -1,4 +1,5 @@
 data/unity8-greeter-wrapper usr/bin/
 data/unity8-greeter-init.conf usr/share/upstart/sessions/
+data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/
 usr/share/lightdm/greeters/unity8-greeter.desktop
 usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf
 
=== modified file 'plugins/LightDM/Greeter.cpp'
--- plugins/LightDM/Greeter.cpp	2015-10-01 23:54:24 +0000
+++ plugins/LightDM/Greeter.cpp	2016-06-09 21:56:24 +0000
@@ -78,6 +78,12 @@
     return d->promptless;
 }
 
+QString Greeter::selectUser() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->selectUserHint();
+}
+
 void Greeter::authenticate(const QString &username)
 {
     Q_D(Greeter);
 
=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2015-09-11 13:38:45 +0000
+++ plugins/LightDM/Greeter.h	2016-06-09 21:56:24 +0000
@@ -38,6 +38,7 @@
     Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
     Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
     Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
+    Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
 
 public:
     explicit Greeter(QObject* parent=0);
@@ -46,6 +47,7 @@
     bool isAuthenticated() const;
     QString authenticationUser() const;
     bool promptless() const;
+    QString selectUser() const;
 
 public Q_SLOTS:
     void authenticate(const QString &username=QString());
 
=== modified file 'plugins/Unity/Indicators/indicatorsmanager.cpp'
--- plugins/Unity/Indicators/indicatorsmanager.cpp	2016-03-29 03:47:39 +0000
+++ plugins/Unity/Indicators/indicatorsmanager.cpp	2016-06-09 21:56:24 +0000
@@ -291,7 +291,7 @@
     // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)
     if ((new_indicator->identifier() == QStringLiteral("indicator-session"))
             || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {
-        new_indicator->setProfile(QStringLiteral("desktop"));
+        new_indicator->setProfile(m_profile.replace(QStringLiteral("phone"), QStringLiteral("desktop")));
     } else {
         new_indicator->setProfile(m_profile);
     }
 
=== modified file 'qml/Greeter/Greeter.qml'
--- qml/Greeter/Greeter.qml	2016-05-02 18:43:06 +0000
+++ qml/Greeter/Greeter.qml	2016-06-09 21:56:24 +0000
@@ -114,7 +114,8 @@
         id: d
 
         readonly property bool multiUser: LightDMService.users.count > 1
-        property int currentIndex
+        readonly property int selectUserIndex: d.getUserIndex(LightDMService.greeter.selectUser)
+        property int currentIndex: Math.max(selectUserIndex, 0)
         property bool waiting
 
         // We want 'launcherOffset' to animate down to zero.  But not to animate
@@ -131,7 +132,23 @@
             UbuntuNumberAnimation {}
         }
 
+        function getUserIndex(username) {
+            if (username === "")
+                return -1;
+
+            // Find index for requested user, if it exists
+            for (var i = 0; i < LightDMService.users.count; i++) {
+                if (username === LightDMService.users.data(i, LightDMService.userRoles.NameRole)) {
+                    return i;
+                }
+            }
+
+            return -1;
+        }
+
         function selectUser(uid, reset) {
+            if (uid < 0)
+                return;
             d.waiting = true;
             if (reset) {
                 loader.item.reset();
@@ -440,15 +457,7 @@
             }
         }
 
-        onRequestAuthenticationUser: {
-            // Find index for requested user, if it exists
-            for (var i = 0; i < LightDMService.users.count; i++) {
-                if (user === LightDMService.users.data(i, LightDMService.userRoles.NameRole)) {
-                    d.selectUser(i, true);
-                    return;
-                }
-            }
-        }
+        onRequestAuthenticationUser: d.selectUser(d.getUserIndex(user), true)
     }
 
     Connections {
 
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2016-06-07 16:10:36 +0000
+++ qml/Shell.qml	2016-06-09 21:56:24 +0000
@@ -259,8 +259,8 @@
                                            ? "phone"
                                            : shell.usageScenario
             readonly property string qmlComponent: {
-                if(shell.mode === "greeter") {
-                    return "Stages/ShimStage.qml"
+                if (shell.mode === "greeter") {
+                    return "Stages/AbstractStage.qml"
                 } else if (applicationsDisplayLoader.usageScenario === "phone") {
                     return "Stages/PhoneStage.qml";
                 } else if (applicationsDisplayLoader.usageScenario === "tablet") {
@@ -531,7 +531,12 @@
 
                 indicatorsModel: Indicators.IndicatorsModel {
                     // tablet and phone both use the same profile
-                    profile: "phone"
+                    // FIXME: use just "phone" for greeter too, but first fix
+                    // greeter app launching to either load the app inside the
+                    // greeter or tell the session to load the app.  This will
+                    // involve taking the url-dispatcher dbus name and using
+                    // SessionBroadcast to tell the session.
+                    profile: shell.mode === "greeter" ? "desktop_greeter" : "phone"
                     Component.onCompleted: load();
                 }
             }
 
=== removed file 'qml/Stages/ShimStage.qml'
--- qml/Stages/ShimStage.qml	2016-04-14 13:28:11 +0000
+++ qml/Stages/ShimStage.qml	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2015 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY 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.4
-import Ubuntu.Components 1.3
-
-AbstractStage {
-    id: shimStage
-
-    anchors.fill: parent
-
-    Text {
-        id: greeterModeText
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.top: parent.top
-        anchors.topMargin: units.gu(10)
-        font.bold: true
-        horizontalAlignment: Text.AlignHCenter
-        text: "Shell is in \"greeter\" mode"
-    }
-
-    Text {
-        anchors.centerIn: parent
-        color: UbuntuColors.orange
-        font.pointSize: units.gu(8)
-        horizontalAlignment: Text.AlignHCenter
-        text: "Shim \nStage"
-    }
-}
 
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.cpp	2016-06-09 21:56:24 +0000
@@ -33,3 +33,19 @@
         Q_EMIT mockModeChanged(mockMode);
     }
 }
+
+QString MockGreeter::selectUserHint() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->selectUserHint();
+}
+
+void MockGreeter::setSelectUserHint(const QString &selectUserHint)
+{
+    Q_D(Greeter);
+
+    if (d->m_greeter->selectUserHint() != selectUserHint) {
+        d->m_greeter->setSelectUserHint(selectUserHint);
+        Q_EMIT selectUserHintChanged();
+    }
+}
 
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h'
--- tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	2015-09-25 13:01:00 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/MockGreeter.h	2016-06-09 21:56:24 +0000
@@ -25,13 +25,18 @@
     Q_OBJECT
 
     Q_PROPERTY(QString mockMode READ mockMode WRITE setMockMode NOTIFY mockModeChanged)
+    Q_PROPERTY(QString selectUser READ selectUserHint WRITE setSelectUserHint NOTIFY selectUserHintChanged)
 
 public:
     QString mockMode() const;
     void setMockMode(QString mockMode);
 
+    QString selectUserHint() const;
+    void setSelectUserHint(const QString &selectUserHint);
+
 Q_SIGNALS:
     void mockModeChanged(QString mode);
+    void selectUserHintChanged();
 };
 
 #endif // MOCK_UNITY_GREETER_H
 
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2015-08-19 14:24:07 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp	2016-06-09 21:56:24 +0000
@@ -76,7 +76,14 @@
 
 QString Greeter::selectUserHint() const
 {
-    return "";
+    Q_D(const Greeter);
+    return d->selectUserHint;
+}
+
+void Greeter::setSelectUserHint(const QString &selectUserHint)
+{
+    Q_D(Greeter);
+    d->selectUserHint = selectUserHint;
 }
 
 bool Greeter::selectGuestHint() const
 
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2015-02-20 15:30:19 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h	2016-06-09 21:56:24 +0000
@@ -70,6 +70,7 @@
     bool lockHint () const;
     bool hasGuestAccountHint() const;
     QString selectUserHint() const;
+    void setSelectUserHint(const QString &selectUserHint); // only in mock
     bool selectGuestHint() const;
     QString autologinUserHint() const;
     bool autologinGuestHint() const;
 
=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2016-05-26 13:15:35 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.h	2016-06-09 21:56:24 +0000
@@ -34,6 +34,7 @@
     bool authenticated;
     QString authenticationUser;
     bool twoFactorDone;
+    QString selectUserHint;
 
     QString mockMode;
 
 
=== modified file 'tests/qmltests/Greeter/TestView.qml'
--- tests/qmltests/Greeter/TestView.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Greeter/TestView.qml	2016-06-09 21:56:24 +0000
@@ -33,6 +33,7 @@
     property var infographicModel
     readonly property bool fullyShown: _fullyShown
     readonly property bool required: _required
+    readonly property bool animating: false
 
     property bool _fullyShown: true
     property bool _required: true
@@ -41,6 +42,7 @@
     signal responded(string response)
     signal tease()
     signal emergencyCall()
+    signal promptlessLogin()
 
     signal _showMessageCalled(string html)
     signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)
 
=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2016-06-07 16:10:36 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2016-06-09 21:56:24 +0000
@@ -139,7 +139,9 @@
 
         function init() {
             greeterSettings.lockedOutTime = 0;
-            resetLoader();
+            LightDM.Greeter.selectUser = "";
+            greeter.failedLoginsDelayAttempts = 7;
+            greeter.failedLoginsDelayMinutes = 5;
             teaseSpy.clear();
             sessionStartedSpy.clear();
             activeChangedSpy.clear();
@@ -151,11 +153,7 @@
             viewAuthenticationFailedSpy.clear();
             viewResetSpy.clear();
             viewTryToUnlockSpy.clear();
-            tryCompare(greeter, "waiting", false);
-            view = findChild(greeter, "testView");
-            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
-            greeter.failedLoginsDelayAttempts = 7;
-            greeter.failedLoginsDelayMinutes = 5;
+            resetLoader();
         }
 
         function resetLoader() {
@@ -167,6 +165,8 @@
             loader.active = true;
             tryCompare(loader, "status", Loader.Ready);
             removeTimeConstraintsFromSwipeAreas(loader.item);
+            tryCompare(greeter, "waiting", false);
+            view = findChild(greeter, "testView");
         }
 
         function getIndexOf(name) {
@@ -191,6 +191,7 @@
             compare(view.currentIndex, i);
             compare(AccountsService.user, name);
             compare(LightDM.Greeter.authenticationUser, name);
+            return i;
         }
 
         function verifyLoggedIn() {
@@ -229,11 +230,9 @@
 
         function test_promptless() {
             selectUser("no-password");
-            tryCompare(viewAuthenticationSucceededSpy, "count", 1);
-            compare(sessionStartedSpy.count, 1);
+            tryCompare(view, "locked", false);
             compare(viewShowPromptSpy.count, 0);
             compare(viewHideSpy.count, 0);
-            compare(view.locked, false);
         }
 
         function test_twoFactorPass() {
@@ -553,5 +552,24 @@
             compare(viewResetSpy.count, 1);
             tryCompare(viewShowPromptSpy, "count", 1);
         }
+
+        function test_selectUserHint() {
+            LightDM.Greeter.selectUser = "info-prompt";
+            resetLoader();
+            var i = verifySelected("info-prompt");
+            verify(i != 0); // sanity-check that info-prompt isn't default 0 answer
+        }
+
+        function test_selectUserHintUnset() {
+            LightDM.Greeter.selectUser = "";
+            resetLoader();
+            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+        }
+
+        function test_selectUserHintInvalid() {
+            LightDM.Greeter.selectUser = "not-a-real-user";
+            resetLoader();
+            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
+        }
     }
 }