Install and use prettier

.prettierignore

@@ -0,0 +1,2 @@
+node_modules
+dist

.prettierrc.json

@@ -0,0 +1 @@
+{}

README.md

@@ -1,5 +1,4 @@
-[![Serverless Fullstack Application Express React DynamoDB AWS Lambda AWS HTTP API](https://s3.amazonaws.com/assets.github.serverless/components/readme-serverless-framework-fullstack-application.png
+[![Serverless Fullstack Application Express React DynamoDB AWS Lambda AWS HTTP API](https://s3.amazonaws.com/assets.github.serverless/components/readme-serverless-framework-fullstack-application.png)](https://www.serverless-fullstack-app.com)
-)](https://www.serverless-fullstack-app.com)
 
 A complete, serverless, full-stack application built on AWS Lambda, AWS HTTP API, Express.js, React and DynamoDB.
 
@@ -9,7 +8,6 @@ A complete, serverless, full-stack application built on AWS Lambda, AWS HTTP API
 
 Install the latest version of the Serverless Framework:
 
-
 ```
 npm i -g serverless
 ```
@@ -99,11 +97,11 @@ Enjoy!  This is a work in progress and we will continue to add funcitonality to
 
 For more details on each part of this fullstack application, check out these resources:
 
-* [Serverless Components](https://github.com/serverless/components)
+- [Serverless Components](https://github.com/serverless/components)
-* [Serverless Express](https://github.com/serverless-components/express)
+- [Serverless Express](https://github.com/serverless-components/express)
-* [Serverless Website](https://github.com/serverless-components/website)
+- [Serverless Website](https://github.com/serverless-components/website)
-* [Serverless AWS DynamoDB](https://github.com/serverless-components/aws-dynamodb)
+- [Serverless AWS DynamoDB](https://github.com/serverless-components/aws-dynamodb)
-* [Serverless AWS IAM Role](https://github.com/serverless-components/aws-iam-role)
+- [Serverless AWS IAM Role](https://github.com/serverless-components/aws-iam-role)
 
 ## Guides
 

api/app.js

@@ -1,16 +1,17 @@
-const express = require('express')
+const express = require("express");
-const app = express()
+const app = express();
-const passport = require('passport')
+const passport = require("passport");
-const {
+const { users } = require("./controllers");
-  users
-} = require('./controllers')
 
 /**
  * Configure Passport
  */
 
-try { require('./config/passport')(passport) }
+try {
-catch (error) { console.log(error) }
+  require("./config/passport")(passport);
+} catch (error) {
+  console.log(error);
+}
 
 /**
  * Configure Express.js Middleware
@@ -18,26 +19,24 @@ catch (error) { console.log(error) }
 
 // Enable CORS
 app.use(function (req, res, next) {
-  res.header('Access-Control-Allow-Origin', '*')
+  res.header("Access-Control-Allow-Origin", "*");
-  res.header('Access-Control-Allow-Methods', '*')
+  res.header("Access-Control-Allow-Methods", "*");
-  res.header('Access-Control-Allow-Headers', '*')
+  res.header("Access-Control-Allow-Headers", "*");
-  res.header('x-powered-by', 'serverless-express')
+  res.header("x-powered-by", "serverless-express");
-  next()
+  next();
-})
+});
 
 // Initialize Passport and restore authentication state, if any, from the session
-app.use(passport.initialize())
+app.use(passport.initialize());
-app.use(passport.session())
+app.use(passport.session());
 
 // Enable JSON use
-app.use(express.json())
+app.use(express.json());
 
 // Since Express doesn't support error handling of promises out of the box,
 // this handler enables that
-const asyncHandler = fn => (req, res, next) => {
+const asyncHandler = (fn) => (req, res, next) => {
-  return Promise
+  return Promise.resolve(fn(req, res, next)).catch(next);
-    .resolve(fn(req, res, next))
-    .catch(next);
 };
 
 /**
@@ -45,37 +44,43 @@ const asyncHandler = fn => (req, res, next) => {
  */
 
 app.options(`*`, (req, res) => {
-  res.status(200).send()
+  res.status(200).send();
-})
+});
 
-app.post(`/users/register`, asyncHandler(users.register))
+app.post(`/users/register`, asyncHandler(users.register));
 
-app.post(`/users/login`, asyncHandler(users.login))
+app.post(`/users/login`, asyncHandler(users.login));
 
 app.get(`/test/`, (req, res) => {
-  res.status(200).send('Request received')
+  res.status(200).send("Request received");
-})
+});
 
 /**
  * Routes - Protected
  */
 
-app.post(`/user`, passport.authenticate('jwt', { session: false }), asyncHandler(users.get))
+app.post(
+  `/user`,
+  passport.authenticate("jwt", { session: false }),
+  asyncHandler(users.get)
+);
 
 /**
  * Routes - Catch-All
  */
 
 app.get(`/*`, (req, res) => {
-  res.status(404).send('Route not found')
+  res.status(404).send("Route not found");
-})
+});
 
 /**
  * Error Handler
  */
 app.use(function (err, req, res, next) {
-  console.error(err)
+  console.error(err);
-  res.status(500).json({ error: `Internal Serverless Error - "${err.message}"` })
+  res
-})
+    .status(500)
+    .json({ error: `Internal Serverless Error - "${err.message}"` });
+});
 
-module.exports = app
+module.exports = app;

api/config/passport.js

@@ -2,26 +2,30 @@
  * Config: Passport.js
  */
 
-const StrategyJWT = require('passport-jwt').Strategy
+const StrategyJWT = require("passport-jwt").Strategy;
-const ExtractJWT = require('passport-jwt').ExtractJwt
+const ExtractJWT = require("passport-jwt").ExtractJwt;
-const { users } = require('../models')
+const { users } = require("../models");
-const { comparePassword } = require('../utils')
+const { comparePassword } = require("../utils");
 
 module.exports = (passport) => {
+  const options = {};
+  options.jwtFromRequest = ExtractJWT.fromAuthHeaderAsBearerToken();
+  options.secretOrKey = process.env.tokenSecret; // Change this to only use your own secret token
 
-  const options = {}
+  passport.use(
-  options.jwtFromRequest = ExtractJWT.fromAuthHeaderAsBearerToken()
+    new StrategyJWT(options, async (jwtPayload, done) => {
-  options.secretOrKey = process.env.tokenSecret || 'secret_j91jasf0j1asfkl' // Change this to only use your own secret token
+      let user;
-
+      try {
-  passport.use(new StrategyJWT(options, async (jwtPayload, done) => {
+        user = await users.getById(jwtPayload.id);
-    let user
+      } catch (error) {
-    try { user = await users.getById(jwtPayload.id) }
+        console.log(error);
-    catch (error) {
+        return done(error, null);
-      console.log(error)
-      return done(error, null)
       }
 
-    if (!user) { return done(null, false) }
+      if (!user) {
-    return done(null, user)
+        return done(null, false);
-  }))
+      }
-}
+      return done(null, user);
+    })
+  );
+};

api/controllers/index.js

@@ -1,5 +1,5 @@
-const users = require('./users')
+const users = require("./users");
 
 module.exports = {
   users,
-}
+};

api/controllers/users.js

@@ -2,9 +2,9 @@
  * Controllers: Users
  */
 
-const jwt = require('jsonwebtoken')
+const jwt = require("jsonwebtoken");
-const { users } = require('../models')
+const { users } = require("../models");
-const { comparePassword } = require('../utils')
+const { comparePassword } = require("../utils");
 
 /**
  * Save
@@ -13,27 +13,26 @@ const { comparePassword } = require('../utils')
  * @param {*} next
  */
 const register = async (req, res, next) => {
-
   try {
-    await users.register(req.body)
+    await users.register(req.body);
   } catch (error) {
-    return res.status(400).json({ error: error.message })
+    return res.status(400).json({ error: error.message });
   }
 
-  let user
+  let user;
   try {
-    user = await users.getByEmail(req.body.email)
+    user = await users.getByEmail(req.body.email);
   } catch (error) {
-    console.log(error)
+    console.log(error);
-    return next(error, null)
+    return next(error, null);
   }
 
   const token = jwt.sign(user, process.env.tokenSecret, {
-    expiresIn: 604800 // 1 week
+    expiresIn: 604800, // 1 week
-  })
+  });
 
-  res.json({ message: 'Authentication successful', token })
+  res.json({ message: "Authentication successful", token });
-}
+};
 
 /**
  * Sign a user in
@@ -42,26 +41,32 @@ const register = async (req, res, next) => {
  * @param {*} next
  */
 const login = async (req, res, next) => {
-
+  let user;
-  let user
+  try {
-  try { user = await users.getByEmail(req.body.email) }
+    user = await users.getByEmail(req.body.email);
-  catch (error) { return done(error, null) }
+  } catch (error) {
-
+    return done(error, null);
-  if (!user) {
-    return res.status(404).send({ error: 'Authentication failed. User not found.' })
   }
 
-  const isCorrect = comparePassword(req.body.password, user.password)
+  if (!user) {
+    return res
+      .status(404)
+      .send({ error: "Authentication failed. User not found." });
+  }
+
+  const isCorrect = comparePassword(req.body.password, user.password);
   if (!isCorrect) {
-    return res.status(401).send({ error: 'Authentication failed. Wrong password.' })
+    return res
+      .status(401)
+      .send({ error: "Authentication failed. Wrong password." });
   }
 
   const token = jwt.sign(user, process.env.tokenSecret, {
-    expiresIn: 604800 // 1 week
+    expiresIn: 604800, // 1 week
-  })
+  });
 
-  res.json({ message: 'Authentication successful', token })
+  res.json({ message: "Authentication successful", token });
-}
+};
 
 /**
  * Get a user
@@ -70,12 +75,12 @@ const login = async (req, res, next) => {
  * @param {*} next
  */
 const get = async (req, res, next) => {
-  const user = users.convertToPublicFormat(req.user)
+  const user = users.convertToPublicFormat(req.user);
-  res.json({ user })
+  res.json({ user });
-}
+};
 
 module.exports = {
   register,
   login,
   get,
-}
+};

api/models/index.js

@@ -1,5 +1,5 @@
-const users = require('./users')
+const users = require("./users");
 
 module.exports = {
   users,
-}
+};

api/models/users.js

@@ -2,116 +2,113 @@
  * Model: Users
  */
 
-const AWS = require('aws-sdk')
+const AWS = require("aws-sdk");
-const shortid = require('shortid')
+const shortid = require("shortid");
-const utils = require('../utils')
+const utils = require("../utils");
 
 const dynamodb = new AWS.DynamoDB.DocumentClient({
-  region: process.env.AWS_REGION
+  region: process.env.AWS_REGION,
-})
+});
 
 /**
  * Register user
  * @param {string} user.email User email
  * @param {string} user.password User password
  */
-const register = async(user = {}) => {
+const register = async (user = {}) => {
-
   // Validate
   if (!user.email) {
-    throw new Error(`"email" is required`)
+    throw new Error(`"email" is required`);
   }
   if (!user.password) {
-    throw new Error(`"password" is required`)
+    throw new Error(`"password" is required`);
   }
   if (!utils.validateEmailAddress(user.email)) {
-    throw new Error(`"${user.email}" is not a valid email address`)
+    throw new Error(`"${user.email}" is not a valid email address`);
   }
 
   // Check if user is already registered
-  const existingUser = await getByEmail(user.email)
+  const existingUser = await getByEmail(user.email);
   if (existingUser) {
-    throw new Error(`A user with email "${user.email}" is already registered`)
+    throw new Error(`A user with email "${user.email}" is already registered`);
   }
 
-  user.password = utils.hashPassword(user.password)
+  user.password = utils.hashPassword(user.password);
 
   // Save
   const params = {
     TableName: process.env.db,
     Item: {
       hk: user.email,
-      sk: 'user',
+      sk: "user",
       sk2: shortid.generate(),
       createdAt: Date.now(),
       updatedAt: Date.now(),
       password: user.password,
-    }
+    },
-  }
+  };
 
-  await dynamodb.put(params).promise()
+  await dynamodb.put(params).promise();
-}
+};
 
 /**
  * Get user by email address
  * @param {string} email
  */
 
-const getByEmail = async(email) => {
+const getByEmail = async (email) => {
-
   // Validate
   if (!email) {
-    throw new Error(`"email" is required`)
+    throw new Error(`"email" is required`);
   }
   if (!utils.validateEmailAddress(email)) {
-    throw new Error(`"${email}" is not a valid email address`)
+    throw new Error(`"${email}" is not a valid email address`);
   }
 
   // Query
   const params = {
     TableName: process.env.db,
-    KeyConditionExpression: 'hk = :hk',
+    KeyConditionExpression: "hk = :hk",
-    ExpressionAttributeValues: { ':hk': email }
+    ExpressionAttributeValues: { ":hk": email },
-  }
+  };
 
-  let user = await dynamodb.query(params).promise()
+  let user = await dynamodb.query(params).promise();
 
-  user = user.Items && user.Items[0] ? user.Items[0] : null
+  user = user.Items && user.Items[0] ? user.Items[0] : null;
   if (user) {
-    user.id = user.sk2
+    user.id = user.sk2;
-    user.email = user.hk
+    user.email = user.hk;
   }
-  return user
+  return user;
-}
+};
 
 /**
  * Get user by id
  * @param {string} id
  */
 
-const getById = async(id) => {
+const getById = async (id) => {
-
   // Validate
   if (!id) {
-    throw new Error(`"id" is required`)
+    throw new Error(`"id" is required`);
   }
 
   // Query
   const params = {
     TableName: process.env.db,
     IndexName: process.env.dbIndex1,
-    KeyConditionExpression: 'sk2 = :sk2 and sk = :sk',
+    KeyConditionExpression: "sk2 = :sk2 and sk = :sk",
-    ExpressionAttributeValues: { ':sk2': id, ':sk': 'user' }
+    ExpressionAttributeValues: { ":sk2": id, ":sk": "user" },
-  }
+  };
-  let user = await dynamodb.query(params).promise()
+  let user = await dynamodb.query(params).promise();
 
-  user = user.Items && user.Items[0] ? user.Items[0] : null
+  user = user.Items && user.Items[0] ? user.Items[0] : null;
   if (user) {
-    user.id = user.sk2
+    user.id = user.sk2;
-    user.email = user.hk
+    user.email = user.hk;
   }
-  return user
+  return user;
-}
+};
 
 /**
  * Convert user record to public format
@@ -119,18 +116,18 @@ const getById = async(id) => {
  * @param {*} user
  */
 const convertToPublicFormat = (user = {}) => {
-  user.email = user.hk || null
+  user.email = user.hk || null;
-  user.id = user.sk2 || null
+  user.id = user.sk2 || null;
-  if (user.hk) delete user.hk
+  if (user.hk) delete user.hk;
-  if (user.sk) delete user.sk
+  if (user.sk) delete user.sk;
-  if (user.sk2) delete user.sk2
+  if (user.sk2) delete user.sk2;
-  if (user.password) delete user.password
+  if (user.password) delete user.password;
-  return user
+  return user;
-}
+};
 
 module.exports = {
   register,
   getByEmail,
   getById,
   convertToPublicFormat,
-}
+};

api/package.json

@@ -1,7 +1,6 @@
 {
-  "name": "serverless-fullstack-app-api",
+  "name": "forgetmenot",
   "version": "1.0.0",
-  "description": "",
   "main": "app.js",
   "dependencies": {
     "bcryptjs": "^2.4.3",
@@ -15,6 +14,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "author": "",
+  "author": "Ben Ramey <benramey@fastmail.com>",
-  "license": "ISC"
+  "license": "ISC",
+  "description": ""
 }

api/utils/index.js

@@ -2,34 +2,35 @@
  * Utils
  */
 
-const bcrypt = require('bcryptjs')
+const bcrypt = require("bcryptjs");
 
 /**
  * Validate email address
  */
 const validateEmailAddress = (email) => {
-  var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  var re =
-  return re.test(String(email).toLowerCase())
+    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-}
+  return re.test(String(email).toLowerCase());
+};
 
 /**
  * Hash password
  * @param {*} user
  */
 const hashPassword = (password) => {
-  const salt = bcrypt.genSaltSync(10)
+  const salt = bcrypt.genSaltSync(10);
-  return bcrypt.hashSync(password, salt)
+  return bcrypt.hashSync(password, salt);
-}
+};
 
 /**
  * Compare password
  */
 const comparePassword = (candidatePassword, trustedPassword) => {
-  return bcrypt.compareSync(candidatePassword, trustedPassword)
+  return bcrypt.compareSync(candidatePassword, trustedPassword);
-}
+};
 
 module.exports = {
   hashPassword,
   comparePassword,
-  validateEmailAddress
+  validateEmailAddress,
-}
+};

package.json

@@ -0,0 +1,18 @@
+{
+  "name": "forgetmenot-serverless",
+  "version": "1.0.0",
+  "description": "[![Serverless Fullstack Application Express React DynamoDB AWS Lambda AWS HTTP API](https://s3.amazonaws.com/assets.github.serverless/components/readme-serverless-framework-fullstack-application.png\r )](https://www.serverless-fullstack-app.com)",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://grimfere@dev.azure.com/grimfere/ForgetMeNot/_git/forgetmenot-serverless"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "prettier": "2.4.1"
+  }
+}

site/README.md

@@ -32,7 +32,7 @@ Any static assets, like images, can be placed in the `public/` directory.
 All commands are run from the root of the project, from a terminal:
 
 | Command         | Action                                      |
-|:----------------|:--------------------------------------------|
+| :-------------- | :------------------------------------------ |
 | `npm install`   | Installs dependencies                       |
 | `npm run dev`   | Starts local dev server at `localhost:3000` |
 | `npm run build` | Build your production site to `./dist/`     |

site/astro.config.mjs

@@ -12,7 +12,5 @@ export default {
     // port: 3000,             // The port to run the dev server on.
     // tailwindConfig: '',     // Path to tailwind.config.js if used, e.g. './tailwind.config.js'
   },
-  renderers: [
+  renderers: ["@astrojs/renderer-react"],
-    "@astrojs/renderer-react"
-  ],
 };

site/public/style/global.css

@@ -4,10 +4,15 @@
 }
 
 :root {
-  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji;
+  font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial,
+    sans-serif, Apple Color Emoji, Segoe UI Emoji;
   font-size: 1rem;
   --user-font-scale: 1rem - 16px;
-  font-size: clamp(0.875rem, 0.4626rem + 1.0309vw + var(--user-font-scale), 1.125rem);
+  font-size: clamp(
+    0.875rem,
+    0.4626rem + 1.0309vw + var(--user-font-scale),
+    1.125rem
+  );
 }
 
 body {

site/public/style/home.css

@@ -1,6 +1,8 @@
 :root {
-  --font-mono: Consolas, 'Andale Mono WT', 'Andale Mono', 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', 'Bitstream Vera Sans Mono', 'Liberation Mono',
+  --font-mono: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console",
-    'Nimbus Mono L', Monaco, 'Courier New', Courier, monospace;
+    "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono",
+    "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier,
+    monospace;
   --color-light: #f3f4f6;
 }
 

site/src/components/ReactCounter.jsx

@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useState } from "react";
 
 export default function ReactCounter() {
   const [count, setCount] = useState(0);

site/src/config.js

@@ -2,10 +2,10 @@
  * Global Config
  */
 
-const config = {}
+const config = {};
 
 // Domains
-config.domains = {}
+config.domains = {};
 
 /**
  * API Domain
@@ -13,6 +13,6 @@ config.domains = {}
  * This will enable your front-end to communicate with your back-end.
  * (e.g. 'https://api.mydomain.com' or 'https://091jafsl10.execute-api.us-east-1.amazonaws.com')
  */
-config.domains.api = 'https://1t8da6s66e.execute-api.us-east-1.amazonaws.com'
+config.domains.api = "https://1t8da6s66e.execute-api.us-east-1.amazonaws.com";
 
-export default config
+export default config;

site/src/utils/api.js

@@ -2,70 +2,69 @@
  * Utils: Back-end
  */
 
-import config from '../config'
+import config from "../config";
 
 /**
  * Register a new user
  */
 export const userRegister = async (email, password) => {
-  return await requestApi('/users/register', 'POST', { email, password })
+  return await requestApi("/users/register", "POST", { email, password });
-}
+};
 
 /**
  * Login a new user
  */
 export const userLogin = async (email, password) => {
-  return await requestApi('/users/login', 'POST', { email, password })
+  return await requestApi("/users/login", "POST", { email, password });
-}
+};
 
 /**
  * userGet
  */
 export const userGet = async (token) => {
-  return await requestApi('/user', 'POST', null, {
+  return await requestApi("/user", "POST", null, {
-    Authorization: `Bearer ${token}`
+    Authorization: `Bearer ${token}`,
-  })
+  });
-}
+};
 
 /**
  * API request to call the backend
  */
 export const requestApi = async (
-  path = '',
+  path = "",
-  method = 'GET',
+  method = "GET",
   data = null,
-  headers = {}) => {
+  headers = {}
-
+) => {
   // Check if API URL has been set
   if (!config?.domains?.api) {
-    throw new Error(`Error: Missing API Domain – Please add the API domain from your serverless Express.js back-end to this front-end application.  You can do this in the "site" folder, in the "./config.js" file.  Instructions are listed there and in the documentation.`)
+    throw new Error(
+      `Error: Missing API Domain – Please add the API domain from your serverless Express.js back-end to this front-end application.  You can do this in the "site" folder, in the "./config.js" file.  Instructions are listed there and in the documentation.`
+    );
   }
 
   // Prepare URL
-  if (!path.startsWith('/')) {
+  if (!path.startsWith("/")) {
-    path = `/${path}`
+    path = `/${path}`;
   }
-  const url = `${config.domains.api}${path}`
+  const url = `${config.domains.api}${path}`;
 
   // Set headers
-  headers = Object.assign(
+  headers = Object.assign({ "Content-Type": "application/json" }, headers);
-    { 'Content-Type': 'application/json' },
-    headers
-  )
 
   // Default options are marked with *
   const response = await fetch(url, {
     method: method.toUpperCase(),
-    mode: 'cors',
+    mode: "cors",
-    cache: 'no-cache',
+    cache: "no-cache",
     headers,
-    body: data ? JSON.stringify(data) : null
+    body: data ? JSON.stringify(data) : null,
-  })
+  });
 
   if (response.status < 200 || response.status >= 300) {
-    const error = await response.json()
+    const error = await response.json();
-    throw new Error(error.error)
+    throw new Error(error.error);
   }
 
-  return await response.json()
+  return await response.json();
-}
+};

site/src/utils/index.js

@@ -1 +1 @@
-export * from './api'
+export * from "./api";