Upgraded deps, Fixed tests

Author: niftylettuce

.remarkignore

@@ -1,3 +1,5 @@
 test/snapshots/**/*.md
+template/test/snapshots/**/*.md
+template/test/**/snapshots/**/*.md
 template/README.md
 template/locales/README.md

package.json

@@ -20,13 +20,22 @@
       "template/**/*.test.js"
     ]
   },
+  "prettier": {
+    "parser": "babylon",
+    "printWidth": 100,
+    "tabWidth": 2,
+    "useTabs": false,
+    "semi": true,
+    "singleQuote": true,
+    "bracketSpacing": true,
+    "jsxBracketSameLine": true,
+    "trailingComma": "none"
+  },
   "bugs": {
     "url": "https://github.com/ladjs/lad/issues",
     "email": "[email protected]"
   },
-  "contributors": [
-    "Nick Baugh <[email protected]> (http://niftylettuce.com)"
-  ],
+  "contributors": ["Nick Baugh <[email protected]> (http://niftylettuce.com)"],
   "dependencies": {
     "cac": "^4.2.2",
     "camelcase": "^4.1.0",
@@ -35,26 +44,26 @@
     "is-url": "^1.2.2",
     "is-valid-npm-name": "^0.0.4",
     "npm-conf": "^1.1.2",
-    "sao": "^0.22.2",
+    "sao": "^0.22.3",
     "semver": "^5.4.1",
     "speakingurl": "^14.0.1",
-    "superb": "^1.3.0",
-    "update-notifier": "^2.2.0",
+    "superb": "^2.0.0",
+    "update-notifier": "^2.3.0",
     "uppercamelcase": "^3.0.0"
   },
   "devDependencies": {
     "ava": "^0.22.0",
     "codecov": "^2.3.0",
     "cross-env": "^5.0.5",
-    "eslint": "^4.7.2",
+    "eslint": "^4.8.0",
     "eslint-config-prettier": "^2.6.0",
-    "eslint-plugin-compat": "^1.0.4",
+    "eslint-plugin-compat": "^2.0.1",
     "eslint-plugin-prettier": "^2.3.1",
     "gulp-swagger-js-codegen": "^1.0.0",
     "husky": "^0.14.3",
-    "lint-staged": "^4.2.2",
+    "lint-staged": "^4.2.3",
     "nyc": "^11.2.1",
-    "prettier": "^1.7.0",
+    "prettier": "^1.7.4",
     "remark-cli": "^4.0.0",
     "remark-preset-github": "^0.0.7",
     "supertest": "^3.0.0",
@@ -95,11 +104,11 @@
   ],
   "license": "MIT",
   "lint-staged": {
-    "*.{js,jsx,mjs,ts,tsx,css,less,scss,json,graphql}": [
-      "prettier --write --single-quote --trailing-comma none",
-      "git add"
-    ],
-    "*.md": ["remark . -qfo", "git add"]
+    "*.{js,jsx,mjs,ts,tsx,css,less,scss,json,graphql}": ["prettier --write", "git add"],
+    "*.md": ["git add"],
+    "*.md,!test/snapshots/**/*.md,!template/test/snapshots/**/*.md,!template/test/**/*snapshots/**/*.md,!template/README.md,!template/locales/README.md": [
+      "remark . -qfo"
+    ]
   },
   "main": "sao.js",
   "nyc": {
@@ -137,7 +146,7 @@
       "max-len": [
         "error",
         {
-          "code": 120,
+          "code": 100,
           "ignoreUrls": true
         }
       ],

sao.js

@@ -60,15 +60,12 @@ module.exports = {
       message: 'What is your GitHub username or organization',
       default: ':gitUser:',
       store: true,
-      validate: val =>
-        githubUsernameRegex.test(val) ? true : 'Invalid GitHub username'
+      validate: val => (githubUsernameRegex.test(val) ? true : 'Invalid GitHub username')
     },
     repo: {
       message: "What is your GitHub repository's URL",
       default(answers) {
-        return `https://github.com/${slug(answers.username)}/${slug(
-          slug(answers.name)
-        )}`;
+        return `https://github.com/${slug(answers.username)}/${slug(slug(answers.name))}`;
       },
       validate: val =>
         isURL(val) &&

template/.remarkignore

@@ -1,2 +1,3 @@
 test/snapshots/**/*.md
+test/**/snapshots/**/*.md
 locales/README.md

template/api.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 const http = require('http');
 const https = require('https');
 const Koa = require('koa');
@@ -145,8 +146,7 @@ else server = https.createServer(config.ssl.api, app.callback());
 if (!module.parent)
   server = server.listen(config.ports.api, () =>
     logger.info(
-      `api server listening on ${config.ports
-        .api} (LAN: ${ip.address()}:${config.ports.api})`
+      `api server listening on ${config.ports.api} (LAN: ${ip.address()}:${config.ports.api})`
     )
   );
 

template/app/controllers/api/v1/users.js

@@ -8,13 +8,7 @@ const retrieve = async ctx => {
 
 const update = async ctx => {
   // set fields we allow to be updated
-  const fields = [
-    'email',
-    'display_name',
-    'given_name',
-    'family_name',
-    'avatar_url'
-  ];
+  const fields = ['email', 'display_name', 'given_name', 'family_name', 'avatar_url'];
 
   // extend the user object
   // (basically overwrites or "extends" the existing fields)

template/app/controllers/web/auth.js

@@ -20,10 +20,7 @@ const signupOrLogin = async ctx => {
   // then set it as the returnTo value for when we log in
   if (_.isString(ctx.query.return_to) && !s.isBlank(ctx.query.return_to)) {
     ctx.session.returnTo = ctx.query.return_to;
-  } else if (
-    _.isString(ctx.query.redirect_to) &&
-    !s.isBlank(ctx.query.redirect_to)
-  ) {
+  } else if (_.isString(ctx.query.redirect_to) && !s.isBlank(ctx.query.redirect_to)) {
     // in case people had a typo, we should support redirect_to as well
     ctx.session.returnTo = ctx.query.redirect_to;
   }
@@ -34,16 +31,11 @@ const signupOrLogin = async ctx => {
     ctx.session.returnTo.indexOf('://') !== -1 &&
     ctx.session.returnTo.indexOf(config.urls.web) !== 0
   ) {
-    logger.warn(
-      `Prevented abuse with returnTo hijacking to ${ctx.session.returnTo}`
-    );
+    logger.warn(`Prevented abuse with returnTo hijacking to ${ctx.session.returnTo}`);
     ctx.session.returnTo = null;
   }
 
-  ctx.state.verb =
-    ctx.path.replace(`/${ctx.req.locale}`, '') === '/signup'
-      ? 'sign up'
-      : 'log in';
+  ctx.state.verb = ctx.path.replace(`/${ctx.req.locale}`, '') === '/signup' ? 'sign up' : 'log in';
 
   await ctx.render('signup-or-login');
 };
@@ -54,8 +46,7 @@ const login = async (ctx, next) => {
       return new Promise(async (resolve, reject) => {
         if (err) return reject(err);
 
-        let redirectTo = `/${ctx.req.locale}${config.auth.callbackOpts
-          .successReturnToOrRedirect}`;
+        let redirectTo = `/${ctx.req.locale}${config.auth.callbackOpts.successReturnToOrRedirect}`;
 
         if (ctx.session && ctx.session.returnTo) {
           redirectTo = ctx.session.returnTo;
@@ -69,7 +60,7 @@ const login = async (ctx, next) => {
             return reject(err);
           }
 
-          if (ctx.is('json')) {
+          if (ctx.accepts('json')) {
             ctx.body = {
               message: ctx.translate('LOGGED_IN'),
               redirectTo,
@@ -96,6 +87,9 @@ const login = async (ctx, next) => {
 const register = async ctx => {
   const { body } = ctx.request;
 
+  if (Object.keys(body).length === 0)
+    return ctx.throw(Boom.badData(ctx.translate('MISSING_REGISTER_FIELDS')));
+
   if (!_.isString(body.email) || !validator.isEmail(body.email))
     return ctx.throw(Boom.badRequest(ctx.translate('INVALID_EMAIL')));
 
@@ -119,7 +113,7 @@ const register = async ctx => {
       delete ctx.session.returnTo;
     }
 
-    if (ctx.is('json')) {
+    if (ctx.accepts('json')) {
       ctx.body = {
         message: ctx.translate('REGISTERED'),
         redirectTo
@@ -161,7 +155,7 @@ const forgotPassword = async ctx => {
   // we always say "a password reset request has been sent to your email"
   // and if the email didn't exist in our system then we simply don't send it
   if (!user) {
-    if (ctx.is('json')) {
+    if (ctx.accepts('json')) {
       ctx.body = {
         message: ctx.translate('PASSWORD_RESET_SENT')
       };
@@ -180,10 +174,7 @@ const forgotPassword = async ctx => {
   )
     return ctx.throw(
       Boom.badRequest(
-        ctx.translate(
-          'PASSWORD_RESET_LIMIT',
-          moment(user.reset_token_expires_at).fromNow()
-        )
+        ctx.translate('PASSWORD_RESET_LIMIT', moment(user.reset_token_expires_at).fromNow())
       )
     );
 
@@ -195,7 +186,7 @@ const forgotPassword = async ctx => {
 
   await user.save();
 
-  if (ctx.is('json')) {
+  if (ctx.accepts('json')) {
     ctx.body = {
       message: ctx.translate('PASSWORD_RESET_SENT')
     };
@@ -259,7 +250,7 @@ const resetPassword = async ctx => {
   } finally {
     await user.save();
     await util.promisify(ctx.login).bind(ctx.req)(user);
-    if (ctx.is('json')) {
+    if (ctx.accepts('json')) {
       ctx.body = {
         message: ctx.translate('RESET_PASSWORD'),
         redirectTo: `/${ctx.req.locale}`

template/app/controllers/web/contact.js

@@ -11,13 +11,15 @@ const config = require('../../../config');
 module.exports = async function(ctx) {
   let { body } = ctx.request;
 
+  // @TODO: Remove this once store ip is fixed
+  if (config.env === 'test') ctx.req.ip = ctx.req.ip || '127.0.0.1';
+
   body = _.pick(body, ['email', 'message']);
 
   if (!_.isString(body.email) || !validator.isEmail(body.email))
     return ctx.throw(Boom.badRequest(ctx.translate('INVALID_EMAIL')));
 
-  if (!_.isUndefined(body.message) && !_.isString(body.message))
-    delete body.message;
+  if (!_.isUndefined(body.message) && !_.isString(body.message)) delete body.message;
 
   if (body.message)
     body.message = sanitize(body.message, {
@@ -36,9 +38,16 @@ module.exports = async function(ctx) {
   }
 
   // check if we already sent a contact request in the past day
-  // with this given ip address, otherwise create and email
+  // with this given ip address or email, otherwise create and email
   const count = await Inquiries.count({
-    ip: ctx.req.ip,
+    $or: [
+      {
+        ip: ctx.req.ip
+      },
+      {
+        email: body.email
+      }
+    ],
     created_at: {
       $gte: moment()
         .subtract(1, 'day')
@@ -75,7 +84,7 @@ module.exports = async function(ctx) {
     ctx.logger.info('queued inquiry email', job);
 
     const message = ctx.translate('CONTACT_REQUEST_SENT');
-    if (ctx.is('json')) {
+    if (ctx.accepts('json')) {
       ctx.body = { message };
     } else {
       ctx.flash('success', message);

template/app/models/inquiry.js

@@ -21,8 +21,7 @@ const Inquiry = new mongoose.Schema({
   message: {
     type: String,
     required: true,
-    validate: val =>
-      _.isString(val) && val.length <= config.contactRequestMaxLength
+    validate: val => _.isString(val) && val.length <= config.contactRequestMaxLength
   },
   is_email_only: {
     type: Boolean,

template/app/models/plugins/slug.js

@@ -93,7 +93,7 @@ function SlugPlugin(tmpl = '', ERROR_KEY = 'INVALID_SLUG') {
         this.slug = await getUniqueSlug(this.constructor, this._id, this.slug);
 
         // create slug history if it does not exist yet
-        if (!_.isArray(this.slug_history)) this.slug_history = [];
+        if (!Array.isArray(this.slug_history)) this.slug_history = [];
 
         // add the slug to the slug_history
         this.slug_history.push(this.slug);

template/app/models/user.js

@@ -102,10 +102,7 @@ User.pre('validate', function(next) {
   if (!_.isString(this.api_token) || s.isBlank(this.api_token))
     this.api_token = randomstring.token(24);
 
-  if (
-    _.isString(this.email) &&
-    (!_.isString(this.display_name) || s.isBlank(this.display_name))
-  )
+  if (_.isString(this.email) && (!_.isString(this.display_name) || s.isBlank(this.display_name)))
     this.display_name = this.email.split('@')[0];
 
   next();