Feature added: Ability to force email and name entry

.env.SAMPLE

@@ -19,3 +19,15 @@ STAGE=prod
 # A Slack webhook to send notifications to (optional)
 #SLACK=https://hooks.slack.com/services/XXXXXXXXX/YYYYYYYYY/ZZZZZZZZZZZZZZZZZZZZZZZZ
 
+# Require author email address - string is error message to display.
+#REQEMAIL='Email is required.'
+
+# Require author name - string is error message to display.
+#REQNAME='Name is required.'
+
+# Size limit of post in bytes
+#SIZELIMIT=4096
+
+# Disallow empty content (spaces only, etc.) - string is error message to display.
+#DISALLOW_EMPTY='You need to actually use words.'
+

README.md

@@ -83,7 +83,12 @@ STAGE=prod
 
 # A Slack webhook to send notifications to (optional)
 #SLACK=https://hooks.slack.com/services/XXXXXXXXX/YYYYYYYYY/ZZZZZZZZZZZZZZZZZZZZZZZZ
-```
+
+# Require author email address - string is error message to display.
+#REQEMAIL='Email is required.'
+
+# Require author name - string is error message to display.
+#REQNAME='Name is required.'
 
 We use [dotenv](https://github.com/motdotla/dotenv) so it is also possible to
 configure the project by setting environment variables.

deploy/apex/webpack.config.es6.js

@@ -37,6 +37,22 @@ if (process.env.SLACK) {
   defines['process.env.SLACK'] = `'${process.env.SLACK}'`
 }
 
+if (process.env.REQEMAIL) {
+  defines['process.env.REQEMAIL'] = `'${process.env.REQEMAIL}'`
+}
+
+if (process.env.REQNAME) {
+  defines['process.env.REQNAME'] = `'${process.env.REQNAME}'`
+}
+
+if (process.env.SIZELIMIT) {
+  defines['process.env.SIZELIMIT'] = `'${process.env.SIZELIMIT}'`
+}
+
+if (process.env.DISALLOW_EMPTY) {
+  defines['process.env.DISALLOW_EMPTY'] = `'${process.env.DISALLOW_EMPTY}'`
+}
+
 export default {
   entry: {
     [lambdaDirNames['QueueComment']]: [

packages/frontend/package.json

@@ -78,6 +78,7 @@
     "react-measure": "0.3.5",
     "react-motion": "0.4.2",
     "react-project": "0.0.30",
+    "react-redux": "4.4.5",
     "react-router": "2.0.0",
     "react-router-redux": "4.0.2",
     "react-spinner": "0.2.6",

packages/frontend/src/actions/comments.js

@@ -25,6 +25,10 @@ export const FORM_FIELDS = [
 const websiteUrl = __CONFIG__.websiteUrl
 const apiUrl = __CONFIG__.apiUrl
 const apiKey = __CONFIG__.apiKey
+const authorNameRequired = __CONFIG__.authorNameRequired
+const authorEmailRequired = __CONFIG__.authorEmailRequired
+const contentSizeLimit = __CONFIG__.contentSizeLimit
+const disallowEmptyContent = __CONFIG__.disallowEmptyContent
 
 class ValidationError extends Error {
   constructor (data) {

packages/frontend/src/ui/comments.css

@@ -97,6 +97,13 @@
   }
 }
 
+.commentCounter {
+ font-size: 13px;
+ color: gray;
+ text-decoration: none;
+ padding-left: 10px;
+}
+
 .previewWrapper {
   overflow-y: hidden;
 }

packages/frontend/src/ui/postCommentForm.js

@@ -16,6 +16,7 @@ import {
   errorMessage,
   postCommentFormHeader,
   markdownNote,
+  commentCounter,
   previewWrapper,
   preview,
   spinnerButton,
@@ -27,15 +28,34 @@ import {
 } from './comments.css'
 import { FORM_NAME, FORM_FIELDS } from '../actions/comments'
 
+const authorNameRequired = __CONFIG__.authorNameRequired
+const authorEmailRequired = __CONFIG__.authorEmailRequired
+const contentSizeLimit = __CONFIG__.contentSizeLimit
+const disallowEmptyContent = __CONFIG__.disallowEmptyContent
+
+let contentRegex = /\w+/
+
 function validate (values) {
   const errors = {}
-  const { commentContent, authorEmail, authorUrl } = values
+  const { commentContent, authorName, authorEmail, authorUrl } = values
   if (!commentContent) {
     errors.commentContent = 'Required'
   }
   if (commentContent && commentContent.length < 3) {
     errors.commentContent = 'Must be at least 3 characters'
   }
+  if (commentContent && contentSizeLimit && (commentContent.length > parseInt(contentSizeLimit))) {
+    errors.commentContent = 'Comment has exceeded content length of: ' + parseInt(contentSizeLimit) + ' characters.'
+  }
+  if (commentContent && disallowEmptyContent && !commentContent.match(contentRegex)) {
+    errors.commentContent = disallowEmptyContent
+  }
+  if (authorNameRequired && !authorName) {
+    errors.authorName = authorNameRequired
+  }
+  if (authorEmailRequired && !authorEmail) {
+    errors.authorEmail = authorEmailRequired
+  }
   if (authorEmail && !isEmail(authorEmail)) {
     errors.authorEmail = 'Email format not valid'
   }
@@ -138,13 +158,15 @@ export default class PostCommentForm extends Component {
       date: new Date(),
       commentContent: commentContent.value,
     }
+    const length = commentContent.value ? commentContent.value.length : 0
     return (
       <form
         className={postCommentForm}
         onSubmit={handleSubmit}
       >
         <div className={postCommentFormHeader}>
           <strong>Add your comment</strong>
+          <span className={commentCounter}>{length}</span>
           <span className={markdownNote}>
             <a
               target="_blank"
@@ -175,7 +197,7 @@ export default class PostCommentForm extends Component {
         }
         <input
           type="text"
-          placeholder="Name (optional)"
+          placeholder={authorNameRequired ? "Name (required)" : "Name"}
           className={
             authorName.touched && authorName.error && hasError
           }
@@ -189,7 +211,7 @@ export default class PostCommentForm extends Component {
         }
         <input
           type="email"
-          placeholder="Email (optional, not shown)"
+          placeholder={authorEmailRequired ? "Email (required - not shown)" : "Email (not shown)"}
           className={
             authorEmail.touched && authorEmail.error && hasError
           }

packages/frontend/webpack.config.js

@@ -12,6 +12,9 @@ dotenv.config({ path: '../../.env' })
 
 const apiUrl = getApiUrl()
 const websiteUrl = getWebsiteUrl()
+const { REQEMAIL: authorEmailRequired, REQNAME: authorNameRequired } = process.env
+const { SIZELIMIT: contentSizeLimit, DISALLOW_EMPTY: disallowEmptyContent } = process.env
+
 
 function modify (webpackConfig) {
   webpackConfig.postcss = () => {
@@ -69,7 +72,11 @@ function modifyClient (webpackConfig) {
     '__CONFIG__': JSON.stringify({
       apiUrl,
       websiteUrl,
-      apiKey
+      apiKey,
+      authorNameRequired,
+      authorEmailRequired,
+      contentSizeLimit,
+      disallowEmptyContent
     })
   }))
   webpackConfig.plugins = plugins

packages/lambda/src/queueComment/index.js

@@ -14,8 +14,11 @@ import { apiKey } from '../../../../deploy/state/apiKey.json'
 dotenv.config({ silent: true })
 
 const hmac = jwa('HS256')
+const { REQEMAIL: authorEmailRequired, REQNAME: authorNameRequired } = process.env
+const { SIZELIMIT: contentSizeLimit, DISALLOW_EMPTY: disallowEmptyContent } = process.env
 
 let akismet = null
+let contentRegex = /\w+/
 
 class ValidationError extends Error {
   constructor (data) {
@@ -56,6 +59,18 @@ function validate (payload) {
   if (commentContent && commentContent.length < 3) {
     errors.commentContent = 'Must be at least 3 characters'
   }
+  if (commentContent && contentSizeLimit && (commentContent.length > parseInt(contentSizeLimit))) {
+    errors.commentContent = 'Comment has exceeded content length of: ' + parseInt(contentSizeLimit) + ' characters.'
+  }
+  if (commentContent && disallowEmptyContent && !commentContent.match(contentRegex)) {
+    errors.commentContent = disallowEmptyContent
+  }
+  if (authorNameRequired && !authorName) {
+    errors.authorName = authorNameRequired
+  }
+  if (authorEmailRequired && !authorEmail) {
+    errors.authorEmail = authorEmailRequired
+  }
   if (authorEmail && !isEmail(authorEmail)) {
     errors.authorEmail = 'Email format not valid'
   }