Skip to content
Snippets Groups Projects
Commit d86b9c8b authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Change pubkey preview + add it in Settings > Crypto

parent 278ece5c
Branches
Tags
No related merge requests found
......@@ -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']);
......
"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);
};
......@@ -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);
};
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);
};
});
};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment