bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

support user encryption key

Browse Source
This commit is contained in:
Kyle Spearrin
2017-06-02 00:10:29 -04:00
parent e282966d64
commit 16098a1743
13 changed files with 218 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/models/api/requestModels.js
View File

@@ -48,11 +48,12 @@ var TokenRequest = function (email, masterPasswordHash, token, device) {
};
};
var RegisterRequest = function (email, masterPasswordHash, masterPasswordHint) {
var RegisterRequest = function (email, masterPasswordHash, masterPasswordHint, key) {
this.name = null;
this.email = email;
this.masterPasswordHash = masterPasswordHash;
this.masterPasswordHint = masterPasswordHint ? masterPasswordHint : null;
this.key = key;
};
var PasswordHintRequest = function (email) {

4
src/models/api/responseModels.js
View File

@@ -38,6 +38,9 @@ var ProfileResponse = function (response) {
this.masterPasswordHint = response.MasterPasswordHint;
this.culture = response.Culture;
this.twoFactorEnabled = response.TwoFactorEnabled;
this.key = response.Key;
this.privateKey = response.PrivateKey;
this.securityStamp = response.SecurityStamp;
this.organizations = [];
if (response.Organizations) {
@@ -68,6 +71,7 @@ var IdentityTokenResponse = function (response) {
this.tokenType = response.token_type;
this.privateKey = response.PrivateKey;
this.key = response.Key;
};
var ListResponse = function (data) {

9
src/models/domainModels.js
View File

@@ -9,13 +9,8 @@ var CipherString = function () {
var constants = chrome.extension.getBackgroundPage().constantsService;
if (arguments.length >= 2) {
// ct and optional header
if (arguments[0] === constants.encType.AesCbc256_B64) {
this.encryptedString = arguments[1];
}
else {
this.encryptedString = arguments[0] + '.' + arguments[1];
}
// ct and header
this.encryptedString = arguments[0] + '.' + arguments[1];
// iv
if (arguments.length > 2 && arguments[2]) {