Merge pull request #1 from noelmcloughlin/dev

Merge Dev to Master

Author: noelmcloughlin

.DS_Store

@@ -1,6 +1,8 @@
-DB_URI="mongodb://<user>:<pass>@localhost/<dbname>"
-DB_HOST=localhost
-DB_PORT=27017
-cookie_password='jfkdjfsklfjkfsjksfjkfsjkfjsjlsfsecret'
-cookie_name='lkjflkdjfjlskfkjdkjfklsjfsklsfjklfs'
-db=mongodb://localhost/pointsOfInterest
+DB="mongodb+srv://noel:[email protected]/pointsOfInterest?retryWrites=true"
+
+OAUTH_PROVIDER=github
+OAUTH_CLIENT_ID=eb67f11a7bd5c10dc6b1
+OAUTH_CLIENT_SECRET=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+COOKIE_NAME='nodejs-hapi-nunjunks-mongodb'
+BASE_URL='http://localhost'
+BASE_URL_PORT=3000

.env

@@ -1,4 +1,5 @@
 .idea
+#.env
 node_modules
 db
 public/db

.gitignore

@@ -2,16 +2,13 @@
 
 POINTS OF INTEREST
 
-Server-Rendered Web Application, release 1:
+Server-Rendered Web Application
 
 * [x] Front End [ nunjunks, semantic-ui, jquery ]
-* [x] Components [boom, dotenv,, mongoose, mais-mongoose-seeder ]
+* [x] Components [ axios, boom, dotenv, lodash, mongoose, mongoose-long, mais-mongoose-seeder ]
 * [x] Backend. [ hapi, joi, vision, inert ]
-* [x] Infrastructure. [ node, mongodb ]
+* [x] Infrastructure. [ node, mongodb cloud, oAuth ]
+* [x] Unit Tests [ chai, mocha ]
 
 # ![](preview_r1.png)
 
-
-API Web Service, release 2:
-
-* [x] Work in progress

README.md

@@ -0,0 +1,70 @@
+const Poi = require('../mvc/models/poi');
+const Boom = require('Boom');
+
+const Pois = {
+
+  findAll: {
+    auth: false,
+    handler: async function(request, h) {
+      const pois = await Poi.findAll();
+      return pois;
+    }
+  },
+
+  find: {
+    auth: false,
+    handler: async function(request, h) {
+      try {
+        const poi = await Poi.find({ _poi_id: request.params._id });
+        if (!poi) {
+          return Boom.notFound('No point-of-interest with this id');
+        }
+        return poi;
+      } catch (err) {
+        return Boom.notFound('No point-of-interest with that id');
+      }
+    }
+  },
+
+  create: {
+    auth: false,
+    handler: async function(request, h) {
+      const newPoi = new Poi(request.payload);
+      const poi = await newPoi.save();
+      if (poi) {
+        // successful post
+        return h.response(poi).code(201);
+      }
+      // failed post
+      return Boom.badImplementation('error creating Point of Interest')
+    }
+  },
+
+  delete: {
+    auth: false,
+    handler: async function(request, h) {
+      const poi = await Poi.deleteOne({ _poi_id: request.params.id });
+      if (poi) {
+        // delete success
+        return { success: true };
+      }
+      // delete failed
+      return Boom.notFound('POI id not found')
+    }
+  },
+
+  deleteAll: {
+    auth: false,
+    handler: async function(request, h) {
+      const poi = await Poi.deleteMany({});
+      if (poi) {
+        // delete success
+        return { success: true };
+      }
+      // delete failed
+      return Boom.notFound('Pois deleteAll failed')
+    }
+  }
+};
+
+module.exports = Pois;

api/pois.js

@@ -0,0 +1,70 @@
+const Region = require('../mvc/models/region');
+const Boom = require('Boom');
+
+const Regions = {
+
+  findAll: {
+    auth: false,
+    handler: async function(request, h) {
+      const regions = await Region.findAll();
+      return regions
+    }
+  },
+
+  find: {
+    auth: false,
+    handler: async function(request, h) {
+      try {
+        const region = await Region.findOne({ _region_id: request.params.region_id });
+        if (!region) {
+          return Boom.notFound('No region with this id');
+        }
+        return region;
+      } catch (err) {
+        return Boom.notFound('No region with that id');
+      }
+    }
+  },
+
+  create: {
+    auth: false,
+    handler: async function(request, h) {
+      const newRegion = new Region(request.payload);
+      const region = await newRegion.save();
+      if (region) {
+        // successful post
+        return h.response(region).code(201);
+      }
+      // failed post
+      return Boom.badImplementation('error creating Region')
+    }
+  },
+
+  delete: {
+    auth: false,
+    handler: async function(request, h) {
+      const region = await Region.delete({ _region_id: request.params.id });
+      if (region) {
+        // delete success
+        return { success: true };
+      }
+      // delete failed
+      return Boom.notFound('Region id not found')
+    }
+  },
+
+  deleteAll: {
+    auth: false,
+    handler: async function(request, h) {
+      const region = await Region.delete({});
+      if (region) {
+        // delete success
+        return { success: true };
+      }
+      // delete failed
+      return Boom.notFound('Region deleteAll failed')
+    }
+  }
+};
+
+module.exports = Regions;

api/regions.js

@@ -1,27 +1,33 @@
 'use strict';
 
+const Bell         = require('bell');
+const Boom         = require('boom');
+const Cookie       = require('hapi-auth-cookie');
 const Dotenv       = require('dotenv');
-const Result       = Dotenv.config();
 const Hapi         = require('hapi');
-const HapiCookie   = require('hapi-auth-cookie');
-const Vision       = require('vision');
 const Inert        = require('inert');
+const Nanoid       = require('nanoid');
 const Nunjucks     = require('nunjucks');
 const NunjucksHapi = require('nunjucks-hapi');
 const Routes       = require('./routes');
-const server       = Hapi.server({ port: process.env.PORT || 3000, });
-let Path           = require('path');
-
-require('./mvc/models/db');
+const RoutesApi    = require('./routesApi');
+const Vision       = require('vision');
 
-const Checklist = [Result, Hapi, HapiCookie, Vision, Inert, Nunjucks, NunjucksHapi, Routes, server, Path]
+// Sanity check modules
+const Checklist = [Bell, Boom, Cookie, Hapi, Vision, Inert, Nanoid, Nunjucks, NunjucksHapi, Routes, RoutesApi];
 for (const o of Checklist) {
     if (o.error) {
         console.log(o.error.message);
         process.exit(1);
     }
 }
 
+// Setup environment
+Dotenv.config();
+const server = Hapi.server({ port: process.env.BASE_URL_PORT || 3000, });
+require('./mvc/models/db');
+
+// Setup Rendering engine
 Nunjucks.installJinjaCompat();
 Nunjucks.configure('views', {
     autoescape: true,
@@ -30,9 +36,10 @@ Nunjucks.configure('views', {
 });
 
 async function provision() {
+  await server.register(Bell);
+  await server.register(Cookie);
   await server.register(Inert);
   await server.register(Vision);
-  await server.register(HapiCookie);
 
   server.views({
     engines: {
@@ -43,25 +50,31 @@ async function provision() {
     layoutPath: './mvc/views/layouts',
     partialsPath: './mvc/views/partials',
     isCached: false,
-    layout: false            // warning; true renders (unwanted) raw html! Need false.
+    layout: false        // warning; true renders (unwanted) raw html - nunjunks needs false.
   });
 
-  server.auth.strategy('standard', 'cookie', {
-    password: process.env.cookie_password,
-    cookie: process.env.cookie_name,
-    isSecure: false,
-    ttl: 24 * 60 * 60 * 1000,
-    redirectTo: '/'
-  });
+  let authCookieOptions = {
+    password: Nanoid() + Nanoid(),  // String to encrypt auth cookie during authorization(min 32 chars)
+    isSecure: false                 // 'true' in production (requires HTTPS)
+  };
+
+  server.auth.strategy('cookie-auth', 'cookie', authCookieOptions);
+
+  let bellAuthOptions = {
+    provider: process.env.OAUTH_PROVIDER,
+    password: Nanoid() + Nanoid(),                  // String to encrypt temp cookie during authorization
+    clientId: process.env.OAUTH_CLIENT_ID,          // *** Replace with your app Client Id ****
+    clientSecret: process.env.OAUTH_CLIENT_SECRET,  // *** Replace with your app Client Secret ***
+    isSecure: false                                 // 'true' in production (requires HTTPS)
+  };
 
-  server.auth.default({
-    mode: 'required',
-    strategy: 'standard'
- });
+  server.auth.strategy('github-oauth', 'bell', bellAuthOptions);
+  server.auth.default('cookie-auth');
 
   server.route(Routes);
+  server.route(RoutesApi);
   await server.start();
-  console.log(`Server running at: ${server.info.uri}`);
+  console.log(`server running at: ${server.info.uri}`);
 }
 
 process.on('unhandledRejection', err => {