a929782 · unity8 · git.iko.soy

git.iko.soy/unity8

Use the password hint from AccountsService to determine whether to show pin or password prompt

commita929782295e3578d11ccc4ac088529af43ba07e7 authorMichael Terry <michael.terry@canonical.com> dateWed 2 Jul 2014, 12:17 (12 years ago) parentc6e3263

13 files changed+86−24

compare with xenial

unifiedsplit

plugins/AccountsService/AccountsService.cpp+21−1 plugins/AccountsService/AccountsService.h+13 plugins/AccountsService/plugin.cpp+1 qml/Shell.qml+7−11 tests/mocks/AccountsService/AccountsService.cpp+12−2 tests/mocks/AccountsService/AccountsService.h+12 tests/mocks/AccountsService/CMakeLists.txt+4−1 tests/mocks/AccountsService/plugin.cpp+1 tests/mocks/LightDM/full/GreeterPrivate.cpp+1−1 tests/mocks/LightDM/single-pin/GreeterPrivate.cpp+1−1 tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp+1−1 tests/qmltests/CMakeLists.txt+1−1 tests/qmltests/Greeter/tst_Lockscreen.qml+11−5

plugins/AccountsService/AccountsService.cpp+21−1

@@ -26,7 +26,8 @@ AccountsService::AccountsService(QObject* parent)

2626 m_service(new AccountsServiceDBusAdaptor(this)),

2727 m_user(qgetenv("USER")),

2828 m_demoEdges(false),

29− m_statsWelcomeScreen(false)

29+ m_statsWelcomeScreen(false),

30+ m_passwordDisplayHint(Keyboard)

3031{

3132 connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),

3233 this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));

@@ -47,6 +48,7 @@ void AccountsService::setUser(const QString &user)

4748 updateDemoEdges();

4849 updateBackgroundFile();

4950 updateStatsWelcomeScreen();

51+ updatePasswordDisplayHint();

5052}

5153

5254bool AccountsService::demoEdges() const

@@ -70,6 +72,11 @@ bool AccountsService::statsWelcomeScreen() const

7072 return m_statsWelcomeScreen;

7173}

7274

75+AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

76+{

77+ return m_passwordDisplayHint;

78+}

79+

7380void AccountsService::updateDemoEdges()

7481{

7582 auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();

@@ -97,6 +104,15 @@ void AccountsService::updateStatsWelcomeScreen()

97104 }

98105}

99106

107+void AccountsService::updatePasswordDisplayHint()

108+{

109+ PasswordDisplayHint passwordDisplayHint = (PasswordDisplayHint)m_service->getUserProperty(m_user, "com.ubuntu.AccountsService.SecurityPrivacy", "PasswordDisplayHint").toInt();

110+ if (m_passwordDisplayHint != passwordDisplayHint) {

111+ m_passwordDisplayHint = passwordDisplayHint;

112+ Q_EMIT passwordDisplayHintChanged();

113+ }

114+}

115+

100116void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)

101117{

102118 if (m_user != user) {

@@ -111,6 +127,10 @@ void AccountsService::propertiesChanged(const QString &user, const QString &inte

111127 if (changed.contains("StatsWelcomeScreen")) {

112128 updateStatsWelcomeScreen();

113129 }

130+ } else if (interface == "com.ubuntu.AccountsService.SecurityPrivacy") {

131+ if (changed.contains("PasswordDisplayHint")) {

132+ updatePasswordDisplayHint();

133+ }

114134 }

115135}

116136

plugins/AccountsService/AccountsService.h+13

@@ -27,6 +27,7 @@ class AccountsServiceDBusAdaptor;

2727class AccountsService: public QObject

2828{

2929 Q_OBJECT

30+ Q_ENUMS(PasswordDisplayHint)

3031 Q_PROPERTY (QString user

3132 READ user

3233 WRITE setUser

@@ -41,8 +42,16 @@ class AccountsService: public QObject

4142 Q_PROPERTY (bool statsWelcomeScreen

4243 READ statsWelcomeScreen

4344 NOTIFY statsWelcomeScreenChanged)

45+ Q_PROPERTY (PasswordDisplayHint passwordDisplayHint

46+ READ passwordDisplayHint

47+ NOTIFY passwordDisplayHintChanged)

4448

4549public:

50+ enum PasswordDisplayHint {

51+ Keyboard,

52+ Numeric,

53+ };

54+

4655 explicit AccountsService(QObject *parent = 0);

4756

4857 QString user() const;

@@ -51,12 +60,14 @@ public:

5160 void setDemoEdges(bool demoEdges);

5261 QString backgroundFile() const;

5362 bool statsWelcomeScreen() const;

63+ PasswordDisplayHint passwordDisplayHint() const;

5464

5565Q_SIGNALS:

5666 void userChanged();

5767 void demoEdgesChanged();

5868 void backgroundFileChanged();

5969 void statsWelcomeScreenChanged();

70+ void passwordDisplayHintChanged();

6071

6172private Q_SLOTS:

6273 void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

@@ -66,12 +77,14 @@ private:

6677 void updateDemoEdges();

6778 void updateBackgroundFile();

6879 void updateStatsWelcomeScreen();

80+ void updatePasswordDisplayHint();

6981

7082 AccountsServiceDBusAdaptor *m_service;

7183 QString m_user;

7284 bool m_demoEdges;

7385 QString m_backgroundFile;

7486 bool m_statsWelcomeScreen;

87+ PasswordDisplayHint m_passwordDisplayHint;

7588};

7689

7790#endif

plugins/AccountsService/plugin.cpp+1

@@ -33,5 +33,6 @@ void AccountsServicePlugin::registerTypes(const char *uri)

3333{

3434 Q_ASSERT(uri == QLatin1String("AccountsService"));

3535 qDBusRegisterMetaType<QList<QVariantMap>>();

36+ qRegisterMetaType<AccountsService::PasswordDisplayHint>("AccountsService::PasswordDisplayHint");

3637 qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

3738}

qml/Shell.qml+7−11

@@ -349,6 +349,7 @@ FocusScope {

349349 width: parent.width

350350 height: parent.height - panel.panelHeight

351351 background: shell.background

352+ alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard

352353 minPinLength: 4

353354 maxPinLength: 4

354355

@@ -376,12 +377,6 @@ FocusScope {

376377

377378 onShowPrompt: {

378379 if (LightDM.Users.count == 1) {

379− // TODO: There's no better way for now to determine if its a PIN or a passphrase.

380− if (text == "PIN") {

381− lockscreen.alphaNumeric = false

382− } else {

383− lockscreen.alphaNumeric = true

384− }

385380 lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text);

386381 lockscreen.show();

387382 }

@@ -449,11 +444,12 @@ FocusScope {

449444

450445 function login() {

451446 enabled = false;

452− LightDM.Greeter.startSessionSync();

453− sessionStarted();

454− greeter.hide();

455− lockscreen.hide();

456− launcher.hide();

447+ if (LightDM.Greeter.startSessionSync()) {

448+ sessionStarted();

449+ greeter.hide();

450+ lockscreen.hide();

451+ launcher.hide();

452+ }

457453 enabled = true;

458454 }

459455

tests/mocks/AccountsService/AccountsService.cpp+12−2

@@ -29,12 +29,14 @@ AccountsService::AccountsService(QObject* parent)

2929

3030QString AccountsService::user() const

3131{

32− return "testuser";

32+ return m_user;

3333}

3434

3535void AccountsService::setUser(const QString &user)

3636{

37− Q_UNUSED(user)

37+ m_user = user;

38+ Q_EMIT userChanged();

39+ Q_EMIT passwordDisplayHintChanged();

3840}

3941

4042bool AccountsService::demoEdges() const

@@ -68,3 +70,11 @@ void AccountsService::setStatsWelcomeScreen(bool statsWelcomeScreen)

6870 m_statsWelcomeScreen = statsWelcomeScreen;

6971 statsWelcomeScreenChanged();

7072}

73+

74+AccountsService::PasswordDisplayHint AccountsService::passwordDisplayHint() const

75+{

76+ if (m_user == "has-pin")

77+ return PasswordDisplayHint::Numeric;

78+ else

79+ return PasswordDisplayHint::Keyboard;

80+}

tests/mocks/AccountsService/AccountsService.h+12

@@ -27,6 +27,7 @@

2727class AccountsService: public QObject

2828{

2929 Q_OBJECT

30+ Q_ENUMS(PasswordDisplayHint)

3031 Q_PROPERTY (QString user

3132 READ user

3233 WRITE setUser

@@ -43,8 +44,16 @@ class AccountsService: public QObject

4344 READ statsWelcomeScreen

4445 WRITE setStatsWelcomeScreen // only available in mock

4546 NOTIFY statsWelcomeScreenChanged)

47+ Q_PROPERTY (PasswordDisplayHint passwordDisplayHint

48+ READ passwordDisplayHint

49+ NOTIFY passwordDisplayHintChanged)

4650

4751public:

52+ enum PasswordDisplayHint {

53+ Keyboard,

54+ Numeric,

55+ };

56+

4857 explicit AccountsService(QObject *parent = 0);

4958

5059 QString user() const;

@@ -55,15 +64,18 @@ public:

5564 void setBackgroundFile(const QString &backgroundFile);

5665 bool statsWelcomeScreen() const;

5766 void setStatsWelcomeScreen(bool statsWelcomeScreen);

67+ PasswordDisplayHint passwordDisplayHint() const;

5868

5969Q_SIGNALS:

6070 void userChanged();

6171 void demoEdgesChanged();

6272 void backgroundFileChanged();

6373 void statsWelcomeScreenChanged();

74+ void passwordDisplayHintChanged();

6475

6576private:

6677 QString m_backgroundFile;

78+ QString m_user;

6779 bool m_statsWelcomeScreen;

6880};

6981

tests/mocks/AccountsService/CMakeLists.txt+4−1

@@ -5,4 +5,7 @@ add_library(MockAccountsService-qml MODULE

66qt5_use_modules(MockAccountsService-qml DBus Qml)

8−add_unity8_mock(AccountsService 0.1 AccountsService TARGETS MockAccountsService-qml)

8+add_unity8_mock(AccountsService 0.1 AccountsService

9+ PREFIX mocks

10+ TARGETS MockAccountsService-qml

11+ )

tests/mocks/AccountsService/plugin.cpp+1

@@ -32,5 +32,6 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

3232void AccountsServicePlugin::registerTypes(const char *uri)

3333{

3434 Q_ASSERT(uri == QLatin1String("AccountsService"));

35+ qRegisterMetaType<AccountsService::PasswordDisplayHint>("AccountsService::PasswordDisplayHint");

3536 qmlRegisterSingletonType<AccountsService>(uri, 0, 1, "AccountsService", service_provider);

3637}

tests/mocks/LightDM/full/GreeterPrivate.cpp+1−1

@@ -54,7 +54,7 @@ void GreeterPrivate::handleAuthenticate()

5454 authenticated = true;

5555 Q_EMIT q->authenticationComplete();

5656 } else if (authenticationUser == "has-pin"){

57− Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);

57+ Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);

5858 } else if (authenticationUser == "auth-error") {

5959 authenticated = false;

6060 Q_EMIT q->authenticationComplete();

tests/mocks/LightDM/single-pin/GreeterPrivate.cpp+1−1

@@ -32,7 +32,7 @@ GreeterPrivate::GreeterPrivate(Greeter* parent)

3232void GreeterPrivate::handleAuthenticate()

3333{

3434 Q_Q(Greeter);

35− Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);

35+ Q_EMIT q->showPrompt("Password:", Greeter::PromptTypeSecret);

3636}

3737

3838void GreeterPrivate::handleRespond(const QString &response)

tests/mocks/LightDM/single-pin/UsersModelPrivate.cpp+1−1

@@ -26,7 +26,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

2626{

2727 entries =

2828 {

29− { "single", "Has PIN", 0, 0, false, false, 0, 0 },

29+ { "has-pin", "Has PIN", 0, 0, false, false, 0, 0 },

3030 };

3131}

3232

tests/qmltests/CMakeLists.txt+1−1

@@ -73,4 +73,4 @@ add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=

7373# These MenuItemFactory tests need the test/mocks/ to come before plugins/

7474add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

7575add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})

76−add_qml_test(Stages PhoneStage)

76+add_qml_test(Stages PhoneStage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin")

tests/qmltests/Greeter/tst_Lockscreen.qml+11−5

@@ -18,8 +18,9 @@ import QtQuick 2.0

1818import QtTest 1.0

1919import ".."

2020import "../../../qml/Components"

21−import Ubuntu.Components 0.1

21+import AccountsService 0.1

2222import LightDM 0.1 as LightDM

23+import Ubuntu.Components 0.1

2324import Unity.Test 0.1 as UT

2425

2526Rectangle {

@@ -53,11 +54,16 @@ Rectangle {

5354 }

5455 }

5556

57+ function setUser(username) {

58+ AccountsService.user = username

59+ LightDM.Greeter.authenticate(username)

60+ }

61+

5662 Connections {

5763 target: LightDM.Greeter

5864

5965 onShowPrompt: {

60− if (text === "PIN") {

66+ if (AccountsService.passwordDisplayHint === AccountsService.Numeric) {

6167 pinPadCheckBox.checked = false

6268 } else {

6369 pinPadCheckBox.checked = true

@@ -139,12 +145,12 @@ Rectangle {

139145 Button {

140146 text: "start auth (1234)"

141147 width: parent.width

142− onClicked: LightDM.Greeter.authenticate("has-pin")

148+ onClicked: setUser("has-pin")

143149 }

144150 Button {

145151 text: "start auth (password)"

146152 width: parent.width

147− onClicked: LightDM.Greeter.authenticate("has-password")

153+ onClicked: setUser("has-password")

148154 }

149155

150156 TextField {

@@ -255,7 +261,7 @@ Rectangle {

255261 enteredLabel.text = ""

256262 minPinLengthTextField.text = data.minPinLength

257263 maxPinLengthTextField.text = data.maxPinLength

258− LightDM.Greeter.authenticate(data.username)

264+ setUser(data.username)

259265 waitForLockscreenReady();

260266

261267 var inputField = findChild(lockscreen, "pinentryField")