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

makeEncKey to use UInt8Array

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-04 15:29:23 -04:00
parent 8947cafa4e
commit 3ee9b1bba1
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/popup/app/accounts/accountsRegisterController.js
View File

@@ -44,19 +44,19 @@
};
function registerPromise(key, masterPassword, email, hint) {
return $q(function (resolve, reject) {
cryptoService.makeEncKey(key).then(function (encKey) {
cryptoService.hashPassword(masterPassword, key, function (hashedPassword) {
var request = new RegisterRequest(email, hashedPassword, hint, encKey.encryptedString);
apiService.postRegister(request,
function () {
resolve();
},
function (error) {
reject(error);
});
});
var deferred = $q.defer();
cryptoService.makeEncKey(key).then(function (encKey) {
cryptoService.hashPassword(masterPassword, key, function (hashedPassword) {
var request = new RegisterRequest(email, hashedPassword, hint, encKey.encryptedString);
apiService.postRegister(request,
function () {
deferred.resolve();
},
function (error) {
deferred.reject(error);
});
});
});
return deferred.promise;
}
});