anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Coinbase connection issues and logout from tab-setting

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-12-08 13:06:01 -03:00
commit 539583a2af
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
9 changed files with 130 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/js/controllers/modals/coinbaseConfirmation.js
View file

@ -1,20 +0,0 @@
'use strict';
angular.module('copayApp.controllers').controller('coinbaseConfirmationController', function($scope, $timeout, coinbaseService, applicationService) {
$scope.ok = function() {
coinbaseService.logout($scope.network, function() {
$timeout(function() {
applicationService.restart();
}, 1000);
});
$scope.cancel();
};
$scope.cancel = function() {
$scope.coinbaseConfirmationModal.hide();
};
});

48
src/js/controllers/preferencesCoinbase.js
View file

@ -1,18 +1,42 @@
'use strict';
angular.module('copayApp.controllers').controller('preferencesCoinbaseController',
function($scope, $timeout, $ionicModal, applicationService, coinbaseService) {
angular.module('copayApp.controllers').controller('preferencesCoinbaseController', function($scope, $timeout, $state, $ionicHistory, lodash, ongoingProcess, popupService, coinbaseService) {
this.revokeToken = function(testnet) {
$scope.network = testnet ? 'testnet' : 'livenet';
$scope.revokeToken = function() {
popupService.showConfirm('Coinbase', 'Are you sure you would like to log out of your Coinbase account?', null, null, function(res) {
if (res) {
coinbaseService.logout(function() {
$ionicHistory.clearHistory();
$timeout(function() {
$state.go('tabs.home');
}, 100);
});
}
});
};
$ionicModal.fromTemplateUrl('views/modals/coinbase-confirmation.html', {
scope: $scope,
animation: 'slide-in-up'
}).then(function(modal) {
$scope.coinbaseConfirmationModal = modal;
$scope.coinbaseConfirmationModal.show();
$scope.$on("$ionicView.enter", function(event, data){
coinbaseService.setCredentials();
$scope.network = coinbaseService.getEnvironment();
ongoingProcess.set('connectingCoinbase', true);
coinbaseService.init($scope.accessToken, function(err, data) {
ongoingProcess.set('connectingCoinbase', false);
if (err || lodash.isEmpty(data)) {
ongoingProcess.set('connectingCoinbase', false);
if (err) {
popupService.showAlert(gettextCatalog.getString('Error'), err);
}
return;
}
var accessToken = data.accessToken;
var accountId = data.accountId;
coinbaseService.getAccount(accessToken, accountId, function(err, account) {
$scope.coinbaseAccount = account.data;
});
};
coinbaseService.getCurrentUser(accessToken, function(err, user) {
$scope.coinbaseUser = user.data;
});
});
});
});

11
src/js/controllers/tab-settings.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, appConfigService, $ionicModal, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, gettextCatalog) {
angular.module('copayApp.controllers').controller('tabSettingsController', function($scope, appConfigService, $window, $log, lodash, uxLanguage, platformInfo, profileService, feeService, configService, externalLinkService, bitpayCardService, storageService, glideraService, coinbaseService, gettextCatalog) {
var updateConfig = function() {
var isCordova = platformInfo.isCordova;
@ -26,6 +26,7 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
$scope.bitpayCardEnabled = config.bitpayCard.enabled;
$scope.glideraEnabled = config.glidera.enabled && !isWindowsPhoneApp;
$scope.coinbaseEnabled = config.coinbase.enabled && !isWindowsPhoneApp;
if ($scope.bitpayCardEnabled) {
bitpayCardService.getBitpayDebitCards(function(err, cards) {
@ -41,6 +42,14 @@ angular.module('copayApp.controllers').controller('tabSettingsController', funct
});
}
if ($scope.coinbaseEnabled) {
coinbaseService.setCredentials();
storageService.getCoinbaseToken(coinbaseService.getEnvironment(), function(err, token) {
if (err) $log.error(err);
$scope.coinbaseToken = token;
});
}
});
};

29
src/js/routes.js
View file

@ -926,24 +926,25 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
*
*/
.state('tabs.buyandsell.coinbase', {
url: '/coinbase',
views: {
'tab-home@tabs': {
controller: 'coinbaseController',
controllerAs: 'coinbase',
templateUrl: 'views/coinbase.html'
}
}
})
.state('tabs.buyandsell.coinbase.preferences', {
url: '/preferences',
.state('tabs.buyandsell.coinbase', {
url: '/coinbase',
views: {
'tab-home@tabs': {
controller: 'preferencesCoinbaseController',
controller: 'coinbaseController',
controllerAs: 'coinbase',
templateUrl: 'views/coinbase.html'
}
}
})
.state('tabs.preferences.coinbase', {
url: '/coinbase',
views: {
'tab-settings@tabs': {
controller: 'preferencesCoinbaseController',
templateUrl: 'views/preferencesCoinbase.html'
}
})
}
})
.state('tabs.buyandsell.coinbase.buy', {
url: '/buy',
'tab-home@tabs': {

5
src/js/services/coinbaseService.js
View file

@ -177,7 +177,10 @@ angular.module('copayApp.services').factory('coinbaseService', function($http, $
if (err) return cb(err);
_refreshToken(refreshToken, function(err, newToken) {
if (err) return cb(err);
return cb(null, {accessToken: newToken, accountId: accountId});
_getMainAccountId(newToken, function(err, accountId) {
if (err) return cb(err);
return cb(null, {accessToken: newToken, accountId: accountId});
});
});
});
} else {

5
www/views/coinbase.html
View file

@ -3,11 +3,6 @@
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title>Coinbase</ion-nav-title>
<ion-nav-buttons side="secondary">
<button ng-show="accountId" class="button no-border" ui-sref="tabs.buyandsell.coinbase.preferences">
<i class="icon ion-ios-settings"></i>
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content>

18
www/views/modals/coinbase-confirmation.html
View file

@ -1,18 +0,0 @@
<ion-modal-view ng-controller="coinbaseConfirmationController">
<div class="m20tp text-center">
<div class="row">
<h1 class="text-center m20b p20h">Are you sure you would like to log out of your Coinbase account?</h1>
<p class="text-gray p20h">You will need to log back in to buy or sell bitcoin in Copay.</p>
<div class="large-6 medium-6 small-6 columns">
<button class="button light-gray expand outline round" ng-click="cancel()">
<i class="fi-arrow-left"></i> <span class="tu">Back</span>
</button>
</div>
<div class="large-6 medium-6 small-6 columns">
<button class="button warning expand round" ng-click="ok()">
<span>Log out</span>
</button>
</div>
</div>
</div>
</ion-modal-view>

114
www/views/preferencesCoinbase.html
View file

@ -1,60 +1,62 @@
<div
class="topbar-container"
ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Preferences'; goBackToState = 'coinbase'; noColor = true">
</div>
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-back-button>
</ion-nav-back-button>
<ion-nav-title>Preferences</ion-nav-title>
</ion-nav-bar>
<div class="content coinbase-preferences" ng-controller="preferencesCoinbaseController as coinbase">
<ion-content>
<ul ng-if="index.coinbaseAccount && !index.coinbaseError" class="no-bullet m0">
<h4 class="title m0">Account</h4>
<li>
<span>ID</span>
<span class="right text-gray enable_text_select">
{{index.coinbaseAccount.id}}
</span>
</li>
<li>
<span>Name</span>
<span class="right text-gray">
{{index.coinbaseAccount.name}}
</span>
</li>
<li>
<span>Balance</span>
<span class="right text-gray">
{{index.coinbaseAccount.balance.amount}} {{index.coinbaseAccount.balance.currency}}
</span>
</li>
<li>
<span>Native Balance</span>
<span class="right text-gray">
{{index.coinbaseAccount.native_balance.amount}} {{index.coinbaseAccount.native_balance.currency}}
</span>
</li>
<ul ng-if="coinbaseAccount && !error" class="list">
<div class="item item-divider">
Account
</div>
<li class="item">
<span>ID</span>
<span class="item-note">
{{coinbaseAccount.id}}
</span>
</li>
<li class="item">
<span>Name</span>
<span class="item-note">
{{coinbaseAccount.name}}
</span>
</li>
<li class="item">
<span>Balance</span>
<span class="item-note">
{{coinbaseAccount.balance.amount}} {{coinbaseAccount.balance.currency}}
</span>
</li>
<li class="item">
<span>Native Balance</span>
<span class="item-note">
{{coinbaseAccount.native_balance.amount}} {{coinbaseAccount.native_balance.currency}}
</span>
</li>
<h4 class="title m0">User Information</h4>
<li>
<span>ID</span>
<span class="right text-gray enable_text_select">
{{index.coinbaseUser.id}}
</span>
</li>
<li>
<span>Email</span>
<span class="right text-gray">
{{index.coinbaseUser.email}}
</span>
</li>
</ul>
<ul class="no-bullet m0">
<h4></h4>
<li ng-click="coinbase.revokeToken(index.coinbaseTestnet)">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span class="text-warning">Log out</span>
</li>
</ul>
<h4></h4>
<div class="item item-divider">
User Information
</div>
<li class="item">
<span>ID</span>
<span class="item-note">
{{coinbaseUser.id}}
</span>
</li>
<li class="item">
<span>Email</span>
<span class="item-note">
{{coinbaseUser.email}}
</span>
</li>
</div>
<div class="extra-margin-bottom"></div>
<div class="item item-divider"></div>
<li class="item" ng-click="revokeToken()">
<span>Log out</span>
</li>
</ul>
</ion-content>
</ion-view>

7
www/views/tab-settings.html
View file

@ -133,6 +133,13 @@
<i class="icon bp-arrow-right"></i>
</a>
<a class="item item-icon-right"
ng-if="coinbaseEnabled && coinbaseToken"
ui-sref="tabs.preferences.coinbase">
<img src="img/coinbase-logo.png" width="90"/>
<i class="icon bp-arrow-right"></i>
</a>
<div class="item item-divider"></div>
<a class="item item-icon-right item-icon-left" href ui-sref="tabs.advanced">