bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 10:43:35 +00:00
Code Issues Releases Wiki Activity

u2f fixes. bg vars with prefix

Browse Source
This commit is contained in:
Kyle Spearrin
2017-06-26 23:55:51 -04:00
parent 61c44ea4d9
commit 4e270cc1cb
10 changed files with 166 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/folderService.js
View File

@@ -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) {

6
src/services/lockService.js
View File

@@ -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();

22
src/services/loginService.js
View File

@@ -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) {