From 71471f2aad130c5eb69b361da587d6a0e7373249 Mon Sep 17 00:00:00 2001
From: Gustavo Maximiliano Cortez <cmgustavo83@gmail.com>
Date: Mon, 7 Sep 2015 18:48:47 -0300
Subject: [PATCH] Adds glidera for livenet

---
 public/views/glidera.html         |  6 +++---
 src/js/controllers/index.js       |  2 +-
 src/js/services/glideraService.js | 26 +++++++++++++++++++++-----
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/public/views/glidera.html b/public/views/glidera.html
index 822bdc503..6465b90f1 100644
--- a/public/views/glidera.html
+++ b/public/views/glidera.html
@@ -26,7 +26,7 @@
     <img src="img/glidera-logo.png">
   </div>
 
-  <div ng-if="!index.glideraToken && !index.glideraLoading" class="row">
+  <div ng-if="!index.glideraToken && !index.glideraLoading && !index.glideraError" class="row">
     <div class="columns" ng-init="showOauthForm = false">
       <div class="text-center" ng-show="!showOauthForm">
         <p translate>You can buy and sell Bitcoin with a US bank account directly in Copay.</p>
@@ -59,11 +59,11 @@
     </div>
   </div>
   
-  <div class="m20t text-center" ng-if="index.glideraToken && index.glideraError">
+  <div class="m20t text-center" ng-if="index.glideraError">
     <div class="text-warning">
       <span ng-show="index.glideraError == 'Unauthorized'" translate>Could not connect with Glidera: Unauthorized</span>
       <span ng-show="index.glideraError == 'Forbidden'" translate>Could not connect with Glidera: Forbidden</span>
-      <span ng-show="index.glideraError != ('Forbidden' && 'Unauthorized')" translate>Could not connect with Glidera</span>
+      <span ng-show="index.glideraError != ('Forbidden' && 'Unauthorized')">{{index.glideraError}}</span>
     </div>
     <div class="m10t">
       <button class="round tiny" ng-click="index.glideraToken = null; index.glideraError = null">
diff --git a/src/js/controllers/index.js b/src/js/controllers/index.js
index 6c66909c9..be636889f 100644
--- a/src/js/controllers/index.js
+++ b/src/js/controllers/index.js
@@ -852,11 +852,11 @@ console.log('[index.js:395]',txps); //TODO
       if (err || !accessToken) return;
       else {
         self.glideraLoading = gettext('Connecting to Glidera...');
+        glideraService.init(self.network);
         glideraService.getAccessTokenPermissions(accessToken, function(err, p) {
           self.glideraLoading = null;
           if (err) {
             self.glideraError = err;
-            $log.error(err);
           }
           else {
             self.glideraToken = accessToken;
diff --git a/src/js/services/glideraService.js b/src/js/services/glideraService.js
index 62cbe7eb2..1932f8735 100644
--- a/src/js/services/glideraService.js
+++ b/src/js/services/glideraService.js
@@ -2,10 +2,26 @@
 
 angular.module('copayApp.services').factory('glideraService', function($http, $log) {
   var root = {};
-  var HOST = 'https://sandbox.glidera.io';
-  var REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob';
-  var CLIENT_ID = '9915b6ffa6dc3baffb87135ed3873d49';
-  var CLIENT_SECRET = 'd74eda05b9c6a228fd5c85cfbd0eb7eb';
+
+  var HOST;
+  var REDIRECT_URI;
+  var CLIENT_ID;
+  var CLIENT_SECRET;
+
+  root.init = function(network) {
+    if (network == 'testnet') {
+      HOST = 'https://sandbox.glidera.io';
+      REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob';
+      CLIENT_ID = '9915b6ffa6dc3baffb87135ed3873d49';
+      CLIENT_SECRET = 'd74eda05b9c6a228fd5c85cfbd0eb7eb'; 
+    }
+    else {
+      HOST = 'https://glidera.io';
+      REDIRECT_URI = 'urn:ietf:wg:oauth:2.0:oob';
+      CLIENT_ID = '';
+      CLIENT_SECRET = ''; 
+    }
+  };
 
   root.getOauthCodeUrl = function() {
     return HOST 
@@ -60,7 +76,7 @@ angular.module('copayApp.services').factory('glideraService', function($http, $l
       return cb(null, data.data);
     }, function(data) {
       $log.error('Glidera Access Token Permissions: ERROR ' + data.statusText);
-      return cb(data.statusText);
+      return cb('Glidera Access Token Permissions: ERROR');
     });
   };