Merge pull request #64 from joyja/auditFix

fixed npm audit vulnerabilities

jest.config.js

@@ -14,6 +14,6 @@ module.exports = {
   watchPlugins: [
     require.resolve('jest-watch-select-projects'),
     require.resolve('jest-watch-typeahead/filename'),
-    require.resolve('jest-watch-typeahead/testname')
-  ]
+    require.resolve('jest-watch-typeahead/testname'),
+  ],
 }

package.json

@@ -46,7 +46,7 @@
     "express": "^4.17.1",
     "graphql-yoga": "^1.18.3",
     "jsonwebtoken": "^8.5.1",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "make-promises-safe": "^5.1.0",
     "modbus-serial": "^8.0.1",
     "mqtt": "^4.0.1",

src/__tests__/auth.js

@@ -57,9 +57,9 @@ describe(`User:`, () => {
     const context = {
       request: {
         headers: {
-          authorization: `Bearer ${token}`
-        }
-      }
+          authorization: `Bearer ${token}`,
+        },
+      },
     }
     const user = await User.getUserFromContext(context)
     expect(user.username).toBe(`admin`)
@@ -70,9 +70,9 @@ describe(`User:`, () => {
     const context = {
       connection: {
         context: {
-          Authorization: `Bearer ${token}`
-        }
-      }
+          Authorization: `Bearer ${token}`,
+        },
+      },
     }
     const user = await User.getUserFromContext(context)
     expect(user.username).toBe(`admin`)
@@ -106,9 +106,9 @@ describe(`User:`, () => {
     const context = {
       request: {
         headers: {
-          authorization: `Bearer ${token}`
-        }
-      }
+          authorization: `Bearer ${token}`,
+        },
+      },
     }
     expect(
       await User.changePassword(
@@ -123,26 +123,26 @@ describe(`User:`, () => {
     const context = {
       request: {
         headers: {
-          authorization: `Bearer ${token}`
-        }
-      }
+          authorization: `Bearer ${token}`,
+        },
+      },
     }
     const user = await User.changePassword(context, 'password', 'newPassword')
     expect(await bcrypt.compare(`newPassword`, user.password)).toBe(true)
   })
   test(`getUserFromContext without valid token returns an error.`, async () => {
     const token = jwt.sign(
       {
-        userId: 123
+        userId: 123,
       },
       `aSecret`
     )
     const context = {
       request: {
         headers: {
-          authorization: `Bearer ${token}`
-        }
-      }
+          authorization: `Bearer ${token}`,
+        },
+      },
     }
     expect(
       await User.getUserFromContext(context).catch((e) => e)

src/__tests__/tag.js

@@ -7,7 +7,7 @@ const {
   ScanClass,
   Device,
   Service,
-  MqttSource
+  MqttSource,
 } = require('../relations')
 const fromUnixTime = require('date-fns/fromUnixTime')
 

src/database/__tests__/model.js

@@ -36,7 +36,7 @@ TestModel.table = 'test'
 describe(`executeQuery:`, () => {
   test('Called with undefined params calls db.all with empty object.', () => {
     const mockdb = {
-      all: jest.fn((sql, params, callback) => callback())
+      all: jest.fn((sql, params, callback) => callback()),
     }
     const sql = ``
     const params = undefined
@@ -54,7 +54,7 @@ describe(`executeQuery:`, () => {
 
 test('executeUpdate: Called with undefined params calls db.run with empty object.', () => {
   const mockdb = {
-    run: jest.fn((sql, params, callback) => callback())
+    run: jest.fn((sql, params, callback) => callback()),
   }
   const sql = ``
   const params = undefined
@@ -165,7 +165,7 @@ describe(`Model:`, () => {
     const result = await new Promise((resolve, reject) => {
       return db.run(
         `INSERT INTO test (testField) VALUES ("testValue")`,
-        function(error) {
+        function (error) {
           if (error) {
             reject(error)
           } else {

src/database/index.js

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

src/device/index.js

@@ -7,5 +7,5 @@ module.exports = {
   Modbus,
   ModbusSource,
   EthernetIP,
-  EthernetIPSource
+  EthernetIPSource,
 }

src/resolvers/DeviceConfig.js

@@ -3,5 +3,5 @@ async function __resolveType(parent, args, context, info) {
 }
 
 module.exports = {
-  __resolveType
+  __resolveType,
 }

src/resolvers/MqttPrimaryHost.js

@@ -1,7 +1,7 @@
-const recordCount = async function(parent, args, context, info) {
+const recordCount = async function (parent, args, context, info) {
   return parent.getRecordCount()
 }
 
 module.exports = {
-  recordCount
+  recordCount,
 }

src/resolvers/Mutation/auth.js

@@ -10,5 +10,5 @@ async function changePassword(root, args, context, info) {
 
 module.exports = {
   login,
-  changePassword
+  changePassword,
 }

src/resolvers/Mutation/index.js

@@ -7,5 +7,5 @@ module.exports = {
   ...auth,
   ...tag,
   ...device,
-  ...service
+  ...service,
 }

src/resolvers/Mutation/service/index.js

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

src/resolvers/Query/device.js

@@ -6,5 +6,5 @@ async function devices(root, args, context, info) {
 }
 
 module.exports = {
-  devices
+  devices,
 }

src/resolvers/Query/index.js

@@ -7,5 +7,5 @@ module.exports = {
   ...user,
   ...tag,
   ...device,
-  ...service
+  ...service,
 }

src/resolvers/Query/service.js

@@ -6,5 +6,5 @@ async function services(root, args, context, info) {
 }
 
 module.exports = {
-  services
+  services,
 }

src/resolvers/Query/tag.js

@@ -12,5 +12,5 @@ async function scanClasses(root, args, context, info) {
 
 module.exports = {
   tags,
-  scanClasses
+  scanClasses,
 }

src/resolvers/Query/user.js

@@ -5,5 +5,5 @@ async function user(root, args, context, info) {
 }
 
 module.exports = {
-  user
+  user,
 }

src/resolvers/Source.js

@@ -3,5 +3,5 @@ async function __resolveType(parent, args, context, info) {
 }
 
 module.exports = {
-  __resolveType
+  __resolveType,
 }

src/resolvers/Subscription/device.js

@@ -1,9 +1,9 @@
 const deviceUpdate = {
   subscribe: (root, args, context) => {
     return context.pubsub.asyncIterator(`deviceUpdate`)
-  }
+  },
 }
 
 module.exports = {
-  deviceUpdate
+  deviceUpdate,
 }

src/resolvers/Subscription/index.js

@@ -5,5 +5,5 @@ const service = require('./service')
 module.exports = {
   ...device,
   ...service,
-  ...tag
+  ...tag,
 }