Merge pull request #873 from matiu/feature/test01

Feature/test01

js/models/core/WalletFactory.js

@@ -9,7 +9,6 @@ var Wallet = require('./Wallet');
 
 var WebRTC = module.exports.WebRTC = require('../network/WebRTC');
 var Insight = module.exports.Insight = require('../blockchain/Insight');
-//var StorageLocalPlain = module.exports.StorageLocalPlain = require('../storage/LocalPlain');
 var StorageLocalEncrypted = module.exports.StorageLocalEncrypted = require('../storage/LocalEncrypted');
 
 /*

js/models/storage/LocalEncrypted.js

@@ -8,13 +8,21 @@ function Storage(opts) {
   opts = opts || {};
 
   this.__uniqueid = ++id;
-
   if (opts.password)
     this._setPassphrase(opts.password);
+
+  if (opts.localStorage) {
+    this.localStorage = opts.localStorage;
+  } else if (localStorage) {
+  this.localStorage = localStorage;
+}
 }
 
 var pps = {};
 Storage.prototype._getPassphrase = function() {
+  if (!pps[this.__uniqueid])
+    throw new Error('No passprase set');
+
   return pps[this.__uniqueid];
 }
 
@@ -37,7 +45,6 @@ Storage.prototype._decrypt = function(base64) {
   var decryptedStr = null;
   try {
     var decrypted = CryptoJS.AES.decrypt(base64, this._getPassphrase());
-
     if (decrypted)
       decryptedStr = decrypted.toString(CryptoJS.enc.Utf8);
   } catch (e) {
@@ -54,7 +61,7 @@ Storage.prototype._decryptObj = function(base64) {
 
 Storage.prototype._read = function(k) {
   var ret;
-  ret = localStorage.getItem(k);
+  ret = this.localStorage.getItem(k);
   if (!ret) return null;
   ret = this._decrypt(ret);
   if (!ret) return null;
@@ -67,23 +74,23 @@ Storage.prototype._write = function(k, v) {
   v = JSON.stringify(v);
   v = this._encrypt(v);
 
-  localStorage.setItem(k, v);
+  this.localStorage.setItem(k, v);
 };
 
 // get value by key
 Storage.prototype.getGlobal = function(k) {
-  var item = localStorage.getItem(k);
+  var item = this.localStorage.getItem(k);
   return item == 'undefined' ? undefined : item;
 };
 
 // set value for key
 Storage.prototype.setGlobal = function(k, v) {
-  localStorage.setItem(k, JSON.stringify(v));
+  this.localStorage.setItem(k, typeof v === 'object' ? JSON.stringify(v) : v);
 };
 
 // remove value for key
 Storage.prototype.removeGlobal = function(k) {
-  localStorage.removeItem(k);
+  this.localStorage.removeItem(k);
 };
 
 Storage.prototype._key = function(walletId, k) {
@@ -110,14 +117,17 @@ Storage.prototype.setName = function(walletId, name) {
 };
 
 Storage.prototype.getName = function(walletId) {
-  return this.getGlobal('nameFor::' + walletId);
+  var ret = this.getGlobal('nameFor::' + walletId);
+
+  return ret;
 };
 
 Storage.prototype.getWalletIds = function() {
   var walletIds = [];
   var uniq = {};
-  for (var i = 0; i < localStorage.length; i++) {
-    var key = localStorage.key(i);
+
+  for (var i = 0; i < this.localStorage.length; i++) {
+    var key = this.localStorage.key(i);
     var split = key.split('::');
     if (split.length == 2) {
       var walletId = split[0];
@@ -150,8 +160,8 @@ Storage.prototype.deleteWallet = function(walletId) {
   var toDelete = {};
   toDelete['nameFor::' + walletId] = 1;
 
-  for (var i = 0; i < localStorage.length; i++) {
-    var key = localStorage.key(i);
+  for (var i = 0; i < this.localStorage.length; i++) {
+    var key = this.localStorage.key(i);
     var split = key.split('::');
     if (split.length == 2 && split[0] === walletId) {
       toDelete[key] = 1;
@@ -173,7 +183,7 @@ Storage.prototype.setFromObj = function(walletId, obj) {
 
 // remove all values
 Storage.prototype.clearAll = function() {
-  localStorage.clear();
+  this.localStorage.clear();
 };
 
 Storage.prototype.export = function(obj) {

js/models/storage/LocalPlain.js

@@ -1,124 +0,0 @@
-'use strict';
-
-var imports = require('soop').imports();
-
-function Storage() {}
-
-Storage.prototype._read = function(k) {
-  var ret;
-  try {
-    ret = JSON.parse(localStorage.getItem(k));
-  } catch (e) {};
-  return ret;
-};
-
-Storage.prototype._write = function(k, v) {
-  localStorage.setItem(k, JSON.stringify(v));
-};
-
-Storage.prototype._getWalletKeys = function(walletId) {
-  var keys = [];
-
-  for (var i = 0; i < localStorage.length; i++) {
-    var key = localStorage.key(i);
-    var split = key.split('::');
-    if (split.length == 3) {
-      if (walletId = split[0])
-        keys.push(split[2]);
-    }
-  }
-
-  return keys;
-};
-
-// get value by key
-Storage.prototype.getGlobal = function(k) {
-  return this._read(k);
-};
-
-// set value for key
-Storage.prototype.setGlobal = function(k, v) {
-  this._write(k, v);
-};
-
-// remove value for key
-Storage.prototype.removeGlobal = function(k) {
-  localStorage.removeItem(k);
-};
-
-
-
-Storage.prototype._key = function(walletId, k) {
-  return walletId + '::' + k;
-};
-// get value by key
-Storage.prototype.get = function(walletId, k) {
-  return this.getGlobal(this._key(walletId, k));
-};
-
-// set value for key
-Storage.prototype.set = function(walletId, k, v) {
-  this.setGlobal(this._key(walletId, k), v);
-};
-
-// remove value for key
-Storage.prototype.remove = function(walletId, k) {
-  this.removeGlobal(this._key(walletId, k));
-};
-
-Storage.prototype.setName = function(walletId, name) {
-  this.setGlobal('nameFor::' + walletId, name);
-};
-
-Storage.prototype.getName = function(walletId) {
-  return this.getGlobal('nameFor::' + walletId);
-};
-
-Storage.prototype.getWalletIds = function() {
-  var walletIds = [];
-  var uniq = {};
-  for (var i = 0; i < localStorage.length; i++) {
-    var key = localStorage.key(i);
-    var split = key.split('::');
-    if (split.length == 2) {
-      var walletId = split[0];
-
-      if (walletId === 'nameFor') continue;
-
-      if (typeof uniq[walletId] === 'undefined') {
-        walletIds.push(walletId);
-        uniq[walletId] = 1;
-      }
-    }
-  }
-  return walletIds;
-};
-
-Storage.prototype.getWallets = function() {
-  var wallets = [];
-  var uniq = {};
-  var ids = this.getWalletIds();
-
-  for (var i in ids) {
-    wallets.push({
-      id: ids[i],
-      name: this.getName(ids[i]),
-    });
-  }
-  return wallets;
-};
-
-//obj contains keys to be set
-Storage.prototype.setFromObj = function(walletId, obj) {
-  for (var k in obj) {
-    this.set(walletId, k, obj[k]);
-  }
-  this.setName(walletId, obj.opts.name);
-};
-
-// remove all values
-Storage.prototype.clearAll = function() {
-  localStorage.clear();
-};
-
-module.exports = require('soop')(Storage);