From 10792f714e301905fb6841afa4f909d72f7b1cc3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 24 Jul 2017 12:08:21 -0400
Subject: [PATCH] focus master password field on load

---
 src/app/settings/settingsTwoStepAuthenticatorController.js | 6 +++++-
 src/app/settings/settingsTwoStepDuoController.js           | 6 +++++-
 src/app/settings/settingsTwoStepEmailController.js         | 6 +++++-
 src/app/settings/settingsTwoStepRecoverController.js       | 6 +++++-
 src/app/settings/settingsTwoStepU2fController.js           | 4 ++++
 src/app/settings/settingsTwoStepYubiController.js          | 6 +++++-
 6 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/app/settings/settingsTwoStepAuthenticatorController.js b/src/app/settings/settingsTwoStepAuthenticatorController.js
index 88422f69..2110a82d 100644
--- a/src/app/settings/settingsTwoStepAuthenticatorController.js
+++ b/src/app/settings/settingsTwoStepAuthenticatorController.js
@@ -2,13 +2,17 @@
     .module('bit.settings')
 
     .controller('settingsTwoStepAuthenticatorController', function ($scope, apiService, $uibModalInstance, cryptoService,
-        authService, $q, toastr, $analytics, constants) {
+        authService, $q, toastr, $analytics, constants, $timeout) {
         $analytics.eventTrack('settingsTwoStepAuthenticatorController', { category: 'Modal' });
         var _issuer = 'bitwarden',
             _profile = null,
             _masterPasswordHash,
             _key = null;
 
+        $timeout(function () {
+            $("#masterPassword").focus();
+        });
+
         $scope.auth = function (model) {
             var response = null;
             $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
diff --git a/src/app/settings/settingsTwoStepDuoController.js b/src/app/settings/settingsTwoStepDuoController.js
index 324ec96c..9a8a3ed7 100644
--- a/src/app/settings/settingsTwoStepDuoController.js
+++ b/src/app/settings/settingsTwoStepDuoController.js
@@ -2,7 +2,7 @@
     .module('bit.settings')
 
     .controller('settingsTwoStepDuoController', function ($scope, apiService, $uibModalInstance, cryptoService,
-        toastr, $analytics, constants) {
+        toastr, $analytics, constants, $timeout) {
         $analytics.eventTrack('settingsTwoStepDuoController', { category: 'Modal' });
         var _masterPasswordHash;
 
@@ -13,6 +13,10 @@
             skey: null
         };
 
+        $timeout(function () {
+            $("#masterPassword").focus();
+        });
+
         $scope.auth = function (model) {
             $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
                 _masterPasswordHash = hash;
diff --git a/src/app/settings/settingsTwoStepEmailController.js b/src/app/settings/settingsTwoStepEmailController.js
index 1563ae1d..f6bc85ca 100644
--- a/src/app/settings/settingsTwoStepEmailController.js
+++ b/src/app/settings/settingsTwoStepEmailController.js
@@ -2,7 +2,7 @@
     .module('bit.settings')
 
     .controller('settingsTwoStepEmailController', function ($scope, apiService, $uibModalInstance, cryptoService,
-        authService, toastr, $analytics, constants) {
+        authService, toastr, $analytics, constants, $timeout) {
         $analytics.eventTrack('settingsTwoStepEmailController', { category: 'Modal' });
         var _profile = null,
             _masterPasswordHash;
@@ -12,6 +12,10 @@
             email: null
         };
 
+        $timeout(function () {
+            $("#masterPassword").focus();
+        });
+
         $scope.auth = function (model) {
             var response = null;
             $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
diff --git a/src/app/settings/settingsTwoStepRecoverController.js b/src/app/settings/settingsTwoStepRecoverController.js
index d7dba16c..fa34bb0a 100644
--- a/src/app/settings/settingsTwoStepRecoverController.js
+++ b/src/app/settings/settingsTwoStepRecoverController.js
@@ -2,7 +2,7 @@
     .module('bit.settings')
 
     .controller('settingsTwoStepRecoverController', function ($scope, apiService, $uibModalInstance, cryptoService,
-        $analytics) {
+        $analytics, $timeout) {
         $analytics.eventTrack('settingsTwoStepRecoverController', { category: 'Modal' });
         $scope.code = null;
 
@@ -17,6 +17,10 @@
             });
         };
 
+        $timeout(function () {
+            $("#masterPassword").focus();
+        });
+
         $scope.print = function () {
             if (!$scope.code) {
                 return;
diff --git a/src/app/settings/settingsTwoStepU2fController.js b/src/app/settings/settingsTwoStepU2fController.js
index bab7c1cd..f72fae46 100644
--- a/src/app/settings/settingsTwoStepU2fController.js
+++ b/src/app/settings/settingsTwoStepU2fController.js
@@ -11,6 +11,10 @@
         $scope.deviceListening = false;
         $scope.deviceError = false;
 
+        $timeout(function () {
+            $("#masterPassword").focus();
+        });
+
         $scope.auth = function (model) {
             $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
                 _masterPasswordHash = hash;
diff --git a/src/app/settings/settingsTwoStepYubiController.js b/src/app/settings/settingsTwoStepYubiController.js
index ca1f2404..55d512ec 100644
--- a/src/app/settings/settingsTwoStepYubiController.js
+++ b/src/app/settings/settingsTwoStepYubiController.js
@@ -2,11 +2,15 @@
     .module('bit.settings')
 
     .controller('settingsTwoStepYubiController', function ($scope, apiService, $uibModalInstance, cryptoService,
-        authService, toastr, $analytics, constants) {
+        authService, toastr, $analytics, constants, $timeout) {
         $analytics.eventTrack('settingsTwoStepYubiController', { category: 'Modal' });
         var _profile = null,
             _masterPasswordHash;
 
+        $timeout(function () {
+            $("#masterPassword").focus();
+        });
+
         $scope.auth = function (model) {
             var response = null;
             $scope.authPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {