Merge branch 'ref/design' of github.com:matiu/copay into ref/design

This commit is contained in:
Matias Alejo Garcia 2016-08-23 12:41:49 -03:00
commit bc4f7e841e
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
15 changed files with 235 additions and 429 deletions

View file

@ -5,9 +5,13 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
var credentials = {};
var bpSession = {};
root.setCredentials = function(network) {
credentials.NETWORK = network;
if (network == 'testnet') {
var _setCredentials = function() {
/*
* Development: 'testnet'
* Production: 'livenet'
*/
credentials.NETWORK = 'livenet';
if (credentials.NETWORK == 'testnet') {
credentials.BITPAY_API_URL = 'https://test.bitpay.com';
}
else {
@ -16,6 +20,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
var _getUser = function(cb) {
_setCredentials();
storageService.getBitpayCard(credentials.NETWORK, function(err, user) {
if (err) return cb(err);
if (lodash.isString(user)) {
@ -26,6 +31,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
var _setUser = function(user, cb) {
_setCredentials();
user = JSON.stringify(user);
storageService.setBitpayCard(credentials.NETWORK, user, function(err) {
return cb(err);
@ -33,6 +39,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
var _getSession = function(cb) {
_setCredentials();
$http({
method: 'GET',
url: credentials.BITPAY_API_URL + '/visa-api/session',
@ -50,6 +57,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
var _getBitPay = function(endpoint) {
_setCredentials();
return {
method: 'GET',
url: credentials.BITPAY_API_URL + endpoint,
@ -61,6 +69,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
var _postBitPay = function(endpoint, data) {
_setCredentials();
return {
method: 'POST',
url: credentials.BITPAY_API_URL + endpoint,
@ -72,6 +81,11 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
};
root.getEnvironment = function() {
_setCredentials();
return credentials.NETWORK;
};
root.topUp = function(data, cb) {
var dataSrc = {
amount: data.amount,
@ -173,6 +187,7 @@ angular.module('copayApp.services').factory('bitpayCardService', function($http,
};
root.logout = function(cb) {
_setCredentials();
storageService.removeBitpayCard(credentials.NETWORK, function(err) {
$http(_getBitPay('/visa-api/logout')).then(function(data) {
$log.info('BitPay Logout: SUCCESS');