From 4e270cc1cb20b921b191d5e6eb5badd402075b5d Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 26 Jun 2017 23:55:51 -0400 Subject: [PATCH] u2f fixes. bg vars with prefix --- src/background.js | 167 +++++++++--------- src/models/domainModels.js | 6 +- .../accountsLoginTwoFactorController.js | 52 ++++-- .../accountsTwoFactorMethodsController.js | 2 +- .../views/accountsLoginTwoFactor.html | 4 +- src/popup/app/services/backgroundService.js | 30 ++-- src/scripts/analytics.js | 6 +- src/services/folderService.js | 12 +- src/services/lockService.js | 6 +- src/services/loginService.js | 22 +-- 10 files changed, 166 insertions(+), 141 deletions(-) diff --git a/src/background.js b/src/background.js index c1db42e9..be23191a 100644 --- a/src/background.js +++ b/src/background.js @@ -1,21 +1,22 @@ var isBackground = true; -var loginsToAdd = []; -var i18nService = new i18nService(); -var constantsService = new ConstantsService(); -var utilsService = new UtilsService(); -var cryptoService = new CryptoService(constantsService); -var tokenService = new TokenService(); -var appIdService = new AppIdService(); -var apiService = new ApiService(tokenService, appIdService, utilsService, logout); -var userService = new UserService(tokenService, apiService, cryptoService); -var settingsService = new SettingsService(userService); -var loginService = new LoginService(cryptoService, userService, apiService, settingsService); -var folderService = new FolderService(cryptoService, userService, apiService); -var lockService = new LockService(constantsService, cryptoService, folderService, loginService, setIcon, refreshBadgeAndMenu); -var syncService = new SyncService(loginService, folderService, userService, apiService, settingsService, - cryptoService, logout); -var autofillService = new AutofillService(); -var passwordGenerationService = new PasswordGenerationService(); +var bg_loginsToAdd = []; +var bg_i18nService = new i18nService(); +var bg_constantsService = new ConstantsService(); +var bg_utilsService = new UtilsService(); +var bg_cryptoService = new CryptoService(bg_constantsService); +var bg_tokenService = new TokenService(); +var bg_appIdService = new AppIdService(); +var bg_apiService = new ApiService(bg_tokenService, bg_appIdService, bg_utilsService, logout); +var bg_userService = new UserService(bg_tokenService, bg_apiService, bg_cryptoService); +var bg_settingsService = new SettingsService(bg_userService); +var bg_loginService = new LoginService(bg_cryptoService, bg_userService, bg_apiService, bg_settingsService); +var bg_folderService = new FolderService(bg_cryptoService, bg_userService, bg_apiService); +var bg_lockService = new LockService(bg_constantsService, bg_cryptoService, bg_folderService, bg_loginService, setIcon, + refreshBadgeAndMenu); +var bg_syncService = new SyncService(bg_loginService, bg_folderService, bg_userService, bg_apiService, bg_settingsService, + bg_cryptoService, logout); +var bg_autofillService = new AutofillService(); +var bg_passwordGenerationService = new PasswordGenerationService(); if (chrome.commands) { chrome.commands.onCommand.addListener(function (command) { @@ -24,8 +25,8 @@ if (chrome.commands) { hitType: 'event', eventAction: 'Generated Password From Command' }); - passwordGenerationService.getOptions().then(function (options) { - var password = passwordGenerationService.generatePassword(options); + bg_passwordGenerationService.getOptions().then(function (options) { + var password = bg_passwordGenerationService.generatePassword(options); copyToClipboard(password); }); } @@ -77,7 +78,7 @@ chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) { } else if (msg.command === 'collectPageDetailsResponse') { if (msg.contentScript) { - var forms = autofillService.getFormsWithPasswordFields(msg.details); + var forms = bg_autofillService.getFormsWithPasswordFields(msg.details); messageTab(msg.tabId, 'pageDetails', { details: msg.details, forms: forms }); } else { @@ -92,8 +93,8 @@ chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) { setIcon(); function setIcon() { - userService.isAuthenticated(function (isAuthenticated) { - cryptoService.getKey().then(function (key) { + bg_userService.isAuthenticated(function (isAuthenticated) { + bg_cryptoService.getKey().then(function (key) { var suffix = ''; if (!isAuthenticated) { suffix = '_gray'; @@ -144,9 +145,9 @@ function buildContextMenu(callback) { id: 'autofill', parentId: 'root', contexts: ['all'], - title: i18nService.autoFill + title: bg_i18nService.autoFill }, function () { - if (utilsService.isFirefox()) { + if (bg_utilsService.isFirefox()) { // Firefox does not support writing to the clipboard from background buildingContextMenu = false; if (callback) { @@ -160,14 +161,14 @@ function buildContextMenu(callback) { id: 'copy-username', parentId: 'root', contexts: ['all'], - title: i18nService.copyUsername + title: bg_i18nService.copyUsername }, function () { chrome.contextMenus.create({ type: 'normal', id: 'copy-password', parentId: 'root', contexts: ['all'], - title: i18nService.copyPassword + title: bg_i18nService.copyPassword }, function () { chrome.contextMenus.create({ type: 'separator', @@ -179,7 +180,7 @@ function buildContextMenu(callback) { id: 'generate-password', parentId: 'root', contexts: ['all'], - title: i18nService.generatePasswordCopied + title: bg_i18nService.generatePasswordCopied }, function () { buildingContextMenu = false; if (callback) { @@ -203,7 +204,7 @@ chrome.tabs.onReplaced.addListener(function (addedTabId, removedTabId) { return; } onReplacedRan = true; - checkLoginsToAdd(); + checkbg_loginsToAdd(); refreshBadgeAndMenu(); }); @@ -213,7 +214,7 @@ chrome.tabs.onUpdated.addListener(function (tabId, changeInfo, tab) { return; } onUpdatedRan = true; - checkLoginsToAdd(); + checkbg_loginsToAdd(); refreshBadgeAndMenu(); }); @@ -236,8 +237,8 @@ function refreshBadgeAndMenu() { return; } - chrome.storage.local.get(constantsService.disableContextMenuItemKey, function (obj) { - if (!obj[constantsService.disableContextMenuItemKey]) { + chrome.storage.local.get(bg_constantsService.disableContextMenuItemKey, function (obj) { + if (!obj[bg_constantsService.disableContextMenuItemKey]) { buildContextMenu(function () { contextMenuReady(tab, true); }); @@ -260,7 +261,7 @@ function loadMenuAndUpdateBadge(url, tabId, contextMenuEnabled) { return; } - var tabDomain = utilsService.getDomain(url); + var tabDomain = bg_utilsService.getDomain(url); if (!tabDomain) { return; } @@ -268,7 +269,7 @@ function loadMenuAndUpdateBadge(url, tabId, contextMenuEnabled) { chrome.browserAction.setBadgeBackgroundColor({ color: '#294e5f' }); menuOptionsLoaded = []; - loginService.getAllDecryptedForDomain(tabDomain).then(function (logins) { + bg_loginService.getAllDecryptedForDomain(tabDomain).then(function (logins) { sortLogins(logins); if (contextMenuEnabled) { @@ -291,7 +292,7 @@ function loadMenuAndUpdateBadge(url, tabId, contextMenuEnabled) { } else { if (contextMenuEnabled) { - loadNoLoginsContextMenuOptions(i18nService.noMatchingLogins); + loadNoLoginsContextMenuOptions(bg_i18nService.noMatchingLogins); } chrome.browserAction.setBadgeText({ text: '', @@ -300,7 +301,7 @@ function loadMenuAndUpdateBadge(url, tabId, contextMenuEnabled) { } }, function () { if (contextMenuEnabled) { - loadNoLoginsContextMenuOptions(i18nService.vaultLocked); + loadNoLoginsContextMenuOptions(bg_i18nService.vaultLocked); } chrome.browserAction.setBadgeText({ text: '', @@ -315,8 +316,8 @@ chrome.contextMenus.onClicked.addListener(function (info, tab) { hitType: 'event', eventAction: 'Generated Password From Context Menu' }); - passwordGenerationService.getOptions().then(function (options) { - var password = passwordGenerationService.generatePassword(options); + bg_passwordGenerationService.getOptions().then(function (options) { + var password = bg_passwordGenerationService.generatePassword(options); copyToClipboard(password); }); } @@ -327,7 +328,7 @@ chrome.contextMenus.onClicked.addListener(function (info, tab) { return; } - loginService.getAllDecrypted().then(function (logins) { + bg_loginService.getAllDecrypted().then(function (logins) { for (var i = 0; i < logins.length; i++) { if (logins[i].id === id) { if (info.parentMenuItemId === 'autofill') { @@ -400,12 +401,12 @@ function collectPageDetailsForContentScript(tab) { } function addLogin(login, tab) { - var loginDomain = utilsService.getDomain(login.url); + var loginDomain = bg_utilsService.getDomain(login.url); if (!loginDomain) { return; } - loginService.getAllDecryptedForDomain(loginDomain).then(function (logins) { + bg_loginService.getAllDecryptedForDomain(loginDomain).then(function (logins) { var match = false; for (var i = 0; i < logins.length; i++) { if (logins[i].username === login.username) { @@ -418,7 +419,7 @@ function addLogin(login, tab) { // remove any old logins for this tab removeAddLogin(tab); - loginsToAdd.push({ + bg_loginsToAdd.push({ username: login.username, password: login.password, name: loginDomain, @@ -427,15 +428,15 @@ function addLogin(login, tab) { tabId: tab.id, expires: new Date((new Date()).getTime() + 30 * 60000) // 30 minutes }); - checkLoginsToAdd(tab); + checkbg_loginsToAdd(tab); } }); } var lastCleanupLoginCheck = null; -cleanupLoginsToAdd(); -setInterval(cleanupLoginsToAdd, 2 * 60 * 1000); // check every 2 minutes -function cleanupLoginsToAdd() { +cleanupbg_loginsToAdd(); +setInterval(cleanupbg_loginsToAdd, 2 * 60 * 1000); // check every 2 minutes +function cleanupbg_loginsToAdd() { var now = new Date(); if (lastCleanupLoginCheck && (now - lastCleanupLoginCheck) < 10000) { // can only check cleanup every 10 seconds @@ -443,30 +444,30 @@ function cleanupLoginsToAdd() { } lastCleanupLoginCheck = now; - for (var i = loginsToAdd.length - 1; i >= 0; i--) { - if (loginsToAdd[i].expires < now) { - loginsToAdd.splice(i, 1); + for (var i = bg_loginsToAdd.length - 1; i >= 0; i--) { + if (bg_loginsToAdd[i].expires < now) { + bg_loginsToAdd.splice(i, 1); } } } function removeAddLogin(tab) { - for (var i = loginsToAdd.length - 1; i >= 0; i--) { - if (loginsToAdd[i].tabId === tab.id) { - loginsToAdd.splice(i, 1); + for (var i = bg_loginsToAdd.length - 1; i >= 0; i--) { + if (bg_loginsToAdd[i].tabId === tab.id) { + bg_loginsToAdd.splice(i, 1); } } } function saveAddLogin(tab) { - for (var i = loginsToAdd.length - 1; i >= 0; i--) { - if (loginsToAdd[i].tabId === tab.id) { - var loginToAdd = loginsToAdd[i]; + for (var i = bg_loginsToAdd.length - 1; i >= 0; i--) { + if (bg_loginsToAdd[i].tabId === tab.id) { + var loginToAdd = bg_loginsToAdd[i]; - var tabDomain = utilsService.getDomain(tab.url); + var tabDomain = bg_utilsService.getDomain(tab.url); if (tabDomain && tabDomain === loginToAdd.domain) { - loginsToAdd.splice(i, 1); - loginService.encrypt({ + bg_loginsToAdd.splice(i, 1); + bg_loginService.encrypt({ id: null, folderId: null, favorite: false, @@ -477,7 +478,7 @@ function saveAddLogin(tab) { notes: null }).then(function (loginModel) { var login = new Login(loginModel, true); - loginService.saveWithServer(login).then(function (login) { + bg_loginService.saveWithServer(login).then(function (login) { ga('send', { hitType: 'event', eventAction: 'Added Login from Notification Bar' @@ -491,23 +492,23 @@ function saveAddLogin(tab) { } function saveNever(tab) { - for (var i = loginsToAdd.length - 1; i >= 0; i--) { - if (loginsToAdd[i].tabId === tab.id) { - var loginToAdd = loginsToAdd[i]; + for (var i = bg_loginsToAdd.length - 1; i >= 0; i--) { + if (bg_loginsToAdd[i].tabId === tab.id) { + var loginToAdd = bg_loginsToAdd[i]; - var tabDomain = utilsService.getDomain(tab.url); + var tabDomain = bg_utilsService.getDomain(tab.url); if (tabDomain && tabDomain === loginToAdd.domain) { - loginsToAdd.splice(i, 1); - var hostname = utilsService.getHostname(tab.url); - loginService.saveNeverDomain(hostname); + bg_loginsToAdd.splice(i, 1); + var hostname = bg_utilsService.getHostname(tab.url); + bg_loginService.saveNeverDomain(hostname); messageTab(tab.id, 'closeNotificationBar'); } } } } -function checkLoginsToAdd(tab, callback) { - if (!loginsToAdd.length) { +function checkbg_loginsToAdd(tab, callback) { + if (!bg_loginsToAdd.length) { if (callback) { callback(); } @@ -534,7 +535,7 @@ function checkLoginsToAdd(tab, callback) { return; } - var tabDomain = utilsService.getDomain(tab.url); + var tabDomain = bg_utilsService.getDomain(tab.url); if (!tabDomain) { if (callback) { callback(); @@ -542,8 +543,8 @@ function checkLoginsToAdd(tab, callback) { return; } - for (var i = 0; i < loginsToAdd.length; i++) { - if (loginsToAdd[i].tabId === tab.id && loginsToAdd[i].domain === tabDomain) { + for (var i = 0; i < bg_loginsToAdd.length; i++) { + if (bg_loginsToAdd[i].tabId === tab.id && bg_loginsToAdd[i].domain === tabDomain) { messageTab(tab.id, 'openNotificationBar', { type: 'add' }, function () { @@ -598,8 +599,8 @@ function autofillPage() { continue; } - var fillScript = autofillService.generateFillScript(pageDetailsToAutoFill[i].details, loginToAutoFill.username, - loginToAutoFill.password); + var fillScript = bg_autofillService.generateFillScript(pageDetailsToAutoFill[i].details, + loginToAutoFill.username, loginToAutoFill.password); if (tabId && fillScript && fillScript.script && fillScript.script.length) { chrome.tabs.sendMessage(tabId, { command: 'fillForm', @@ -658,7 +659,7 @@ function loadContextMenuOptions(title, idSuffix, login) { }); } - if (utilsService.isFirefox()) { + if (bg_utilsService.isFirefox()) { // Firefox does not support writing to the clipboard from background return; } @@ -686,14 +687,14 @@ function loadContextMenuOptions(title, idSuffix, login) { // TODO: Fix callback hell by moving to promises function logout(expired, callback) { - userService.getUserId(function (userId) { - syncService.setLastSync(new Date(0), function () { - settingsService.clear(function () { - tokenService.clearToken(function () { - cryptoService.clearKeys(function () { - userService.clear(function () { - loginService.clear(userId, function () { - folderService.clear(userId, function () { + bg_userService.getUserId(function (userId) { + bg_syncService.setLastSync(new Date(0), function () { + bg_settingsService.clear(function () { + bg_tokenService.clearToken(function () { + bg_cryptoService.clearKeys(function () { + bg_userService.clear(function () { + bg_loginService.clear(userId, function () { + bg_folderService.clear(userId, function () { chrome.runtime.sendMessage({ command: 'doneLoggingOut', expired: expired }); @@ -753,9 +754,9 @@ function fullSync(override) { lastSyncCheck = now; override = override || false; - syncService.getLastSync(function (lastSync) { + bg_syncService.getLastSync(function (lastSync) { if (override || !lastSync || (now - lastSync) >= syncInternal) { - syncService.fullSync(override || false, function () { + bg_syncService.fullSync(override || false, function () { }); } }); diff --git a/src/models/domainModels.js b/src/models/domainModels.js index ea080a0e..e27e857d 100644 --- a/src/models/domainModels.js +++ b/src/models/domainModels.js @@ -6,7 +6,7 @@ var CipherString = function () { this.initializationVector = null; this.mac = null; - var constants = chrome.extension.getBackgroundPage().constantsService; + var constants = chrome.extension.getBackgroundPage().bg_constantsService; if (arguments.length >= 2) { // ct and header @@ -130,7 +130,7 @@ var Folder = function (obj, alreadyEncrypted) { } var self = this; - var cryptoService = chrome.extension.getBackgroundPage().cryptoService; + var cryptoService = chrome.extension.getBackgroundPage().bg_cryptoService; return cryptoService.getOrgKey(orgId).then(function (orgKey) { return cryptoService.decrypt(self, orgKey); }).then(function (decValue) { @@ -162,7 +162,7 @@ var Folder = function (obj, alreadyEncrypted) { }).then(function (val) { model.uri = val; - var utilsService = chrome.extension.getBackgroundPage().utilsService; + var utilsService = chrome.extension.getBackgroundPage().bg_utilsService; model.domain = utilsService.getDomain(val); if (self.username) { diff --git a/src/popup/app/accounts/accountsLoginTwoFactorController.js b/src/popup/app/accounts/accountsLoginTwoFactorController.js index 636b06cf..717b392c 100644 --- a/src/popup/app/accounts/accountsLoginTwoFactorController.js +++ b/src/popup/app/accounts/accountsLoginTwoFactorController.js @@ -6,6 +6,19 @@ $scope.i18n = i18nService; utilsService.initListSectionItemListeners($(document), angular); + var u2f = new U2f(function (data) { + $scope.login(data); + $scope.$apply(); + }, function (error) { + toastr.error(error, i18nService.errorsOccurred); + $scope.$apply(); + }, function (info) { + if (info === 'ready') { + $scope.u2fReady = true; + } + $scope.$apply(); + }); + var constants = constantsService; var email = $stateParams.email; var masterPassword = $stateParams.masterPassword; @@ -31,7 +44,15 @@ return; } - if ($scope.providerType === constants.twoFactorProvider.email || + if ($scope.providerType === constants.twoFactorProvider.u2f) { + if (u2f) { + u2f.stop(); + } + else { + return; + } + } + else if ($scope.providerType === constants.twoFactorProvider.email || $scope.providerType === constants.twoFactorProvider.authenticator) { token = token.replace(' ', '') } @@ -40,6 +61,9 @@ $scope.loginPromise.then(function () { $analytics.eventTrack('Logged In From Two-step'); $state.go('tabs.vault', { animation: 'in-slide-left', syncOnLoad: true }); + u2f = null; + }, function () { + u2f.start(); }); }; @@ -67,7 +91,8 @@ }; $scope.anotherMethod = function () { - $analytics.eventTrack('Selected Another Two Factor Method'); + u2f.stop(); + u2f = null; $state.go('twoFactorMethods', { animation: 'in-slide-up', email: email, @@ -77,6 +102,14 @@ }); }; + $scope.back = function () { + u2f.stop(); + u2f = null; + $state.go('login', { + animation: 'out-slide-right' + }); + }; + function getDefaultProvider(twoFactorProviders) { var keys = Object.keys(twoFactorProviders); var providerType = null; @@ -97,6 +130,8 @@ } function init() { + u2f.stop(); + $timeout(function () { $('#code').focus(); @@ -116,19 +151,6 @@ var params = providers[constants.twoFactorProvider.u2f]; var challenges = JSON.parse(params.Challenges); - var u2f = new U2f(function (data) { - $scope.login(data); - $scope.$apply(); - }, function (error) { - toastr.error(error, i18nService.errorsOccurred); - $scope.$apply(); - }, function (info) { - if (info === 'ready') { - $scope.u2fReady = true; - } - $scope.$apply(); - }); - u2f.init({ appId: challenges[0].appId, challenge: challenges[0].challenge, diff --git a/src/popup/app/accounts/accountsTwoFactorMethodsController.js b/src/popup/app/accounts/accountsTwoFactorMethodsController.js index 113d93a5..77cc5d50 100644 --- a/src/popup/app/accounts/accountsTwoFactorMethodsController.js +++ b/src/popup/app/accounts/accountsTwoFactorMethodsController.js @@ -25,7 +25,7 @@ if (providers.hasOwnProperty(constants.twoFactorProvider.duo)) { add(constants.twoFactorProvider.duo); } - if (providers.hasOwnProperty(constants.twoFactorProvider.u2f) && (utilsService.isChrome() || !utilsService.isOpera())) { + if (providers.hasOwnProperty(constants.twoFactorProvider.u2f) && (utilsService.isChrome() || utilsService.isOpera())) { add(constants.twoFactorProvider.u2f); } diff --git a/src/popup/app/accounts/views/accountsLoginTwoFactor.html b/src/popup/app/accounts/views/accountsLoginTwoFactor.html index b34f20c8..f39f83af 100644 --- a/src/popup/app/accounts/views/accountsLoginTwoFactor.html +++ b/src/popup/app/accounts/views/accountsLoginTwoFactor.html @@ -2,7 +2,7 @@ ng-if="providerType === constantsProvider.authenticator || providerType === constantsProvider.email">
- {{i18n.login}} + {{i18n.login}}
@@ -106,7 +106,7 @@
- +

Loading...

diff --git a/src/popup/app/services/backgroundService.js b/src/popup/app/services/backgroundService.js index 9f2e1fc8..844be60d 100644 --- a/src/popup/app/services/backgroundService.js +++ b/src/popup/app/services/backgroundService.js @@ -2,47 +2,47 @@ .module('bit.services') .factory('tokenService', function () { - return chrome.extension.getBackgroundPage().tokenService; + return chrome.extension.getBackgroundPage().bg_tokenService; }) .factory('cryptoService', function () { - return chrome.extension.getBackgroundPage().cryptoService; + return chrome.extension.getBackgroundPage().bg_cryptoService; }) .factory('userService', function () { - return chrome.extension.getBackgroundPage().userService; + return chrome.extension.getBackgroundPage().bg_userService; }) .factory('apiService', function () { - return chrome.extension.getBackgroundPage().apiService; + return chrome.extension.getBackgroundPage().bg_apiService; }) .factory('folderService', function () { - return chrome.extension.getBackgroundPage().folderService; + return chrome.extension.getBackgroundPage().bg_folderService; }) .factory('loginService', function () { - return chrome.extension.getBackgroundPage().loginService; + return chrome.extension.getBackgroundPage().bg_loginService; }) .factory('syncService', function () { - return chrome.extension.getBackgroundPage().syncService; + return chrome.extension.getBackgroundPage().bg_syncService; }) .factory('autofillService', function () { - return chrome.extension.getBackgroundPage().autofillService; + return chrome.extension.getBackgroundPage().bg_autofillService; }) .factory('passwordGenerationService', function () { - return chrome.extension.getBackgroundPage().passwordGenerationService; + return chrome.extension.getBackgroundPage().bg_passwordGenerationService; }) .factory('utilsService', function () { - return chrome.extension.getBackgroundPage().utilsService; + return chrome.extension.getBackgroundPage().bg_utilsService; }) .factory('appIdService', function () { - return chrome.extension.getBackgroundPage().appIdService; + return chrome.extension.getBackgroundPage().bg_appIdService; }) .factory('i18nService', function () { - return chrome.extension.getBackgroundPage().i18nService; + return chrome.extension.getBackgroundPage().bg_i18nService; }) .factory('constantsService', function () { - return chrome.extension.getBackgroundPage().constantsService; + return chrome.extension.getBackgroundPage().bg_constantsService; }) .factory('settingsService', function () { - return chrome.extension.getBackgroundPage().settingsService; + return chrome.extension.getBackgroundPage().bg_settingsService; }) .factory('lockService', function () { - return chrome.extension.getBackgroundPage().lockService; + return chrome.extension.getBackgroundPage().bg_lockService; }); diff --git a/src/scripts/analytics.js b/src/scripts/analytics.js index 48d074a0..64022ceb 100644 --- a/src/scripts/analytics.js +++ b/src/scripts/analytics.js @@ -1,6 +1,6 @@ -var gaTrackingId = chrome.extension.getBackgroundPage().utilsService.analyticsId(); +var gaTrackingId = chrome.extension.getBackgroundPage().bg_utilsService.analyticsId(); var gaFunc = null; -var isFirefox = chrome.extension.getBackgroundPage().utilsService.isFirefox(); +var isFirefox = chrome.extension.getBackgroundPage().bg_utilsService.isFirefox(); window.GoogleAnalyticsObject = 'ga'; window[window.GoogleAnalyticsObject] = function (action, param1, param2, param3, param4) { @@ -30,7 +30,7 @@ function gaTrackPageView(pagePath) { return '&t=pageview&dp=' + encodeURIComponent(pagePath); } -chrome.extension.getBackgroundPage().appIdService.getAnonymousAppId(function (gaAnonAppId) { +chrome.extension.getBackgroundPage().bg_appIdService.getAnonymousAppId(function (gaAnonAppId) { gaFunc = function (action, param1, param2, param3, param4) { if (action !== 'send' || !param1) { return; diff --git a/src/services/folderService.js b/src/services/folderService.js index 5abe6c57..efbc5cd8 100644 --- a/src/services/folderService.js +++ b/src/services/folderService.js @@ -17,7 +17,7 @@ function initFolderService() { id: folder.id }; - return cryptoService.encrypt(folder.name).then(function (cs) { + return self.cryptoService.encrypt(folder.name).then(function (cs) { model.name = cs; return model; }); @@ -68,7 +68,7 @@ function initFolderService() { var deferred = Q.defer(); var self = this; - cryptoService.getKey().then(function (key) { + self.cryptoService.getKey().then(function (key) { if (!key) { deferred.reject(); return; @@ -122,7 +122,7 @@ function initFolderService() { function apiSuccess(response) { folder.id = response.id; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var data = new FolderData(response, userId); self.upsert(data, function () { deferred.resolve(folder); @@ -140,7 +140,7 @@ function initFolderService() { var self = this; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var foldersKey = 'folders_' + userId; chrome.storage.local.get(foldersKey, function (obj) { @@ -175,7 +175,7 @@ function initFolderService() { var self = this; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var obj = {}; obj['folders_' + userId] = folders; chrome.storage.local.set(obj, function () { @@ -205,7 +205,7 @@ function initFolderService() { var self = this; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var foldersKey = 'folders_' + userId; chrome.storage.local.get(foldersKey, function (obj) { diff --git a/src/services/lockService.js b/src/services/lockService.js index 7a0dcccd..f44d2875 100644 --- a/src/services/lockService.js +++ b/src/services/lockService.js @@ -87,7 +87,7 @@ function initLockService(self) { var deferred = Q.defer(); chrome.storage.local.get(self.constantsService.lockOptionKey, function (obj) { - if (obj && obj[constantsService.lockOptionKey] === 0 || obj[constantsService.lockOptionKey]) { + if (obj && obj[self.constantsService.lockOptionKey] === 0 || obj[self.constantsService.lockOptionKey]) { deferred.resolve(parseInt(obj[self.constantsService.lockOptionKey])); } else { @@ -102,8 +102,8 @@ function initLockService(self) { var deferred = Q.defer(); chrome.storage.local.get(self.constantsService.lastActiveKey, function (obj) { - if (obj && obj[constantsService.lastActiveKey]) { - deferred.resolve(obj[constantsService.lastActiveKey]); + if (obj && obj[self.constantsService.lastActiveKey]) { + deferred.resolve(obj[self.constantsService.lastActiveKey]); } else { deferred.reject(); diff --git a/src/services/loginService.js b/src/services/loginService.js index 34a83331..0124f9f1 100644 --- a/src/services/loginService.js +++ b/src/services/loginService.js @@ -14,6 +14,8 @@ function initLoginService() { }; LoginService.prototype.encrypt = function (login) { + var self = this; + var model = { id: login.id, folderId: login.folderId, @@ -22,21 +24,21 @@ function initLoginService() { }; var orgKey = null; - return cryptoService.getOrgKey(login.organizationId).then(function (key) { + return self.cryptoService.getOrgKey(login.organizationId).then(function (key) { orgKey = key; - return cryptoService.encrypt(login.name, orgKey); + return self.cryptoService.encrypt(login.name, orgKey); }).then(function (cs) { model.name = cs; - return cryptoService.encrypt(login.uri, orgKey); + return self.cryptoService.encrypt(login.uri, orgKey); }).then(function (cs) { model.uri = cs; - return cryptoService.encrypt(login.username, orgKey); + return self.cryptoService.encrypt(login.username, orgKey); }).then(function (cs) { model.username = cs; - return cryptoService.encrypt(login.password, orgKey); + return self.cryptoService.encrypt(login.password, orgKey); }).then(function (cs) { model.password = cs; - return cryptoService.encrypt(login.notes, orgKey); + return self.cryptoService.encrypt(login.notes, orgKey); }).then(function (cs) { model.notes = cs; return model; @@ -91,7 +93,7 @@ function initLoginService() { var deferred = Q.defer(); var self = this; - cryptoService.getKey().then(function (key) { + self.cryptoService.getKey().then(function (key) { if (!key) { deferred.reject(); return; @@ -209,7 +211,7 @@ function initLoginService() { var self = this; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var loginsKey = 'sites_' + userId; chrome.storage.local.get(loginsKey, function (obj) { @@ -244,7 +246,7 @@ function initLoginService() { var self = this; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var obj = {}; obj['sites_' + userId] = logins; chrome.storage.local.set(obj, function () { @@ -274,7 +276,7 @@ function initLoginService() { var self = this; - userService.getUserId(function (userId) { + self.userService.getUserId(function (userId) { var loginsKey = 'sites_' + userId; chrome.storage.local.get(loginsKey, function (obj) {