From 6e6d75c90be6eab284975ab0c65a923daadbd3af Mon Sep 17 00:00:00 2001
From: Rashmi Kulkarni <rashmi.kulkarni@elastic.co>
Date: Mon, 24 Sep 2018 08:11:43 -0700
Subject: [PATCH] backport

---
 test/functional/config.js                     |  4 ++
 .../public/views/account/account.html         |  4 +-
 .../security/public/views/account/account.js  |  5 +-
 .../change_password_form.html                 |  5 ++
 .../public/views/nav_control/nav_control.html |  1 +
 x-pack/test/functional/apps/security/index.js |  1 +
 .../functional/apps/security/user_email.js    | 56 +++++++++++++++++++
 x-pack/test/functional/config.js              |  2 +
 .../page_objects/accountsetting_page.js       | 34 +++++++++++
 x-pack/test/functional/page_objects/index.js  |  1 +
 10 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/test/functional/apps/security/user_email.js
 create mode 100644 x-pack/test/functional/page_objects/accountsetting_page.js

diff --git a/test/functional/config.js b/test/functional/config.js
index aafdf9ebad25ca..394810a52f83a7 100644
--- a/test/functional/config.js
+++ b/test/functional/config.js
@@ -151,6 +151,10 @@ export default async function ({ readConfigFile }) {
         pathname: '/app/kibana',
         hash: '/dev_tools/console',
       },
+      account: {
+        pathname: '/app/kibana',
+        hash: '/account',
+      },
       home: {
         pathname: '/app/kibana',
         hash: '/home',
diff --git a/x-pack/plugins/security/public/views/account/account.html b/x-pack/plugins/security/public/views/account/account.html
index 9ae1092897b08a..67bb4edef50cd1 100644
--- a/x-pack/plugins/security/public/views/account/account.html
+++ b/x-pack/plugins/security/public/views/account/account.html
@@ -31,7 +31,7 @@ <h1 class="kuiTitle">
       Username
     </label>
     <div class="euiText">
-      <p ng-bind="::user.username"></p>
+      <p ng-bind="::user.username" data-test-subj=usernameField></p>
     </div>
   </div>
 
@@ -41,7 +41,7 @@ <h1 class="kuiTitle">
       Email
     </label>
     <div class="euiText">
-      <p ng-bind="::accountController.getEmail()"></p>
+      <p ng-bind="::accountController.getEmail()" data-test-subj=emailIdField></p>
     </div>
   </div>
 
diff --git a/x-pack/plugins/security/public/views/account/account.js b/x-pack/plugins/security/public/views/account/account.js
index 33df417b4d9832..fea49c55ccf20a 100644
--- a/x-pack/plugins/security/public/views/account/account.js
+++ b/x-pack/plugins/security/public/views/account/account.js
@@ -39,7 +39,10 @@ routes.when('/account', {
       }
 
       $scope.user.$changePassword()
-        .then(() => toastNotifications.addSuccess('Updated password'))
+        .then(() => toastNotifications.addSuccess({
+          title: 'Updated password',
+          'data-test-subj': 'passwordUpdateSuccess',
+        }))
         .then(onSuccess)
         .catch(error => {
           if (error.status === 401) {
diff --git a/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html b/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
index 45b2cff41031e9..f4fd63ff5b8d05 100644
--- a/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
+++ b/x-pack/plugins/security/public/views/management/change_password_form/change_password_form.html
@@ -9,6 +9,7 @@
     <a
       kbn-accessible-click
       class="kuiLink"
+      data-test-subj="changePasswordLink"
       ng-show="!changePasswordController.isFormVisible"
       ng-click="changePasswordController.showForm()"
     >
@@ -29,6 +30,7 @@
           type="password"
           class="kuiTextInput fullWidth"
           id="password"
+          data-test-subj="currentPasswordInput"
           name="password"
           ng-model="changePasswordController.currentPassword"
           required
@@ -52,6 +54,7 @@
           type="password"
           class="kuiTextInput fullWidth"
           id="newPassword"
+          data-test-subj="newPasswordInput"
           name="newPassword"
           ng-model="changePasswordController.newPassword"
           required
@@ -76,6 +79,7 @@
           type="password"
           class="kuiTextInput fullWidth"
           name="confirmPassword"
+          data-test-subj="confirmPasswordInput"
           ng-model="changePasswordController.newPasswordConfirmation"
           required
         />
@@ -102,6 +106,7 @@
       <div class="kuiFormFooter">
         <button
           type="button"
+          data-test-subj="saveChangesButton"
           class="kuiButton kuiButton--primary"
           ng-click="onChangePassword({ newPassword: changePasswordController.newPassword, currentPassword: changePasswordController.currentPassword, onSuccess: changePasswordController.hideForm, onIncorrectPassword: changePasswordController.onIncorrectPassword })"
           ng-disabled="changePasswordForm.newPassword.$invalid || (changePasswordController.newPassword !== changePasswordController.newPasswordConfirmation)"
diff --git a/x-pack/plugins/security/public/views/nav_control/nav_control.html b/x-pack/plugins/security/public/views/nav_control/nav_control.html
index 26b762c7863e3e..53f3beae707525 100644
--- a/x-pack/plugins/security/public/views/nav_control/nav_control.html
+++ b/x-pack/plugins/security/public/views/nav_control/nav_control.html
@@ -6,6 +6,7 @@
     label="user.full_name || user.username"
     is-disabled="accountDisabled"
     on-click="onClick($event, accountDisabled)"
+    data-test-subj="loggedInUser"
   ></global-nav-link>
 
   <global-nav-link
diff --git a/x-pack/test/functional/apps/security/index.js b/x-pack/test/functional/apps/security/index.js
index 7e3a1b2b813d51..0bccef48960c34 100644
--- a/x-pack/test/functional/apps/security/index.js
+++ b/x-pack/test/functional/apps/security/index.js
@@ -13,5 +13,6 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./secure_roles_perm'));
     loadTestFile(require.resolve('./field_level_security'));
     loadTestFile(require.resolve('./rbac_phase1'));
+    loadTestFile(require.resolve('./user_email'));
   });
 }
diff --git a/x-pack/test/functional/apps/security/user_email.js b/x-pack/test/functional/apps/security/user_email.js
new file mode 100644
index 00000000000000..3312171786683d
--- /dev/null
+++ b/x-pack/test/functional/apps/security/user_email.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from 'expect.js';
+import { indexBy } from 'lodash';
+export default function ({ getService, getPageObjects }) {
+
+  const PageObjects = getPageObjects(['security', 'settings', 'common', 'accountSetting']);
+  const log = getService('log');
+  const esArchiver = getService('esArchiver');
+
+  describe('useremail', function () {
+    before(async () => {
+      await esArchiver.load('discover');
+      await PageObjects.settings.navigateTo();
+      await PageObjects.security.clickElasticsearchUsers();
+    });
+
+    it('should add new user', async function () {
+      await PageObjects.security.addUser({ username: 'newuser', password: 'changeme',
+        confirmPassword: 'changeme', fullname: 'newuserFirst newuserLast', email: 'newuser@myEmail.com',
+        save: true, roles: ['kibana_user', 'superuser'] });
+      const users = indexBy(await PageObjects.security.getElasticsearchUsers(), 'username');
+      log.debug('actualUsers = %j', users);
+      expect(users.newuser.roles).to.eql(['kibana_user', 'superuser']);
+      expect(users.newuser.fullname).to.eql('newuserFirst newuserLast');
+      expect(users.newuser.email).to.eql('newuser@myEmail.com');
+      expect(users.newuser.reserved).to.be(false);
+      await PageObjects.security.logout();
+    });
+
+    it('login as new user and verify email', async function () {
+      await PageObjects.security.login('newuser', 'changeme');
+      await PageObjects.accountSetting.verifyAccountSettings('newuser@myEmail.com', 'newuser');
+    });
+
+    it('click changepassword link, change the password and re-login', async function () {
+      await PageObjects.accountSetting.verifyAccountSettings('newuser@myEmail.com', 'newuser');
+      await PageObjects.accountSetting.changePassword('changeme', 'mechange');
+      await PageObjects.security.logout();
+    });
+
+
+    it('login as new user with changed password', async function () {
+      await PageObjects.security.login('newuser', 'mechange');
+      await PageObjects.accountSetting.verifyAccountSettings('newuser@myEmail.com', 'newuser');
+    });
+
+    after(async function () {
+      await PageObjects.security.logout();
+    });
+  });
+}
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index c490c84bf21427..a7fea7e6eb0b88 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -16,6 +16,7 @@ import {
   GrokDebuggerPageProvider,
   WatcherPageProvider,
   ReportingPageProvider,
+  AccountSettingProvider,
 } from './page_objects';
 
 import {
@@ -116,6 +117,7 @@ export default async function ({ readConfigFile }) {
     pageObjects: {
       ...kibanaFunctionalConfig.get('pageObjects'),
       security: SecurityPageProvider,
+      accountSetting: AccountSettingProvider,
       monitoring: MonitoringPageProvider,
       logstash: LogstashPageProvider,
       graph: GraphPageProvider,
diff --git a/x-pack/test/functional/page_objects/accountsetting_page.js b/x-pack/test/functional/page_objects/accountsetting_page.js
new file mode 100644
index 00000000000000..20029f17ada9b8
--- /dev/null
+++ b/x-pack/test/functional/page_objects/accountsetting_page.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+//import { map as mapAsync } from 'bluebird';
+import expect from 'expect.js';
+
+export function AccountSettingProvider({ getService }) {
+  const testSubjects = getService('testSubjects');
+
+  class AccountSettingsPage {
+    async verifyAccountSettings(expectedEmail, expectedUserName) {
+      await testSubjects.click('loggedInUser');
+      const usernameField = await testSubjects.find('usernameField');
+      const userName = await usernameField.getVisibleText();
+      expect(userName).to.be(expectedUserName);
+      const emailIdField = await testSubjects.find('emailIdField');
+      const emailField = await emailIdField.getVisibleText();
+      expect(emailField).to.be(expectedEmail);
+    }
+
+    async changePassword(currentPassword, newPassword) {
+      await testSubjects.click('changePasswordLink');
+      await testSubjects.setValue('newPasswordInput', newPassword);
+      await testSubjects.setValue('currentPasswordInput', currentPassword);
+      await testSubjects.setValue('confirmPasswordInput', newPassword);
+      await testSubjects.click('saveChangesButton');
+      await testSubjects.existOrFail('passwordUpdateSuccess');
+    }
+  }
+  return new AccountSettingsPage();
+}
diff --git a/x-pack/test/functional/page_objects/index.js b/x-pack/test/functional/page_objects/index.js
index 9c505cee719e02..2a66d83a91ad93 100644
--- a/x-pack/test/functional/page_objects/index.js
+++ b/x-pack/test/functional/page_objects/index.js
@@ -11,3 +11,4 @@ export { GraphPageProvider } from './graph_page';
 export { GrokDebuggerPageProvider } from './grok_debugger_page';
 export { WatcherPageProvider } from './watcher_page';
 export { ReportingPageProvider } from './reporting_page';
+export { AccountSettingProvider } from './accountsetting_page';