From 516b80ebd7f943e2ffac7da3cb522f1c6d1c9736 Mon Sep 17 00:00:00 2001
From: jash <jash@schulterklopfer-productions.de>
Date: Sat, 3 Nov 2018 12:27:55 +0100
Subject: [PATCH] fixed recreation of keys and certs

---
 .../generators/app/index.js                     | 13 -------------
 .../generators/app/prompters/010_gatekeeper.js  | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/install/generator-cyphernode/generators/app/index.js b/install/generator-cyphernode/generators/app/index.js
index 52c4929..b03d58f 100644
--- a/install/generator-cyphernode/generators/app/index.js
+++ b/install/generator-cyphernode/generators/app/index.js
@@ -316,19 +316,6 @@ module.exports = class extends Generator {
 
   /* some utils */
 
-  _hasAuthKeys() {
-     return this.props && 
-      this.props.gatekeeper_keys && 
-      this.props.gatekeeper_keys.configEntries &&
-      this.props.gatekeeper_keys.configEntries.length > 0;
-  }
-
-  _hasCert() {
-    return this.props && 
-      this.props.gatekeeper_sslkey && 
-      this.props.gatekeeper_sslcert
-  }
-
   _assignConfigDefaults() {
     this.props = Object.assign( {
       features: [],
diff --git a/install/generator-cyphernode/generators/app/prompters/010_gatekeeper.js b/install/generator-cyphernode/generators/app/prompters/010_gatekeeper.js
index ad6cabb..77e96db 100644
--- a/install/generator-cyphernode/generators/app/prompters/010_gatekeeper.js
+++ b/install/generator-cyphernode/generators/app/prompters/010_gatekeeper.js
@@ -10,6 +10,19 @@ const prefix = function() {
   return chalk.bold.red(capitalise(name)+': ');
 };
 
+const hasAuthKeys = function( props ) {
+   return props && 
+    props.gatekeeper_keys && 
+    props.gatekeeper_keys.configEntries &&
+    props.gatekeeper_keys.configEntries.length > 0;
+}
+
+const hasCert = function( props ) {
+  return props && 
+    props.gatekeeper_sslkey && 
+    props.gatekeeper_sslcert
+}
+
 module.exports = {
   name: function() { 
     return name;
@@ -25,14 +38,14 @@ module.exports = {
       validate: utils._notEmptyValidator
     },
     {
-      when: utils._hasAuthKeys,
+      when: function() { return hasAuthKeys( utils.props ); },
       type: 'confirm',
       name: 'gatekeeper_recreatekeys',
       default: false,
       message: prefix()+'Recreate gatekeeper keys?'+utils._getHelp('gatekeeper_recreatekeys')
     },
     {
-      when: utils._hasCert,
+      when: function() { return hasCert( utils.props ); },
       type: 'confirm',
       name: 'gatekeeper_recreatecert',
       default: false,