From f704826a5c3c90d6f70e0116923d1e773b282a2d Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 30 Jul 2014 20:12:22 -0300 Subject: [PATCH 1/4] feature: Logout wallet after 15 minutes of inactivity --- bower.json | 3 ++- index.html | 1 + js/app.js | 2 ++ js/controllers/sidebar.js | 16 +++++++++++++++- js/routes.js | 5 ++++- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/bower.json b/bower.json index cf1a4f301..ed357189c 100644 --- a/bower.json +++ b/bower.json @@ -21,6 +21,7 @@ "bitcore": "0.1.34", "angular-moment": "~0.7.1", "socket.io-client": ">=1.0.0", - "mousetrap": "1.4.6" + "mousetrap": "1.4.6", + "ng-idle": "*" } } diff --git a/index.html b/index.html index acc29b64d..6369c9331 100644 --- a/index.html +++ b/index.html @@ -62,6 +62,7 @@ + diff --git a/js/app.js b/js/app.js index cf5656438..058dfbba6 100644 --- a/js/app.js +++ b/js/app.js @@ -27,6 +27,7 @@ var copayApp = window.copayApp = angular.module('copayApp', [ 'angularMoment', 'mm.foundation', 'monospaced.qrcode', + 'ngIdle', 'copayApp.filters', 'copayApp.services', 'copayApp.controllers', @@ -40,6 +41,7 @@ copayApp.config(function($sceDelegateProvider) { ]); }); + angular.module('copayApp.filters', []); angular.module('copayApp.services', []); angular.module('copayApp.controllers', []); diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 79b8ad859..92917054f 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('SidebarController', - function($scope, $rootScope, $sce, $location, $http, notification, controllerUtils) { + function($scope, $rootScope, $sce, $location, $http, $idle, notification, controllerUtils) { $scope.version = copay.version; $scope.networkName = config.networkName; @@ -82,4 +82,18 @@ angular.module('copayApp.controllers').controller('SidebarController', // Init socket handlers (with no wallet yet) controllerUtils.setSocketHandlers(); + if ($rootScope.wallet) { + $idle.watch(); + + $scope.$on('$idleStart', function(a) { + notification.warning('Timing', 'You were enought time in inactivity. This session will be closed in 10 seconds if continues without activity'); + }); + + $scope.$on('$idleTimeout', function() { + $idle.unwatch(); + $scope.signout(); + notification.warning('Session closed', 'Session closed for a long time of inactivity'); + }); + } + }); diff --git a/js/routes.js b/js/routes.js index 9db46fdc1..192d44609 100644 --- a/js/routes.js +++ b/js/routes.js @@ -65,10 +65,13 @@ angular //Setting HTML5 Location Mode angular .module('copayApp') - .config(function($locationProvider) { + .config(function($locationProvider, $idleProvider) { $locationProvider .html5Mode(false) .hashPrefix('!'); + // IDLE timeout + $idleProvider.idleDuration(15 * 60); // in seconds + $idleProvider.warningDuration(10); // in seconds }) .run(function($rootScope, $location) { $rootScope.$on('$routeChangeStart', function(event, next, current) { From dbf812f84807babedc23799a03faf49aede1a837 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 31 Jul 2014 22:49:11 -0300 Subject: [PATCH 2/4] Fix Karma test --- js/controllers/sidebar.js | 5 +---- js/routes.js | 4 +++- karma.conf.js | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 92917054f..7f4a8128c 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -1,7 +1,7 @@ 'use strict'; angular.module('copayApp.controllers').controller('SidebarController', - function($scope, $rootScope, $sce, $location, $http, $idle, notification, controllerUtils) { + function($scope, $rootScope, $sce, $location, $http, notification, controllerUtils) { $scope.version = copay.version; $scope.networkName = config.networkName; @@ -83,14 +83,11 @@ angular.module('copayApp.controllers').controller('SidebarController', controllerUtils.setSocketHandlers(); if ($rootScope.wallet) { - $idle.watch(); - $scope.$on('$idleStart', function(a) { notification.warning('Timing', 'You were enought time in inactivity. This session will be closed in 10 seconds if continues without activity'); }); $scope.$on('$idleTimeout', function() { - $idle.unwatch(); $scope.signout(); notification.warning('Session closed', 'Session closed for a long time of inactivity'); }); diff --git a/js/routes.js b/js/routes.js index 192d44609..00ab8b185 100644 --- a/js/routes.js +++ b/js/routes.js @@ -73,12 +73,14 @@ angular $idleProvider.idleDuration(15 * 60); // in seconds $idleProvider.warningDuration(10); // in seconds }) - .run(function($rootScope, $location) { + .run(function($rootScope, $location, $idle) { + $idle.watch(); $rootScope.$on('$routeChangeStart', function(event, next, current) { if (!util.supports.data) { $location.path('unsupported'); } else { if ((!$rootScope.wallet || !$rootScope.wallet.id) && next.validate) { + $idle.unwatch(); $location.path('/'); } if ($rootScope.wallet && !$rootScope.wallet.isReady()) { diff --git a/karma.conf.js b/karma.conf.js index 8bd9d8e1b..fd2c586fe 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -21,6 +21,7 @@ module.exports = function(config) { 'lib/angular/angular.min.js', 'lib/angular-mocks/angular-mocks.js', 'lib/moment/moment.js', + 'lib/ng-idle/angular-idle.min.js', 'lib/angular-moment/angular-moment.js', 'lib/qrcode-generator/js/qrcode.js', 'lib/angular-qrcode/qrcode.js', From fc71e6a4410b7943011a6feea596899c434e8f55 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 1 Aug 2014 10:44:33 -0300 Subject: [PATCH 3/4] Fixes: typo --- js/controllers/sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 7f4a8128c..3062424e9 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -89,7 +89,7 @@ angular.module('copayApp.controllers').controller('SidebarController', $scope.$on('$idleTimeout', function() { $scope.signout(); - notification.warning('Session closed', 'Session closed for a long time of inactivity'); + notification.warning('Session closed', 'Session closed because a long time of inactivity'); }); } From d2ae49f9a5e57e64a07a447cba08f30f7ff32b17 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Fri, 1 Aug 2014 10:51:26 -0300 Subject: [PATCH 4/4] Fixes: typo --- js/controllers/sidebar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/controllers/sidebar.js b/js/controllers/sidebar.js index 3062424e9..7606483b9 100644 --- a/js/controllers/sidebar.js +++ b/js/controllers/sidebar.js @@ -84,7 +84,7 @@ angular.module('copayApp.controllers').controller('SidebarController', if ($rootScope.wallet) { $scope.$on('$idleStart', function(a) { - notification.warning('Timing', 'You were enought time in inactivity. This session will be closed in 10 seconds if continues without activity'); + notification.warning('Session will be closed', 'Your session is about to expire due to inactivity'); }); $scope.$on('$idleTimeout', function() {