Fix link account
This commit is contained in:
parent
fcae682954
commit
4ec340640e
4 changed files with 22 additions and 45 deletions
|
|
@ -108,7 +108,11 @@ angular.module('copayApp.controllers').controller('glideraController',
|
||||||
$scope.network = glideraService.getNetwork();
|
$scope.network = glideraService.getNetwork();
|
||||||
$scope.showOauthForm = false;
|
$scope.showOauthForm = false;
|
||||||
$scope.account = {};
|
$scope.account = {};
|
||||||
init();
|
if (data.stateParams && data.stateParams.code) {
|
||||||
|
$scope.submitOauthCode(data.stateParams.code);
|
||||||
|
} else {
|
||||||
|
init();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
'use strict';
|
|
||||||
angular.module('copayApp.controllers').controller('glideraUriController',
|
|
||||||
function($scope, $log, $stateParams, $timeout, glideraService, storageService, $state, ongoingProcess, popupService, gettextCatalog) {
|
|
||||||
|
|
||||||
var submitOauthCode = function(code) {
|
|
||||||
$log.debug('Glidera Oauth Code:' + code);
|
|
||||||
$scope.network = glideraService.getEnvironment();
|
|
||||||
ongoingProcess.set('connectingGlidera', true);
|
|
||||||
$timeout(function() {
|
|
||||||
glideraService.getToken(code, function(err, data) {
|
|
||||||
ongoingProcess.set('connectingGlidera', false);
|
|
||||||
if (err) {
|
|
||||||
popupService.showAlert(gettextCatalog.getString('Error'), err);
|
|
||||||
} else if (data && data.access_token) {
|
|
||||||
storageService.setGlideraToken($scope.network, data.access_token, function() {
|
|
||||||
$timeout(function() {
|
|
||||||
$state.go('tabs.buyandsell.glidera');
|
|
||||||
$scope.$apply();
|
|
||||||
}, 500);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}, 100);
|
|
||||||
};
|
|
||||||
|
|
||||||
$scope.$on("$ionicView.enter", function(event, data){
|
|
||||||
if ($stateParams.url) {
|
|
||||||
var match = $stateParams.url.match(/code=(.+)/);
|
|
||||||
if (match && match[1]) {
|
|
||||||
submitOauthCode(match[1]);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
$log.error('Bad state: ' + JSON.stringify($stateParams));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
@ -137,11 +137,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
url: '/uri-payment/:url',
|
url: '/uri-payment/:url',
|
||||||
templateUrl: 'views/paymentUri.html'
|
templateUrl: 'views/paymentUri.html'
|
||||||
})
|
})
|
||||||
.state('uriglidera', {
|
|
||||||
url: '/uri-glidera/:url',
|
|
||||||
controller: 'glideraUriController',
|
|
||||||
templateUrl: 'views/glideraUri.html'
|
|
||||||
})
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*
|
*
|
||||||
|
|
@ -880,7 +875,7 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.state('tabs.buyandsell.glidera', {
|
.state('tabs.buyandsell.glidera', {
|
||||||
url: '/glidera',
|
url: '/glidera/:code',
|
||||||
views: {
|
views: {
|
||||||
'tab-home@tabs': {
|
'tab-home@tabs': {
|
||||||
controller: 'glideraController',
|
controller: 'glideraController',
|
||||||
|
|
|
||||||
|
|
@ -122,9 +122,23 @@ angular.module('copayApp.services').factory('incomingData', function($log, $stat
|
||||||
goToAmountPage(data);
|
goToAmountPage(data);
|
||||||
}
|
}
|
||||||
} else if (data && data.indexOf(appConfigService.name + '://glidera') === 0) {
|
} else if (data && data.indexOf(appConfigService.name + '://glidera') === 0) {
|
||||||
return $state.go('uriglidera', {
|
var code = getParameterByName('code', data);
|
||||||
url: data
|
$ionicHistory.nextViewOptions({
|
||||||
|
disableAnimate: true
|
||||||
});
|
});
|
||||||
|
$state.go('tabs.home', {}, {
|
||||||
|
'reload': true,
|
||||||
|
'notify': $state.current.name == 'tabs.home' ? false : true
|
||||||
|
}).then(function() {
|
||||||
|
$ionicHistory.nextViewOptions({
|
||||||
|
disableAnimate: true
|
||||||
|
});
|
||||||
|
$state.transitionTo('tabs.buyandsell.glidera', {
|
||||||
|
code: code
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return true;
|
||||||
|
|
||||||
} else if (data && data.indexOf(appConfigService.name + '://coinbase') === 0) {
|
} else if (data && data.indexOf(appConfigService.name + '://coinbase') === 0) {
|
||||||
var code = getParameterByName('code', data);
|
var code = getParameterByName('code', data);
|
||||||
$ionicHistory.nextViewOptions({
|
$ionicHistory.nextViewOptions({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue