mirror of https://github.com/BTCPrivate/copay.git
Fixing encrypted
This commit is contained in:
parent
35bab383b0
commit
126a57d5ab
|
@ -1,7 +1,7 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('ImportController',
|
angular.module('copayApp.controllers').controller('ImportController',
|
||||||
function($scope, $rootScope, $location, controllerUtils, notification, isMobile, Compatibility, cryptoUtils) {
|
function($scope, $rootScope, $location, controllerUtils, notification, isMobile, Compatibility) {
|
||||||
|
|
||||||
$rootScope.title = 'Import a backup';
|
$rootScope.title = 'Import a backup';
|
||||||
$scope.importStatus = 'Importing wallet - Reading backup...';
|
$scope.importStatus = 'Importing wallet - Reading backup...';
|
||||||
|
|
|
@ -8,7 +8,7 @@ function EncryptedInsightStorage(config) {
|
||||||
inherits(EncryptedInsightStorage, InsightStorage);
|
inherits(EncryptedInsightStorage, InsightStorage);
|
||||||
|
|
||||||
EncryptedInsightStorage.prototype.getItem = function(name, callback) {
|
EncryptedInsightStorage.prototype.getItem = function(name, callback) {
|
||||||
var key = cryptoUtil.kdf(this.password + this.email);
|
var key = cryptoUtil.kdfbinary(this.password + this.email);
|
||||||
InsightStorage.prototype.getItem.apply(this, [name,
|
InsightStorage.prototype.getItem.apply(this, [name,
|
||||||
function(err, body) {
|
function(err, body) {
|
||||||
var decryptedJson = cryptoUtil.decrypt(key, body);
|
var decryptedJson = cryptoUtil.decrypt(key, body);
|
||||||
|
@ -21,13 +21,13 @@ EncryptedInsightStorage.prototype.getItem = function(name, callback) {
|
||||||
};
|
};
|
||||||
|
|
||||||
EncryptedInsightStorage.prototype.setItem = function(name, value, callback) {
|
EncryptedInsightStorage.prototype.setItem = function(name, value, callback) {
|
||||||
var key = cryptoUtil.kdf(this.password + this.email);
|
var key = cryptoUtil.kdfbinary(this.password + this.email);
|
||||||
var record = cryptoUtil.encrypt(key, value);
|
var record = cryptoUtil.encrypt(key, value);
|
||||||
InsightStorage.prototype.setItem.apply(this, [name, record, callback]);
|
InsightStorage.prototype.setItem.apply(this, [name, record, callback]);
|
||||||
};
|
};
|
||||||
|
|
||||||
EncryptedInsightStorage.prototype.removeItem = function(name, callback) {
|
EncryptedInsightStorage.prototype.removeItem = function(name, callback) {
|
||||||
var key = cryptoUtil.kdf(this.password + this.email);
|
var key = cryptoUtil.kdfbinary(this.password + this.email);
|
||||||
InsightStorage.prototype.removeItem.apply(this, [name, callback]);
|
InsightStorage.prototype.removeItem.apply(this, [name, callback]);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ InsightStorage.prototype.setCredentials = function(email, password, opts) {
|
||||||
};
|
};
|
||||||
|
|
||||||
InsightStorage.prototype.getItem = function(name, callback) {
|
InsightStorage.prototype.getItem = function(name, callback) {
|
||||||
var key = cryptoUtil.kdf(this.password, this.email);
|
var key = cryptoUtil.kdf(this.password + this.email);
|
||||||
var secret = cryptoUtil.kdf(key, this.password);
|
var secret = cryptoUtil.kdf(key, this.password);
|
||||||
var encodedEmail = encodeURIComponent(this.email);
|
var encodedEmail = encodeURIComponent(this.email);
|
||||||
var retrieveUrl = this.storeUrl + '/retrieve/' + encodedEmail;
|
var retrieveUrl = this.storeUrl + '/retrieve/' + encodedEmail;
|
||||||
|
@ -35,7 +35,7 @@ InsightStorage.prototype.getItem = function(name, callback) {
|
||||||
};
|
};
|
||||||
|
|
||||||
InsightStorage.prototype.setItem = function(name, value, callback) {
|
InsightStorage.prototype.setItem = function(name, value, callback) {
|
||||||
var key = cryptoUtil.kdf(this.password, this.email);
|
var key = cryptoUtil.kdf(this.password + this.email);
|
||||||
var secret = cryptoUtil.kdf(key, this.password);
|
var secret = cryptoUtil.kdf(key, this.password);
|
||||||
var registerUrl = this.storeUrl + '/register';
|
var registerUrl = this.storeUrl + '/register';
|
||||||
this.request.post({
|
this.request.post({
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var BackupService = function($rootScope, notification, cryptoUtils) {
|
var BackupService = function($rootScope, notification) {
|
||||||
this.$rootScope = $rootScope;
|
this.$rootScope = $rootScope;
|
||||||
this.notifications = notification;
|
this.notifications = notification;
|
||||||
this.cryptoUtils = cryptoUtils;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
BackupService.prototype.getCopayer = function(wallet) {
|
BackupService.prototype.getCopayer = function(wallet) {
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular.module('copayApp.services').factory('cryptoUtils', function() {
|
|
||||||
return require('../util/crypto');
|
|
||||||
});
|
|
Loading…
Reference in New Issue