diff --git a/src/content/notificationBar.js b/src/content/notificationBar.js index df6c356970d..a87b307f7a7 100644 --- a/src/content/notificationBar.js +++ b/src/content/notificationBar.js @@ -3,8 +3,8 @@ formData = [], barType = null; - chrome.storage.local.get('disableAddSiteNotification', function (obj) { - if (!obj || !obj['disableAddSiteNotification']) { + chrome.storage.local.get('disableAddLoginNotification', function (obj) { + if (!obj || !obj['disableAddLoginNotification']) { chrome.runtime.sendMessage({ command: 'bgCollectPageDetails' }); diff --git a/src/models/api/requestModels.js b/src/models/api/requestModels.js index 7d03388e5d3..f83082a4aab 100644 --- a/src/models/api/requestModels.js +++ b/src/models/api/requestModels.js @@ -1,11 +1,11 @@ -var SiteRequest = function (site) { - this.folderId = site.folderId; - this.name = site.name ? site.name.encryptedString : null; - this.uri = site.uri ? site.uri.encryptedString : null; - this.username = site.username ? site.username.encryptedString : null; - this.password = site.password ? site.password.encryptedString : null; - this.notes = site.notes ? site.notes.encryptedString : null; - this.favorite = site.favorite; +var LoginRequest = function (login) { + this.folderId = login.folderId; + this.name = login.name ? login.name.encryptedString : null; + this.uri = login.uri ? login.uri.encryptedString : null; + this.username = login.username ? login.username.encryptedString : null; + this.password = login.password ? login.password.encryptedString : null; + this.notes = login.notes ? login.notes.encryptedString : null; + this.favorite = login.favorite; }; var FolderRequest = function (folder) { diff --git a/src/models/api/responseModels.js b/src/models/api/responseModels.js index a28fa0052c6..cb3e4411ba8 100644 --- a/src/models/api/responseModels.js +++ b/src/models/api/responseModels.js @@ -13,7 +13,7 @@ var FolderResponse = function (response) { this.revisionDate = response.RevisionDate; }; -var SiteResponse = function (response) { +var LoginResponse = function (response) { this.id = response.Id; this.folderId = response.FolderId; this.name = response.Name; diff --git a/src/models/dataModels.js b/src/models/dataModels.js index cba28b4918a..d1713b80a7b 100644 --- a/src/models/dataModels.js +++ b/src/models/dataModels.js @@ -15,12 +15,12 @@ var FolderData = function (response, userId) { this.revisionDate = response.revisionDate; }; -var SiteData = function (response, userId) { +var LoginData = function (response, userId) { this.id = response.id; this.folderId = response.folderId; this.userId = userId; - if (response instanceof SiteResponse) { + if (response instanceof LoginResponse) { this.name = response.name; this.uri = response.uri; this.username = response.username; diff --git a/src/models/domainModels.js b/src/models/domainModels.js index 8a2da0b29a2..6dfa519fa54 100644 --- a/src/models/domainModels.js +++ b/src/models/domainModels.js @@ -11,7 +11,7 @@ var CipherString = function (encryptedString) { } }; -var Site = function (obj, alreadyEncrypted) { +var Login = function (obj, alreadyEncrypted) { this.id = obj.id ? obj.id : null; this.folderId = obj.folderId ? obj.folderId : null; this.favorite = obj.favorite ? true : false; @@ -62,7 +62,7 @@ var Folder = function (obj, alreadyEncrypted) { return deferred.promise; }; - Site.prototype.decrypt = function () { + Login.prototype.decrypt = function () { var self = this; var model = { id: self.id, diff --git a/src/popup/app/accounts/accountsLoginController.js b/src/popup/app/accounts/accountsLoginController.js index f9f5ca75d0c..16e341af559 100644 --- a/src/popup/app/accounts/accountsLoginController.js +++ b/src/popup/app/accounts/accountsLoginController.js @@ -1,7 +1,7 @@ angular .module('bit.accounts') - .controller('accountsLoginController', function ($scope, $state, $stateParams, loginService, userService, toastr, + .controller('accountsLoginController', function ($scope, $state, $stateParams, authService, userService, toastr, utilsService, $analytics, i18nService) { utilsService.initListSectionItemListeners($(document), angular); $scope.i18n = i18nService; @@ -32,7 +32,7 @@ return; } - $scope.loginPromise = loginService.logIn(model.email, model.masterPassword); + $scope.loginPromise = authService.logIn(model.email, model.masterPassword); $scope.loginPromise.then(function () { userService.isTwoFactorAuthenticated(function (isTwoFactorAuthenticated) { diff --git a/src/popup/app/accounts/accountsLoginTwoFactorController.js b/src/popup/app/accounts/accountsLoginTwoFactorController.js index a4c952f750b..fe8155f27e9 100644 --- a/src/popup/app/accounts/accountsLoginTwoFactorController.js +++ b/src/popup/app/accounts/accountsLoginTwoFactorController.js @@ -1,7 +1,7 @@ angular .module('bit.accounts') - .controller('accountsLoginTwoFactorController', function ($scope, $state, loginService, toastr, utilsService, + .controller('accountsLoginTwoFactorController', function ($scope, $state, authService, toastr, utilsService, $analytics, i18nService) { $scope.i18n = i18nService; $scope.model = {}; @@ -15,7 +15,7 @@ return; } - $scope.loginPromise = loginService.logInTwoFactor(model.code); + $scope.loginPromise = authService.logInTwoFactor(model.code); $scope.loginPromise.then(function () { $analytics.eventTrack('Logged In From Two-step'); $state.go('tabs.vault', { animation: 'in-slide-left', syncOnLoad: true }); diff --git a/src/popup/app/config.js b/src/popup/app/config.js index d45d59c0efe..e95bf59126a 100644 --- a/src/popup/app/config.js +++ b/src/popup/app/config.js @@ -95,26 +95,26 @@ data: { authorize: true }, params: { animation: null, from: 'vault' } }) - .state('viewSite', { - url: '/view-site?siteId', - templateUrl: 'app/vault/views/vaultViewSite.html', - controller: 'vaultViewSiteController', + .state('viewLogin', { + url: '/view-login?loginId', + templateUrl: 'app/vault/views/vaultViewLogin.html', + controller: 'vaultViewLoginController', data: { authorize: true }, params: { animation: null, from: 'vault' } }) - .state('addSite', { - url: '/add-site', - templateUrl: 'app/vault/views/vaultAddSite.html', - controller: 'vaultAddSiteController', + .state('addLogin', { + url: '/add-login', + templateUrl: 'app/vault/views/vaultAddLogin.html', + controller: 'vaultAddLoginController', data: { authorize: true }, - params: { animation: null, name: null, uri: null, folderId: null, site: null, from: 'vault' } + params: { animation: null, name: null, uri: null, folderId: null, login: null, from: 'vault' } }) - .state('editSite', { - url: '/edit-site?siteId', - templateUrl: 'app/vault/views/vaultEditSite.html', - controller: 'vaultEditSiteController', + .state('editLogin', { + url: '/edit-login?loginId', + templateUrl: 'app/vault/views/vaultEditLogin.html', + controller: 'vaultEditLoginController', data: { authorize: true }, - params: { animation: null, fromView: true, site: null, from: 'vault' } + params: { animation: null, fromView: true, login: null, from: 'vault' } }) .state('passwordGenerator', { @@ -190,7 +190,7 @@ params: { animation: null } }); }) - .run(function ($rootScope, userService, loginService, cryptoService, tokenService, $state, constantsService, stateService) { + .run(function ($rootScope, userService, authService, cryptoService, tokenService, $state, constantsService, stateService) { $rootScope.$on('$stateChangeStart', function (event, toState, toParams) { if ($state.current.name.indexOf('tabs.') > -1 && toState.name.indexOf('tabs.') > -1) { stateService.purgeState(); @@ -221,7 +221,7 @@ if (!isAuthenticated || tokenService.isTokenExpired(token)) { event.preventDefault(); - loginService.logOut(function () { + authService.logOut(function () { $state.go('home'); }); } diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js index 43c6183be10..4a25057ef08 100644 --- a/src/popup/app/current/currentController.js +++ b/src/popup/app/current/currentController.js @@ -1,7 +1,7 @@ angular .module('bit.current') - .controller('currentController', function ($scope, siteService, tldjs, toastr, $q, $window, $state, $timeout, + .controller('currentController', function ($scope, loginService, tldjs, toastr, $q, $window, $state, $timeout, autofillService, $analytics, i18nService) { $scope.i18n = i18nService; @@ -11,7 +11,7 @@ angular domain = null, canAutofill = false; - $scope.sites = []; + $scope.logins = []; $scope.loaded = false; $scope.$on('$viewContentLoaded', function () { @@ -41,17 +41,17 @@ angular canAutofill = true; }); - var filteredSites = []; - var sitePromise = $q.when(siteService.getAllDecrypted()); - sitePromise.then(function (sites) { - for (var i = 0; i < sites.length; i++) { - if (sites[i].domain && sites[i].domain === domain) { - filteredSites.push(sites[i]); + var filteredLogins = []; + var loginPromise = $q.when(loginService.getAllDecrypted()); + loginPromise.then(function (logins) { + for (var i = 0; i < logins.length; i++) { + if (logins[i].domain && logins[i].domain === domain) { + filteredLogins.push(logins[i]); } } $scope.loaded = true; - $scope.sites = filteredSites; + $scope.logins = filteredLogins; }); }); } @@ -66,8 +66,8 @@ angular $analytics.eventTrack('Copied ' + (type === i18nService.username ? 'Username' : 'Password')); }; - $scope.addSite = function () { - $state.go('addSite', { + $scope.addLogin = function () { + $state.go('addLogin', { animation: 'in-slide-up', name: domain, uri: url, @@ -75,16 +75,16 @@ angular }); }; - $scope.fillSite = function (site) { + $scope.fillLogin = function (login) { var didAutofill = false; - if (site && canAutofill && pageDetails && pageDetails.length) { + if (login && canAutofill && pageDetails && pageDetails.length) { for (var i = 0; i < pageDetails.length; i++) { if (pageDetails[i].tabId !== tabId) { continue; } - var fillScript = autofillService.generateFillScript(pageDetails[i].details, site.username, site.password); + var fillScript = autofillService.generateFillScript(pageDetails[i].details, login.username, login.password); if (tabId && fillScript && fillScript.script && fillScript.script.length) { didAutofill = true; $analytics.eventTrack('Autofilled'); @@ -104,11 +104,11 @@ angular } }; - $scope.viewSite = function (site, e) { + $scope.viewLogin = function (login, e) { e.stopPropagation(); - $state.go('viewSite', { - siteId: site.id, + $state.go('viewLogin', { + loginId: login.id, animation: 'in-slide-up', from: 'current' }); diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html index 2ee32b753e2..06057e0e71c 100644 --- a/src/popup/app/current/views/current.html +++ b/src/popup/app/current/views/current.html @@ -1,41 +1,41 @@ 
- +
{{i18n.currentTab}}
-
+
- + + data-clipboard-text="{{login.password}}" ng-class="{'disabled': !login.password}"> + data-clipboard-text="{{login.username}}" ng-class="{'disabled': !login.username}"> - + - {{site.name}} - {{site.username}} + {{login.name}} + {{login.username}}
-
+

{{i18n.autoFillInfo}} - +

diff --git a/src/popup/app/global/mainController.js b/src/popup/app/global/mainController.js index f9eaf1f3ed4..1c656438ee4 100644 --- a/src/popup/app/global/mainController.js +++ b/src/popup/app/global/mainController.js @@ -1,7 +1,7 @@ angular .module('bit.global') - .controller('mainController', function ($scope, $state, loginService, toastr, i18nService) { + .controller('mainController', function ($scope, $state, authService, toastr, i18nService) { var self = this; self.currentYear = new Date().getFullYear(); self.animation = ''; @@ -24,7 +24,7 @@ angular $scope.$broadcast('syncStarted'); } else if (msg.command === 'logout') { - loginService.logOut(function () { + authService.logOut(function () { toastr.warning(i18nService.loginExpired, i18nService.loggedOut); $state.go('home'); }); diff --git a/src/popup/app/lock/lockController.js b/src/popup/app/lock/lockController.js index fc77ebb5620..032ffe0f6ea 100644 --- a/src/popup/app/lock/lockController.js +++ b/src/popup/app/lock/lockController.js @@ -1,7 +1,7 @@ angular .module('bit.lock') - .controller('lockController', function ($scope, $state, $analytics, i18nService, loginService, cryptoService, toastr, + .controller('lockController', function ($scope, $state, $analytics, i18nService, authService, cryptoService, toastr, userService, SweetAlert) { $scope.i18n = i18nService; $('#master-password').focus(); @@ -15,7 +15,7 @@ cancelButtonText: i18nService.cancel }, function (confirmed) { if (confirmed) { - loginService.logOut(function () { + authService.logOut(function () { $analytics.eventTrack('Logged Out'); $state.go('home'); }); diff --git a/src/popup/app/services/loginService.js b/src/popup/app/services/authService.js similarity index 93% rename from src/popup/app/services/loginService.js rename to src/popup/app/services/authService.js index d275cbee349..1f7fd68f0b6 100644 --- a/src/popup/app/services/loginService.js +++ b/src/popup/app/services/authService.js @@ -1,7 +1,7 @@ angular .module('bit.services') - .factory('loginService', function (cryptoService, apiService, userService, tokenService, $q, $rootScope, siteService, + .factory('authService', function (cryptoService, apiService, userService, tokenService, $q, $rootScope, loginService, folderService) { var _service = {}; @@ -73,9 +73,9 @@ cryptoService.clearKeyHash(function () { userService.clearUserId(function () { userService.clearEmail(function () { - siteService.clear(userId, function () { + loginService.clear(userId, function () { folderService.clear(userId, function () { - $rootScope.vaultSites = null; + $rootScope.vaultLogins = null; $rootScope.vaultFolders = null; chrome.runtime.sendMessage({ command: 'loggedOut' }); callback(); diff --git a/src/popup/app/services/backgroundService.js b/src/popup/app/services/backgroundService.js index e05e8da69f0..891abb4dd8b 100644 --- a/src/popup/app/services/backgroundService.js +++ b/src/popup/app/services/backgroundService.js @@ -16,8 +16,8 @@ .factory('folderService', function () { return chrome.extension.getBackgroundPage().folderService; }) - .factory('siteService', function () { - return chrome.extension.getBackgroundPage().siteService; + .factory('loginService', function () { + return chrome.extension.getBackgroundPage().loginService; }) .factory('syncService', function () { return chrome.extension.getBackgroundPage().syncService; diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js index 10efb38eb82..1f307b4fbed 100644 --- a/src/popup/app/settings/settingsController.js +++ b/src/popup/app/settings/settingsController.js @@ -1,7 +1,7 @@ angular .module('bit.settings') - .controller('settingsController', function ($scope, loginService, $state, SweetAlert, utilsService, $analytics, + .controller('settingsController', function ($scope, authService, $state, SweetAlert, utilsService, $analytics, i18nService, constantsService, cryptoService) { utilsService.initListSectionItemListeners($(document), angular); $scope.lockOption = ''; @@ -38,7 +38,7 @@ }, function (confirmed) { if (confirmed) { cryptoService.toggleKey(function () { }); - loginService.logOut(function () { + authService.logOut(function () { $analytics.eventTrack('Logged Out'); $state.go('home'); }); @@ -58,7 +58,7 @@ cancelButtonText: i18nService.cancel }, function (confirmed) { if (confirmed) { - loginService.logOut(function () { + authService.logOut(function () { $analytics.eventTrack('Logged Out'); $state.go('home'); }); diff --git a/src/popup/app/settings/settingsFeaturesController.js b/src/popup/app/settings/settingsFeaturesController.js index 2810b4d07f2..98962013551 100644 --- a/src/popup/app/settings/settingsFeaturesController.js +++ b/src/popup/app/settings/settingsFeaturesController.js @@ -4,7 +4,7 @@ .controller('settingsFeaturesController', function ($scope, i18nService, $analytics, constantsService) { $scope.i18n = i18nService; $scope.disableGa = false; - $scope.disableAddSiteNotification = false; + $scope.disableAddLoginNotification = false; chrome.storage.local.get(constantsService.disableGaKey, function (obj) { if (obj && obj[constantsService.disableGaKey]) { @@ -15,12 +15,12 @@ } }); - chrome.storage.local.get(constantsService.disableAddSiteNotificationKey, function (obj) { - if (obj && obj[constantsService.disableAddSiteNotificationKey]) { - $scope.disableAddSiteNotification = true; + chrome.storage.local.get(constantsService.disableAddLoginNotificationKey, function (obj) { + if (obj && obj[constantsService.disableAddLoginNotificationKey]) { + $scope.disableAddLoginNotification = true; } else { - $scope.disableAddSiteNotification = false; + $scope.disableAddLoginNotification = false; } }); @@ -45,22 +45,22 @@ }); }; - $scope.updateAddSiteNotification = function () { - chrome.storage.local.get(constantsService.disableAddSiteNotificationKey, function (obj) { - if (obj[constantsService.disableAddSiteNotificationKey]) { + $scope.updateAddLoginNotification = function () { + chrome.storage.local.get(constantsService.disableAddLoginNotificationKey, function (obj) { + if (obj[constantsService.disableAddLoginNotificationKey]) { // enable - obj[constantsService.disableAddSiteNotificationKey] = false; + obj[constantsService.disableAddLoginNotificationKey] = false; } else { // disable - $analytics.eventTrack('Disabled Add Site Notification'); - obj[constantsService.disableAddSiteNotificationKey] = true; + $analytics.eventTrack('Disabled Add Login Notification'); + obj[constantsService.disableAddLoginNotificationKey] = true; } chrome.storage.local.set(obj, function () { - $scope.disableAddSiteNotification = obj[constantsService.disableAddSiteNotificationKey]; - if (!obj[constantsService.disableAddSiteNotificationKey]) { - $analytics.eventTrack('Enabled Add Site Notification'); + $scope.disableAddLoginNotification = obj[constantsService.disableAddLoginNotificationKey]; + if (!obj[constantsService.disableAddLoginNotificationKey]) { + $analytics.eventTrack('Enabled Add Login Notification'); } }); }); diff --git a/src/popup/app/settings/views/settingsFeatures.html b/src/popup/app/settings/views/settingsFeatures.html index a21a7db6044..5be7840a1a1 100644 --- a/src/popup/app/settings/views/settingsFeatures.html +++ b/src/popup/app/settings/views/settingsFeatures.html @@ -20,13 +20,13 @@
- - + +
- {{i18n.addSiteNotificationDesc}} + {{i18n.addLoginNotificationDesc}}
diff --git a/src/popup/app/tools/toolsPasswordGeneratorController.js b/src/popup/app/tools/toolsPasswordGeneratorController.js index b11fb7fb505..6b13c2588c9 100644 --- a/src/popup/app/tools/toolsPasswordGeneratorController.js +++ b/src/popup/app/tools/toolsPasswordGeneratorController.js @@ -80,10 +80,10 @@ $analytics.eventTrack('Selected Generated Password'); if (addState) { - addState.site.password = $scope.password; + addState.login.password = $scope.password; } else if (editState) { - editState.site.password = $scope.password; + editState.login.password = $scope.password; } dismiss(); @@ -91,18 +91,18 @@ function dismiss() { if (addState) { - $state.go('addSite', { + $state.go('addLogin', { animation: 'out-slide-down', from: addState.from, - site: addState.site + login: addState.login }); } else if (editState) { - $state.go('editSite', { + $state.go('editLogin', { animation: 'out-slide-down', - site: editState.site, + login: editState.login, fromView: editState.fromView, - siteId: editState.siteId, + loginId: editState.loginId, from: editState.from }); } diff --git a/src/popup/app/vault/vaultAddSiteController.js b/src/popup/app/vault/vaultAddSiteController.js index 3c3e53d0bf7..e9994fa67fe 100644 --- a/src/popup/app/vault/vaultAddSiteController.js +++ b/src/popup/app/vault/vaultAddSiteController.js @@ -1,23 +1,23 @@ angular .module('bit.vault') - .controller('vaultAddSiteController', function ($scope, $state, $stateParams, siteService, folderService, + .controller('vaultAddLoginController', function ($scope, $state, $stateParams, loginService, folderService, cryptoService, $q, toastr, utilsService, $analytics, i18nService) { $scope.i18n = i18nService; var from = $stateParams.from, folderId = $stateParams.folderId; - $scope.site = { + $scope.login = { folderId: folderId, name: $stateParams.name, uri: $stateParams.uri }; - if ($stateParams.site) { - angular.extend($scope.site, $stateParams.site); + if ($stateParams.login) { + angular.extend($scope.login, $stateParams.login); } - if (!$stateParams.site && $scope.site.name && $scope.site.uri) { + if (!$stateParams.login && $scope.login.name && $scope.login.uri) { $('#username').focus(); } else { @@ -36,11 +36,11 @@ return; } - $scope.savePromise = $q.when(siteService.encrypt(model)).then(function (siteModel) { - var site = new Site(siteModel, true); - return $q.when(siteService.saveWithServer(site)).then(function (site) { - $analytics.eventTrack('Added Site'); - toastr.success(i18nService.addedSite); + $scope.savePromise = $q.when(loginService.encrypt(model)).then(function (loginModel) { + var login = new Login(loginModel, true); + return $q.when(loginService.saveWithServer(login)).then(function (login) { + $analytics.eventTrack('Added Login'); + toastr.success(i18nService.addedLogin); $scope.close(); }); }); @@ -71,7 +71,7 @@ animation: 'in-slide-up', addState: { from: from, - site: $scope.site + login: $scope.login } }); }; diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js index 4e4ee7e0be0..75671ce2e93 100644 --- a/src/popup/app/vault/vaultController.js +++ b/src/popup/app/vault/vaultController.js @@ -1,7 +1,7 @@ angular .module('bit.vault') - .controller('vaultController', function ($scope, $rootScope, siteService, folderService, $q, $state, $stateParams, toastr, + .controller('vaultController', function ($scope, $rootScope, loginService, folderService, $q, $state, $stateParams, toastr, syncService, utilsService, $analytics, i18nService, stateService, $timeout) { var stateKey = 'vault', state = stateService.getState(stateKey) || {}; @@ -20,8 +20,8 @@ var delayLoad = true; $scope.loaded = true; - if (!$rootScope.vaultSites) { - $rootScope.vaultSites = []; + if (!$rootScope.vaultLogins) { + $rootScope.vaultLogins = []; delayLoad = false; } if (!$rootScope.vaultFolders) { @@ -40,7 +40,7 @@ function loadVault() { var decFolders = []; - var decSites = []; + var decLogins = []; var promises = []; var folderPromise = $q.when(folderService.getAllDecrypted()); @@ -49,16 +49,16 @@ }); promises.push(folderPromise); - var sitePromise = $q.when(siteService.getAllDecrypted()); - sitePromise.then(function (sites) { - decSites = sites; + var loginPromise = $q.when(loginService.getAllDecrypted()); + loginPromise.then(function (logins) { + decLogins = logins; }); - promises.push(sitePromise); + promises.push(loginPromise); $q.all(promises).then(function () { $scope.loaded = true; $rootScope.vaultFolders = decFolders; - $rootScope.vaultSites = decSites; + $rootScope.vaultLogins = decLogins; if (!delayLoad) { setScrollY(); @@ -79,41 +79,41 @@ return item.name.toLowerCase(); }; - $scope.searchSites = function () { + $scope.searchLogins = function () { if (!$scope.searchText || $scope.searchText.length < 2) { return; } - return searchSite; + return searchLogin; }; - function searchSite(site) { + function searchLogin(login) { var searchTerm = $scope.searchText.toLowerCase(); - if (site.name && site.name.toLowerCase().indexOf(searchTerm) !== -1) { + if (login.name && login.name.toLowerCase().indexOf(searchTerm) !== -1) { return true; } - if (site.username && site.username.toLowerCase().indexOf(searchTerm) !== -1) { + if (login.username && login.username.toLowerCase().indexOf(searchTerm) !== -1) { return true; } - if (site.uri && site.uri.toLowerCase().indexOf(searchTerm) !== -1) { + if (login.uri && login.uri.toLowerCase().indexOf(searchTerm) !== -1) { return true; } return false; } - $scope.addSite = function () { + $scope.addLogin = function () { storeState(); - $state.go('addSite', { + $state.go('addLogin', { animation: 'in-slide-up', from: 'vault' }); }; - $scope.viewSite = function (site) { + $scope.viewLogin = function (login) { storeState(); - $state.go('viewSite', { - siteId: site.id, + $state.go('viewLogin', { + loginId: login.id, animation: 'in-slide-up', from: 'vault' }); diff --git a/src/popup/app/vault/vaultEditSiteController.js b/src/popup/app/vault/vaultEditSiteController.js index 21f0ad3b36a..9bd604d9659 100644 --- a/src/popup/app/vault/vaultEditSiteController.js +++ b/src/popup/app/vault/vaultEditSiteController.js @@ -1,24 +1,24 @@ angular .module('bit.vault') - .controller('vaultEditSiteController', function ($scope, $state, $stateParams, siteService, folderService, + .controller('vaultEditLoginController', function ($scope, $state, $stateParams, loginService, folderService, cryptoService, $q, toastr, SweetAlert, utilsService, $analytics, i18nService) { $scope.i18n = i18nService; - var siteId = $stateParams.siteId; + var loginId = $stateParams.loginId; var fromView = $stateParams.fromView; var from = $stateParams.from; - $scope.site = { + $scope.login = { folderId: null }; - if ($stateParams.site) { - angular.extend($scope.site, $stateParams.site); + if ($stateParams.login) { + angular.extend($scope.login, $stateParams.login); } else { - siteService.get(siteId, function (site) { - $q.when(site.decrypt()).then(function (model) { - $scope.site = model; + loginService.get(loginId, function (login) { + $q.when(login.decrypt()).then(function (model) { + $scope.login = model; }); }); } @@ -36,11 +36,11 @@ angular return; } - $scope.savePromise = $q.when(siteService.encrypt(model)).then(function (siteModel) { - var site = new Site(siteModel, true); - return $q.when(siteService.saveWithServer(site)).then(function (site) { - $analytics.eventTrack('Edited Site'); - toastr.success(i18nService.editedSite); + $scope.savePromise = $q.when(loginService.encrypt(model)).then(function (loginModel) { + var login = new Login(loginModel, true); + return $q.when(loginService.saveWithServer(login)).then(function (login) { + $analytics.eventTrack('Edited Login'); + toastr.success(i18nService.editedLogin); $scope.close(); }); }); @@ -48,16 +48,16 @@ angular $scope.delete = function () { SweetAlert.swal({ - title: i18nService.deleteSite, - text: i18nService.deleteSiteConfirmation, + title: i18nService.deleteLogin, + text: i18nService.deleteLoginConfirmation, showCancelButton: true, confirmButtonText: i18nService.yes, cancelButtonText: i18nService.no }, function (confirmed) { if (confirmed) { - $q.when(siteService.deleteWithServer(siteId)).then(function () { - $analytics.eventTrack('Deleted Site'); - toastr.success(i18nService.deletedSite); + $q.when(loginService.deleteWithServer(loginId)).then(function () { + $analytics.eventTrack('Deleted Login'); + toastr.success(i18nService.deletedLogin); $state.go('tabs.vault', { animation: 'out-slide-down' }); @@ -68,8 +68,8 @@ angular $scope.close = function () { if (fromView) { - $state.go('viewSite', { - siteId: siteId, + $state.go('viewLogin', { + loginId: loginId, animation: 'out-slide-down', from: from }); @@ -82,7 +82,7 @@ angular }; $scope.generatePassword = function () { - if ($scope.site.password) { + if ($scope.login.password) { SweetAlert.swal({ title: i18nService.overwritePassword, text: i18nService.overwritePasswordConfirmation, @@ -107,8 +107,8 @@ angular animation: 'in-slide-up', editState: { fromView: fromView, - siteId: siteId, - site: $scope.site, + loginId: loginId, + login: $scope.login, from: from } }); diff --git a/src/popup/app/vault/vaultViewFolderController.js b/src/popup/app/vault/vaultViewFolderController.js index 0846bb6c6dd..47b776b97ee 100644 --- a/src/popup/app/vault/vaultViewFolderController.js +++ b/src/popup/app/vault/vaultViewFolderController.js @@ -1,7 +1,7 @@ angular .module('bit.vault') - .controller('vaultViewFolderController', function ($scope, siteService, folderService, $q, $state, $stateParams, toastr, + .controller('vaultViewFolderController', function ($scope, loginService, folderService, $q, $state, $stateParams, toastr, syncService, $analytics, i18nService, stateService) { var stateKey = 'viewFolder', state = stateService.getState(stateKey) || {}; @@ -10,7 +10,7 @@ var pageSize = 100, decFolder = null, - decSites = []; + decLogins = []; $scope.folder = { id: !state.folderId || state.folderId === '0' ? null : state.folderId, @@ -20,8 +20,8 @@ $('#search').focus(); $scope.loaded = false; - $scope.vaultSites = []; - $scope.pagedVaultSites = []; + $scope.vaultLogins = []; + $scope.pagedVaultLogins = []; $scope.searchText = null; loadVault(); @@ -39,15 +39,15 @@ promises.push(folderDeferred.promise); } - var sitePromise = $q.when(siteService.getAllDecryptedForFolder($scope.folder.id)); - sitePromise.then(function (sites) { - decSites = sites.sort(siteSort); + var loginPromise = $q.when(loginService.getAllDecryptedForFolder($scope.folder.id)); + loginPromise.then(function (logins) { + decLogins = logins.sort(loginSort); }); - promises.push(sitePromise); + promises.push(loginPromise); $q.all(promises).then(function () { $scope.loaded = true; - $scope.vaultSites = decSites; + $scope.vaultLogins = decLogins; if (decFolder) { $scope.folder.name = decFolder.name; @@ -55,14 +55,14 @@ if (state.searchText) { $scope.searchText = state.searchText; - $scope.searchSites(); + $scope.searchLogins(); } setTimeout(setScrollY, 200); }); } - function siteSort(a, b) { + function loginSort(a, b) { if (!a.name) { return -1; } @@ -100,65 +100,65 @@ } $scope.loadMore = function () { - var pagedLength = $scope.pagedVaultSites.length; - if ($scope.vaultSites.length > pagedLength) { - $scope.pagedVaultSites = - $scope.pagedVaultSites.concat($scope.vaultSites.slice(pagedLength, pagedLength + pageSize)); + var pagedLength = $scope.pagedVaultLogins.length; + if ($scope.vaultLogins.length > pagedLength) { + $scope.pagedVaultLogins = + $scope.pagedVaultLogins.concat($scope.vaultLogins.slice(pagedLength, pagedLength + pageSize)); } }; - $scope.searchSites = function () { + $scope.searchLogins = function () { if (!$scope.searchText || $scope.searchText.length < 2) { - if ($scope.vaultSites.length !== decSites.length) { - resetList(decSites); + if ($scope.vaultLogins.length !== decLogins.length) { + resetList(decLogins); } return; } - var matchedSites = []; - for (var i = 0; i < decSites.length; i++) { - if (searchSite(decSites[i])) { - matchedSites.push(decSites[i]); + var matchedLogins = []; + for (var i = 0; i < decLogins.length; i++) { + if (searchLogin(decLogins[i])) { + matchedLogins.push(decLogins[i]); } } - resetList(matchedSites); + resetList(matchedLogins); }; - function resetList(sites) { - $scope.vaultSites = sites; - $scope.pagedVaultSites = []; + function resetList(logins) { + $scope.vaultLogins = logins; + $scope.pagedVaultLogins = []; $scope.loadMore(); } - function searchSite(site) { + function searchLogin(login) { var searchTerm = $scope.searchText.toLowerCase(); - if (site.name && site.name.toLowerCase().indexOf(searchTerm) !== -1) { + if (login.name && login.name.toLowerCase().indexOf(searchTerm) !== -1) { return true; } - if (site.username && site.username.toLowerCase().indexOf(searchTerm) !== -1) { + if (login.username && login.username.toLowerCase().indexOf(searchTerm) !== -1) { return true; } - if (site.uri && site.uri.toLowerCase().indexOf(searchTerm) !== -1) { + if (login.uri && login.uri.toLowerCase().indexOf(searchTerm) !== -1) { return true; } return false; } - $scope.addSite = function () { + $scope.addLogin = function () { storeState(); - $state.go('addSite', { + $state.go('addLogin', { animation: 'in-slide-up', from: 'folder', folderId: $scope.folder.id }); }; - $scope.viewSite = function (site) { + $scope.viewLogin = function (login) { storeState(); - $state.go('viewSite', { - siteId: site.id, + $state.go('viewLogin', { + loginId: login.id, animation: 'in-slide-up', from: 'folder' }); diff --git a/src/popup/app/vault/vaultViewSiteController.js b/src/popup/app/vault/vaultViewSiteController.js index 21c2a4ef403..3c67f379615 100644 --- a/src/popup/app/vault/vaultViewSiteController.js +++ b/src/popup/app/vault/vaultViewSiteController.js @@ -1,19 +1,19 @@ angular .module('bit.vault') - .controller('vaultViewSiteController', function ($scope, $state, $stateParams, siteService, tldjs, toastr, $q, + .controller('vaultViewLoginController', function ($scope, $state, $stateParams, loginService, tldjs, toastr, $q, $analytics, i18nService) { $scope.i18n = i18nService; var from = $stateParams.from; - $scope.site = null; - siteService.get($stateParams.siteId, function (site) { - if (!site) { + $scope.login = null; + loginService.get($stateParams.loginId, function (login) { + if (!login) { return; } - $q.when(site.decrypt()).then(function (model) { - $scope.site = model; + $q.when(login.decrypt()).then(function (model) { + $scope.login = model; if (model.password) { var maskedPassword = ''; @@ -21,29 +21,29 @@ angular maskedPassword += '•'; } - $scope.site.maskedPassword = maskedPassword; + $scope.login.maskedPassword = maskedPassword; } if (model.uri) { - $scope.site.showLaunch = model.uri.startsWith('http://') || model.uri.startsWith('https://'); + $scope.login.showLaunch = model.uri.startsWith('http://') || model.uri.startsWith('https://'); var domain = tldjs.getDomain(model.uri); if (domain) { - $scope.site.website = domain; + $scope.login.website = domain; } else { - $scope.site.website = model.uri; + $scope.login.website = model.uri; } } else { - $scope.site.showLaunch = false; + $scope.login.showLaunch = false; } }); }); - $scope.edit = function (site) { - $state.go('editSite', { + $scope.edit = function (login) { + $state.go('editLogin', { animation: 'in-slide-up', - siteId: site.id, + loginId: login.id, fromView: true, from: from }); @@ -67,10 +67,10 @@ angular } }; - $scope.launchWebsite = function (site) { - if (site.showLaunch) { + $scope.launchWebsite = function (login) { + if (login.showLaunch) { $analytics.eventTrack('Launched Website'); - chrome.tabs.create({ url: site.uri }); + chrome.tabs.create({ url: login.uri }); } }; diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html index b84a5d02413..6143b475ec1 100644 --- a/src/popup/app/vault/views/vault.html +++ b/src/popup/app/vault/views/vault.html @@ -1,6 +1,6 @@ 
- +
@@ -8,7 +8,7 @@
-
+
@@ -22,38 +22,38 @@
-
+
-
-
+

- {{i18n.noSitesInList}} - + {{i18n.noLoginsInList}} +

diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddSite.html index 6e1330d0622..ffca045c372 100644 --- a/src/popup/app/vault/views/vaultAddSite.html +++ b/src/popup/app/vault/views/vaultAddSite.html @@ -1,4 +1,4 @@ -
+
{{i18n.cancel}} @@ -7,30 +7,30 @@
-
{{i18n.addSite}}
+
{{i18n.addLogin}}
- {{i18n.siteInformation}} + {{i18n.loginInformation}}
- +
- +
- +
- +
{{i18n.generatePassword}} @@ -42,7 +42,7 @@
- @@ -50,7 +50,7 @@
- +
@@ -60,7 +60,7 @@
- +
diff --git a/src/popup/app/vault/views/vaultEditSite.html b/src/popup/app/vault/views/vaultEditSite.html index 7bac9ea755c..18a92795efd 100644 --- a/src/popup/app/vault/views/vaultEditSite.html +++ b/src/popup/app/vault/views/vaultEditSite.html @@ -1,4 +1,4 @@ - +
{{i18n.cancel}} @@ -7,30 +7,30 @@
-
{{i18n.editSite}}
+
{{i18n.editLogin}}
- {{i18n.siteInformation}} + {{i18n.loginInformation}}
- +
- +
- +
- +
{{i18n.generatePassword}} @@ -42,7 +42,7 @@
- @@ -50,7 +50,7 @@
- +
@@ -60,14 +60,14 @@
- +
- {{i18n.deleteSite}} + {{i18n.deleteLogin}}
diff --git a/src/popup/app/vault/views/vaultViewFolder.html b/src/popup/app/vault/views/vaultViewFolder.html index b255feafd9b..7263958f37b 100644 --- a/src/popup/app/vault/views/vaultViewFolder.html +++ b/src/popup/app/vault/views/vaultViewFolder.html @@ -3,44 +3,44 @@ {{i18n.myVault}}
- +
- +
- -
+

- {{i18n.noSitesInList}} - + {{i18n.noLoginsInList}} +

diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html index def75ca2e56..b561709c75f 100644 --- a/src/popup/app/vault/views/vaultViewSite.html +++ b/src/popup/app/vault/views/vaultViewSite.html @@ -3,38 +3,38 @@ {{i18n.close}}
- {{i18n.edit}} + {{i18n.edit}}
-
{{i18n.viewSite}}
+
{{i18n.viewLogin}}
- {{i18n.siteInformation}} + {{i18n.loginInformation}}
{{i18n.name}} - {{site.name}} + {{login.name}}
-
+
+ ng-show="login.showLaunch"> {{i18n.website}} {{site.website}}
-
+
{{i18n.username}} - {{site.username}} + {{login.username}}
-
+
@@ -43,18 +43,18 @@ {{i18n.password}} - {{site.maskedPassword}} - {{site.password}} + {{login.maskedPassword}} + {{login.password}}
-
+
{{i18n.notes}}
- {{site.notes}} + {{login.notes}}
diff --git a/src/popup/index.html b/src/popup/index.html index f45ce9a3313..8c860045cb1 100644 --- a/src/popup/index.html +++ b/src/popup/index.html @@ -42,7 +42,7 @@ - + @@ -64,9 +64,9 @@ - - - + + + diff --git a/src/services/apiService.js b/src/services/apiService.js index a95d05a017c..7eb78c482cd 100644 --- a/src/services/apiService.js +++ b/src/services/apiService.js @@ -97,9 +97,9 @@ function initApiService() { }); }; - // Site APIs + // Login APIs - ApiService.prototype.getSite = function (id, success, error) { + ApiService.prototype.getLogin = function (id, success, error) { var self = this; this.tokenService.getToken(function (token) { $.ajax({ @@ -107,7 +107,7 @@ function initApiService() { url: self.baseUrl + '/sites/' + id + '?access_token=' + token, dataType: 'json', success: function (response) { - success(new SiteResponse(response)); + success(new LoginResponse(response)); }, error: function (jqXHR, textStatus, errorThrown) { handleError(error, jqXHR, textStatus, errorThrown); @@ -116,17 +116,17 @@ function initApiService() { }); }; - ApiService.prototype.postSite = function (siteRequest, success, error) { + ApiService.prototype.postLogin = function (loginRequest, success, error) { var self = this; this.tokenService.getToken(function (token) { $.ajax({ type: 'POST', url: self.baseUrl + '/sites?access_token=' + token, - data: JSON.stringify(siteRequest), + data: JSON.stringify(loginRequest), contentType: 'application/json; charset=utf-8', dataType: 'json', success: function (response) { - success(new SiteResponse(response)); + success(new LoginResponse(response)); }, error: function (jqXHR, textStatus, errorThrown) { handleError(error, jqXHR, textStatus, errorThrown); @@ -135,17 +135,17 @@ function initApiService() { }); }; - ApiService.prototype.putSite = function (id, siteRequest, success, error) { + ApiService.prototype.putLogin = function (id, loginRequest, success, error) { var self = this; this.tokenService.getToken(function (token) { $.ajax({ type: 'POST', url: self.baseUrl + '/sites/' + id + '?access_token=' + token, - data: JSON.stringify(siteRequest), + data: JSON.stringify(loginRequest), contentType: 'application/json; charset=utf-8', dataType: 'json', success: function (response) { - success(new SiteResponse(response)); + success(new LoginResponse(response)); }, error: function (jqXHR, textStatus, errorThrown) { handleError(error, jqXHR, textStatus, errorThrown); diff --git a/src/services/constantsService.js b/src/services/constantsService.js index a63055ce04f..92748435046 100644 --- a/src/services/constantsService.js +++ b/src/services/constantsService.js @@ -1,7 +1,7 @@ function ConstantsService() { return { disableGaKey: 'disableGa', - disableAddSiteNotificationKey: 'disableAddSiteNotification', + disableAddLoginNotificationKey: 'disableAddLoginNotification', lockOptionKey: 'lockOption', lastActiveKey: 'lastActive' }; diff --git a/src/services/loginService.js b/src/services/loginService.js new file mode 100644 index 00000000000..62e54859459 --- /dev/null +++ b/src/services/loginService.js @@ -0,0 +1,302 @@ +function LoginService(cryptoService, userService, apiService) { + this.cryptoService = cryptoService; + this.userService = userService; + this.apiService = apiService; + this.decryptedLoginCache = null; + + initLoginService(); +}; + +function initLoginService() { + LoginService.prototype.clearCache = function () { + this.decryptedLoginCache = null + }; + + LoginService.prototype.encrypt = function (login) { + var model = { + id: login.id, + folderId: login.folderId, + favorite: login.favorite + }; + + return cryptoService.encrypt(login.name).then(function (cs) { + model.name = cs; + return cryptoService.encrypt(login.uri); + }).then(function (cs) { + model.uri = cs; + return cryptoService.encrypt(login.username); + }).then(function (cs) { + model.username = cs; + return cryptoService.encrypt(login.password); + }).then(function (cs) { + model.password = cs; + return cryptoService.encrypt(login.notes); + }).then(function (cs) { + model.notes = cs; + return model; + }); + }; + + LoginService.prototype.get = function (id, callback) { + if (!callback || typeof callback !== 'function') { + throw 'callback function required'; + } + + this.userService.getUserId(function (userId) { + var loginsKey = 'sites_' + userId; + + chrome.storage.local.get(loginsKey, function (obj) { + var logins = obj[loginsKey]; + if (logins && id in logins) { + callback(new Login(logins[id])); + return; + } + + callback(null); + }); + }); + }; + + LoginService.prototype.getAll = function (callback) { + if (!callback || typeof callback !== 'function') { + throw 'callback function required'; + } + + this.userService.getUserId(function (userId) { + var loginsKey = 'sites_' + userId; + + chrome.storage.local.get(loginsKey, function (obj) { + var logins = obj[loginsKey]; + var response = []; + for (var id in logins) { + if (!id) { + continue; + } + + response.push(new Login(logins[id])); + } + + callback(response); + }); + }); + }; + + LoginService.prototype.getAllDecrypted = function () { + var deferred = Q.defer(); + var self = this; + + cryptoService.getKey(false, function (key) { + if (!key) { + deferred.reject(); + return; + } + + if (self.decryptedLoginCache) { + deferred.resolve(self.decryptedLoginCache); + return; + } + + var promises = []; + var decLogins = []; + self.getAll(function (logins) { + for (var i = 0; i < logins.length; i++) { + promises.push(logins[i].decrypt().then(function (login) { + decLogins.push(login); + })); + } + + Q.all(promises).then(function () { + self.decryptedLoginCache = decLogins; + deferred.resolve(self.decryptedLoginCache); + }); + }); + }); + + return deferred.promise; + }; + + LoginService.prototype.getAllDecryptedForFolder = function (folderId) { + var self = this; + + return self.getAllDecrypted().then(function (logins) { + var loginsToReturn = []; + for (var i = 0; i < logins.length; i++) { + if (logins[i].folderId === folderId) { + loginsToReturn.push(logins[i]); + } + } + + return loginsToReturn; + }); + }; + + LoginService.prototype.getAllDecryptedForDomain = function (domain) { + var self = this; + + return self.getAllDecrypted().then(function (logins) { + var loginsToReturn = []; + for (var i = 0; i < logins.length; i++) { + if (logins[i].domain === domain) { + loginsToReturn.push(logins[i]); + } + } + + return loginsToReturn; + }); + }; + + LoginService.prototype.saveWithServer = function (login) { + var deferred = Q.defer(); + + var self = this, + request = new LoginRequest(login); + + if (!login.id) { + self.apiService.postLogin(request, apiSuccess, function (response) { + handleError(response, deferred) + }); + } + else { + self.apiService.putLogin(login.id, request, apiSuccess, function (response) { + handleError(response, deferred) + }); + } + + function apiSuccess(response) { + login.id = response.id; + userService.getUserId(function (userId) { + var data = new LoginData(response, userId); + self.upsert(data, function () { + deferred.resolve(login); + }); + }); + } + + return deferred.promise; + }; + + LoginService.prototype.upsert = function (login, callback) { + if (!callback || typeof callback !== 'function') { + throw 'callback function required'; + } + + var self = this; + + userService.getUserId(function (userId) { + var loginsKey = 'sites_' + userId; + + chrome.storage.local.get(loginsKey, function (obj) { + var logins = obj[loginsKey]; + if (!logins) { + logins = {}; + } + + if (login.constructor === Array) { + for (var i = 0; i < login.length; i++) { + logins[login[i].id] = login[i]; + } + } + else { + logins[login.id] = login; + } + + obj[loginsKey] = logins; + + chrome.storage.local.set(obj, function () { + self.decryptedLoginCache = null; + callback(); + }); + }); + }); + }; + + LoginService.prototype.replace = function (logins, callback) { + if (!callback || typeof callback !== 'function') { + throw 'callback function required'; + } + + var self = this; + + userService.getUserId(function (userId) { + var obj = {}; + obj['sites_' + userId] = logins; + chrome.storage.local.set(obj, function () { + self.decryptedLoginCache = null; + callback(); + }); + }); + }; + + LoginService.prototype.clear = function (userId, callback) { + if (!callback || typeof callback !== 'function') { + throw 'callback function required'; + } + + var self = this; + + chrome.storage.local.remove('sites_' + userId, function () { + self.decryptedLoginCache = null; + callback(); + }); + }; + + LoginService.prototype.delete = function (id, callback) { + if (!callback || typeof callback !== 'function') { + throw 'callback function required'; + } + + var self = this; + + userService.getUserId(function (userId) { + var loginsKey = 'sites_' + userId; + + chrome.storage.local.get(loginsKey, function (obj) { + var logins = obj[loginsKey]; + if (!logins) { + callback(); + return; + } + + if (id.constructor === Array) { + for (var i = 0; i < id.length; i++) { + if (id[i] in logins) { + delete logins[id[i]]; + } + } + } + else if (id in logins) { + delete logins[id]; + } + else { + callback(); + return; + } + + obj[loginsKey] = logins; + chrome.storage.local.set(obj, function () { + self.decryptedLoginCache = null; + callback(); + }); + }); + }); + }; + + LoginService.prototype.deleteWithServer = function (id) { + var deferred = Q.defer(); + + var self = this; + self.apiService.deleteCipher(id, function () { + self.delete(id, function () { + deferred.resolve(); + }); + }, function (response) { + handleError(response, deferred) + }); + + return deferred.promise; + }; + + function handleError(error, deferred) { + deferred.reject(error); + } +}; diff --git a/src/services/siteService.js b/src/services/siteService.js deleted file mode 100644 index a0fa64dd090..00000000000 --- a/src/services/siteService.js +++ /dev/null @@ -1,302 +0,0 @@ -function SiteService(cryptoService, userService, apiService) { - this.cryptoService = cryptoService; - this.userService = userService; - this.apiService = apiService; - this.decryptedSiteCache = null; - - initSiteService(); -}; - -function initSiteService() { - SiteService.prototype.clearCache = function () { - this.decryptedSiteCache = null - }; - - SiteService.prototype.encrypt = function (site) { - var model = { - id: site.id, - folderId: site.folderId, - favorite: site.favorite - }; - - return cryptoService.encrypt(site.name).then(function (cs) { - model.name = cs; - return cryptoService.encrypt(site.uri); - }).then(function (cs) { - model.uri = cs; - return cryptoService.encrypt(site.username); - }).then(function (cs) { - model.username = cs; - return cryptoService.encrypt(site.password); - }).then(function (cs) { - model.password = cs; - return cryptoService.encrypt(site.notes); - }).then(function (cs) { - model.notes = cs; - return model; - }); - }; - - SiteService.prototype.get = function (id, callback) { - if (!callback || typeof callback !== 'function') { - throw 'callback function required'; - } - - this.userService.getUserId(function (userId) { - var sitesKey = 'sites_' + userId; - - chrome.storage.local.get(sitesKey, function (obj) { - var sites = obj[sitesKey]; - if (sites && id in sites) { - callback(new Site(sites[id])); - return; - } - - callback(null); - }); - }); - }; - - SiteService.prototype.getAll = function (callback) { - if (!callback || typeof callback !== 'function') { - throw 'callback function required'; - } - - this.userService.getUserId(function (userId) { - var sitesKey = 'sites_' + userId; - - chrome.storage.local.get(sitesKey, function (obj) { - var sites = obj[sitesKey]; - var response = []; - for (var id in sites) { - if (!id) { - continue; - } - - response.push(new Site(sites[id])); - } - - callback(response); - }); - }); - }; - - SiteService.prototype.getAllDecrypted = function () { - var deferred = Q.defer(); - var self = this; - - cryptoService.getKey(false, function (key) { - if (!key) { - deferred.reject(); - return; - } - - if (self.decryptedSiteCache) { - deferred.resolve(self.decryptedSiteCache); - return; - } - - var promises = []; - var decSites = []; - self.getAll(function (sites) { - for (var i = 0; i < sites.length; i++) { - promises.push(sites[i].decrypt().then(function (site) { - decSites.push(site); - })); - } - - Q.all(promises).then(function () { - self.decryptedSiteCache = decSites; - deferred.resolve(self.decryptedSiteCache); - }); - }); - }); - - return deferred.promise; - }; - - SiteService.prototype.getAllDecryptedForFolder = function (folderId) { - var self = this; - - return self.getAllDecrypted().then(function (sites) { - var sitesToReturn = []; - for (var i = 0; i < sites.length; i++) { - if (sites[i].folderId === folderId) { - sitesToReturn.push(sites[i]); - } - } - - return sitesToReturn; - }); - }; - - SiteService.prototype.getAllDecryptedForDomain = function (domain) { - var self = this; - - return self.getAllDecrypted().then(function (sites) { - var sitesToReturn = []; - for (var i = 0; i < sites.length; i++) { - if (sites[i].domain === domain) { - sitesToReturn.push(sites[i]); - } - } - - return sitesToReturn; - }); - }; - - SiteService.prototype.saveWithServer = function (site) { - var deferred = Q.defer(); - - var self = this, - request = new SiteRequest(site); - - if (!site.id) { - self.apiService.postSite(request, apiSuccess, function (response) { - handleError(response, deferred) - }); - } - else { - self.apiService.putSite(site.id, request, apiSuccess, function (response) { - handleError(response, deferred) - }); - } - - function apiSuccess(response) { - site.id = response.id; - userService.getUserId(function (userId) { - var data = new SiteData(response, userId); - self.upsert(data, function () { - deferred.resolve(site); - }); - }); - } - - return deferred.promise; - }; - - SiteService.prototype.upsert = function (site, callback) { - if (!callback || typeof callback !== 'function') { - throw 'callback function required'; - } - - var self = this; - - userService.getUserId(function (userId) { - var sitesKey = 'sites_' + userId; - - chrome.storage.local.get(sitesKey, function (obj) { - var sites = obj[sitesKey]; - if (!sites) { - sites = {}; - } - - if (site.constructor === Array) { - for (var i = 0; i < site.length; i++) { - sites[site[i].id] = site[i]; - } - } - else { - sites[site.id] = site; - } - - obj[sitesKey] = sites; - - chrome.storage.local.set(obj, function () { - self.decryptedSiteCache = null; - callback(); - }); - }); - }); - }; - - SiteService.prototype.replace = function (sites, callback) { - if (!callback || typeof callback !== 'function') { - throw 'callback function required'; - } - - var self = this; - - userService.getUserId(function (userId) { - var obj = {}; - obj['sites_' + userId] = sites; - chrome.storage.local.set(obj, function () { - self.decryptedSiteCache = null; - callback(); - }); - }); - }; - - SiteService.prototype.clear = function (userId, callback) { - if (!callback || typeof callback !== 'function') { - throw 'callback function required'; - } - - var self = this; - - chrome.storage.local.remove('sites_' + userId, function () { - self.decryptedSiteCache = null; - callback(); - }); - }; - - SiteService.prototype.delete = function (id, callback) { - if (!callback || typeof callback !== 'function') { - throw 'callback function required'; - } - - var self = this; - - userService.getUserId(function (userId) { - var sitesKey = 'sites_' + userId; - - chrome.storage.local.get(sitesKey, function (obj) { - var sites = obj[sitesKey]; - if (!sites) { - callback(); - return; - } - - if (id.constructor === Array) { - for (var i = 0; i < id.length; i++) { - if (id[i] in sites) { - delete sites[id[i]]; - } - } - } - else if (id in sites) { - delete sites[id]; - } - else { - callback(); - return; - } - - obj[sitesKey] = sites; - chrome.storage.local.set(obj, function () { - self.decryptedSiteCache = null; - callback(); - }); - }); - }); - }; - - SiteService.prototype.deleteWithServer = function (id) { - var deferred = Q.defer(); - - var self = this; - self.apiService.deleteCipher(id, function () { - self.delete(id, function () { - deferred.resolve(); - }); - }, function (response) { - handleError(response, deferred) - }); - - return deferred.promise; - }; - - function handleError(error, deferred) { - deferred.reject(error); - } -}; diff --git a/src/services/syncService.js b/src/services/syncService.js index e1589db3089..36dc34b7c17 100644 --- a/src/services/syncService.js +++ b/src/services/syncService.js @@ -1,5 +1,5 @@ -function SyncService(siteService, folderService, userService, apiService) { - this.siteService = siteService; +function SyncService(loginService, folderService, userService, apiService) { + this.loginService = loginService; this.folderService = folderService; this.userService = userService; this.apiService = apiService; @@ -27,13 +27,13 @@ function initSyncService() { self.userService.getUserId(function (userId) { var now = new Date(); var ciphers = self.apiService.getCiphers(function (response) { - var sites = {}; + var logins = {}; var folders = {}; for (var i = 0; i < response.data.length; i++) { var data = response.data[i]; if (data.type === 1) { - sites[data.id] = new SiteData(data, userId); + logins[data.id] = new LoginData(data, userId); } else if (data.type === 0) { folders[data.id] = new FolderData(data, userId); @@ -41,7 +41,7 @@ function initSyncService() { } self.folderService.replace(folders, function () { - self.siteService.replace(sites, function () { + self.loginService.replace(logins, function () { self.setLastSync(now, function () { self.syncCompleted(true); callback(true); @@ -95,7 +95,7 @@ function initSyncService() { }); } - function syncSites(serverSites, callback) { + function syncLogins(serverLogins, callback) { var self = this; self.userService.isAuthenticated(function (isAuthenticated) { @@ -105,23 +105,23 @@ function initSyncService() { } self.userService.getUserId(function (userId) { - self.siteService.getAll(function (sites) { - var localSites = {}; - for (var i = 0; i < sites.length; i++) { - localSites[sites[i].id] = sites[i]; + self.loginService.getAll(function (logins) { + var localLogins = {}; + for (var i = 0; i < logins.length; i++) { + localLogins[logins[i].id] = logins[i]; } var data = []; - for (var j = 0; j < serverSites.length; j++) { - var serverSite = serverSites[j]; - var existingLocalSite = localSites[serverSite.id]; + for (var j = 0; j < serverLogins.length; j++) { + var serverLogin = serverLogins[j]; + var existingLocalLogin = localLogins[serverLogin.id]; - if (!existingLocalSite || existingLocalSite.RevisionDate !== serverSite.RevisionDate) { - data.push(new SiteData(serverSite, userId)); + if (!existingLocalLogin || existingLocalLogin.RevisionDate !== serverLogin.RevisionDate) { + data.push(new LoginData(serverLogin, userId)); } } - self.siteService.upsert(data, function () { + self.loginService.upsert(data, function () { callback(); }); });