Fix upgrade of bitpay account storage.

This commit is contained in:
Andy Phillipson 2016-12-23 12:22:53 -05:00
commit 3bac0fe707

View file

@ -161,14 +161,14 @@ angular.module('copayApp.services')
var upgraded = ''; var upgraded = '';
Object.keys(data).forEach(function(key) { Object.keys(data).forEach(function(key) {
// Keys are account emails // Keys are account emails
if (!data[key]['bitpayApi-' + network].token) { if (!data[key]['bitpayApi-' + network]) {
// Needs upgrade // Needs upgrade
upgraded += ' ' + key; upgraded += ' ' + key;
var acctData = { var acctData = {
token: data[key]['bitpayDebitCards-' + network].token, token: data[key]['bitpayDebitCards-' + network].token,
email: key email: key
}; };
_02_setBitpayAccount(network, data, function(err) { _02_setBitpayAccount(network, acctData, function(err) {
if (err) return cb(err); if (err) return cb(err);
_02_setBitpayDebitCards(network, data[key]['bitpayDebitCards-' + network], function(err) { _02_setBitpayDebitCards(network, data[key]['bitpayDebitCards-' + network], function(err) {
@ -236,7 +236,7 @@ angular.module('copayApp.services')
data = JSON.parse(data); data = JSON.parse(data);
} }
data = data || {}; data = data || {};
if (lodash.isEmpty(data) || !data.email) return cb('No card(s) to set'); if (lodash.isEmpty(data) || !data.email) return cb('Cannot set cards: no account to set');
storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) { storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) {
if (err) return cb(err); if (err) return cb(err);
if (lodash.isString(bitpayAccounts)) { if (lodash.isString(bitpayAccounts)) {
@ -588,7 +588,7 @@ angular.module('copayApp.services')
data = JSON.parse(data); data = JSON.parse(data);
} }
data = data || {}; data = data || {};
if (lodash.isEmpty(data) || !data.email) return cb('No card(s) to set'); if (lodash.isEmpty(data) || !data.email) return cb('Cannot set cards: no account to set');
storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) { storage.get('bitpayAccounts-' + network, function(err, bitpayAccounts) {
if (err) return cb(err); if (err) return cb(err);
if (lodash.isString(bitpayAccounts)) { if (lodash.isString(bitpayAccounts)) {