From 71e469756218f4c4ee578090e7379bd13336ec12 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin
Date: Sat, 11 Feb 2017 17:08:06 -0500
Subject: [PATCH] two factor edits
---
src/app/settings/settingsController.js | 10 +++++++++-
src/app/settings/settingsTwoFactorController.js | 2 +-
src/app/settings/views/settingsTwoFactor.html | 6 ++++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/app/settings/settingsController.js b/src/app/settings/settingsController.js
index 7e81cd931e..c7021531ad 100644
--- a/src/app/settings/settingsController.js
+++ b/src/app/settings/settingsController.js
@@ -52,11 +52,19 @@
};
$scope.twoFactor = function () {
- $uibModal.open({
+ var twoFactorModal = $uibModal.open({
animation: true,
templateUrl: 'app/settings/views/settingsTwoFactor.html',
controller: 'settingsTwoFactorController'
});
+
+ twoFactorModal.result.then(function (enabled) {
+ if (enabled == null) {
+ return;
+ }
+
+ $scope.model.twoFactorEnabled = enabled;
+ });
};
$scope.sessions = function () {
diff --git a/src/app/settings/settingsTwoFactorController.js b/src/app/settings/settingsTwoFactorController.js
index dfd125d20d..0c8d4d3b03 100644
--- a/src/app/settings/settingsTwoFactorController.js
+++ b/src/app/settings/settingsTwoFactorController.js
@@ -83,6 +83,6 @@
}
$scope.close = function () {
- $uibModalInstance.dismiss('cancel');
+ $uibModalInstance.close(!_profile.extended ? null : _profile.extended.twoFactorEnabled);
};
});
diff --git a/src/app/settings/views/settingsTwoFactor.html b/src/app/settings/views/settingsTwoFactor.html
index 8cdfa7f5b4..4b4bfc7b14 100644
--- a/src/app/settings/views/settingsTwoFactor.html
+++ b/src/app/settings/views/settingsTwoFactor.html
@@ -64,7 +64,9 @@
print the recovery code below and keep it in a safe place.
Recovery Code: {{twoFactorModel.recovery}}
-
+
@@ -74,7 +76,7 @@
- What to disable? 3. Enter the resulting verification code from the app
+ Want to disable? 3. Enter the resulting verification code from the app