mirror of https://github.com/BTCPrivate/copay.git
Refactor network environment
This commit is contained in:
parent
03965b6e3a
commit
e466405769
|
@ -1,13 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
angular.module('copayApp.controllers').controller('amazonController',
|
||||
function($scope, $timeout, $ionicModal, $log, lodash, bwcError, configService, amazonService) {
|
||||
function($scope, $timeout, $ionicModal, $log, lodash, bwcError, amazonService) {
|
||||
|
||||
this.init = function() {
|
||||
var self = this;
|
||||
var network = configService.getSync().amazon.testnet ? 'testnet' : 'livenet';
|
||||
self.sandbox = network == 'testnet' ? true : false;
|
||||
amazonService.setCredentials(network);
|
||||
self.sandbox = amazonService.getEnvironment() == 'testnet' ? true : false;
|
||||
amazonService.getPendingGiftCards(function(err, gcds) {
|
||||
if (err) {
|
||||
self.error = err;
|
||||
|
|
|
@ -15,8 +15,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
|
|||
};
|
||||
|
||||
this.init = function() {
|
||||
var network = configService.getSync().amazon.testnet ? 'testnet' : 'livenet';
|
||||
amazonService.setCredentials(network);
|
||||
var network = amazonService.getEnvironment();
|
||||
self.allWallets = profileService.getWallets(network, 1);
|
||||
client = profileService.focusedClient;
|
||||
|
||||
|
|
|
@ -3,8 +3,14 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
|
|||
var root = {};
|
||||
var credentials = {};
|
||||
|
||||
root.setCredentials = function(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 {
|
||||
credentials.BITPAY_API_URL = "https://bitpay.com";
|
||||
|
@ -12,6 +18,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
|
|||
};
|
||||
|
||||
var _getBitPay = function(endpoint) {
|
||||
_setCredentials();
|
||||
return {
|
||||
method: 'GET',
|
||||
url: credentials.BITPAY_API_URL + endpoint,
|
||||
|
@ -22,6 +29,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
|
|||
};
|
||||
|
||||
var _postBitPay = function(endpoint, data) {
|
||||
_setCredentials();
|
||||
return {
|
||||
method: 'POST',
|
||||
url: credentials.BITPAY_API_URL + endpoint,
|
||||
|
@ -32,8 +40,13 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
|
|||
};
|
||||
};
|
||||
|
||||
root.getEnvironment = function() {
|
||||
_setCredentials();
|
||||
return credentials.NETWORK;
|
||||
};
|
||||
|
||||
root.savePendingGiftCard = function(gc, opts, cb) {
|
||||
var network = configService.getSync().amazon.testnet ? 'testnet' : 'livenet';
|
||||
var network = root.getEnvironment();
|
||||
storageService.getAmazonGiftCards(network, function(err, oldGiftCards) {
|
||||
if (lodash.isString(oldGiftCards)) {
|
||||
oldGiftCards = JSON.parse(oldGiftCards);
|
||||
|
@ -58,7 +71,7 @@ angular.module('copayApp.services').factory('amazonService', function($http, $lo
|
|||
};
|
||||
|
||||
root.getPendingGiftCards = function(cb) {
|
||||
var network = configService.getSync().amazon.testnet ? 'testnet' : 'livenet';
|
||||
var network = root.getEnvironment();
|
||||
storageService.getAmazonGiftCards(network, function(err, giftCards) {
|
||||
var _gcds = giftCards ? JSON.parse(giftCards) : null;
|
||||
return cb(err, _gcds);
|
||||
|
|
|
@ -43,11 +43,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
|||
testnet: false
|
||||
},
|
||||
|
||||
amazon: {
|
||||
enabled: true,
|
||||
testnet: false
|
||||
},
|
||||
|
||||
rates: {
|
||||
url: 'https://insight.bitpay.com:443/api/rates',
|
||||
},
|
||||
|
@ -106,9 +101,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
|||
if (!configCache.coinbase) {
|
||||
configCache.coinbase = defaultConfig.coinbase;
|
||||
}
|
||||
if (!configCache.amazon) {
|
||||
configCache.amazon = defaultConfig.amazon;
|
||||
}
|
||||
if (!configCache.pushNotifications) {
|
||||
configCache.pushNotifications = defaultConfig.pushNotifications;
|
||||
}
|
||||
|
@ -125,10 +117,6 @@ angular.module('copayApp.services').factory('configService', function(storageSer
|
|||
// Disabled for testnet
|
||||
configCache.coinbase.testnet = false;
|
||||
|
||||
// Amazon
|
||||
// Disabled for testnet
|
||||
configCache.amazon.testnet = false;
|
||||
|
||||
$log.debug('Preferences read:', configCache)
|
||||
return cb(err, configCache);
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue