Hapi credentials

package.json

@@ -25,6 +25,7 @@
     "handlebars": "^4.0.6",
     "hapi": "^15.2.0",
     "hapi-auth-cookie": "^6.1.1",
+    "hapi-context-credentials": "^2.0.0",
     "inert": "^4.0.3",
     "joi": "^10.0.1",
     "pg": "^6.1.0",

src/dbrequests/getResources.js

@@ -13,13 +13,20 @@ const standardQuery = `SELECT
     LEFT JOIN reviews ON (resources.resource_id = reviews.resource_id)
     JOIN categories ON (resources.category_id = categories.category_id)`;
 
-const allResources = (cb) => {
+const all = (cb) => {
   dbConn.query(standardQuery + `GROUP BY resources.resource_id, category_name
   ORDER BY AVG(rating) DESC NULLS LAST`, (err, data) => {
     (err ? cb(err) : cb(null, data.rows));
   });
 };
 
+const amount = (cb) => {
+  dbConn.query(standardQuery + `GROUP BY resources.resource_id, category_name
+  ORDER BY COUNT(reviews.review_id) DESC NULLS LAST`, (err, data) => {
+    (err ? cb(err) : cb(null, data.rows));
+  });
+};
+
 const top5resources = (cb) => {
   dbConn.query(standardQuery + `GROUP BY resources.resource_id, category_name
   ORDER BY AVG(rating) DESC NULLS LAST LIMIT 5`, (err, data) => {
@@ -34,4 +41,4 @@ const oneResource = (cb, resourceId) => {
     });
 };
 
-module.exports = { allResources, top5resources, oneResource };
+module.exports = { all, amount, top5resources, oneResource };

src/handlers/addReviewHandler.js

@@ -1,10 +1,7 @@
 const addReviewSql = require('../dbrequests/addReview.js');
 
 const addReviewHandler = (req, rep) => {
-  var userId;
-  if (req.auth.isAuthenticated) {
-    userId = req.auth.credentials.current_user_id;
-  }
+  const userId = req.auth.isAuthenticated ? req.auth.credentials.current_user_id : 0;
   const resourceId = req.params.resource_id;
   const rating = req.payload.rating;
   const reviewContent = req.payload.review_content;

src/handlers/deleteReviewHandler.js

@@ -1,10 +1,7 @@
 const deleteReviewSql = require('../dbrequests/deleteReview.js');
 
 const deleteReviewHandler = (req, rep) => {
-  var userId;
-  if (req.auth.isAuthenticated) {
-    userId = req.auth.credentials.current_user_id;
-  }
+  const userId = req.auth.isAuthenticated ? req.auth.credentials.current_user_id : 0;
   const reviewId = req.params.review_id;
   deleteReviewSql((err, data) => {
     if (err) throw err;

src/handlers/editReviewHandler.js

@@ -8,7 +8,6 @@ const editHandler = (req, rep) => {
   if (req.method === 'get' && req.auth.isAuthenticated) {
     reviewId = req.params.review_id;
     userId = req.auth.credentials.current_user_id;
-    console.log(reviewId, userId);
     userCanEdit((err, data) => {
       if (err) throw err;
       if (data) {
@@ -22,7 +21,6 @@ const editHandler = (req, rep) => {
     reviewId = req.params.review_id;
     formContent = req.payload;
     updateReview((err, resourceId) => {
-      // console.log(resourceId);
       if (err) throw err;
       if (resourceId) {
         rep.redirect(`/resource/${resourceId}`);

src/handlers/homeHandler.js

@@ -3,13 +3,8 @@ const latest5Reviews = require('../dbrequests/getReviews.js').latest5;
 
 const homeHandler = (req, rep) => {
   let obj = {};
-  let currentUser = 0;
-  if (req.auth.isAuthenticated) {
-    obj.current_user = req.auth.credentials.current_user;
-    obj.current_user_id = req.auth.credentials.current_user_id;
-    currentUser = obj.current_user_id;
-    obj.loggedIn = true;
-  }
+  let currentUser = req.auth.isAuthenticated ? req.auth.credentials.current_user_id : 0;
+  obj.credentials = req.auth.credentials;
   top5resources((err, data) => {
     if (err) throw err;
     obj.resources = data;

src/handlers/loginHandler.js

@@ -17,7 +17,7 @@ const loginHandler = function (request, reply) {
         Bcrypt.compare(password, data.password, function (err, isMatch) {
           if (err) { throw (err); }
           if (isMatch) {
-            request.cookieAuth.set({ current_user: data.username, current_user_id: data.user_id }); // set cookie, our user is the entire object returned from the db
+            request.cookieAuth.set({ current_user: data.username, current_user_id: data.user_id });
             reply.redirect('/');
           } else {
             reply.view('login', { message: 'Wrong password' });

src/handlers/resourceProfile.js

@@ -3,14 +3,9 @@ const resourceQuery = require('../dbrequests/getResources.js').oneResource;
 
 const resourceProfileHandler = (req, rep) => {
   let resourceId = req.params.num;
-  let currentUser = 0;
   let obj = {};
-  if (req.auth.isAuthenticated) {
-    obj.current_user = req.auth.credentials.current_user;
-    obj.current_user_id = req.auth.credentials.current_user_id;
-    currentUser = obj.current_user_id;
-    obj.loggedIn = true;
-  }
+  let currentUser = req.auth.isAuthenticated ? req.auth.credentials.current_user_id : 0;
+  obj.credentials = req.auth.credentials;
   viewReviews((err, data) => {
     if (err) { throw err; }
     obj.reviews = data;

src/handlers/resourcesHandler.js

@@ -1,17 +1,15 @@
-const { allResources } = require('../dbrequests/getResources.js');
+const { all, amount } = require('../dbrequests/getResources.js');
 
 const resourcesHandler = (req, rep) => {
-  allResources((err, data) => {
-    let obj = {};
-    if (err) throw err;
-    obj.resources = data;
-    if (req.auth.isAuthenticated) {
-      obj.current_user = req.auth.credentials.current_user;
-      obj.current_user_id = req.auth.credentials.current_user_id;
-      obj.loggedIn = true;
-    }
-    rep.view('resources_list', obj);
-  });
+  if (req.query.sortby === 'amount') {
+    amount((err, data) => {
+      (err) ? console.log(err) : rep.view('resources_list', {resources: data});
+    });
+  } else {
+    all((err, data) => {
+      (err) ? console.log(err) : rep.view('resources_list', {resources: data});
+    });
+  }
 };
 
 const resources = {

src/handlers/userProfile.js

@@ -2,20 +2,12 @@ const viewReviews = require('../dbrequests/getReviews.js').byUser;
 const userQuery = require('../dbrequests/getUserDetails.js').byUserId;
 
 const userProfileHandler = (req, rep) => {
-  let currentUser = 0;
-  if (req.auth.isAuthenticated) {
-    currentUser = req.auth.credentials.current_user_id;
-  }
+  let currentUser = req.auth.isAuthenticated ? req.auth.credentials.current_user_id : 0;
   const userId = req.params.user_id;
   viewReviews((err, data) => {
     if (err) { throw err; }
     let obj = {};
     obj.reviews = data;
-    if (req.auth.isAuthenticated) {
-      obj.current_user = req.auth.credentials.current_user;
-      obj.current_user_id = req.auth.credentials.current_user_id;
-      obj.loggedIn = true;
-    }
     userQuery((err, data) => {
       if (err) { throw err; }
       obj.user_id = data.user_id;

src/server.js

@@ -1,5 +1,6 @@
 const Hapi = require('hapi');
 const CookieAuth = require('hapi-auth-cookie');
+const hapiContextCredentials = require('hapi-context-credentials');
 const Vision = require('vision');
 const Inert = require('inert');
 const Routes = require('./routes.js');
@@ -27,7 +28,7 @@ server.connection({
   }
 });
 
-server.register([Vision, Inert, CookieAuth], (err) => {
+server.register([Vision, Inert, CookieAuth, hapiContextCredentials], (err) => {
   if (err) { throw err; }
   server.views({
     engines: {

views/add_new_user.html

@@ -3,16 +3,16 @@
 <h3 class='login-warning'>{{message}}</h3>
 <form class="form" method="post" action="/newuser">
   <label class="form__text-label" for="username">User: </label>
-    <input type="text" class="form__input" id="username" name="username"></input>
+    <input type="text" class="form__input" id="username" name="username" pattern="^[A-Za-z0-9]{1,25}$" placeholder="1-25 alphanumeric charcters only (no whitespace)"></input>
 
   <label class="form__text-label" for="password">Password: </label>
-    <input type="password" class="form__input" id="password" name="password"></input>
+    <input type="password" class="form__input" id="password" name="password" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" placeholder="8+ characters including 1 letter, 1 number, 1 capital letter"></input>
 
   <label class="form__text-label"  for="rpassword">Repeat your password: </label>
-    <input type="password" class="form__input"  id="rpassword" name="rpassword"></input>
+    <input type="password" class="form__input"  id="rpassword" name="rpassword" pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}" placeholder="passwords must match"></input>
 
   <label class="form__text-label" for="email">Email address: </label>
-    <input type="email" class="form__input" id="email" name="email"></input>
+    <input type="email" class="form__input" id="email" name="email" pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$" placeholder="valid email only"></input>
 
   <label class="form__avatar-label">Choose your avatar: </label>
     <div class="form__avatar-pic-container">

views/partials/header.html

@@ -8,8 +8,8 @@ <h1 class='badgerer-title'>The Badgerer</h1>
 </div>
 
 <div class='nav__controls nav__item-container'>
-  {{#if loggedIn}}
-  <a class="nav__username nav__item" href="/user/{{current_user_id}}">{{current_user}}</a>
+  {{#if credentials.current_user}}
+  <a class="nav__username nav__item" href="/user/{{credentials.current_user_id}}">{{credentials.current_user}}</a>
   <a class="nav__logout nav__item" href="/logout">Logout</a>
   {{else}}
   <a class="nav__login nav__item" href="/login">Login</a>

views/partials/resources.html

@@ -2,8 +2,13 @@
   <tr class="resource-table__row resource-table__row-header">
     <th class="resource-table__header">Resource</th>
     <th class="resource-table__header">Type</th>
+    {{#if fromResourceList}}
+    <th class="resource-table__header"><a href='/resources?sortby=amount'>Number of reviews</a></th>
+    <th class="resource-table__header"><a href='/resources?sortby=rating'>Average user rating</a></th>
+    {{else}}
     <th class="resource-table__header">Number of reviews</th>
     <th class="resource-table__header">Average user rating</th>
+    {{/if}}
   </tr>
   {{#each resources}}
   <tr class="resource-table__row">

views/resources_list.html

@@ -1,4 +1,4 @@
 {{!< layout/default}}
 <nav class='nav'>{{> header}}</nav>
 <h3 class="resource-header">Resources</h3>
-{{> resources}}
+{{> resources fromResourceList=true}}