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

promisify makekeypair and generate keys on login

Browse Source
This commit is contained in:
Kyle Spearrin
2017-04-13 18:18:32 -04:00
parent 2228263b9f
commit e4ffdf6815
4 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/accounts/accountsRegisterController.js
View File

@@ -32,27 +32,30 @@ angular
var email = $scope.model.email.toLowerCase();
var key = cryptoService.makeKey($scope.model.masterPassword, email);
cryptoService.makeKeyPair(key, function (publicKey, privateKeyEnc, errors) {
if (errors) {
validationService.addError(form, null, 'Problem generating keys.', true);
return;
}
$scope.registerPromise = cryptoService.makeKeyPair(key).then(function (result) {
var request = {
name: $scope.model.name,
email: email,
masterPasswordHash: cryptoService.hashPassword($scope.model.masterPassword, key),
masterPasswordHint: $scope.model.masterPasswordHint,
keys: {
publicKey: publicKey,
encryptedPrivateKey: privateKeyEnc
publicKey: result.publicKey,
encryptedPrivateKey: result.privateKeyEnc
}
};
$scope.registerPromise = apiService.accounts.register(request, function () {
$scope.success = true;
$analytics.eventTrack('Registered');
}).$promise;
return apiService.accounts.register(request);
}, function (errors) {
validationService.addError(form, null, 'Problem generating keys.', true);
return false;
}).then(function (result) {
if (result === false) {
return;
}
$scope.success = true;
$analytics.eventTrack('Registered');
});
};
});