From e466405769a7aa5536808e3a0204ef5c89623a14 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Fri, 5 Aug 2016 12:59:03 -0300
Subject: [PATCH] Refactor network environment

---
 src/js/controllers/amazon.js     |  6 ++----
 src/js/controllers/buyAmazon.js  |  3 +--
 src/js/services/amazonService.js | 21 +++++++++++++++++----
 src/js/services/configService.js | 12 ------------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/js/controllers/amazon.js b/src/js/controllers/amazon.js
index 809e2b816..8c8271223 100644
--- a/src/js/controllers/amazon.js
+++ b/src/js/controllers/amazon.js
@@ -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;
diff --git a/src/js/controllers/buyAmazon.js b/src/js/controllers/buyAmazon.js
index ddc8d28dd..a2b9aacef 100644
--- a/src/js/controllers/buyAmazon.js
+++ b/src/js/controllers/buyAmazon.js
@@ -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;
 
diff --git a/src/js/services/amazonService.js b/src/js/services/amazonService.js
index c3fe61223..a656849ad 100644
--- a/src/js/services/amazonService.js
+++ b/src/js/services/amazonService.js
@@ -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);
diff --git a/src/js/services/configService.js b/src/js/services/configService.js
index 9c0eb270a..a552b58fe 100644
--- a/src/js/services/configService.js
+++ b/src/js/services/configService.js
@@ -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);
     });