Merge pull request #410 from nmarklund10/nmarklund10/issue-408/add-auditing

Nmarklund10/issue 408/add auditing

Author: blakenan-bellese

.github/workflows/ci.yml .github/workflows/main.yml.github/workflows/ci.yml renamed to .github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Bmore Responsive CI
+name: Bmore-Responsive
 
 on: push
 
@@ -30,15 +30,28 @@ jobs:
       - name: Install npm packages
         run: npm install
 
-      # - name: Audit npm packages
-      #   run: npm audit
+      - name: Audit npm packages
+        run: npm audit
 
   lint:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v2
 
+      - name: Restore node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
       - name: install eslint
         run: npm install eslint
 

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive.svg?branch=master)](https://travis-ci.org/CodeForBaltimore/Bmore-Responsive) [![codecov](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive/branch/master/graph/badge.svg)](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/CodeForBaltimore/Bmore-Responsive.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/CodeForBaltimore/Bmore-Responsive/context:javascript) [![Known Vulnerabilities](https://snyk.io/test/github/CodeForBaltimore/Bmore-Responsive/badge.svg)](https://snyk.io/test/github/CodeForBaltimore/Bmore-Responsive)
+[![Build Status](https://github.com/CodeForBaltimore/Bmore-Responsive/actions/workflows/ci.yml/badge.svg)](https://github.com/CodeForBaltimore/Bmore-Responsive/actions/workflows/ci.yml) [![codecov](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive/branch/master/graph/badge.svg)](https://codecov.io/gh/CodeForBaltimore/Bmore-Responsive) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/CodeForBaltimore/Bmore-Responsive.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/CodeForBaltimore/Bmore-Responsive/context:javascript) [![Known Vulnerabilities](https://snyk.io/test/github/CodeForBaltimore/Bmore-Responsive/badge.svg)](https://snyk.io/test/github/CodeForBaltimore/Bmore-Responsive)
 
 # Bmore Responsive
 

package-lock.json

@@ -34,9 +34,12 @@
   "dependencies": {
     "@babel/core": "7.12.17",
     "@babel/node": "7.12.17",
+    "@types/bluebird": "^3.5.36",
+    "ansi-regex": "^6.0.1",
+    "browserslist": "^4.19.3",
     "casbin": "4.7.2",
     "casbin-sequelize-adapter": "2.1.0",
-    "chai": "4.3.0",
+    "chai": "^4.3.6",
     "complexity": "0.0.6",
     "cors": "2.8.5",
     "crypto": "1.0.1",
@@ -48,33 +51,37 @@
     "json2csv": "^5.0.6",
     "jsonwebtoken": "8.5.1",
     "lodash": "^4.17.21",
-    "mocha": "8.3.0",
+    "mocha": "^9.2.1",
     "morgan": "1.10.0",
-    "nodemailer": "^6.4.18",
+    "nodemailer": "^6.7.2",
     "nodemon": "2.0.7",
     "nunjucks": "^3.2.3",
     "pg": "^8.5.1",
-    "random-words": "1.1.1",
-    "sequelize": "5.22.3",
-    "snyk": "^1.459.0",
+    "random-words": "^1.1.2",
+    "sequelize": "^6.17.0",
+    "sequelize-typescript": "^2.0.0",
+    "snyk": "^1.860.0",
     "supertest": "4.0.2",
-    "swagger-ui-express": "4.1.6",
+    "swagger-ui-express": "^4.3.0",
     "tls": "0.0.1",
     "uuid4": "1.1.4",
-    "validator": "12.2.0"
+    "validator": "^13.7.0",
+    "webpack": "^5.70.0"
   },
   "devDependencies": {
     "@babel/compat-data": "7.8.6",
     "@babel/polyfill": "7.8.3",
     "@babel/preset-env": "7.8.4",
     "@babel/register": "7.8.3",
     "all-contributors-cli": "6.14.1",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^8.2.3",
     "chakram": "^1.5.0",
     "codecov": "3.7.2",
-    "eslint": "7.7.0",
+    "eslint": "^8.10.0",
     "eslint-plugin-mocha": "8.0.0",
     "nyc": "15.0.0",
-    "sequelize-cli": "5.5.1"
+    "sequelize-cli": "^6.4.1"
   },
   "resolutions": {
     "@babel/preset-env": "7.8.4"

package.json

@@ -92,4 +92,4 @@ const contact = (sequelize, DataTypes) => {
   return Contact
 }
 
-export default contact
+module.exports = contact

src/models/contact.js

@@ -33,7 +33,7 @@ const entityContact = (sequelize, DataTypes) => {
   })
 
   EntityContact.createIfNew = async (ec) => {
-    let whereQuery = { 
+    let whereQuery = {
       entityId: ec.entityId,
       contactId: ec.contactId,
     }
@@ -59,4 +59,4 @@ const entityContact = (sequelize, DataTypes) => {
   return EntityContact
 }
 
-export default entityContact
+module.exports = entityContact

src/models/entity-contact.js

@@ -53,15 +53,15 @@ const entity = (sequelize, DataTypes) => {
     const entity = await Entity.findOne({
       where: { id }
     })
-        
+
     return entity
   }
 
   Entity.findByName = async (name) => {
     const entity = await Entity.findOne({
       where: { name }
     })
-        
+
     return entity
   }
 
@@ -87,4 +87,4 @@ const entity = (sequelize, DataTypes) => {
   return Entity
 }
 
-export default entity
+module.exports = entity

src/models/entity.js

@@ -57,7 +57,7 @@ fs
     return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js')
   })
   .forEach(file => {
-    models[_.upperFirst(_.camelCase(file.replace('.js', '')))] = sequelize.import(`./${file.replace('.js', '')}`)
+    models[_.upperFirst(_.camelCase(file.replace('.js', '')))] = require(`./${file.replace('.js', '')}`)(sequelize, Sequelize.DataTypes)
   })
 
 // Bringing it all together easily for use.

src/models/index.js

@@ -36,4 +36,4 @@ const userRole = (sequelize, DataTypes) => {
   return UserRole
 }
 
-export default userRole
+module.exports = userRole

src/models/user-role.js

@@ -134,4 +134,4 @@ const user = (sequelize, DataTypes) => {
   return User
 }
 
-export default user
+module.exports = user