-
{context.appConfig.name}
-
-
-
-
-
{context.appConfig.subHeading}
-
{context.appConfig.description}
+
{context.config.title}
+
{context.config.author} - {context.config.role}
diff --git a/app/app_jsCodingStandards/Readme.md b/app/app_jsCodingStandards/Readme.md
index fa825b893..639a4b69e 100644
--- a/app/app_jsCodingStandards/Readme.md
+++ b/app/app_jsCodingStandards/Readme.md
@@ -4,10 +4,4 @@ With this application I have built...
### Explanation ###
-The interest in this application...
-
-Run the application from within the route directory, using the master Gulp file and the default Gulp task.
-```
- cd ../../
- gulp
-```
\ No newline at end of file
+The interest in this application...
\ No newline at end of file
diff --git a/app/app_master_react/Readme.md b/app/app_master_react/Readme.md
index cbea019b1..090fd303f 100644
--- a/app/app_master_react/Readme.md
+++ b/app/app_master_react/Readme.md
@@ -6,17 +6,4 @@ With this application I have built a simple To-Do list using React to handle use
I have used Webpack to bundle JS dependancies and Babel to transpile to the correct ES version.
-The interest in this application is to explore how React can be used for 2 way data binding between the DOM and application state. With a particular interest in Reacts use of a virtual DOM.
-
-### Project commands ###
-
-Build JavaScript by running the default Gulp task from within this directory
-```
- gulp
-```
-
-Run the application from within the route directory, using the master Gulp file and the default Gulp task
-```
- cd ../../
- gulp
-```
+The interest in this application is to explore how React can be used for 2 way data binding between the DOM and application state. With a particular interest in Reacts use of a virtual DOM.
\ No newline at end of file
diff --git a/app/app_nodeToDo/Readme.md b/app/app_nodeToDo/Readme.md
new file mode 100644
index 000000000..68e0c3354
--- /dev/null
+++ b/app/app_nodeToDo/Readme.md
@@ -0,0 +1,13 @@
+# NodeJS, To-Do List SPA
+
+With this application, I have extended previous To-Do concepts. This application is driven by Node.js and Express and is authenticated using JWT tokens.
+
+Please note that data is only stored in memory for the purpose of this example. I may use MongoDB or a similar solution in the near future.
+
+The frontend is built with React and React Router. State is managed using a combination of React Context and the Context Provider Pattern.
+
+- NodeJS (https://nodejs.org/en/)
+- Express (https://www.npmjs.com/package/express)
+- React Hooks (https://reactjs.org/docs/hooks-reference.html)
+- React Router (https://reactrouter.com/web/guides/quick-start)
+- React Context (https://reactjs.org/docs/context.html)
\ No newline at end of file
diff --git a/app/app_nodeToDo/backend/api/controllers/healthcheckController.js b/app/app_nodeToDo/backend/api/controllers/healthcheckController.js
new file mode 100644
index 000000000..b7a31ad3c
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/controllers/healthcheckController.js
@@ -0,0 +1,12 @@
+/**
+ * Responds with a 200 status for the healthcheck.
+ * @param {object} req - The HTTP request object.
+ * @param {object} res - The HTTP response object.
+ */
+const handleHealthcheck = (req, res) => {
+ res.status(200).send();
+};
+
+module.exports = {
+ handleHealthcheck
+};
diff --git a/app/app_nodeToDo/backend/api/controllers/itemsController.js b/app/app_nodeToDo/backend/api/controllers/itemsController.js
new file mode 100644
index 000000000..19c35b34e
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/controllers/itemsController.js
@@ -0,0 +1,121 @@
+const itemsService = require('../services/itemsService');
+const userService = require('../services/userService');
+
+/**
+* Retrieves all items belonging to the current user and sends them as a response
+* @param {Object} req - Express request object
+* @param {Object} res - Express response object
+* @returns {Array} The updated list of items for the current user
+*/
+const getAllItems = (req, res) => {
+
+ try {
+ const { username } = userService.getCurrentUser(req, res);
+ const items = itemsService.getItems(username);
+
+ res.send({ items });
+ } catch (error) {
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+* Get an item with the given ID and associated with the current user.
+* @param {Object} req - The request object.
+* @param {Object} res - The response object.
+* @returns {Object} The object
+*/
+const getItem = (req, res) => {
+
+ try {
+ const { username } = userService.getCurrentUser(req, res);
+
+ const id = req.params.id;
+
+ const item = itemsService.getItem(id, username);
+
+ res.send({ item });
+ } catch (error) {
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+ * Deletes an item with the specified ID for the current user and returns the updated list of items
+ * @param {Object} req - The request object
+ * @param {Object} res - The response object
+ * @returns {Array} The updated list of items for the current user
+ */
+const deleteItem = (req, res) => {
+
+ try {
+ const { username } = userService.getCurrentUser(req, res);
+
+ const id = req.params.id;
+
+ itemsService.deleteItem(id, username);
+
+ const itmes = itemsService.getItems(username);
+
+ res.send({ itmes });
+ } catch (error) {
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+ * Create a new item for the current user and return the updated list of items.
+ * @param {Object} req - Express request object.
+ * @param {Object} res - Express response object.
+ * @returns {void}
+ */
+const addItem = (req, res) => {
+
+ try {
+ const { username } = userService.getCurrentUser(req, res);
+
+ const { id, description, done } = req.body;
+ const item = { id, description, done };
+
+ itemsService.createItem(item, username);
+
+ const itmes = itemsService.getItems(username);
+
+ res.send({ itmes });
+ } catch (error) {
+ console.error(error.message);
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+ * Updates an item for the authenticated user.
+ * @param {Object} req - The request object from the client.
+ * @param {Object} res - The response object returned to the client.
+ * @returns {Object} - The updated items list for the authenticated user.
+ */
+const updateItem = (req, res) => {
+
+ try {
+ const { username } = userService.getCurrentUser(req, res);
+
+ const { id, description, done } = req.body;
+ const item = { id, description, done };
+
+ itemsService.updateItem(item, username);
+
+ const items = itemsService.getItems(username);
+
+ res.send({ items });
+ } catch (error) {
+ res.status(400).send(error.message);
+ }
+};
+
+module.exports = {
+ getAllItems,
+ getItem,
+ deleteItem,
+ addItem,
+ updateItem
+}
diff --git a/app/app_nodeToDo/backend/api/controllers/userController.js b/app/app_nodeToDo/backend/api/controllers/userController.js
new file mode 100644
index 000000000..838383f8a
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/controllers/userController.js
@@ -0,0 +1,83 @@
+const userService = require('../services/userService');
+
+/**
+ * Handles user login.
+ * @param {object} req - The HTTP request object.
+ * @param {object} res - The HTTP response object.
+ */
+const login = (req, res) => {
+
+ try {
+ const { username, password } = req.body;
+ const token = userService.handleLogin(username, password, req);
+
+ res.send({ token });
+
+ } catch (error) {
+ console.error(error.message);
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+ * Handles user logout.
+ * @param {object} req - The HTTP request object.
+ * @param {object} res - The HTTP response object.
+ */
+const logout = (req, res) => {
+
+ try {
+ userService.handleLogout(req);
+
+ res.status(200).send();
+
+ } catch (error) {
+ console.error(error.message);
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+ * Handles user registration.
+ * @param {object} req - The HTTP request object.
+ * @param {object} res - The HTTP response object.
+ */
+const register = (req, res) => {
+
+ try {
+ const { username, password } = req.body;
+
+ userService.registerUser(username, password);
+
+ res.send({ username });
+
+ } catch (error) {
+ console.error(error.message);
+ res.status(400).send(error.message);
+ }
+};
+
+/**
+ * Gets the current user.
+ * @param {object} req - The HTTP request object.
+ * @param {object} res - The HTTP response object.
+ */
+const getUser = (req, res) => {
+
+ try {
+ const user = userService.getCurrentUser(req);
+
+ res.send({ user });
+
+ } catch (error) {
+ console.error(error.message);
+ res.status(400).send(error.message);
+ }
+};
+
+module.exports = {
+ login,
+ logout,
+ register,
+ getUser
+};
diff --git a/app/app_nodeToDo/backend/api/index.js b/app/app_nodeToDo/backend/api/index.js
new file mode 100644
index 000000000..7ea892810
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/index.js
@@ -0,0 +1,66 @@
+const express = require('express');
+const bodyParser = require('body-parser');
+const cors = require('cors');
+
+const { isAuthenticated } = require('./services/userService');
+const { handleHealthcheck } = require('./controllers/healthcheckController');
+
+const {
+ login,
+ logout,
+ register,
+ getUser
+} = require('./controllers/userController');
+
+const {
+ getAllItems,
+ getItem,
+ deleteItem,
+ addItem,
+ updateItem
+} = require('./controllers/itemsController');
+
+const PORT = process.env.PORT || 3006;
+
+// Middleware
+const app = express();
+
+// Please note that in production, only specific origins would be allowed for CORS, most likely configured through an environment variable.
+app.use(cors({ origin: true }));
+
+app.use(bodyParser.json());
+
+// Routing
+// healthcheck
+app.get('/healthcheck', handleHealthcheck)
+
+// login
+app.post('/login', login);
+
+// logout
+app.get('/logout', isAuthenticated, logout);
+
+// register
+app.post('/register', register);
+
+// get user
+app.get('/user', isAuthenticated, getUser);
+
+// get items
+app.get('/', isAuthenticated, getAllItems);
+
+// get item
+app.get('/:id', isAuthenticated, getItem);
+
+//delete item
+app.delete('/:id', isAuthenticated, deleteItem);
+
+// create item
+app.post('/', isAuthenticated, addItem);
+
+// update item
+app.put('/', isAuthenticated, updateItem);
+
+app.listen(PORT, () => {
+ console.log(`Server listening on port ${PORT}.`);
+});
\ No newline at end of file
diff --git a/app/app_nodeToDo/backend/api/package-lock.json b/app/app_nodeToDo/backend/api/package-lock.json
new file mode 100644
index 000000000..bda73b3f6
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/package-lock.json
@@ -0,0 +1,755 @@
+{
+ "name": "node-todo-api",
+ "version": "1.0.0",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {
+ "": {
+ "name": "node-todo-api",
+ "version": "1.0.0",
+ "license": "MIT",
+ "dependencies": {
+ "body-parser": "^1.20.2",
+ "cors": "^2.8.5",
+ "crypto": "^1.0.1",
+ "express": "^4.18.2",
+ "jsonwebtoken": "^9.0.0",
+ "uuid": "^9.0.0"
+ }
+ },
+ "node_modules/accepts": {
+ "version": "1.3.8",
+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+ "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+ "dependencies": {
+ "mime-types": "~2.1.34",
+ "negotiator": "0.6.3"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/array-flatten": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+ },
+ "node_modules/body-parser": {
+ "version": "1.20.2",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+ "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+ "dependencies": {
+ "bytes": "3.1.2",
+ "content-type": "~1.0.5",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.2",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
+ },
+ "node_modules/buffer-equal-constant-time": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
+ "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+ },
+ "node_modules/bytes": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+ "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/call-bind": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+ "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "get-intrinsic": "^1.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/content-disposition": {
+ "version": "0.5.4",
+ "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+ "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+ "dependencies": {
+ "safe-buffer": "5.2.1"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/content-type": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+ "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/cookie": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+ "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/cookie-signature": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+ "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+ },
+ "node_modules/cors": {
+ "version": "2.8.5",
+ "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+ "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+ "dependencies": {
+ "object-assign": "^4",
+ "vary": "^1"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/crypto": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
+ "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==",
+ "deprecated": "This package is no longer supported. It's now a built-in Node module. If you've depended on crypto, you should switch to the one that's built-in."
+ },
+ "node_modules/debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dependencies": {
+ "ms": "2.0.0"
+ }
+ },
+ "node_modules/depd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+ "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/destroy": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+ "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
+ },
+ "node_modules/ecdsa-sig-formatter": {
+ "version": "1.0.11",
+ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
+ "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+ "dependencies": {
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/ee-first": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+ },
+ "node_modules/encodeurl": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/escape-html": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+ },
+ "node_modules/etag": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+ "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/express": {
+ "version": "4.18.2",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+ "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+ "dependencies": {
+ "accepts": "~1.3.8",
+ "array-flatten": "1.1.1",
+ "body-parser": "1.20.1",
+ "content-disposition": "0.5.4",
+ "content-type": "~1.0.4",
+ "cookie": "0.5.0",
+ "cookie-signature": "1.0.6",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "finalhandler": "1.2.0",
+ "fresh": "0.5.2",
+ "http-errors": "2.0.0",
+ "merge-descriptors": "1.0.1",
+ "methods": "~1.1.2",
+ "on-finished": "2.4.1",
+ "parseurl": "~1.3.3",
+ "path-to-regexp": "0.1.7",
+ "proxy-addr": "~2.0.7",
+ "qs": "6.11.0",
+ "range-parser": "~1.2.1",
+ "safe-buffer": "5.2.1",
+ "send": "0.18.0",
+ "serve-static": "1.15.0",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "type-is": "~1.6.18",
+ "utils-merge": "1.0.1",
+ "vary": "~1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.10.0"
+ }
+ },
+ "node_modules/express/node_modules/body-parser": {
+ "version": "1.20.1",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+ "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+ "dependencies": {
+ "bytes": "3.1.2",
+ "content-type": "~1.0.4",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
+ }
+ },
+ "node_modules/express/node_modules/raw-body": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+ "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+ "dependencies": {
+ "bytes": "3.1.2",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "unpipe": "1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/finalhandler": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+ "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+ "dependencies": {
+ "debug": "2.6.9",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "on-finished": "2.4.1",
+ "parseurl": "~1.3.3",
+ "statuses": "2.0.1",
+ "unpipe": "~1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/forwarded": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+ "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+ },
+ "node_modules/get-intrinsic": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
+ "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+ "dependencies": {
+ "function-bind": "^1.1.1",
+ "has": "^1.0.3",
+ "has-symbols": "^1.0.3"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dependencies": {
+ "function-bind": "^1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/has-symbols": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+ "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/http-errors": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+ "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+ "dependencies": {
+ "depd": "2.0.0",
+ "inherits": "2.0.4",
+ "setprototypeof": "1.2.0",
+ "statuses": "2.0.1",
+ "toidentifier": "1.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/iconv-lite": {
+ "version": "0.4.24",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "dependencies": {
+ "safer-buffer": ">= 2.1.2 < 3"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+ },
+ "node_modules/ipaddr.js": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+ "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/jsonwebtoken": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz",
+ "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==",
+ "dependencies": {
+ "jws": "^3.2.2",
+ "lodash": "^4.17.21",
+ "ms": "^2.1.1",
+ "semver": "^7.3.8"
+ },
+ "engines": {
+ "node": ">=12",
+ "npm": ">=6"
+ }
+ },
+ "node_modules/jsonwebtoken/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ },
+ "node_modules/jwa": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz",
+ "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==",
+ "dependencies": {
+ "buffer-equal-constant-time": "1.0.1",
+ "ecdsa-sig-formatter": "1.0.11",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/jws": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
+ "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+ "dependencies": {
+ "jwa": "^1.4.1",
+ "safe-buffer": "^5.0.1"
+ }
+ },
+ "node_modules/lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+ },
+ "node_modules/lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dependencies": {
+ "yallist": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/media-typer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+ "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/merge-descriptors": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+ "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="
+ },
+ "node_modules/methods": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+ "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mime": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+ "bin": {
+ "mime": "cli.js"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/mime-db": {
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/mime-types": {
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+ "dependencies": {
+ "mime-db": "1.52.0"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+ },
+ "node_modules/negotiator": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+ "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-inspect": {
+ "version": "1.12.3",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+ "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/on-finished": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+ "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+ "dependencies": {
+ "ee-first": "1.1.1"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/parseurl": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/path-to-regexp": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+ "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="
+ },
+ "node_modules/proxy-addr": {
+ "version": "2.0.7",
+ "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+ "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+ "dependencies": {
+ "forwarded": "0.2.0",
+ "ipaddr.js": "1.9.1"
+ },
+ "engines": {
+ "node": ">= 0.10"
+ }
+ },
+ "node_modules/qs": {
+ "version": "6.11.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+ "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+ "dependencies": {
+ "side-channel": "^1.0.4"
+ },
+ "engines": {
+ "node": ">=0.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/range-parser": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/raw-body": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+ "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+ "dependencies": {
+ "bytes": "3.1.2",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "unpipe": "1.0.0"
+ },
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ]
+ },
+ "node_modules/safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
+ "node_modules/semver": {
+ "version": "7.3.8",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+ "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+ "dependencies": {
+ "lru-cache": "^6.0.0"
+ },
+ "bin": {
+ "semver": "bin/semver.js"
+ },
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/send": {
+ "version": "0.18.0",
+ "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+ "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+ "dependencies": {
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "etag": "~1.8.1",
+ "fresh": "0.5.2",
+ "http-errors": "2.0.0",
+ "mime": "1.6.0",
+ "ms": "2.1.3",
+ "on-finished": "2.4.1",
+ "range-parser": "~1.2.1",
+ "statuses": "2.0.1"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/send/node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+ },
+ "node_modules/serve-static": {
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+ "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+ "dependencies": {
+ "encodeurl": "~1.0.2",
+ "escape-html": "~1.0.3",
+ "parseurl": "~1.3.3",
+ "send": "0.18.0"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/setprototypeof": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="
+ },
+ "node_modules/side-channel": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+ "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+ "dependencies": {
+ "call-bind": "^1.0.0",
+ "get-intrinsic": "^1.0.2",
+ "object-inspect": "^1.9.0"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/statuses": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/toidentifier": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
+ "engines": {
+ "node": ">=0.6"
+ }
+ },
+ "node_modules/type-is": {
+ "version": "1.6.18",
+ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+ "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+ "dependencies": {
+ "media-typer": "0.3.0",
+ "mime-types": "~2.1.24"
+ },
+ "engines": {
+ "node": ">= 0.6"
+ }
+ },
+ "node_modules/unpipe": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+ "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/utils-merge": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+ "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
+ "engines": {
+ "node": ">= 0.4.0"
+ }
+ },
+ "node_modules/uuid": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz",
+ "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==",
+ "bin": {
+ "uuid": "dist/bin/uuid"
+ }
+ },
+ "node_modules/vary": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+ "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+ }
+ }
+}
diff --git a/app/app_nodeToDo/backend/api/package.json b/app/app_nodeToDo/backend/api/package.json
new file mode 100644
index 000000000..993ba440e
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/package.json
@@ -0,0 +1,19 @@
+{
+ "name": "node-todo-api",
+ "version": "1.0.0",
+ "description": "The api for the node-todo application",
+ "main": "index.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "author": "Fabio Sereno",
+ "license": "MIT",
+ "dependencies": {
+ "body-parser": "^1.20.2",
+ "cors": "^2.8.5",
+ "crypto": "^1.0.1",
+ "express": "^4.18.2",
+ "jsonwebtoken": "^9.0.0",
+ "uuid": "^9.0.0"
+ }
+}
diff --git a/app/app_nodeToDo/backend/api/services/itemsService.js b/app/app_nodeToDo/backend/api/services/itemsService.js
new file mode 100644
index 000000000..deaa9f18e
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/services/itemsService.js
@@ -0,0 +1,128 @@
+const { v4: uuidv4 } = require('uuid');
+
+/**
+ * The items array
+*/
+const items = [
+ {
+ id: "example",
+ username: "user1",
+ description: "some item to do 1",
+ done: false,
+ modifiedOn: new Date(),
+ createdOn: new Date()
+ }
+]
+
+/**
+* Returns an array of items filtered by the provided username.
+* @param {string} username - The username to filter items by.
+* @returns {Array} An array of items filtered by the provided username.
+*/
+const getItems = (username) => {
+
+ if (!username) throw new Error("Invalid username provided");
+
+ const filteredItems = items.filter(x => x.username === username);
+
+ if (!filteredItems || filteredItems.length === 0) return [];
+
+ return filteredItems;
+};
+
+/**
+ * Get a specific item by its ID and the associated username
+ * @param {string} id - The ID of the item to get
+ * @param {string} username - The associated username for the item
+ * @returns {object} - The item object that matches the given ID and username
+ * @throws {Error} - Throws an error if the provided item ID or username is invalid, or if the item is not found
+ */
+const getItem = (id, username) => {
+
+ if (!id) throw new Error("Invalid item ID provided");
+ if (!username) throw new Error("Invalid username provided");
+
+ const filteredItems = items.find(x => x.id === id && x.username === username);
+
+ if (!filteredItems) throw new Error("Item not found for the given ID and username");
+
+ return filteredItems;
+};
+
+/**
+* Deletes an item from the list of items with the specified ID and username.
+* @param {string} id - The ID of the item to delete.
+* @param {string} username - The username associated with the item to delete.
+* @throws {Error} If the ID or username provided are invalid or if the item is not found.
+*/
+const deleteItem = (id, username) => {
+
+ if (!id) throw new Error("Invalid item ID provided");
+ if (!username) throw new Error("Invalid username provided");
+
+ const index = items.findIndex(x => x.id === id && x.username === username);
+
+ if (index !== -1) {
+ items.splice(index, 1);
+ } else {
+ throw new Error("Item not found for the given ID and username");
+ }
+};
+
+/**
+* Creates a new item and adds it to the list of items.
+* @param {object} item - The item object to be created. It should have an 'id', 'description' and 'done' property.
+* @param {string} username - The username of the item owner.
+* @throws {Error} If the 'item' parameter is not a valid object or if it's missing the 'id', 'description' or 'done' properties.
+* @throws {Error} If the 'username' parameter is not provided.
+*/
+const createItem = (item, username) => {
+
+ if (!item || typeof item !== 'object') throw new Error('Invalid item');
+ if (!item.description) throw new Error('Item id and description are required');
+ if (typeof item.done !== 'boolean') throw new Error('Item done must be a boolean');
+
+ item.id = uuidv4();
+ item.username = username;
+ item.modifiedOn = new Date();
+ item.createdOn = new Date();
+
+ items.push(item);
+};
+
+/**
+* Updates an existing item for the given username.
+* @param {object} item - The item object to update.
+* @param {string} username - The username of the user updating the item.
+* @throws {Error} If the item object is invalid, item ID is missing, or username is missing.
+* @throws {Error} If the item cannot be found for the given ID and username.
+* @returns {void}
+*/
+const updateItem = (item, username) => {
+
+ if (!item || typeof item !== 'object' || Array.isArray(item)) throw new Error("Invalid item object provided");
+ if (!item.id) throw new Error("Invalid item ID provided");
+ if (!username) throw new Error("Invalid username provided");
+
+ const index = items.findIndex(x => x.id === item.id && x.username === username);
+
+ if (index !== -1) {
+ const existing = items.find(x => x.id === item.id && x.username === username);
+ if (existing) {
+ item.modifiedOn = new Date();
+ items.splice(index, 1, { ...existing, ...item });
+ } else {
+ throw new Error("Item not found for the given ID and username");
+ }
+ } else {
+ throw new Error("Item not found for the given ID and username");
+ }
+};
+
+module.exports = {
+ getItems,
+ getItem,
+ deleteItem,
+ createItem,
+ updateItem
+}
diff --git a/app/app_nodeToDo/backend/api/services/userService.js b/app/app_nodeToDo/backend/api/services/userService.js
new file mode 100644
index 000000000..1a812987d
--- /dev/null
+++ b/app/app_nodeToDo/backend/api/services/userService.js
@@ -0,0 +1,275 @@
+const jwt = require('jsonwebtoken');
+const crypto = require("crypto");
+const { v4: uuidv4 } = require('uuid');
+
+// public members
+/**
+ * The registered users.
+*/
+const users = [];
+
+// private members
+/**
+ * JWT Whitelisted tokens. These are the logged in tokens.
+*/
+const _tokenWhitelist = [];
+
+/**
+ * The System Secret Key
+*/
+const secretKey = process.env.SECRET_KEY || 'secret_key';
+
+/**
+ * Middleware to check if user is authenticated
+ * @param {Object} req - Request object
+ * @param {Object} res - Response object
+ * @param {Function} next - Next function
+ */
+const isAuthenticated = (req, res, next) => {
+ const authHeader = req.headers.authorization;
+
+ if (!authHeader || !authHeader.startsWith('Bearer ')) {
+ return res.status(401).json({ message: 'Unauthorized' });
+ }
+
+ const bearerToken = extractBearerToken(req);
+
+ if (bearerToken) {
+
+ const isWhitelisted = _tokenWhitelist.some(x => x === bearerToken);
+
+ if (!isWhitelisted) {
+ return res.status(401).json({ message: 'Unauthorized' });
+ }
+
+ jwt.verify(bearerToken, secretKey, (err, decodedToken) => {
+
+ if (err) {
+ return res.sendStatus(403);
+ }
+
+ getUser(decodedToken.username);
+
+ next();
+ });
+ } else {
+ next();
+ }
+};
+
+/**
+ * Get current authenticated user
+ * @param {Object} req - Request object
+ * @param {Object} res - Response object
+ * @returns {Object} User object
+ */
+const getCurrentUser = (req) => {
+
+ const bearerToken = extractBearerToken(req);
+
+ if (bearerToken) {
+
+ return jwt.verify(bearerToken, secretKey, (err, decodedToken) => {
+
+ if (err) {
+ throw new Error('No user found!');
+ }
+
+ const user = getUser(decodedToken.username);
+
+ return user;
+
+ });
+
+ } else {
+ throw new Error('Unauthorized.');
+ }
+};
+
+/**
+ * Handles user login
+ * @param {string} username - User's username
+ * @param {string} password - User's password
+ * @param {Object} req - Request object
+ * @param {Object} res - Response object
+ * @returns {string} JWT token
+ */
+const handleLogin = (username, password, req) => {
+
+ const users = getUsers();
+
+ const user = users.find(x => x.username === username);
+
+ if (!user) {
+ throw new Error('Username or password does not match.');
+ }
+
+ const reHashedPassword = createHash(password);
+
+ if (user.password !== reHashedPassword) {
+ throw new Error('Username or password does not match.');
+ }
+
+ const payload = {
+ username: username
+ };
+
+ const token = jwt.sign(payload, secretKey, { expiresIn: '1h' });
+
+ removeDuplicateUserToken(username);
+
+ _tokenWhitelist.push(token);
+
+ return token;
+};
+
+/**
+ * Handles user logout
+ * @param {Object} req - Request object
+ * @returns {string} - The hashed password.
+ */
+const handleLogout = (req) => {
+
+ const bearerToken = extractBearerToken(req);
+
+ removeToken(bearerToken);
+
+ return true;
+};
+
+/**
+ * Removes a duplicate whitelisted user token
+ * There should only be one JWT per user, per login
+ * @param {string} username - The username to check already whitelisted
+ */
+const removeDuplicateUserToken = (username) => {
+
+ _tokenWhitelist.forEach((existingToken) => {
+
+ jwt.verify(existingToken, secretKey, (err, decodedToken) => {
+ if (username === decodedToken.username) {
+ removeToken(existingToken);
+ }
+ });
+ })
+}
+
+/**
+ * Removes a token form the whitelist
+ * @param {string} token - The token to remove
+ */
+const removeToken = (token) => {
+
+ const index = _tokenWhitelist.findIndex(x => x === token);
+
+ if (index !== -1) {
+ _tokenWhitelist.splice(index, 1);
+ } else {
+ throw new Error("Token not found. User not logged in.");
+ }
+}
+
+/**
+ * Register new user
+ * @param {string} username - User's username
+ * @param {string} password - User's password
+ * @param {Object} res - Response object
+ */
+const registerUser = (username, password) => {
+
+ const users = getUsers();
+
+ if (users.find(u => u.username === username)) {
+ throw new Error('User already exists.');
+ }
+
+ const id = uuidv4();
+ const hashedPassword = createHash(password);
+ const user = { id, username, password: hashedPassword };
+
+ users.push(user);
+};
+
+/**
+ * Retrieves all users.
+ * @returns {array} - Returns and array of all users
+ */
+const getUsers = () => users;
+
+/**
+ * Gets a specific user.
+ * @param {string} username - User's username
+ * @returns {} - Returns a user object
+*/
+const getUser = (username) => {
+
+ if (isUserExists(username)) {
+
+ return users.find(x => x.username === username);
+
+ } else {
+
+ throw new Error('User not found!');
+ }
+}
+
+/**
+ * Retrieves a user with the given username from the users array.
+ * @param {string} username - The username to retrieve.
+ * @returns {boolean} - True if the user exists, False is not found.
+ */
+const isUserExists = (username) => {
+
+ try {
+
+ return users.find(x => x.username === username) !== undefined;
+
+ } catch (err) {
+
+ throw new Error(`Failed to get user with username ${username}: ${err.message}`);
+ }
+};
+
+/**
+ * Creates a SHA512 hash of the given password.
+ * @param {string} password - The password to hash.
+ * @returns {string} - The hashed password.
+ */
+const createHash = (password) => {
+
+ try {
+ const hash = crypto.createHash("sha512");
+
+ hash.update(password);
+
+ return hash.digest("hex");
+
+ } catch (err) {
+
+ throw new Error(`Failed to create hash for password: ${err.message}`);
+ }
+};
+
+/**
+ * Extracts a JWT bearer token from the Authorization header of a request.
+ * @param {Object} req - The request object.
+ * @returns {string|null} - The bearer token, or null if no token was found.
+ */
+const extractBearerToken = (req) => {
+ try {
+ if (req.headers.authorization && req.headers.authorization.split(' ')[0] === 'Bearer') {
+ return req.headers.authorization.split(' ')[1];
+ }
+ return null;
+ } catch (err) {
+ throw new Error(`Failed to extract bearer token from request: ${err.message}`);
+ }
+};
+
+module.exports = {
+ isAuthenticated,
+ getCurrentUser,
+ handleLogin,
+ handleLogout,
+ registerUser
+};
\ No newline at end of file
diff --git a/app/app_awsDotNetCoreShoppingCart/pug/index.pug b/app/app_nodeToDo/pug/index.pug
similarity index 100%
rename from app/app_awsDotNetCoreShoppingCart/pug/index.pug
rename to app/app_nodeToDo/pug/index.pug
diff --git a/app/app_awsNodeToDoApi/sass/styles.scss b/app/app_nodeToDo/sass/styles.scss
similarity index 100%
rename from app/app_awsNodeToDoApi/sass/styles.scss
rename to app/app_nodeToDo/sass/styles.scss
diff --git a/app/app_awsNodeToDoApi/src/app.js b/app/app_nodeToDo/src/app.js
similarity index 87%
rename from app/app_awsNodeToDoApi/src/app.js
rename to app/app_nodeToDo/src/app.js
index fe6ec8b8c..23af9a9d8 100644
--- a/app/app_awsNodeToDoApi/src/app.js
+++ b/app/app_nodeToDo/src/app.js
@@ -11,13 +11,12 @@ import { SpinnerContextProvider } from '../../js/modules/react/spinnerComponent'
import { ToasterContextProvider } from '../../js/modules/react/toasterComponent';
import { ConfigContextProvider } from '../../js/modules/react/configContextProvider';
import { ItemsContextProvider } from './components/contextProviders/itemsContextProvider';
-import { POOL_DATA } from './constants';
function App() {
return (
-
+
-
+
diff --git a/app/app_awsNodeToDoApi/src/components/content.js b/app/app_nodeToDo/src/components/content.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/content.js
rename to app/app_nodeToDo/src/components/content.js
diff --git a/app/app_awsNodeToDoApi/src/components/contentContainer.js b/app/app_nodeToDo/src/components/contentContainer.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/contentContainer.js
rename to app/app_nodeToDo/src/components/contentContainer.js
diff --git a/app/app_awsNodeToDoApi/src/components/contextProviders/itemsContextProvider.js b/app/app_nodeToDo/src/components/contextProviders/itemsContextProvider.js
similarity index 91%
rename from app/app_awsNodeToDoApi/src/components/contextProviders/itemsContextProvider.js
rename to app/app_nodeToDo/src/components/contextProviders/itemsContextProvider.js
index 346b3050f..b43d55c30 100644
--- a/app/app_awsNodeToDoApi/src/components/contextProviders/itemsContextProvider.js
+++ b/app/app_nodeToDo/src/components/contextProviders/itemsContextProvider.js
@@ -9,16 +9,11 @@ export function ItemsContextProvider({ children }) {
const configContext = React.useContext(ConfigContext);
const loginContext = React.useContext(LoginContext);
-
const endpoints = configContext.appConfig.endpoints;
- const API_ENDPOINT = `${endpoints.base}/${endpoints.api}`;
-
+ const API_ENDPOINT = `${configContext.config.apiRoot}${endpoints.base}/`;
const selectedId = useRef();
-
const ver = useRef(0);
-
const [ version, setVersion ] = useState(ver.current);
-
const [items, setItems] = useState([]);
const incrementVersion = () => {
@@ -32,7 +27,7 @@ export function ItemsContextProvider({ children }) {
return XMLHttpRequestUtil.request({
type: "GET",
request: API_ENDPOINT,
- headers: [{ key: "Authorization", value: loginContext.token.current }]
+ headers: [{ key: "Authorization", value: loginContext.prepareToken() }]
});
}
@@ -40,7 +35,7 @@ export function ItemsContextProvider({ children }) {
return XMLHttpRequestUtil.request({
type: "GET",
request: `${API_ENDPOINT}/${selectedId.current}`,
- headers: [{ key: "Authorization", value: loginContext.token.current }]
+ headers: [{ key: "Authorization", value: loginContext.prepareToken() }]
});
}
@@ -48,7 +43,7 @@ export function ItemsContextProvider({ children }) {
return XMLHttpRequestUtil.request({
type: "DELETE",
request: `${API_ENDPOINT}/${id}`,
- headers: [{ key: "Authorization", value: loginContext.token.current }]
+ headers: [{ key: "Authorization", value: loginContext.prepareToken() }]
});
}
@@ -68,9 +63,9 @@ export function ItemsContextProvider({ children }) {
return XMLHttpRequestUtil.request({
type: "PUT",
- request: `${API_ENDPOINT}/${selectedId.current}`,
+ request: `${API_ENDPOINT}`,
payload: JSON.stringify(item),
- headers: [{ key: "Authorization", value: loginContext.token.current }]
+ headers: [{ key: "Authorization", value: loginContext.prepareToken() }]
});
}
@@ -78,14 +73,13 @@ export function ItemsContextProvider({ children }) {
const newItem = {...item};
- newItem.username = loginContext.username.current;
newItem.modifiedOn = _getModifiedOnTime();
return XMLHttpRequestUtil.request({
type: "POST",
request: API_ENDPOINT,
payload: JSON.stringify(newItem),
- headers: [{ key: "Authorization", value: loginContext.token.current }]
+ headers: [{ key: "Authorization", value: loginContext.prepareToken() }]
});
}
diff --git a/app/app_nodeToDo/src/components/contextProviders/loginContextProvider.js b/app/app_nodeToDo/src/components/contextProviders/loginContextProvider.js
new file mode 100644
index 000000000..ee9095994
--- /dev/null
+++ b/app/app_nodeToDo/src/components/contextProviders/loginContextProvider.js
@@ -0,0 +1,133 @@
+"use strict;"
+
+import React, { useState, useLayoutEffect, useRef } from 'react';
+import { LoginContext } from '../../contexts';
+import { ConfigContext } from '../../../../js/modules/react/configContextProvider';
+import { XMLHttpRequestUtil } from '../../../../js/modules/utils/xmlHttpRequestUtil';
+import { DeploymentModalComponent } from '../../../../js/modules/react/deploymentModalComponent.js';
+import { DeploymentUtil } from '../../../../js/modules/utils/deploymentUtil';
+
+const TOKEN_KEY = 'NODE_TODO_TOKEN';
+
+export const LoginContextProvider = ({ children }) => {
+
+ const configContext = React.useContext(ConfigContext);
+ const endpoints = configContext.appConfig.endpoints;
+ const API_ENDPOINT = `${configContext.config.apiRoot}${endpoints.base}/`;
+ const [ authenticated, setAuthenticated ] = useState(false);
+ const token = useRef(sessionStorage.getItem(TOKEN_KEY));
+ const [ showDeploymentModal, setShowDeploymentModal ] = useState(DeploymentUtil.isNotCloud());
+
+ const registerUser = (username, password) => {
+
+ const authenticationData = {
+ username,
+ password,
+ };
+
+ return XMLHttpRequestUtil.request({
+ type: "POST",
+ request: `${API_ENDPOINT}/register`,
+ payload: JSON.stringify(authenticationData),
+ headers: []
+ });
+ };
+
+ const getCurrentUser = (_token) => {
+ return XMLHttpRequestUtil.request({
+ type: "GET",
+ request: `${API_ENDPOINT}/user`,
+ headers: [{ key: "Authorization", value: prepareToken(_token) }]
+ });
+ };
+
+ const logoutUser = () => new Promise((resolve, reject) => {
+ XMLHttpRequestUtil.request({
+ type: "GET",
+ request: `${API_ENDPOINT}/logout`,
+ headers: [{ key: "Authorization", value: prepareToken() }]
+ }).then((response) => {
+ setAuthenticated(false)
+ sessionStorage.removeItem(TOKEN_KEY)
+ resolve(response);
+ }).catch(() => {
+ setAuthenticated(false)
+ reject();
+ } );
+ });
+
+ const loginUser = (username, password) => new Promise((resolve, reject) => {
+
+ const authenticationData = {
+ username,
+ password,
+ };
+
+ XMLHttpRequestUtil.request({
+ type: "POST",
+ request: `${API_ENDPOINT}/login`,
+ payload: JSON.stringify(authenticationData),
+ headers: []
+ }).then((response) => {
+ sessionStorage.setItem(TOKEN_KEY, response.data.token);
+ token.current = response.data.token;
+
+ setAuthenticated(true)
+
+ resolve(response);
+ }).catch((response) => {
+ setAuthenticated(false)
+ reject(response);
+ } );
+ });
+
+ useLayoutEffect(() => {
+ const _token = sessionStorage.getItem(TOKEN_KEY);
+
+ if(_token) {
+ getCurrentUser(_token)
+ .then(response => {
+ if (response.success) {
+ token.current = _token;
+ setAuthenticated(true);
+ }
+ })
+ .catch(() => setAuthenticated(false));
+ }
+ }, []);
+
+ const prepareToken = (_token) => `Bearer ${_token ? _token : token.current}`;
+
+ const handleDeploymentModalClose = () => {
+ setShowDeploymentModal(false);
+ }
+
+ const handleDeploymentModalShow = () => {
+ setShowDeploymentModal(true);
+ }
+
+ const context = {
+ authenticated,
+ setAuthenticated,
+ registerUser,
+ loginUser,
+ logoutUser,
+ token,
+ prepareToken,
+ showDeploymentModal,
+ isCloud: DeploymentUtil.isCloud(),
+ isNotCloud: DeploymentUtil.isNotCloud(),
+ handleDeploymentModalClose,
+ handleDeploymentModalShow
+ };
+
+ return (
+
+ {children}
+
+
+ )
+}
\ No newline at end of file
diff --git a/app/app_awsNodeToDoApi/src/components/contextProviders/manageContextProvider.js b/app/app_nodeToDo/src/components/contextProviders/manageContextProvider.js
similarity index 99%
rename from app/app_awsNodeToDoApi/src/components/contextProviders/manageContextProvider.js
rename to app/app_nodeToDo/src/components/contextProviders/manageContextProvider.js
index 70070f37a..8aabf4798 100644
--- a/app/app_awsNodeToDoApi/src/components/contextProviders/manageContextProvider.js
+++ b/app/app_nodeToDo/src/components/contextProviders/manageContextProvider.js
@@ -10,9 +10,7 @@ export const ManageContextProvider = ({ children }) => {
const spinnerContext = React.useContext(SpinnerContext);
const itemsContext = React.useContext(ItemsContext);
-
const [ showError, setShowError ] = useState(false);
-
const [ state, dispatch ] = useReducer(itemReducer, ITEM);
const doneCallback = () => {
diff --git a/app/app_awsNodeToDoApi/src/components/doneItem.js b/app/app_nodeToDo/src/components/doneItem.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/doneItem.js
rename to app/app_nodeToDo/src/components/doneItem.js
diff --git a/app/app_awsNodeToDoApi/src/components/item.js b/app/app_nodeToDo/src/components/item.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/item.js
rename to app/app_nodeToDo/src/components/item.js
diff --git a/app/app_awsNodeToDoApi/src/components/itemForm.js b/app/app_nodeToDo/src/components/itemForm.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/itemForm.js
rename to app/app_nodeToDo/src/components/itemForm.js
diff --git a/app/app_awsNodeToDoApi/src/components/itemToDo.js b/app/app_nodeToDo/src/components/itemToDo.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/itemToDo.js
rename to app/app_nodeToDo/src/components/itemToDo.js
diff --git a/app/app_awsNodeToDoApi/src/components/listContainer.js b/app/app_nodeToDo/src/components/listContainer.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/listContainer.js
rename to app/app_nodeToDo/src/components/listContainer.js
diff --git a/app/app_awsNodeToDoApi/src/components/listItems.js b/app/app_nodeToDo/src/components/listItems.js
similarity index 95%
rename from app/app_awsNodeToDoApi/src/components/listItems.js
rename to app/app_nodeToDo/src/components/listItems.js
index a613a3531..b50bb7313 100644
--- a/app/app_awsNodeToDoApi/src/components/listItems.js
+++ b/app/app_nodeToDo/src/components/listItems.js
@@ -37,13 +37,14 @@ export const ListItems = React.memo(({version}) => {
itemsContext.getItems()
.then(response => {
- const items = response.data || [];
+ const items = response.data.items || [];
items.sort(modifiedOnComparerDesc);
itemsContext.setItems(items);
spinnerContext.hideSpinner();
setHideItems(false);
- }).catch(() => manageContext.failCallback());
+ }).catch((err) => {
+ manageContext.failCallback()});
}, [version]);
return (
diff --git a/app/app_awsNodeToDoApi/src/components/loginForm.js b/app/app_nodeToDo/src/components/loginForm.js
similarity index 92%
rename from app/app_awsNodeToDoApi/src/components/loginForm.js
rename to app/app_nodeToDo/src/components/loginForm.js
index 6303c2394..65a0d913f 100644
--- a/app/app_awsNodeToDoApi/src/components/loginForm.js
+++ b/app/app_nodeToDo/src/components/loginForm.js
@@ -43,13 +43,17 @@ export function LoginForm() {
setShowValidation(true);
event.stopPropagation();
- } else {
+ } else if (loginContext.isCloud) {
spinnerContext.setShow(true);
loginContext.loginUser(username, password)
- .then(result => result.success ? loginDoneCallback() : loginFailCallback({ message: "Login failed!"}))
- .catch(result => loginFailCallback(result.error));
+ .then(response => response.success ? loginDoneCallback() : loginFailCallback({ message: "Login failed!"}))
+ .catch(response => loginFailCallback({ message: response.data.response }));
+ } else {
+
+ loginContext.handleDeploymentModalShow();
+
}
};
diff --git a/app/app_awsNodeToDoApi/src/components/logoutForm.js b/app/app_nodeToDo/src/components/logoutForm.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/logoutForm.js
rename to app/app_nodeToDo/src/components/logoutForm.js
diff --git a/app/app_awsNodeToDoApi/src/components/manageContainer.js b/app/app_nodeToDo/src/components/manageContainer.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/manageContainer.js
rename to app/app_nodeToDo/src/components/manageContainer.js
diff --git a/app/app_awsNodeToDoApi/src/components/pages/edit.js b/app/app_nodeToDo/src/components/pages/edit.js
similarity index 96%
rename from app/app_awsNodeToDoApi/src/components/pages/edit.js
rename to app/app_nodeToDo/src/components/pages/edit.js
index a61416597..357a2b4cb 100644
--- a/app/app_awsNodeToDoApi/src/components/pages/edit.js
+++ b/app/app_nodeToDo/src/components/pages/edit.js
@@ -17,13 +17,9 @@ export function Edit() {
const spinnerContext = React.useContext(SpinnerContext);
const history = useHistory();
-
const [state, dispatch] = useReducer(itemReducer, ITEM);
-
const doneCallback = () => history.push(MANAGE);
-
const failCallback = () => spinnerContext.hideSpinner();
-
const onBackClick = () => history.goBack();
useEffect(() => {
@@ -32,7 +28,7 @@ export function Edit() {
itemsContext.getItem()
.then(response => {
spinnerContext.hideSpinner();
- dispatch({ type: COPY, value: response.data });
+ dispatch({ type: COPY, value: response.data.item });
}).catch(() => failCallback());
} else {
history.push(MANAGE);
diff --git a/app/app_awsNodeToDoApi/src/components/pages/login.js b/app/app_nodeToDo/src/components/pages/login.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/pages/login.js
rename to app/app_nodeToDo/src/components/pages/login.js
diff --git a/app/app_awsNodeToDoApi/src/components/pages/logout.js b/app/app_nodeToDo/src/components/pages/logout.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/pages/logout.js
rename to app/app_nodeToDo/src/components/pages/logout.js
diff --git a/app/app_awsNodeToDoApi/src/components/pages/manage.js b/app/app_nodeToDo/src/components/pages/manage.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/pages/manage.js
rename to app/app_nodeToDo/src/components/pages/manage.js
diff --git a/app/app_awsNodeToDoApi/src/components/pages/register.js b/app/app_nodeToDo/src/components/pages/register.js
similarity index 100%
rename from app/app_awsNodeToDoApi/src/components/pages/register.js
rename to app/app_nodeToDo/src/components/pages/register.js
diff --git a/app/app_awsNodeToDoApi/src/components/pages/unauthorised.js b/app/app_nodeToDo/src/components/pages/unauthorised.js
similarity index 94%
rename from app/app_awsNodeToDoApi/src/components/pages/unauthorised.js
rename to app/app_nodeToDo/src/components/pages/unauthorised.js
index 52a5813e6..2da9565de 100644
--- a/app/app_awsNodeToDoApi/src/components/pages/unauthorised.js
+++ b/app/app_nodeToDo/src/components/pages/unauthorised.js
@@ -4,15 +4,12 @@ import React from 'react';
import { useHistory } from 'react-router-dom';
import { ContentContainer } from '../contentContainer';
import { Content } from '../content';
-import { Button } from 'react-bootstrap';
import { LOGIN, REGISTER } from '../../constants';
export function Unauthorised() {
const history = useHistory();
-
const onLoginClick = (e) => { e.preventDefault(); history.push(LOGIN)}
-
const onRegisterClick = (e) => { e.preventDefault(); history.push(REGISTER)}
return (
diff --git a/app/app_nodeToDo/src/components/protectedRoute.js b/app/app_nodeToDo/src/components/protectedRoute.js
new file mode 100644
index 000000000..3d928a9f7
--- /dev/null
+++ b/app/app_nodeToDo/src/components/protectedRoute.js
@@ -0,0 +1,39 @@
+"use strict;"
+
+import React, { useEffect, useState} from 'react';
+import { LoginContext } from '../contexts';
+import { Unauthorised } from './pages/unauthorised';
+import { SpinnerContext } from '../../../js/modules/react/spinnerComponent';
+
+export const ProtectedRoute = ({Component}) => {
+
+ const loginContext = React.useContext(LoginContext);
+ const spinnerContext = React.useContext(SpinnerContext);
+ const [ show, setShow ] = useState(false);
+
+ useEffect(() => {
+
+ spinnerContext.showSpinner();
+
+ const timeout = setTimeout(() => {
+
+ setShow(true)
+ spinnerContext.hideSpinner();
+
+ }, 500);
+
+ return () => clearTimeout(timeout);
+
+ }, []);
+
+ return (
+ <>
+ {show && loginContext.authenticated &&
+
+ }
+ {show && !loginContext.authenticated &&
+
+ }
+
+ );
+}
\ No newline at end of file
diff --git a/app/app_awsNodeToDoApi/src/components/registerForm.js b/app/app_nodeToDo/src/components/registerForm.js
similarity index 56%
rename from app/app_awsNodeToDoApi/src/components/registerForm.js
rename to app/app_nodeToDo/src/components/registerForm.js
index af7dfea33..84c81438d 100644
--- a/app/app_awsNodeToDoApi/src/components/registerForm.js
+++ b/app/app_nodeToDo/src/components/registerForm.js
@@ -1,64 +1,47 @@
"use strict;"
-import React, { useState, useLayoutEffect } from 'react';
+import React, { useState } from 'react';
import { useHistory } from 'react-router-dom';
import Col from 'react-bootstrap/Col';
import Button from 'react-bootstrap/Button';
import Form from 'react-bootstrap/Form';
-import { COMPLETE_CHALLENGE_ERROR, LOGIN, POOL_DATA, STANDARD_ERROR } from '../constants';
-import { CognitoUserPool, CognitoUserAttribute } from 'amazon-cognito-identity-js';
+import { LOGIN, STANDARD_ERROR } from '../constants';
import { SpinnerContext } from '../../../js/modules/react/spinnerComponent';
import { Row } from 'react-bootstrap';
import { ToasterContext, ENQUEUE_TOAST } from '../../../js/modules/react/toasterComponent';
import { ToolTip } from './tooltip';
-import ReCAPTCHA from "react-google-recaptcha";
-import { RecaptchaContext } from '../../../js/modules/react/recaptchaContextProvider';
+import { LoginContext } from '../contexts';
export function RegisterForm() {
+ const loginContext = React.useContext(LoginContext);
const spinnerContext = React.useContext(SpinnerContext);
const toasterContext = React.useContext(ToasterContext);
- const recaptchaContext = React.useContext(RecaptchaContext);
const [ showValidation, setShowValidation ] = useState(false);
const [ showFeedback, setShowFeedback ] = useState(false);
const [ feedbackErrors, setFeedbackErrors ] = useState([]);
const [ username, setUsername ] = useState("");
const [ password, setPassword ] = useState("");
- const [ name, setName ] = useState("");
const history = useHistory();
- useLayoutEffect(() => {
-
- if (recaptchaContext.recaptureIsActive && recaptchaContext.isRecaptchValid()) {
- hideErrors();
- }
-
- },[recaptchaContext.recaptchaToken])
-
const handleSubmit = (event) => {
event.preventDefault();
- if (!event.currentTarget.checkValidity() || (recaptchaContext.recaptureIsActive && !recaptchaContext.isRecaptchValid())) {
- setShowValidation(true);
-
- if (recaptchaContext.recaptureIsActive && !recaptchaContext.isRecaptchValid()) {
- showErrors(COMPLETE_CHALLENGE_ERROR);
- }
+ if (!event.currentTarget.checkValidity()) {
+ setShowValidation(true);
event.stopPropagation();
- } else {
+ } else if (loginContext.isCloud) {
spinnerContext.setShow(true);
+ register();
- if (recaptchaContext.recaptureIsActive) {
+ } else {
- recaptchaContext.verify(register, showErrors);
+ loginContext.handleDeploymentModalShow();
- } else {
- register();
- }
}
};
@@ -73,11 +56,6 @@ export function RegisterForm() {
setFeedbackErrors(errors);
setShowFeedback(true);
- if (recaptchaContext.recaptureIsActive) {
- recaptchaContext.setRecaptchaToken(null);
- recaptchaContext.recaptchaRef.current.reset();
- }
-
spinnerContext.setShow(false);
}
@@ -88,30 +66,18 @@ export function RegisterForm() {
const register = () => {
- const userPool = new CognitoUserPool(POOL_DATA);
-
- const attributeList = [
- new CognitoUserAttribute({
- Name: "name",
- Value: name
- })
- ];
-
- userPool.signUp(username, password, attributeList, null, (err, result) => {
-
- if (err != null) {
+ loginContext.registerUser(username, password).then(() => {
- showErrors(err.message);
-
- } else {
+ setShowValidation(false);
+ hideErrors();
- setShowValidation(false);
- hideErrors();
+ spinnerContext.setShow(false);
+ toasterContext.dispatch( { type: ENQUEUE_TOAST, item: { heading: "Registration Successful!", body: `You can now login using your credentials.` } } );
+ history.push(LOGIN);
- spinnerContext.setShow(false);
- toasterContext.dispatch( { type: ENQUEUE_TOAST, item: { heading: "Registration Successful!", body: `${name}, you can now login using your credentials.` } } );
- history.push(LOGIN);
- }
+ }).catch((err) => {
+ debugger;
+ showErrors(err.message)
});
}
@@ -119,23 +85,6 @@ export function RegisterForm() {
