From d86b9c8b5cf9899178eaf86c1db13399694181a6 Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Wed, 23 Mar 2016 12:05:27 +0100 Subject: [PATCH] Change pubkey preview + add it in Settings > Crypto --- app/js/app.config.js | 1 + .../init/create/IdentityController.js | 33 +--------------- .../main/settings/tabs/KeyController.js | 4 +- app/js/services/pubkeyGenerator.js | 39 +++++++++++++++++++ 4 files changed, 45 insertions(+), 32 deletions(-) create mode 100644 app/js/services/pubkeyGenerator.js diff --git a/app/js/app.config.js b/app/js/app.config.js index a8be58e..10c4c8a 100644 --- a/app/js/app.config.js +++ b/app/js/app.config.js @@ -13,6 +13,7 @@ module.exports = () => { require('js/services/datetime')(duniterApp); require('js/services/ui_utils')(duniterApp); require('js/services/graphs')(duniterApp); + require('js/services/pubkeyGenerator')(duniterApp); let homeControllers = angular.module('homeControllers', ['duniter.services']); diff --git a/app/js/controllers/init/create/IdentityController.js b/app/js/controllers/init/create/IdentityController.js index d11adaf..5dcc0ee 100644 --- a/app/js/controllers/init/create/IdentityController.js +++ b/app/js/controllers/init/create/IdentityController.js @@ -1,8 +1,6 @@ "use strict"; -var co = require('co'); - -module.exports = ($scope, $timeout, BMA) => { +module.exports = ($scope, PubkeyGenerator) => { setTimeout(() => { $('select').material_select(); @@ -15,32 +13,5 @@ module.exports = ($scope, $timeout, BMA) => { } }; - let concat = ""; - $scope.pubkey_preview = ""; - let timeout = preview(); - - function preview() { - return $timeout(() => { - if ($scope.$parent) { - let salt = $scope.$parent.conf.idty_entropy; - let pass = $scope.$parent.conf.idty_password; - let newConcat = [salt, pass].join(''); - if (salt && pass && newConcat != concat) { - console.log('different'); - concat = newConcat; - $scope.previewPubkey(concat); - timeout = preview(); - } else { - timeout = preview(); - } - } - }, 100); - } - - $scope.previewPubkey = () => co(function *() { - let data = yield BMA.webmin.key.preview({ - conf: $scope.$parent.conf - }); - $scope.pubkey_preview = data.pubkey; - }).catch(() => null); + PubkeyGenerator($scope); }; diff --git a/app/js/controllers/main/settings/tabs/KeyController.js b/app/js/controllers/main/settings/tabs/KeyController.js index ae37f8d..63d18a2 100644 --- a/app/js/controllers/main/settings/tabs/KeyController.js +++ b/app/js/controllers/main/settings/tabs/KeyController.js @@ -2,7 +2,7 @@ var co = require('co'); -module.exports = ($scope, $state, BMA, summary) => { +module.exports = ($scope, $state, BMA, summary, PubkeyGenerator) => { $scope.pubkey = summary.pubkey; @@ -18,4 +18,6 @@ module.exports = ($scope, $state, BMA, summary) => { $scope.$parent.conf.idty_password = ''; $state.reload(); }); + + PubkeyGenerator($scope); }; diff --git a/app/js/services/pubkeyGenerator.js b/app/js/services/pubkeyGenerator.js new file mode 100644 index 0000000..b38baf5 --- /dev/null +++ b/app/js/services/pubkeyGenerator.js @@ -0,0 +1,39 @@ +module.exports = (app) => { + + app.factory('PubkeyGenerator', function($timeout, BMA) { + + var co = require('co'); + + return ($scope) => { + + let concat = ""; + $scope.pubkey_preview = ""; + let timeout = preview(); + + function preview() { + return $timeout(() => { + if ($scope.$parent) { + let salt = $scope.$parent.conf.idty_entropy; + let pass = $scope.$parent.conf.idty_password; + let newConcat = [salt, pass].join(''); + if (salt && pass && newConcat != concat) { + console.log('different'); + concat = newConcat; + $scope.previewPubkey(concat); + timeout = preview(); + } else { + timeout = preview(); + } + } + }, 100); + } + + $scope.previewPubkey = () => co(function *() { + let data = yield BMA.webmin.key.preview({ + conf: $scope.$parent.conf + }); + $scope.pubkey_preview = data.pubkey; + }).catch(() => null); + }; + }); +}; -- GitLab