Merge lp:~flscogna/ubuntu-terminal-app/fix-add-forceAuth into lp:ubuntu-terminal-app

[Filippo Scognamiglio]

Add the --forceAuth flag to terminal-app

This should add the --forceAuth flag to launch the application bypassing the authentication.
Sadly tonight the emulator is not working for me so I could only check that the code actually compiles, so please use extra care.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:150
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/102/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/462
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/462/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-terminal-app-utopic-amd64-ci/46

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-terminal-app-ci/102/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

This will need the same test work as https://code.launchpad.net/~ubuntu-filemanager-dev/ubuntu-filemanager-app/force-authentication-parameter/+merge/234015

[Nicholas Skaggs (nskaggs)]

This is rolled into https://code.launchpad.net/~ubuntu-terminal-dev/ubuntu-terminal-app/fix-add-forceAuth/+merge/235711 so everyone can work on it. Carla is going to add tests.

Thanks for the changes!

review: Disapprove

[Filippo Scognamiglio (flscogna)]

Ok, very well the other proposal is also fixing tests!

Unmerged revisions

150. By Filippo Scognamiglio on 2014-09-22

Add fake --forceAuth flag (needed for autopilot tests).

149. By Launchpad Translations on behalf of ubuntu-terminal-dev on 2014-09-16

Launchpad automatic translations update.

148. By Launchpad Translations on behalf of ubuntu-terminal-dev on 2014-09-15

Launchpad automatic translations update.

147. By Kill Animals on 2014-09-13

Update lib version imports.

Approved by Alan Pope ʕ•͡ᴥ•ʔ, Ubuntu Phone Apps Jenkins Bot.

146. By Victor Thompson on 2014-09-13

Clear password field when OK is pressed. Fixes: https://bugs.launchpad.net/bugs/1366387.

Approved by Alan Pope ʕ•͡ᴥ•ʔ, Ubuntu Phone Apps Jenkins Bot.

145. By Benjamin Zeller on 2014-09-13

Make terminal app cmake project useable out of the Box with QtCreator
(after dependencies are installed)
- Enable click mode by default
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename apparmor.json to terminal.apparmor (editor support)
- Rename manifest.json => manifest.json.in so insource builds won't
override it.

Approved by Alan Pope ʕ•͡ᴥ•ʔ, Ubuntu Phone Apps Jenkins Bot.

144. By Filippo Scognamiglio on 2014-09-13

Fix: terminal starts in application directory instead of home. Fixes: https://bugs.launchpad.net/bugs/1365602.

Approved by Alan Pope ʕ•͡ᴥ•ʔ, Ubuntu Phone Apps Jenkins Bot.

143. By Launchpad Translations on behalf of ubuntu-terminal-dev on 2014-09-12

Launchpad automatic translations update.

142. By Launchpad Translations on behalf of ubuntu-terminal-dev on 2014-09-11

Launchpad automatic translations update.

141. By Michael Sheldon on 2014-09-08

Set input hint to disable predictive text and auto capitalisation in custom terminal input implementation. Fixes: https://bugs.launchpad.net/bugs/1302870, https://bugs.launchpad.net/bugs/1307386, https://bugs.launchpad.net/bugs/1331354.

Approved by Ubuntu Phone Apps Jenkins Bot, Alan Pope ㋛, Filippo Scognamiglio.

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-04-27 20:38:52 +0000
+++ src/app/main.cpp	2014-09-22 21:32:42 +0000
@@ -47,12 +47,23 @@
         qDebug() << "usage: " + args.at(0) + " [-p|--phone] [-t|--tablet] [-h|--help] [-I <path>]";
         qDebug() << "    -p|--phone    If running on Desktop, start in a phone sized window.";
         qDebug() << "    -t|--tablet   If running on Desktop, start in a tablet sized window.";
+        qDebug() << "    --forceAuth <true|false> Force authentication on or off.";
         qDebug() << "    -h|--help     Print this help.";
         qDebug() << "    -I <path>     Give a path for an additional QML import directory. May be used multiple times.";
         qDebug() << "    -q <qmlfile>  Give an alternative location for the main qml file.";
         return 0;
     }
 
+    // Desktop doesn't have yet Unity8 and so no unity greeter either. Consequently it doesn't
+    // also have any "PIN code" or "Password" extra authentication. Don't require any extra
+    // authentication there by default
+    if (qgetenv("QT_QPA_PLATFORM") != "ubuntumirclient") {
+        qDebug() << Q_FUNC_INFO << "Running on non-MIR desktop, not requiring authentication by default";
+        view.engine()->rootContext()->setContextProperty("noAuthentication", QVariant(true));
+    } else {
+        view.engine()->rootContext()->setContextProperty("noAuthentication", QVariant(false));
+    }
+
     QString qmlfile;
     for (int i = 0; i < args.count(); i++) {
         if (args.at(i) == "-I" && args.count() > i + 1) {
@@ -64,6 +75,17 @@
             importPathList.append(addedPath);
         } else if (args.at(i) == "-q" && args.count() > i + 1) {
             qmlfile = args.at(i+1);
+        } else if (args.at(i) == "--forceAuth" && args.count() > i + 1) {
+            QString value = args.at(i+1);
+            if (value == "true") {
+                qDebug() << Q_FUNC_INFO << "Forcing authentication on";
+                view.engine()->rootContext()->setContextProperty("noAuthentication", QVariant(false));
+            } else if (value == "false") {
+                qDebug() << Q_FUNC_INFO << "Forcing authentication off";
+                view.engine()->rootContext()->setContextProperty("noAuthentication", QVariant(true));
+            } else {
+                qWarning() << Q_FUNC_INFO << "Invalid forceAuth option '" << value << "', keeping default";
+            }
         }
     }
 

=== modified file 'src/app/qml/AuthenticationService.qml'
--- src/app/qml/AuthenticationService.qml	2014-08-26 18:48:18 +0000
+++ src/app/qml/AuthenticationService.qml	2014-09-22 21:32:42 +0000
@@ -30,7 +30,7 @@
     signal denied()
 
     Component.onCompleted: {
-        if ( systemAuthentication.requireAuthentication() ) {
+        if ( systemAuthentication.requireAuthentication() && !noAuthentication) {
             displayLoginDialog();
         }
     }