From 2772bffd0902c354c9bfb858fcd91568ba7b4f01 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 15 Aug 2017 08:24:14 -0400
Subject: [PATCH] qr code size and clean token on delete

---
 src/app/settings/settingsDeleteController.js           | 10 ++++++++--
 .../settings/settingsTwoStepAuthenticatorController.js |  2 +-
 .../settings/views/settingsTwoStepAuthenticator.html   |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/settings/settingsDeleteController.js b/src/app/settings/settingsDeleteController.js
index 15d4c180750..f5d1e303edc 100644
--- a/src/app/settings/settingsDeleteController.js
+++ b/src/app/settings/settingsDeleteController.js
@@ -2,16 +2,22 @@
     .module('bit.settings')
 
     .controller('settingsDeleteController', function ($scope, $state, apiService, $uibModalInstance, cryptoService,
-        authService, toastr, $analytics) {
+        authService, toastr, $analytics, tokenService) {
         $analytics.eventTrack('settingsDeleteController', { category: 'Modal' });
         $scope.submit = function (model) {
-            $scope.submitPromise = cryptoService.hashPassword(model.masterPassword).then(function (hash) {
+            var profile;
+
+            $scope.submitPromise = authService.getUserProfile().then(function (theProfile) {
+                profile = theProfile;
+                return cryptoService.hashPassword(model.masterPassword);
+            }).then(function (hash) {
                 return apiService.accounts.postDelete({
                     masterPasswordHash: hash
                 }).$promise;
             }).then(function () {
                 $uibModalInstance.dismiss('cancel');
                 authService.logOut();
+                tokenService.clearTwoFactorToken(profile.email);
                 $analytics.eventTrack('Deleted Account');
                 return $state.go('frontend.login.info');
             }).then(function () {
diff --git a/src/app/settings/settingsTwoStepAuthenticatorController.js b/src/app/settings/settingsTwoStepAuthenticatorController.js
index e21e51e12e3..2cd255e1dc2 100644
--- a/src/app/settings/settingsTwoStepAuthenticatorController.js
+++ b/src/app/settings/settingsTwoStepAuthenticatorController.js
@@ -44,7 +44,7 @@
 
             $scope.model = {
                 key: formatString(_key),
-                qr: 'https://chart.googleapis.com/chart?chs=120x120&chld=L|0&cht=qr&chl=otpauth://totp/' +
+                qr: 'https://chart.googleapis.com/chart?chs=123x123&chld=L|0&cht=qr&chl=otpauth://totp/' +
                 _issuer + ':' + encodeURIComponent(_profile.email) +
                 '%3Fsecret=' + encodeURIComponent(_key) +
                 '%26issuer=' + _issuer
diff --git a/src/app/settings/views/settingsTwoStepAuthenticator.html b/src/app/settings/views/settingsTwoStepAuthenticator.html
index 0689ca07f76..14edc9687e6 100644
--- a/src/app/settings/views/settingsTwoStepAuthenticator.html
+++ b/src/app/settings/views/settingsTwoStepAuthenticator.html
@@ -75,7 +75,7 @@
         <h4 ng-if="!enabled" style="margin-top: 30px;">2. Scan this QR code with your authenticator app</h4>
         <div class="row">
             <div class="col-md-4 text-center">
-                <p><img ng-src="{{model.qr}}" alt="QR" class="img-thumbnail" /></p>
+                <p><img ng-src="{{model.qr}}" alt="QR" /></p>
             </div>
             <div class="col-md-8">
                 <p>