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

pin fixes

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-03 12:40:13 -03:00 • committed by Gustavo Maximiliano Cortez
commit d3128137ce
8 changed files with 91 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

15
js/controllers/head.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService, pinService) {
angular.module('copayApp.controllers').controller('HeadController', function($scope, $rootScope, $filter, $timeout, notification, identityService, balanceService) {
$scope.username = $rootScope.iden.getName();
$scope.hoverMenu = false;
@ -39,15 +39,10 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
window.onbeforeunload = undefined;
});
// TODO put this on init()
if ($rootScope.wallet) {
pinService.check(function(err, value) {
$scope.hasPin = value;
});
$scope.init = function() {
if (!$rootScope.wallet) return;
$scope.$on('$idleStart', function() {
});
$scope.$on('$idleStart', function() {});
$scope.$on('$idleWarn', function(a, countdown) {
$rootScope.countdown = countdown;
$rootScope.sessionExpired = true;
@ -70,5 +65,5 @@ angular.module('copayApp.controllers').controller('HeadController', function($sc
$rootScope.$watch('title', function(newTitle, oldTitle) {
$scope.title = newTitle;
});
}
};
});

75
js/controllers/home.js
View file

@ -2,6 +2,9 @@
angular.module('copayApp.controllers').controller('HomeController', function($scope, $rootScope, $location, $timeout, notification, identityService, Compatibility, pinService, applicationService, isMobile) {
var _credentials;
$scope.init = function() {
// This is only for backwards compat, insight api should link to #!/confirmed directly
if (getParam('confirmed')) {
@ -15,16 +18,14 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
$rootScope.fromEmailConfirmation = false;
}
if($rootScope.iden) {
if ($rootScope.iden) {
identityService.goWalletHome();
}
Compatibility.check($scope);
if (isMobile.any()) {
pinService.check(function(err, value) {
$scope.hasPin = value;
});
}
pinService.check(function(err, value) {
$rootScope.hasPin = value;
});
};
Object.defineProperty($scope,
@ -72,9 +73,8 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
if ($scope.$$childTail._newpin === newValue) {
// save and submit
$scope.createPin($scope.$$childTail.setPinForm);
}
else {
$scope.error = 'Pin must match!';
} else {
$scope.error = 'Entered PINs were not equal. Try again';
}
}
if (!newValue) {
@ -119,11 +119,28 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
});
};
$scope.openWallets = function() {
preconditions.checkState($rootScope.iden);
var iden = $rootScope.iden;
$rootScope.hideNavigation = false;
$rootScope.starting = true;
iden.on('newWallet', $scope.done);
iden.on('noWallets', $scope.done);
iden.openWallets();
};
$scope.createPin = function(form) {
if (!form) return;
preconditions.checkState($rootScope.iden);
preconditions.checkState(_credentials && _credentials.email);
pinService.save(form.repeatpin.$modelValue, $scope.email, $scope.password, function(err) {
$scope.open($scope.email, $scope.password);
pinService.save(form.repeatpin.$modelValue, _credentials.email, _credentials.password, function(err) {
_credentials.password = '';
_credentials = null;
$rootScope.hasPin = true;
$scope.openWallets();
});
};
@ -133,12 +150,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
$scope.error = 'Please enter the required fields';
return;
}
if (isMobile.any() && !$scope.hasPin) {
$scope.email = form.email.$modelValue;
$scope.password = form.password.$modelValue;
$scope.setPin = true;
return;
}
$scope.open(form.email.$modelValue, form.password.$modelValue);
};
@ -146,7 +158,7 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
$scope.pinLogout = function() {
pinService.clear(function() {
copay.logger.debug('PIN erased');
$scope.hasPin = null;
delete $rootScope['hasPin'];
applicationService.reload();
});
};
@ -169,13 +181,32 @@ angular.module('copayApp.controllers').controller('HomeController', function($sc
} else {
$scope.error = 'Unknown error';
}
return $scope.done();
$rootScope.starting = false;
$rootScope.$digest();
return;
}
// Open successfully?
if (iden) {
iden.on('newWallet', $scope.done);
iden.on('noWallets', $scope.done);
iden.openWallets();
// mobile
//if (isMobile.any() && !$rootScope.hasPin) {
if (true && !$rootScope.hasPin) {
$scope.done();
_credentials = {
email: email,
password: password,
};
$scope.askForPin = true;
$rootScope.starting = false;
$rootScope.hideNavigation = true;
$rootScope.$digest();
return;
}
// no mobile
else {
$scope.openWallets();
}
}
});
}

5
js/controllers/sidebar.js
View file

@ -1,6 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService, pinService) {
angular.module('copayApp.controllers').controller('SidebarController', function($scope, $rootScope, $location, $timeout, identityService) {
$scope.menu = [{
'title': 'Home',
@ -80,9 +80,6 @@ angular.module('copayApp.controllers').controller('SidebarController', function(
$scope.walletSelection = false;
$scope.setWallets();
});
pinService.check(function(err, value) {
$scope.hasPin = value;
});
}
};