221 xhn dev

first-time-setup.js

@@ -1,130 +1,76 @@
 'use strict';
-const Async = require('async');
 const Config = require('./config');
 const Joi = require('joi');
-const MongoModels = require('hicsail-mongo-models');
+const AnchorModels = require('./server/anchor/anchor-model');
 const Mongodb = require('mongodb');
 const Promptly = require('promptly');
 const User = require('./server/models/user');
 const PasswordComplexity = require('joi-password-complexity');
 
-Async.auto({
-  mongodbUri: (done) => {
 
-    const options = {
-      default: 'mongodb://localhost:27017/anchor'
-    };
+const main = async function () {
 
-    Promptly.prompt(`MongoDB URI: (${options.default})`, options, done);
-  },
-  testMongo: ['mongodbUri', (results, done) => {
+  const options = {
+    default: 'mongodb://localhost:27017/anchor'
+  };
+  const mongodbUri = await Promptly.prompt(`MongoDB URI: (${options.default})`, options);
 
-    Mongodb.MongoClient.connect(results.mongodbUri, {}, (err, db) => {
 
-      if (err) {
-        console.error('Failed to connect to Mongodb.');
-        return done(err);
-      }
+  const testMongo = await Mongodb.MongoClient.connect(mongodbUri, {});
 
-      db.close();
-      done(null, true);
-    });
-  }],
-  rootEmail: ['testMongo', (results, done) => {
-
-    Promptly.prompt('Root user email:', done);
-  }],
-  rootPassword: ['rootEmail', (results, done) => {
-
-    Promptly.password('Root user password:', done);
-  }],
-  rootPasswordCheck: ['rootPassword', (results, done) => {
-
-    const complexityOptions = Config.get('/passwordComplexity');
-    Joi.validate(results.rootPassword, new PasswordComplexity(complexityOptions),done);
-  }],
-  setupRootUser: ['rootPassword', (results, done) => {
-
-    Async.auto({
-      connect: function (done) {
-
-        MongoModels.connect(results.mongodbUri, {}, done);
-      },
-      rootUser: ['connect', (dbResults, done) => {
-
-        User.findOne({ username: 'root' }, done);
-      }],
-      rootUserCheck: ['rootUser', (dbResults, done) => {
-
-        if (results.rootUser) {
-          return done(Error('Root User already exists'));
-        }
-        done();
-      }],
-      userEmail:['rootUserCheck', function (dbResults, done) {
-
-        User.findOne({ email: results.rootEmail }, done);
-      }],
-      emailCheck:['userEmail', function (dbResults, done) {
-
-        console.log(dbResults.userEmail);
-        if (dbResults.userEmail) {
-          done(Error('Email is in use'));
-        }
-        else {
-          done();
-        }
-      }],
-      user: ['emailCheck', function (dbResults, done) {
-
-        Async.auto({
-          passwordHash: function (done) {
-
-            User.generatePasswordHash(results.rootPassword,done);
-          }
-        }, (err, passResults) => {
-
-          if (err) {
-            return done(err);
-          }
+  if (!testMongo) {
+    console.error('Failed to connect to Mongodb.');
+  }
 
-          const document = {
-            _id: User.ObjectId('000000000000000000000000'),
-            isActive: true,
-            username: 'root',
-            name: 'Root',
-            password: passResults.passwordHash.hash,
-            email: results.rootEmail.toLowerCase(),
-            roles: {
-              root: true
-            },
-            timeCreated: new Date()
-          };
+  const rootEmail = await Promptly.prompt('Root user email:');
 
-          User.insertOne(document, (err, docs) => {
+  const rootPassword = await Promptly.password('Root user password:');
+  const complexityOptions = Config.get('/passwordComplexity');
+  Joi.validate(rootPassword, new PasswordComplexity(complexityOptions));
 
-            done(err, docs && docs[0]);
-          });
-        });
-      }]
-    }, (err, dbResults) => {
 
-      if (err) {
-        console.error('Failed to setup root user.');
-        return done(err);
-      }
+  console.log(mongodbUri);
+  const connection = { 'uri': mongodbUri, 'db': 'anchor' };
+  await AnchorModels.connect(connection, {});
 
-      done(null, true);
-    });
-  }]
-}, (err, results) => {
+  const rootUser = await User.findOne({ username: 'root' });
 
-  if (err) {
-    console.error('Setup failed.');
-    console.error(err);
+  if (rootUser) {
+    console.error(Error('Root User already exists'));
     return process.exit(1);
   }
 
+  const userEmail = await User.findOne({ email: rootEmail });
+  // replaces emailCheck
+  if (userEmail) {
+    console.err(Error('Email is in use'));
+  }
+  const passwordHash = await User.generatePasswordHash(rootPassword);
+  const document = {
+    _id: User.ObjectId('000000000000000000000000'),
+    isActive: true,
+    username: 'root',
+    name: 'Root',
+    password: passwordHash.hash,
+    email: rootEmail.toLowerCase(),
+    roles: {
+      root: true
+    },
+    timeCreated: new Date()
+  };
+  await User.insertOne(document);
   console.log('Setup complete.');
   process.exit(0);
-});
+
+  /*
+   *  if (err) {
+   *    console.error('Setup failed.');
+   *    console.error(err);
+   *    return process.exit(1);
+   *  }
+   *
+   *  console.log('Setup complete.');
+   *  process.exit(0);
+   */
+};
+main();

manifest.js

@@ -49,6 +49,9 @@ const manifest = {
       {
         plugin: './server/anchor/anchor-api'
       },
+      {
+        plugin: './server/anchor/anchor-web-route'
+      },
       {
         plugin: './server/anchor/hapi-anchor-api'
       },

package.json

@@ -25,6 +25,7 @@
     "node": "8.x.x"
   },
   "dependencies": {
+    "@hapi/joi": "^17.1.1",
     "adm-zip": "0.4.x",
     "archiver": "2.x.x",
     "async": "2.x.x",
@@ -46,6 +47,7 @@
     "hoek": "5.x.x",
     "inert": "^5.1.0",
     "joi": "13.x.x",
+    "joi-json": "^4.0.0",
     "joi-password-complexity": "2.x.x",
     "jsonwebtoken": "8.x.x",
     "lout": "10.x.x",