u2f cleanup

src/app/settings/settingsSessionsController.js

@@ -2,21 +2,25 @@
     .module('bit.settings')
 
     .controller('settingsSessionsController', function ($scope, $state, apiService, $uibModalInstance, cryptoService,
-        authService, toastr, $analytics) {
+        authService, tokenService, toastr, $analytics) {
         $analytics.eventTrack('settingsSessionsController', { category: 'Modal' });
         $scope.submit = function (model) {
             var request = {
                 masterPasswordHash: cryptoService.hashPassword(model.masterPassword)
             };
 
-            $scope.submitPromise = apiService.accounts.putSecurityStamp(request, function () {
-                $uibModalInstance.dismiss('cancel');
-                authService.logOut();
-                $analytics.eventTrack('Deauthorized Sessions');
-                $state.go('frontend.login.info').then(function () {
-                    toastr.success('Please log back in.', 'All Sessions Deauthorized');
+            $scope.submitPromise =
+                authService.getUserProfile().then(function (profile) {
+                    apiService.accounts.putSecurityStamp(request, function () {
+                        $uibModalInstance.dismiss('cancel');
+                        authService.logOut();
+                        tokenService.clearTwoFactorToken(profile.email);
+                        $analytics.eventTrack('Deauthorized Sessions');
+                        $state.go('frontend.login.info').then(function () {
+                            toastr.success('Please log back in.', 'All Sessions Deauthorized');
+                        });
+                    }).$promise;
                 });
-            }).$promise;
         };
 
         $scope.close = function () {

src/app/settings/views/settingsSessions.html

@@ -6,10 +6,14 @@
     <div class="modal-body">
         <p>Concerned your account is logged in on another device?</p>
         <p>Proceed below to deauthorize all computers or devices that you have previously used.</p>
-        <p>This security step is recommended if you previously used a public PC or accidentally saved your password on a device that isn't yours.</p>
+        <p>
+            This security step is recommended if you previously used a public PC or accidentally saved your password
+            on a device that isn't yours. This step will also clear all previously remembered two-step login sessions.
+        </p>
         <div class="callout callout-warning">
             <h4><i class="fa fa-warning"></i> Warning</h4>
-            Proceeding will log you out of your current session as well, requiring you to log back in.
+            Proceeding will also log you out of your current session, requiring you to log back in. You will also be prompted
+            for two-step login again, if enabled.
         </div>
         <div class="callout callout-danger validation-errors" ng-show="logoutSessionsForm.$errors">
             <h4>Errors have occurred</h4>

src/app/settings/views/settingsTwoStep.html

@@ -18,7 +18,7 @@
             <div class="table-responsive">
                 <table class="table table-striped table-hover table-vmiddle">
                     <tbody>
-                        <tr ng-repeat="provider in providers">
+                        <tr ng-repeat="provider in providers | orderBy: 'displayOrder'">
                             <td style="width: 120px; height: 75px;" align="center">
                                 <img alt="{{::provider.name}}" ng-src="{{'images/two-factor/' + provider.image}}" />
                             </td>