From 4193bd59844e8988e13e615d092774197e05c5f6 Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Fri, 12 Oct 2018 19:46:39 +0200
Subject: [PATCH] added trim filters to all inputs to avoid leading and
 trailing spaces

---
 .../generators/app/prompters/000_proxy.js                     | 2 ++
 .../generators/app/prompters/100_bitcoin.js                   | 4 ++++
 .../generators/app/prompters/200_lightning.js                 | 3 +++
 .../generators/app/prompters/999_installer.js                 | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/install/generator-cyphernode/generators/app/prompters/000_proxy.js b/install/generator-cyphernode/generators/app/prompters/000_proxy.js
index 3804458..6563e58 100644
--- a/install/generator-cyphernode/generators/app/prompters/000_proxy.js
+++ b/install/generator-cyphernode/generators/app/prompters/000_proxy.js
@@ -41,6 +41,7 @@ module.exports = {
       name: 'xpub',
       default: utils._getDefault( 'xpub' ),
       message: prefix()+'What is your xpub to watch?'+'\n',
+      filter: utils._trimFilter,
       validate: utils._xkeyValidator
     },
     {
@@ -48,6 +49,7 @@ module.exports = {
       name: 'derivation_path',
       default: utils._getDefault( 'derivation_path' ),
       message: prefix()+'What is your address derivation path?'+'\n',
+      filter: utils._trimFilter,
       validate: utils._derivationPathValidator
     }];
   },
diff --git a/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js b/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js
index bdbe44e..4ed3412 100644
--- a/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js
+++ b/install/generator-cyphernode/generators/app/prompters/100_bitcoin.js
@@ -45,6 +45,7 @@ module.exports = {
       type: 'input',
       name: 'bitcoin_node_ip',
       default: utils._getDefault( 'bitcoin_node_ip' ),
+      filter: utils._trimFilter,
       validate: utils._ipOrFQDNValidator,
       message: prefix()+'What is your full node ip address?'+'\n',
     },
@@ -53,12 +54,14 @@ module.exports = {
       name: 'bitcoin_rpcuser',
       default: utils._getDefault( 'bitcoin_rpcuser' ),
       message: prefix()+'Name of bitcoin rpc user?'+'\n',
+      filter: utils._trimFilter,
     },
     {
       type: 'password',
       name: 'bitcoin_rpcpassword',
       default: utils._getDefault( 'bitcoin_rpcpassword' ),
       message: prefix()+'Password of bitcoin rpc user?'+'\n',
+      filter: utils._trimFilter,
     },
     {
       when: bitcoinInternal,
@@ -73,6 +76,7 @@ module.exports = {
       name: 'bitcoin_uacomment',
       default: utils._getDefault( 'bitcoin_uacomment' ),
       message: prefix()+'Any UA comment?'+'\n',
+      filter: utils._trimFilter,
       validate: utils._UACommentValidator
     }];
   },
diff --git a/install/generator-cyphernode/generators/app/prompters/200_lightning.js b/install/generator-cyphernode/generators/app/prompters/200_lightning.js
index 948b394..f4de49e 100644
--- a/install/generator-cyphernode/generators/app/prompters/200_lightning.js
+++ b/install/generator-cyphernode/generators/app/prompters/200_lightning.js
@@ -49,6 +49,7 @@ module.exports = {
       type: 'input',
       name: 'lightning_external_ip',
       default: utils._getDefault( 'lightning_external_ip' ),
+      filter: utils._trimFilter,
       validate: utils._ipOrFQDNValidator,
       message: prefix()+'What external ip does your lightning node have?'+'\n',
     },
@@ -57,6 +58,7 @@ module.exports = {
       type: 'input',
       name: 'lightning_nodename',
       default: utils._getDefault( 'lightning_nodename' ),
+      filter: utils._trimFilter,
       validate: utils._notEmptyValidator,
       message: prefix()+'What name has your lightning node?'+'\n',
     },
@@ -65,6 +67,7 @@ module.exports = {
       type: 'input',
       name: 'lightning_nodecolor',
       default: utils._getDefault( 'lightning_nodecolor' ),
+      filter: utils._trimFilter,
       validate: utils._colorValidator,
       message: prefix()+'What color has your lightning node?'+'\n',
     }];
diff --git a/install/generator-cyphernode/generators/app/prompters/999_installer.js b/install/generator-cyphernode/generators/app/prompters/999_installer.js
index 68ab366..2325139 100644
--- a/install/generator-cyphernode/generators/app/prompters/999_installer.js
+++ b/install/generator-cyphernode/generators/app/prompters/999_installer.js
@@ -43,6 +43,7 @@ module.exports = {
       type: 'input',
       name: 'proxy_datapath',
       default: utils._getDefault( 'proxy_datapath' ),
+      filter: utils._trimFilter,
       validate: utils._pathValidator,
       message: prefix()+'Where to store your proxy db?'+'\n',
     },
@@ -51,6 +52,7 @@ module.exports = {
       type: 'input',
       name: 'bitcoin_datapath',
       default: utils._getDefault( 'bitcoin_datapath' ),
+      filter: utils._trimFilter,
       validate: utils._pathValidator,
       message: prefix()+'Where is your blockchain data?'+'\n',
     },
@@ -59,6 +61,7 @@ module.exports = {
       type: 'input',
       name: 'lightning_datapath',
       default: utils._getDefault( 'lightning_datapath' ),
+      filter: utils._trimFilter,
       validate: utils._pathValidator,
       message: prefix()+'Where is your lightning node data?'+'\n',
     },