From e00f033ffd7e18ed58a69acf99a0bb2db06375ca Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 3 Apr 2017 09:30:21 -0400
Subject: [PATCH] resolve lint errors

---
 src/app/services/cryptoService.js | 8 ++++----
 src/app/vault/vaultController.js  | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/app/services/cryptoService.js b/src/app/services/cryptoService.js
index 629dd199c9..6aa76f2357 100644
--- a/src/app/services/cryptoService.js
+++ b/src/app/services/cryptoService.js
@@ -57,7 +57,7 @@ angular
             }
         };
 
-        _service.addOrgKey = function (orgId, orgKey, privateKey) {
+        _service.addOrgKey = function (orgId, encOrgKey, privateKey) {
             _orgKeys = _service.getOrgKeys();
             if (!_orgKeys) {
                 _orgKeys = {};
@@ -69,9 +69,9 @@ angular
             }
 
             try {
-                var orgKey = _service.rsaDecrypt(orgKey, privateKey);
-                _orgKeys[orgId] = orgKey;
-                orgKeysb64[orgId] = forge.util.encode64(orgKey);
+                var decOrgKey = _service.rsaDecrypt(encOrgKey, privateKey);
+                _orgKeys[orgId] = decOrgKey;
+                orgKeysb64[orgId] = forge.util.encode64(decOrgKey);
             }
             catch (e) {
                 _orgKeys = null;
diff --git a/src/app/vault/vaultController.js b/src/app/vault/vaultController.js
index dafa882387..8c7e823c01 100644
--- a/src/app/vault/vaultController.js
+++ b/src/app/vault/vaultController.js
@@ -60,8 +60,9 @@
             });
 
             editModel.result.then(function (returnVal) {
+                var loginToUpdate;
                 if (returnVal.action === 'edit') {
-                    var loginToUpdate = $filter('filter')($scope.logins, { id: returnVal.data.id }, true);
+                    loginToUpdate = $filter('filter')($scope.logins, { id: returnVal.data.id }, true);
                     if (loginToUpdate && loginToUpdate.length > 0) {
                         loginToUpdate[0].folderId = returnVal.data.folderId;
                         loginToUpdate[0].name = returnVal.data.name;
@@ -70,7 +71,7 @@
                     }
                 }
                 else if (returnVal.action === 'partialEdit') {
-                    var loginToUpdate = $filter('filter')($scope.logins, { id: returnVal.data.id }, true);
+                    loginToUpdate = $filter('filter')($scope.logins, { id: returnVal.data.id }, true);
                     if (loginToUpdate && loginToUpdate.length > 0) {
                         loginToUpdate[0].folderId = returnVal.data.folderId;
                         loginToUpdate[0].favorite = returnVal.data.favorite;