two factor edits

This commit is contained in:
Kyle Spearrin 2017-02-11 17:08:06 -05:00
parent cf1bffe2f1
commit 71e4697562
3 changed files with 14 additions and 4 deletions

View File

@ -52,11 +52,19 @@
}; };
$scope.twoFactor = function () { $scope.twoFactor = function () {
$uibModal.open({ var twoFactorModal = $uibModal.open({
animation: true, animation: true,
templateUrl: 'app/settings/views/settingsTwoFactor.html', templateUrl: 'app/settings/views/settingsTwoFactor.html',
controller: 'settingsTwoFactorController' controller: 'settingsTwoFactorController'
}); });
twoFactorModal.result.then(function (enabled) {
if (enabled == null) {
return;
}
$scope.model.twoFactorEnabled = enabled;
});
}; };
$scope.sessions = function () { $scope.sessions = function () {

View File

@ -83,6 +83,6 @@
} }
$scope.close = function () { $scope.close = function () {
$uibModalInstance.dismiss('cancel'); $uibModalInstance.close(!_profile.extended ? null : _profile.extended.twoFactorEnabled);
}; };
}); });

View File

@ -64,7 +64,9 @@
print the recovery code below and keep it in a safe place. print the recovery code below and keep it in a safe place.
</p> </p>
<p><strong>Recovery Code:</strong> <code>{{twoFactorModel.recovery}}</code></p> <p><strong>Recovery Code:</strong> <code>{{twoFactorModel.recovery}}</code></p>
<button class="btn btn-default" ng-click="print(twoFactorModel.recovery)"><i class="fa fa-print"></i> Print</button> <button type="button" class="btn btn-default" ng-click="print(twoFactorModel.recovery)">
<i class="fa fa-print"></i> Print
</button>
</div> </div>
</div> </div>
<div class="callout callout-danger validation-errors" ng-show="updateTwoStepForm.$errors"> <div class="callout callout-danger validation-errors" ng-show="updateTwoStepForm.$errors">
@ -74,7 +76,7 @@
</ul> </ul>
</div> </div>
<hr ng-show="enabled()" /> <hr ng-show="enabled()" />
<h4 style="margin-top: 30px;"><span ng-show="enabled()">What to disable? </span><span ng-show="!enabled()">3. </span>Enter the resulting verification code from the app</h4> <h4 style="margin-top: 30px;"><span ng-show="enabled()">Want to disable? </span><span ng-show="!enabled()">3. </span>Enter the resulting verification code from the app</h4>
<div class="form-group" show-errors> <div class="form-group" show-errors>
<label for="token" class="sr-only">Verification Code</label> <label for="token" class="sr-only">Verification Code</label>
<input type="text" id="token" name="Token" placeholder="Verification Code" ng-model="updateModel.token" class="form-control" required api-field /> <input type="text" id="token" name="Token" placeholder="Verification Code" ng-model="updateModel.token" class="form-control" required api-field />