bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-14 07:13:32 +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

6
src/models/domainModels.js
View File

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