From fb72927dfa306fa4de2ba10400aefbef8efe3762 Mon Sep 17 00:00:00 2001 From: Mansur Date: Thu, 17 Nov 2022 06:02:23 +0100 Subject: [PATCH 01/25] Update models to use UUIDs --- src/api/db/migrations/20221030092330-create-user.js | 4 ++-- src/api/db/migrations/20221030101534-create-notice.js | 4 ++-- .../migrations/20221030101627-create-assignment-score.js | 4 ++-- src/api/db/migrations/20221030101644-create-assignment.js | 4 ++-- src/api/db/migrations/20221030101723-create-message.js | 6 +++--- src/api/db/migrations/20221030101744-create-role.js | 4 ++-- .../db/migrations/20221030101838-create-class-teacher.js | 4 ++-- src/api/db/migrations/20221030101917-create-class.js | 4 ++-- .../db/migrations/20221030102005-create-class-student.js | 4 ++-- src/api/db/models/classstudent.js | 1 - src/api/db/models/classteacher.js | 7 ++++--- src/api/db/models/message.js | 5 +++++ src/api/db/models/notice.js | 5 +++++ 13 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/api/db/migrations/20221030092330-create-user.js b/src/api/db/migrations/20221030092330-create-user.js index b3b68d1..939e5c8 100644 --- a/src/api/db/migrations/20221030092330-create-user.js +++ b/src/api/db/migrations/20221030092330-create-user.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('Users', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, first_name: { type: Sequelize.STRING diff --git a/src/api/db/migrations/20221030101534-create-notice.js b/src/api/db/migrations/20221030101534-create-notice.js index 0546275..ce6610e 100644 --- a/src/api/db/migrations/20221030101534-create-notice.js +++ b/src/api/db/migrations/20221030101534-create-notice.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('Notices', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, notice: { type: Sequelize.STRING diff --git a/src/api/db/migrations/20221030101627-create-assignment-score.js b/src/api/db/migrations/20221030101627-create-assignment-score.js index 0bd0b09..4bfd995 100644 --- a/src/api/db/migrations/20221030101627-create-assignment-score.js +++ b/src/api/db/migrations/20221030101627-create-assignment-score.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('AssignmentScores', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, assignmentId: { type:Sequelize.STRING, diff --git a/src/api/db/migrations/20221030101644-create-assignment.js b/src/api/db/migrations/20221030101644-create-assignment.js index 2eb1c55..2a45364 100644 --- a/src/api/db/migrations/20221030101644-create-assignment.js +++ b/src/api/db/migrations/20221030101644-create-assignment.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('Assignments', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, assignment: { type: Sequelize.STRING diff --git a/src/api/db/migrations/20221030101723-create-message.js b/src/api/db/migrations/20221030101723-create-message.js index aa8ccb1..ec34991 100644 --- a/src/api/db/migrations/20221030101723-create-message.js +++ b/src/api/db/migrations/20221030101723-create-message.js @@ -5,10 +5,10 @@ module.exports = { await queryInterface.createTable('Messages', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER - }, + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 + }, message: { type: Sequelize.STRING }, diff --git a/src/api/db/migrations/20221030101744-create-role.js b/src/api/db/migrations/20221030101744-create-role.js index 54efd47..59ecb5f 100644 --- a/src/api/db/migrations/20221030101744-create-role.js +++ b/src/api/db/migrations/20221030101744-create-role.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('Roles', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, role: { type: Sequelize.STRING diff --git a/src/api/db/migrations/20221030101838-create-class-teacher.js b/src/api/db/migrations/20221030101838-create-class-teacher.js index a7efd88..067931a 100644 --- a/src/api/db/migrations/20221030101838-create-class-teacher.js +++ b/src/api/db/migrations/20221030101838-create-class-teacher.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('ClassTeachers', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, classId: { type: Sequelize.STRING diff --git a/src/api/db/migrations/20221030101917-create-class.js b/src/api/db/migrations/20221030101917-create-class.js index 539d29d..cafacfe 100644 --- a/src/api/db/migrations/20221030101917-create-class.js +++ b/src/api/db/migrations/20221030101917-create-class.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('Classes', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, className: { type: Sequelize.STRING diff --git a/src/api/db/migrations/20221030102005-create-class-student.js b/src/api/db/migrations/20221030102005-create-class-student.js index a63a08b..6a56a4b 100644 --- a/src/api/db/migrations/20221030102005-create-class-student.js +++ b/src/api/db/migrations/20221030102005-create-class-student.js @@ -5,9 +5,9 @@ module.exports = { await queryInterface.createTable('ClassStudents', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, classId: { type: Sequelize.STRING diff --git a/src/api/db/models/classstudent.js b/src/api/db/models/classstudent.js index 9ba2cd3..d7685e7 100644 --- a/src/api/db/models/classstudent.js +++ b/src/api/db/models/classstudent.js @@ -20,7 +20,6 @@ module.exports = (sequelize, DataTypes) => { type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, allowNull:false, - unique:true, primaryKey: true }, studentId:{ diff --git a/src/api/db/models/classteacher.js b/src/api/db/models/classteacher.js index 49d0dae..5f883ca 100644 --- a/src/api/db/models/classteacher.js +++ b/src/api/db/models/classteacher.js @@ -15,10 +15,11 @@ module.exports = (sequelize, DataTypes) => { } } ClassTeacher.init({ - id:{ + id: { + allowNull: false, + primaryKey: true, type: DataTypes.UUID, - allowNull:false, - primaryKey: true + defaultValue: DataTypes.UUIDV4 }, teacherId:{ type: DataTypes.UUID, diff --git a/src/api/db/models/message.js b/src/api/db/models/message.js index 95df839..68cb08c 100644 --- a/src/api/db/models/message.js +++ b/src/api/db/models/message.js @@ -16,6 +16,11 @@ module.exports = (sequelize, DataTypes) => { } } Message.init({ + id: { + allowNull: false, + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4 + }, message: { type:DataTypes.STRING, allowNull:false, diff --git a/src/api/db/models/notice.js b/src/api/db/models/notice.js index f91bab5..74b57d8 100644 --- a/src/api/db/models/notice.js +++ b/src/api/db/models/notice.js @@ -16,6 +16,11 @@ module.exports = (sequelize, DataTypes) => { } } Notice.init({ + id: { + allowNull: false, + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4 + }, notice: { type:DataTypes.STRING, allowNull:false, From 4323f648294748625d31373db85d4d7c22046552 Mon Sep 17 00:00:00 2001 From: Mansur Date: Thu, 17 Nov 2022 17:04:42 +0100 Subject: [PATCH 02/25] create seed files --- src/api/db/config/config.example.js | 23 +++++++++++ src/api/db/config/config.js | 12 +++--- src/api/db/models/user.js | 6 +-- src/api/db/seeders/20221117052621-User.js | 39 +++++++++++++++++++ src/api/db/seeders/20221117052728-Role.js | 25 ++++++++++++ src/api/db/seeders/20221117052755-Notice.js | 25 ++++++++++++ src/api/db/seeders/20221117052807-Message.js | 25 ++++++++++++ .../db/seeders/20221117052826-ClassTeacher.js | 25 ++++++++++++ .../db/seeders/20221117052849-ClassStudent.js | 25 ++++++++++++ src/api/db/seeders/20221117052907-Class.js | 25 ++++++++++++ .../db/seeders/20221117052927-Assignment.js | 25 ++++++++++++ .../seeders/20221117052946-AssignmentScore.js | 25 ++++++++++++ 12 files changed, 271 insertions(+), 9 deletions(-) create mode 100644 src/api/db/config/config.example.js create mode 100644 src/api/db/seeders/20221117052621-User.js create mode 100644 src/api/db/seeders/20221117052728-Role.js create mode 100644 src/api/db/seeders/20221117052755-Notice.js create mode 100644 src/api/db/seeders/20221117052807-Message.js create mode 100644 src/api/db/seeders/20221117052826-ClassTeacher.js create mode 100644 src/api/db/seeders/20221117052849-ClassStudent.js create mode 100644 src/api/db/seeders/20221117052907-Class.js create mode 100644 src/api/db/seeders/20221117052927-Assignment.js create mode 100644 src/api/db/seeders/20221117052946-AssignmentScore.js diff --git a/src/api/db/config/config.example.js b/src/api/db/config/config.example.js new file mode 100644 index 0000000..f92dc29 --- /dev/null +++ b/src/api/db/config/config.example.js @@ -0,0 +1,23 @@ +module.exports = { + "development": { + "username": "root", + "password": null, + "database": "database_development", + "host": "127.0.0.1", + "dialect": "mysql" + }, + "test": { + "username": "root", + "password": null, + "database": "database_test", + "host": "127.0.0.1", + "dialect": "mysql" + }, + "production": { + "username": "root", + "password": null, + "database": "database_production", + "host": "127.0.0.1", + "dialect": "mysql" + } +} diff --git a/src/api/db/config/config.js b/src/api/db/config/config.js index f92dc29..409797b 100644 --- a/src/api/db/config/config.js +++ b/src/api/db/config/config.js @@ -1,14 +1,14 @@ module.exports = { "development": { - "username": "root", - "password": null, - "database": "database_development", + "username": "postgres", + "password": "123456789", + "database": "ClassManager", "host": "127.0.0.1", - "dialect": "mysql" + "dialect": "postgres" }, "test": { - "username": "root", - "password": null, + "username": "postgres", + "password": "123456789", "database": "database_test", "host": "127.0.0.1", "dialect": "mysql" diff --git a/src/api/db/models/user.js b/src/api/db/models/user.js index 841dbb0..33b3428 100644 --- a/src/api/db/models/user.js +++ b/src/api/db/models/user.js @@ -25,13 +25,13 @@ module.exports = (sequelize, DataTypes) => { defaultValue: DataTypes.UUIDV4, primaryKey: true }, - first_name: { + firstName: { allowNull: false, type:DataTypes.STRING }, - last_name: { + lastName: { allowNull: false, type:DataTypes.STRING }, - second_name: DataTypes.STRING, + secondName: DataTypes.STRING, email: { type:DataTypes.STRING, unique:true, diff --git a/src/api/db/seeders/20221117052621-User.js b/src/api/db/seeders/20221117052621-User.js new file mode 100644 index 0000000..503f715 --- /dev/null +++ b/src/api/db/seeders/20221117052621-User.js @@ -0,0 +1,39 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + await queryInterface.bulkInsert('People', [{ + name: 'John Doe', + isBetaMember: false, + firstName: 'John', + lastName: 'Doe', + secondName: 'Nok', + email: 'example@example.com', + createdAt: new Date(), + updatedAt: new Date() + }], {}); + + [{ + + }] + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052728-Role.js b/src/api/db/seeders/20221117052728-Role.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052728-Role.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052755-Notice.js b/src/api/db/seeders/20221117052755-Notice.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052755-Notice.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052807-Message.js b/src/api/db/seeders/20221117052807-Message.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052807-Message.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052826-ClassTeacher.js b/src/api/db/seeders/20221117052826-ClassTeacher.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052826-ClassTeacher.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052849-ClassStudent.js b/src/api/db/seeders/20221117052849-ClassStudent.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052849-ClassStudent.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052907-Class.js b/src/api/db/seeders/20221117052907-Class.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052907-Class.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052927-Assignment.js b/src/api/db/seeders/20221117052927-Assignment.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052927-Assignment.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; diff --git a/src/api/db/seeders/20221117052946-AssignmentScore.js b/src/api/db/seeders/20221117052946-AssignmentScore.js new file mode 100644 index 0000000..48a68a0 --- /dev/null +++ b/src/api/db/seeders/20221117052946-AssignmentScore.js @@ -0,0 +1,25 @@ +'use strict'; + +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up (queryInterface, Sequelize) { + /** + * Add seed commands here. + * + * Example: + * await queryInterface.bulkInsert('People', [{ + * name: 'John Doe', + * isBetaMember: false + * }], {}); + */ + }, + + async down (queryInterface, Sequelize) { + /** + * Add commands to revert seed here. + * + * Example: + * await queryInterface.bulkDelete('People', null, {}); + */ + } +}; From 4c63ed7e752770186899e53ac0d0dd3e6bc6beed Mon Sep 17 00:00:00 2001 From: Mansur Date: Thu, 17 Nov 2022 17:11:52 +0100 Subject: [PATCH 03/25] create seed files --- .gitignore | 3 +++ src/api/db/config/config.example.js | 31 ++++++++++++++-------- src/api/db/config/config.js | 41 ++++++++++++++++++----------- 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index a8edfee..daf1ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,9 @@ pids *.seed *.pid.lock +# My DB config +src/api/db/config/config.js + # Directory for instrumented libs generated by jscoverage/JSCover lib-cov diff --git a/src/api/db/config/config.example.js b/src/api/db/config/config.example.js index f92dc29..b8cd2a1 100644 --- a/src/api/db/config/config.example.js +++ b/src/api/db/config/config.example.js @@ -1,23 +1,32 @@ + module.exports = { - "development": { + development: { + database: 'development_database', + username: 'root', + password: null, + host: '127.0.0.1', + dialect: 'postgres' + }, + local: { "username": "root", "password": null, - "database": "database_development", - "host": "127.0.0.1", - "dialect": "mysql" + "database": "local_database", + "host": "", + "dialect": "postgres" }, - "test": { + test: { "username": "root", "password": null, - "database": "database_test", + "database": "test_database", "host": "127.0.0.1", - "dialect": "mysql" + "dialect": "postgres" }, - "production": { + production: { "username": "root", "password": null, - "database": "database_production", + "database": "production_database", "host": "127.0.0.1", - "dialect": "mysql" + "dialect": "postgres" } -} +}; +//export default config; diff --git a/src/api/db/config/config.js b/src/api/db/config/config.js index 409797b..e826292 100644 --- a/src/api/db/config/config.js +++ b/src/api/db/config/config.js @@ -1,23 +1,32 @@ + module.exports = { - "development": { - "username": "postgres", - "password": "123456789", - "database": "ClassManager", - "host": "127.0.0.1", + development: { + database: 'classManager', + username: 'postgres', + password: "123456789", + host: '127.0.0.1', + dialect: 'postgres' + }, + local: { + "username": "tgsowrsnnwphjg", + "password": "da09381ea24589af12153a9aca04de1d9283245434520ba084ccc6b55065520d", + "database": "d3a0e6i6blrn6p", + "host": "https://ec2-3-227-68-43.compute-1.amazonaws.com", "dialect": "postgres" }, - "test": { - "username": "postgres", - "password": "123456789", - "database": "database_test", - "host": "127.0.0.1", - "dialect": "mysql" - }, - "production": { + test: { "username": "root", "password": null, - "database": "database_production", + "database": "classManager_test", "host": "127.0.0.1", - "dialect": "mysql" + "dialect": "postgres" + }, + production: { + "username": "tgsowrsnnwphjg", + "password": "da09381ea24589af12153a9aca04de1d9283245434520ba084ccc6b55065520d", + "database": "d3a0e6i6blrn6p", + "host": "ec2-3-227-68-43.compute-1.amazonaws.com", + "dialect": "postgres" } -} +}; +//export default config; From c9012f7c89e3d96c138f0dc902ca42e5976cf0a0 Mon Sep 17 00:00:00 2001 From: Judy Date: Thu, 24 Nov 2022 11:59:28 +0000 Subject: [PATCH 04/25] chore(assignment crud):add crud endpoints for assignments --- src/api/controllers/assignmentsController.js | 110 +++++++++++++++++++ src/api/db/models/assignment.js | 8 -- src/api/db/models/class.js | 4 - src/api/db/models/classteacher.js | 5 - src/api/db/models/user.js | 5 - src/api/routers/assignmentRouter.js | 12 ++ src/api/services/assignmentService.js | 68 ++++++++++++ src/index.js | 2 + 8 files changed, 192 insertions(+), 22 deletions(-) create mode 100644 src/api/controllers/assignmentsController.js create mode 100644 src/api/routers/assignmentRouter.js create mode 100644 src/api/services/assignmentService.js diff --git a/src/api/controllers/assignmentsController.js b/src/api/controllers/assignmentsController.js new file mode 100644 index 0000000..45bd09c --- /dev/null +++ b/src/api/controllers/assignmentsController.js @@ -0,0 +1,110 @@ +import AssignmentService from '../services/AssignmentService.js'; +import Util from '../utils/Utils.js'; + +const util = new Util(); + +class AssignmentController { + static async home(req, res) { + res.send(`

Welcome to the assignment Route

`) + } + + static async getAllAssignments(req, res) { + try { + const allAssignments = await AssignmentService.getAllAssignments(); + if (allAssignments.length > 0) { + util.setSuccess(200, 'Assignments retrieved', allAssignments); + } else { + util.setSuccess(200, 'No Assignment found in the database'); + } + return util.send(res); + } catch (error) { + util.setError(400, error); + return util.send(res); + } + } + + static async addAssignment(req, res) { + if (!req.body.Assignment || !req.body.senderId || !req.body.receiverId) { + util.setError(400, 'Please provide complete details of the Assignment'); + return util.send(res); + } + const newAssignment = req.body; + try { + const createdAssignment = await AssignmentService.addAssignment(newAssignment); + util.setSuccess(201, 'Assignment Added Successfully!', createdAssignment); + return util.send(res); + } catch (error) { + util.setError(400, error.Assignment); + return util.send(res); + } + } + + static async updatedAssignment(req, res) { + const alteredAssignment = req.body; + const { id } = req.params; + if (!Number(id)) { + util.setError(400, 'Please input a valid numeric value'); + return util.send(res); + } + try { + const updateAssignment = await AssignmentService.updateAssignment(id, alteredAssignment); + if (!updateAssignment) { + util.setError(404, `Cannot find a Assignment with the id: ${id}`); + } else { + util.setSuccess(200, 'Assignment updated', updateAssignment); + } + return util.send(res); + } catch (error) { + util.setError(404, error); + return util.send(res); + } + } + + static async getAAssignment(req, res) { + const { id } = req.params; + + if (!Number(id)) { + util.setError(400, 'Please input a valid numeric value'); + return util.send(res); + } + + try { + const theAssignment = await AssignmentService.getAAssignment(id); + + if (!theAssignment) { + util.setError(404, `Cannot find a Assignment with the id ${id}`); + } else { + util.setSuccess(200, 'Found Assignment', theAssignment); + } + return util.send(res); + } catch (error) { + util.setError(404, error); + return util.send(res); + } + } + + static async deleteAssignment(req, res) { + const { id } = req.params; + + if (!Number(id)) { + util.setError(400, 'Please provide a numeric value'); + return util.send(res); + } + + try { + const AssignmentToDelete = await AssignmentService.deleteAssignment(id); + + if (AssignmentToDelete) { + util.setSuccess(200, `Assignment with ${id} deleted`); + } else { + util.setError(404, `Assignment with the id ${id} cannot be found`); + } + return util.send(res); + } catch (error) { + util.setError(400, error); + return util.send(res); + } + } +} + +export default AssignmentController; \ No newline at end of file diff --git a/src/api/db/models/assignment.js b/src/api/db/models/assignment.js index 55de16d..0c12c0b 100644 --- a/src/api/db/models/assignment.js +++ b/src/api/db/models/assignment.js @@ -11,11 +11,7 @@ module.exports = (sequelize, DataTypes) => { */ static associate(models) { // define association here -<<<<<<< HEAD - Assignment.belongsTo(models.User, {foreignKey: 'teacherId', as: 'teacher'}); -======= // Assignment.belongsTo(models.User, {foreignKey: 'teacherId', as: 'teacher'}); ->>>>>>> 8f085e4edb2023272ebca0171aabbffe9a8178dd Assignment.belongsTo(models.User, {foreignKey: 'studentId', as: 'student'}); Assignment.belongsTo(models.Class, {foreignKey: 'classId', as: 'class'}); } @@ -37,12 +33,8 @@ module.exports = (sequelize, DataTypes) => { }, teacherId:{ type: DataTypes.UUID, -<<<<<<< HEAD - allowNull:false -======= allowNull:false, foreignKey:true ->>>>>>> 8f085e4edb2023272ebca0171aabbffe9a8178dd }, studentId:{ type: DataTypes.UUID, diff --git a/src/api/db/models/class.js b/src/api/db/models/class.js index 59df36a..8cc2e45 100644 --- a/src/api/db/models/class.js +++ b/src/api/db/models/class.js @@ -11,11 +11,7 @@ module.exports = (sequelize, DataTypes) => { */ static associate(models) { // define association here -<<<<<<< HEAD - Class.hasMany(models.ClassStudent, {as: 'student'}); -======= // Class.hasMany(models.ClassStudent, {as: 'student'}); ->>>>>>> 8f085e4edb2023272ebca0171aabbffe9a8178dd Class.hasMany(models.User, {as: 'teacher'}); } diff --git a/src/api/db/models/classteacher.js b/src/api/db/models/classteacher.js index 5fafe7d..49d0dae 100644 --- a/src/api/db/models/classteacher.js +++ b/src/api/db/models/classteacher.js @@ -10,13 +10,8 @@ module.exports = (sequelize, DataTypes) => { * The `models/index` file will call this method automatically. */ static associate(models) { -<<<<<<< HEAD - Class.belongsTo(models.Class, {foreignKey: 'classId', as: 'class'}); - Class.belongsTo(models.User, {foreignKey: 'teacherId', as: 'teacher'}); -======= ClassTeacher.belongsTo(models.Class, {foreignKey: 'classId', as: 'class'}); ClassTeacher.belongsTo(models.User, {foreignKey: 'teacherId', as: 'teacher'}); ->>>>>>> 8f085e4edb2023272ebca0171aabbffe9a8178dd } } ClassTeacher.init({ diff --git a/src/api/db/models/user.js b/src/api/db/models/user.js index 4fa0ac0..a43fd4e 100644 --- a/src/api/db/models/user.js +++ b/src/api/db/models/user.js @@ -14,13 +14,8 @@ module.exports = (sequelize, DataTypes) => { // define association here User.hasMany(models.Assignment, {foreignKey: 'assignmentId', as: 'assignment'}) User.hasMany(models.AssignmentScore, {foreignKey: 'assignmentScoreId', as: 'assignmentScore'}) -<<<<<<< HEAD - User.belongsTo(models.Message, {foreignKey: 'sender', as: 'sender'}); - User.belongsTo(models.Message, {foreignKey: 'receiver', as: 'receiver'}); -======= User.hasMany(models.Message, {foreignKey: 'senderId', as: 'sender'}); User.hasMany(models.Message, {foreignKey: 'receiverId', as: 'receiver'}); ->>>>>>> 8f085e4edb2023272ebca0171aabbffe9a8178dd User.belongsTo(models.Role, {foreignKey: 'roleId', as: 'role'}) } } diff --git a/src/api/routers/assignmentRouter.js b/src/api/routers/assignmentRouter.js new file mode 100644 index 0000000..d4b7d2a --- /dev/null +++ b/src/api/routers/assignmentRouter.js @@ -0,0 +1,12 @@ +import { Router } from "express"; +const assignmentRouter = Router(); +import AssignmentController from '../controllers/assignmentsController.js'; + +assignmentRouter.get('/home', AssignmentController.home); +assignmentRouter.get('/', AssignmentController.getAllAssignments); +assignmentRouter.post('/', AssignmentController.addAssignment); +assignmentRouter.get('/:id', AssignmentController.getAAssignment); +assignmentRouter.put('/:id', AssignmentController.updatedAssignment); +assignmentRouter.delete('/:id', AssignmentController.deleteAssignment); + +export { assignmentRouter }; \ No newline at end of file diff --git a/src/api/services/assignmentService.js b/src/api/services/assignmentService.js new file mode 100644 index 0000000..409fe23 --- /dev/null +++ b/src/api/services/assignmentService.js @@ -0,0 +1,68 @@ +import database from '../db/models/index.js'; + +class AssignmentService { + static async getAllAssignments() { + try { + const result = await database.Assignment.findAll(); + return result; + } catch (error) { + throw error; + } + } + + static async addAssignment(newAssignment) { + try { + const result = await database.Assignment.create(newAssignment); + return result; + } catch (error) { + throw error; + } + } + + static async updateAssignment(id, updateAssignment) { + try { + const AssignmentToUpdate = await database.Assignment.findOne({ + where: { id: Number(id) } + }); + + if (AssignmentToUpdate) { + await database.Assignment.update(updateAssignment, { where: { id: Number(id) } }); + + return updateAssignment; + } + return null; + } catch (error) { + throw error; + } + } + + static async getAAssignment(id) { + try { + const aAssignment = await database.Assignment.findOne({ + where: { id: Number(id) } + }); + + return aAssignment; + } catch (error) { + throw error; + } + } + + static async deleteAssignment(id) { + try { + const AssignmentToDelete = await database.Assignment.findOne({ where: { id: Number(id) } }); + + if (AssignmentToDelete) { + const deletedAssignment = await database.Assignment.destroy({ + where: { id: Number(id) } + }); + return deletedAssignment; + } + return null; + } catch (error) { + throw error; + } + } +} + +export default AssignmentService; diff --git a/src/index.js b/src/index.js index 6cd8823..861c24c 100644 --- a/src/index.js +++ b/src/index.js @@ -2,6 +2,7 @@ import express from "express"; import dotenv from "dotenv"; import messageRouter from "./api/routers/MessageRouter.js"; import { studentRouter } from './api/routers/studentsRoutes.js'; +import { assignmentRouter } from './api/routers/assignmentRouter.js'; const app = express(); dotenv.config(); @@ -10,6 +11,7 @@ app.use(express.json()); app.use(express.urlencoded()); app.use('/api/message', messageRouter); app.use('/api/students', studentRouter); +app.use('/api/assignment', assignmentRouter); app.get('/', (req, res) => { From 5aaadf4370167a28fda7a3b186846de5b2e1d7fa Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Mon, 28 Nov 2022 09:00:15 +0100 Subject: [PATCH 05/25] create seeders to run the seeders make sure you run the migrations: sequelize db:migrate then run the seeders: sequelize db:seed --- package-lock.json | 23 ++++++++++++----- package.json | 18 ++++++------- .../migrations/20221030092330-create-user.js | 19 +++++++++++--- .../20221030101534-create-notice.js | 10 ++++++++ .../20221030101627-create-assignment-score.js | 9 ++++--- .../20221030101644-create-assignment.js | 4 +++ .../20221030101838-create-class-teacher.js | 5 ++++ .../migrations/20221030101917-create-class.js | 4 +++ .../20221030102005-create-class-student.js | 5 ++++ src/api/db/seeders/20221117052621-User.js | 25 +++++++++++++------ src/api/db/seeders/20221117052728-Role.js | 19 ++++++++++++++ src/api/db/seeders/20221117052755-Notice.js | 15 +++++++++++ src/api/db/seeders/20221117052807-Message.js | 17 +++++++++++++ .../db/seeders/20221117052826-ClassTeacher.js | 14 +++++++++++ .../db/seeders/20221117052849-ClassStudent.js | 14 +++++++++++ src/api/db/seeders/20221117052907-Class.js | 14 +++++++++++ .../db/seeders/20221117052927-Assignment.js | 16 ++++++++++++ .../seeders/20221117052946-AssignmentScore.js | 16 ++++++++++++ src/api/services/MessageService.js | 4 +-- 19 files changed, 219 insertions(+), 32 deletions(-) diff --git a/package-lock.json b/package-lock.json index b964439..5e98c35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "body-parser": "^1.20.1", "dotenv": "^16.0.3", "express": "^4.18.2", + "faker": "^5.5.3", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" @@ -4177,6 +4178,11 @@ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true }, + "node_modules/faker": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz", + "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -5433,9 +5439,9 @@ } }, "node_modules/loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -11501,6 +11507,11 @@ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", "dev": true }, + "faker": { + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/faker/-/faker-5.5.3.tgz", + "integrity": "sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==" + }, "fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -12405,9 +12416,9 @@ "peer": true }, "loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "requires": { "big.js": "^5.2.2", diff --git a/package.json b/package.json index 65bcdf8..f77fb10 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,8 @@ { "name": "class-manager", - "version": "1.0.0", - "description": "", - "main": "./src/server.js", - + "version": "1.0.0", + "description": "", + "main": "./src/server.js", "scripts": { "start": "nodemon --exec babel-node ./src/server.js", "watch:dev": "nodemon ./src/server.js", @@ -21,12 +20,12 @@ "body-parser": "^1.20.1", "dotenv": "^16.0.3", "express": "^4.18.2", + "faker": "^5.5.3", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" }, "devDependencies": { - "nodemon": "^2.0.20", "@babel/cli": "^7.19.3", "@babel/core": "^7.19.6", "@babel/node": "^7.19.1", @@ -39,12 +38,13 @@ "chai-http": "^4.3.0", "eslint": "^8.26.0", "eslint-config-airbnb-base": "^15.0.0", - "eslint-plugin-import": "^2.26.0", "eslint-config-prettier": "^8.5.0", - "eslint-plugin-prettier": "^4.2.1", "eslint-plugin": "^1.0.1", - "prettier": "^2.7.1", + "eslint-plugin-import": "^2.26.0", + "eslint-plugin-prettier": "^4.2.1", "mocha": "^10.1.0", - "nyc": "^15.1.0" + "nodemon": "^2.0.20", + "nyc": "^15.1.0", + "prettier": "^2.7.1" } } diff --git a/src/api/db/migrations/20221030092330-create-user.js b/src/api/db/migrations/20221030092330-create-user.js index 939e5c8..822be96 100644 --- a/src/api/db/migrations/20221030092330-create-user.js +++ b/src/api/db/migrations/20221030092330-create-user.js @@ -6,12 +6,25 @@ module.exports = { id: { allowNull: false, primaryKey: true, - type: Sequelize.UUID, - defaultValue: Sequelize.UUIDV4 + type: Sequelize.UUID }, - first_name: { + firstName: { type: Sequelize.STRING }, + lastName: { + allowNull: false, + type:Sequelize.STRING + }, + secondName: Sequelize.STRING, + email: { + type:Sequelize.STRING, + unique:true, + allowNull:false + }, + password: { + type:Sequelize.STRING, + allowNull:false + }, createdAt: { allowNull: false, type: Sequelize.DATE diff --git a/src/api/db/migrations/20221030101534-create-notice.js b/src/api/db/migrations/20221030101534-create-notice.js index ce6610e..7aa66b7 100644 --- a/src/api/db/migrations/20221030101534-create-notice.js +++ b/src/api/db/migrations/20221030101534-create-notice.js @@ -12,6 +12,16 @@ module.exports = { notice: { type: Sequelize.STRING }, + classId: { + type: Sequelize.UUID, + allowNull:false, + foreignKey:true + }, + teacherId: { + type: Sequelize.UUID, + allowNull:false, + foreignKey:true + }, createdAt: { allowNull: false, type: Sequelize.DATE diff --git a/src/api/db/migrations/20221030101627-create-assignment-score.js b/src/api/db/migrations/20221030101627-create-assignment-score.js index 4bfd995..1b4c113 100644 --- a/src/api/db/migrations/20221030101627-create-assignment-score.js +++ b/src/api/db/migrations/20221030101627-create-assignment-score.js @@ -17,11 +17,12 @@ module.exports = { type:Sequelize.STRING, allowNull:false }, - studentId: { - type:Sequelize.STRING, - allowNull:false + teacherId: { + type: Sequelize.UUID, + allowNull:false, + foreignKey:true }, - teacher: { + studentId: { type:Sequelize.STRING, allowNull:false }, diff --git a/src/api/db/migrations/20221030101644-create-assignment.js b/src/api/db/migrations/20221030101644-create-assignment.js index 2a45364..a05221e 100644 --- a/src/api/db/migrations/20221030101644-create-assignment.js +++ b/src/api/db/migrations/20221030101644-create-assignment.js @@ -16,6 +16,10 @@ module.exports = { type: Sequelize.STRING, allowNull:false }, + teacherId:{ + type: Sequelize.UUID, + allowNull:false + }, studentId:{ type: Sequelize.STRING, allowNull:false diff --git a/src/api/db/migrations/20221030101838-create-class-teacher.js b/src/api/db/migrations/20221030101838-create-class-teacher.js index 067931a..871de47 100644 --- a/src/api/db/migrations/20221030101838-create-class-teacher.js +++ b/src/api/db/migrations/20221030101838-create-class-teacher.js @@ -12,6 +12,11 @@ module.exports = { classId: { type: Sequelize.STRING }, + teacherId:{ + type: Sequelize.UUID, + allowNull:false, + foreignKey:true + }, createdAt: { allowNull: false, type: Sequelize.DATE diff --git a/src/api/db/migrations/20221030101917-create-class.js b/src/api/db/migrations/20221030101917-create-class.js index cafacfe..7938bab 100644 --- a/src/api/db/migrations/20221030101917-create-class.js +++ b/src/api/db/migrations/20221030101917-create-class.js @@ -12,6 +12,10 @@ module.exports = { className: { type: Sequelize.STRING }, + year: { + type:Sequelize.STRING, + allowNull:false + }, createdAt: { allowNull: false, type: Sequelize.DATE diff --git a/src/api/db/migrations/20221030102005-create-class-student.js b/src/api/db/migrations/20221030102005-create-class-student.js index 6a56a4b..786cf0e 100644 --- a/src/api/db/migrations/20221030102005-create-class-student.js +++ b/src/api/db/migrations/20221030102005-create-class-student.js @@ -12,6 +12,11 @@ module.exports = { classId: { type: Sequelize.STRING }, + studentId:{ + type: Sequelize.UUID, + allowNull:false, + foreignKey:true + }, createdAt: { allowNull: false, type: Sequelize.DATE diff --git a/src/api/db/seeders/20221117052621-User.js b/src/api/db/seeders/20221117052621-User.js index 503f715..5deb3f1 100644 --- a/src/api/db/seeders/20221117052621-User.js +++ b/src/api/db/seeders/20221117052621-User.js @@ -1,6 +1,7 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +//import bcrypt from 'bcrypt' module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,20 +13,27 @@ module.exports = { * isBetaMember: false * }], {}); */ - await queryInterface.bulkInsert('People', [{ - name: 'John Doe', - isBetaMember: false, + await queryInterface.bulkInsert('Users', [{ + id: "c7a9122e-6694-11ed-9022-0242ac120005", firstName: 'John', lastName: 'Doe', secondName: 'Nok', - email: 'example@example.com', + email: 'example@example2.com', + password: 'nok', createdAt: new Date(), updatedAt: new Date() - }], {}); + }, + { + id: "c7a9122e-6694-11ed-9022-0242ac120006", + firstName: 'John', + lastName: 'Doe', + secondName: 'Nok', + email: 'example@example3.com', + password: 'nok', + createdAt: new Date(), + updatedAt: new Date() + }], {}); - [{ - - }] }, async down (queryInterface, Sequelize) { @@ -35,5 +43,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + await queryInterface.bulkDelete('Users', null, {}); } }; diff --git a/src/api/db/seeders/20221117052728-Role.js b/src/api/db/seeders/20221117052728-Role.js index 48a68a0..f6ccb3e 100644 --- a/src/api/db/seeders/20221117052728-Role.js +++ b/src/api/db/seeders/20221117052728-Role.js @@ -12,6 +12,24 @@ module.exports = { * isBetaMember: false * }], {}); */ + await queryInterface.bulkInsert('Roles', [{ + id: "c7a9122e-6694-11ed-9022-0242ac120001", + role: 'Admin', + createdAt: new Date(), + updatedAt: new Date() + }, + { + id: "c7a9122e-6694-11ed-9022-0242ac120002", + role: 'Student', + createdAt: new Date(), + updatedAt: new Date() + }, + { + id: "c7a9122e-6694-11ed-9022-0242ac120003", + role: 'Teacher', + createdAt: new Date(), + updatedAt: new Date() + }], {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +39,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + await queryInterface.bulkDelete('Roles', null, {}); } }; diff --git a/src/api/db/seeders/20221117052755-Notice.js b/src/api/db/seeders/20221117052755-Notice.js index 48a68a0..c8cca3f 100644 --- a/src/api/db/seeders/20221117052755-Notice.js +++ b/src/api/db/seeders/20221117052755-Notice.js @@ -1,6 +1,19 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') + +faker.seed(123); +const notices = [...Array(100)].map((notice) => ( + { + id: faker.datatype.uuid(), + notice: faker.lorem.sentences(3), + classId: faker.datatype.uuid(), + teacherId: faker.datatype.uuid(), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,6 +25,7 @@ module.exports = { * isBetaMember: false * }], {}); */ + return await queryInterface.bulkInsert('Notices', notices, {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +35,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + return await queryInterface.bulkDelete('People', null, {}); } }; diff --git a/src/api/db/seeders/20221117052807-Message.js b/src/api/db/seeders/20221117052807-Message.js index 48a68a0..ac54f37 100644 --- a/src/api/db/seeders/20221117052807-Message.js +++ b/src/api/db/seeders/20221117052807-Message.js @@ -1,7 +1,21 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') + +faker.seed(123); +const messages = [...Array(100)].map((message) => ( + { + id: faker.datatype.uuid(), + message: faker.lorem.sentence(), + senderId: faker.datatype.uuid(), + receiverId: faker.datatype.uuid(), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { + async up (queryInterface, Sequelize) { /** * Add seed commands here. @@ -12,6 +26,8 @@ module.exports = { * isBetaMember: false * }], {}); */ + return await queryInterface.bulkInsert('Messages', messages, {}); + }, async down (queryInterface, Sequelize) { @@ -21,5 +37,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + return await queryInterface.bulkDelete('Messages', null, {}); } }; diff --git a/src/api/db/seeders/20221117052826-ClassTeacher.js b/src/api/db/seeders/20221117052826-ClassTeacher.js index 48a68a0..fcea8d3 100644 --- a/src/api/db/seeders/20221117052826-ClassTeacher.js +++ b/src/api/db/seeders/20221117052826-ClassTeacher.js @@ -1,6 +1,18 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') + +faker.seed(123); +const classTeachers = [...Array(100)].map((classTeacher) => ( + { + id: faker.datatype.uuid(), + teacherId: faker.datatype.uuid(), + classId: faker.datatype.uuid(), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,6 +24,7 @@ module.exports = { * isBetaMember: false * }], {}); */ + return await queryInterface.bulkInsert('ClassTeachers', classTeachers, {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +34,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + return await queryInterface.bulkDelete('ClassTeachers', null, {}); } }; diff --git a/src/api/db/seeders/20221117052849-ClassStudent.js b/src/api/db/seeders/20221117052849-ClassStudent.js index 48a68a0..1439f3c 100644 --- a/src/api/db/seeders/20221117052849-ClassStudent.js +++ b/src/api/db/seeders/20221117052849-ClassStudent.js @@ -1,6 +1,18 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') + +faker.seed(123); +const classStudents = [...Array(100)].map((classStudent) => ( + { + id: faker.datatype.uuid(), + studentId: faker.datatype.uuid(), + classId: faker.datatype.uuid(), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,6 +24,7 @@ module.exports = { * isBetaMember: false * }], {}); */ + return await queryInterface.bulkInsert('ClassStudents', classStudents, {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +34,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + return await queryInterface.bulkDelete('People', null, {}); } }; diff --git a/src/api/db/seeders/20221117052907-Class.js b/src/api/db/seeders/20221117052907-Class.js index 48a68a0..fe8598c 100644 --- a/src/api/db/seeders/20221117052907-Class.js +++ b/src/api/db/seeders/20221117052907-Class.js @@ -1,6 +1,18 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') + +faker.seed(123); +const classes = [...Array(100)].map((classs) => ( + { + id: faker.datatype.uuid(), + className: faker.datatype.uuid(), + year: faker.date.between(), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,6 +24,7 @@ module.exports = { * isBetaMember: false * }], {}); */ + return await queryInterface.bulkInsert('Classes', classes, {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +34,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + return await queryInterface.bulkDelete('Classes', null, {}); } }; diff --git a/src/api/db/seeders/20221117052927-Assignment.js b/src/api/db/seeders/20221117052927-Assignment.js index 48a68a0..ea6ef48 100644 --- a/src/api/db/seeders/20221117052927-Assignment.js +++ b/src/api/db/seeders/20221117052927-Assignment.js @@ -1,6 +1,20 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') +faker.seed(123); + +const assignments = [...Array(100)].map((assignment) => ( + { + id: faker.datatype.uuid(), + teacherId: faker.datatype.uuid(), + classId: faker.datatype.uuid(), + studentId: faker.datatype.uuid(), + assignment: faker.system.filePath('pdf'), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,6 +26,7 @@ module.exports = { * isBetaMember: false * }], {}); */ + return await queryInterface.bulkInsert('Assignments', assignments, {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +36,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + await queryInterface.bulkDelete('Assignments', null, {}); } }; diff --git a/src/api/db/seeders/20221117052946-AssignmentScore.js b/src/api/db/seeders/20221117052946-AssignmentScore.js index 48a68a0..c8dce40 100644 --- a/src/api/db/seeders/20221117052946-AssignmentScore.js +++ b/src/api/db/seeders/20221117052946-AssignmentScore.js @@ -1,6 +1,20 @@ 'use strict'; /** @type {import('sequelize-cli').Migration} */ +const faker = require('faker') +faker.seed(123); + +const assignmentScores = [...Array(100)].map((assignmentScore) => ( + { + id: faker.datatype.uuid(), + teacherId: faker.datatype.uuid(), + assignmentId: faker.datatype.uuid(), + studentId: faker.datatype.uuid(), + score: faker.datatype.number(100), + createdAt: new Date(), + updatedAt: new Date() + } +)) module.exports = { async up (queryInterface, Sequelize) { /** @@ -12,6 +26,7 @@ module.exports = { * isBetaMember: false * }], {}); */ + await queryInterface.bulkInsert('AssignmentScores', assignmentScores, {}); }, async down (queryInterface, Sequelize) { @@ -21,5 +36,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ + await queryInterface.bulkDelete('AssignmentScores', null, {}); } }; diff --git a/src/api/services/MessageService.js b/src/api/services/MessageService.js index b897b40..b029a35 100644 --- a/src/api/services/MessageService.js +++ b/src/api/services/MessageService.js @@ -3,7 +3,7 @@ import database from '../db/models/index.js'; class MessageService { static async getAllMessages() { try { - const result = await database.Message.findAll(); + const result = await database.Message.findAll(); return result; } catch (error) { throw error; @@ -12,7 +12,7 @@ class MessageService { static async addMessage(newMessage) { try { - const result = await database.Message.create(newMessage); + const result = await database.Message.create(newMessage); return result; } catch (error) { throw error; From 5b034654ad7a70e158cfa9a7b2d90f657377e0e1 Mon Sep 17 00:00:00 2001 From: Judy Date: Mon, 28 Nov 2022 17:50:02 +0000 Subject: [PATCH 06/25] feat(README.md restructure):restructure the README.md file --- README.md | 70 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f7d562c..c54cd67 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,59 @@ # Class Manager -### Introduction - More information coming soon ... - -### Installation Guide -* Clone this repository [here](https://github.com/devcareer/class-manager.git). -* The main branch is the most stable branch at any given time, ensure you're working from it. -* Run npm install to install all dependencies -* Create an .env file in your project root folder and add your variables. See .env.example for assistance. -### Usage -* Run npm watch:dev to start the application. -### License -This project is available for use under the MIT License. \ No newline at end of file + +### The technologies used in creating this project are: +Node.js, ExpressJs, Sequelize ORM, and PostgreSQL + +### :rocket: How to get started +- Make sure to have Git and Node.js installed on your computer +- Clone the project by running: `git clone https://https://github.com/devcareer/class-manager` +- cd into the project and run `npm install` +- create a `config.js` file in the root folder and copy the content in the config.example.js`into it. +- run `sequelize db:migrate` to migrate to the database. +- run `npm start` to start the project. + +These are the HTTP response codes used in this project: +| Status Codes | Indication | +| --- | --- | +| `200` | This `OK` status code indicates that a request has succeeded | +| `400` | This `bad request error` status code indicates that the request sent to the server is incorrect | +| `500` | This `internal server error` status code indicates that something has gone wrong on the web server | + +
+ +The routes featured in this project: +| API routes(url) | Method | Description | +| --- | --- | --- | +| / | `GET` | Api home page | +| /messages | `GET` | Get all messages | +| /messages | `POST` | Create a message | +| /messages/id | `GET` | Get a message by id | +| /messages/id | `PUT` | Update message| +| /messages/id | `DELETE` | Delete message | +| /students | `GET` | Get all students | +| /students | `POST` | Create a student | +| /students/id | `GET` | Get a student by id | +| /students/id | `PUT` | Update student | +| /students/id | `DELETE` | Delete student | +| /teacher | `GET` | Get all teachers | +| /teacher | `POST` | Create a teacher | +| /teacher/id | `GET` | Get a teacher by id | +| /teacher/id | `PUT` | Update teacher | +| /teacher/id | `DELETE` | Delete teacher | +| /assignment | `GET` | Get all assignment | +| /assignment/id | `GET` | Get a assignment with id | +| /assignment/id | `PUT` | Update assignment | +| /assignment/id | `DELETE` | Delete assignment | + +
+ + +👤 **Authors**: + +| Github | Linkedin | +| ------------- | ------------- | +| [@bellogo](https://github.com/bellogo) | [Ufuoma Ogodo](https://ng.linkedin.com/in/ufuoma-ogodo) | +| [@judyseyram](https://github.com/JudySeyram) | [Judith Amegbe](https://gh.linkedin.com/in/amegbe-judith-5b881811a) | +| [@hazeem01](https://github.com/Hazeem01) | [Adenekan Abdulhazeem](https://www.linkedin.com/in/abdulhazeem-adenekan) | +| [@talktonok](https://github.com/talktonok) | [Mansur Ibrahim Nok](https://www.linkedin.com/in/mansuribrahimnok) | +| [@TijanAyo](https://github.com/TijanAyo) | [Tijani Ayomide](https://www.linkedin.com/in/tijanayo) | +| [@Ekemiben](https://github.com/ekemiben) | [Ekemini Ben](https://www.linkedin.com/in/ekemini-ben) | \ No newline at end of file From d8db09a5ff760d80a3e15d097211316cec1e6aa2 Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Wed, 30 Nov 2022 17:49:57 +0100 Subject: [PATCH 07/25] update class student --- src/db/migrations/20221030102005-create-class-student.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/db/migrations/20221030102005-create-class-student.js b/src/db/migrations/20221030102005-create-class-student.js index a335e2e..fa01c55 100644 --- a/src/db/migrations/20221030102005-create-class-student.js +++ b/src/db/migrations/20221030102005-create-class-student.js @@ -1,7 +1,4 @@ 'use strict'; - -const { DataTypes } = require('sequelize'); - /** @type {import('sequelize-cli').Migration} */ module.exports = { async up(queryInterface, Sequelize) { From 593b1f59c9b9036dfd38040951058781b6afbe3f Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Thu, 1 Dec 2022 11:12:38 +0100 Subject: [PATCH 08/25] seed database feat(seed):seed database tables create seeders to populate all database tables -to run the seeders 'run npm migrate' to populate all the tables --- .env.example | 7 +++- config.example.js | 7 ---- package.json | 3 ++ src/api/db/config/config.example.js | 32 ------------------- .../migrations/20221030092330-create-user.js | 2 +- .../20221030102005-create-class-student.js | 8 ++++- src/db/models/classstudent.js | 7 +++- src/db/models/user.js | 6 ++-- .../db/seeders/20221117052621-User.js | 14 ++++---- .../db/seeders/20221117052728-Role.js | 0 .../db/seeders/20221117052755-Notice.js | 0 .../db/seeders/20221117052807-Message.js | 0 .../db/seeders/20221117052826-ClassTeacher.js | 0 .../db/seeders/20221117052849-ClassStudent.js | 0 .../db/seeders/20221117052907-Class.js | 0 .../db/seeders/20221117052927-Assignment.js | 0 .../seeders/20221117052946-AssignmentScore.js | 0 17 files changed, 34 insertions(+), 52 deletions(-) delete mode 100644 config.example.js delete mode 100644 src/api/db/config/config.example.js rename src/{api => }/db/seeders/20221117052621-User.js (78%) rename src/{api => }/db/seeders/20221117052728-Role.js (100%) rename src/{api => }/db/seeders/20221117052755-Notice.js (100%) rename src/{api => }/db/seeders/20221117052807-Message.js (100%) rename src/{api => }/db/seeders/20221117052826-ClassTeacher.js (100%) rename src/{api => }/db/seeders/20221117052849-ClassStudent.js (100%) rename src/{api => }/db/seeders/20221117052907-Class.js (100%) rename src/{api => }/db/seeders/20221117052927-Assignment.js (100%) rename src/{api => }/db/seeders/20221117052946-AssignmentScore.js (100%) diff --git a/.env.example b/.env.example index 0b33b40..548c802 100644 --- a/.env.example +++ b/.env.example @@ -1 +1,6 @@ -PORT = \ No newline at end of file +DBNAME=database +DBUSER=postgres +DBPASSWORD=password +PORT=5432 +DBHOST=127.0.0.1 +SECRETKEY=any_secret \ No newline at end of file diff --git a/config.example.js b/config.example.js deleted file mode 100644 index 8d2620e..0000000 --- a/config.example.js +++ /dev/null @@ -1,7 +0,0 @@ -module.exports = { - "username": "username", - "password": "password", - "database": "databaseName", - "host": "127.0.0.1", - "dialect": "postgres" -} \ No newline at end of file diff --git a/package.json b/package.json index f77fb10..f4b2dfe 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,9 @@ "scripts": { "start": "nodemon --exec babel-node ./src/server.js", "watch:dev": "nodemon ./src/server.js", + "migrate": "sequelize db:migrate", + "migrate:undo": "sequelize db:migrate:undo:all", + "seed": "sequelize db:seed:all", "build": "rm -rf ./build && babel -d ./build ./src -s", "lint": "eslint --ext .js .", "lint:check": "eslint .", diff --git a/src/api/db/config/config.example.js b/src/api/db/config/config.example.js deleted file mode 100644 index b8cd2a1..0000000 --- a/src/api/db/config/config.example.js +++ /dev/null @@ -1,32 +0,0 @@ - -module.exports = { - development: { - database: 'development_database', - username: 'root', - password: null, - host: '127.0.0.1', - dialect: 'postgres' - }, - local: { - "username": "root", - "password": null, - "database": "local_database", - "host": "", - "dialect": "postgres" - }, - test: { - "username": "root", - "password": null, - "database": "test_database", - "host": "127.0.0.1", - "dialect": "postgres" - }, - production: { - "username": "root", - "password": null, - "database": "production_database", - "host": "127.0.0.1", - "dialect": "postgres" - } -}; -//export default config; diff --git a/src/db/migrations/20221030092330-create-user.js b/src/db/migrations/20221030092330-create-user.js index fd115d6..fc40bcc 100644 --- a/src/db/migrations/20221030092330-create-user.js +++ b/src/db/migrations/20221030092330-create-user.js @@ -8,7 +8,7 @@ module.exports = { primaryKey: true, type: Sequelize.UUID }, - firstName: { + first_name: { type: Sequelize.STRING }, last_name: { diff --git a/src/db/migrations/20221030102005-create-class-student.js b/src/db/migrations/20221030102005-create-class-student.js index fa01c55..bea5287 100644 --- a/src/db/migrations/20221030102005-create-class-student.js +++ b/src/db/migrations/20221030102005-create-class-student.js @@ -6,13 +6,19 @@ module.exports = { id: { allowNull: false, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID, + defaultValue: Sequelize.UUIDV4 }, studentId:{ type: Sequelize.UUID, allowNull:false, foreignKey:true }, + classId:{ + type: Sequelize .UUID, + allowNull:false, + foreignKey:true + }, createdAt: { allowNull: false, type: Sequelize.DATE diff --git a/src/db/models/classstudent.js b/src/db/models/classstudent.js index a044b93..c4afc74 100644 --- a/src/db/models/classstudent.js +++ b/src/db/models/classstudent.js @@ -26,7 +26,12 @@ module.exports = (sequelize, DataTypes) => { type: DataTypes.UUID, allowNull:false, foreignKey:true - } + }, + classId:{ + type: DataTypes.UUID, + allowNull:false, + foreignKey:true + }, }, { sequelize, modelName: 'ClassStudent', diff --git a/src/db/models/user.js b/src/db/models/user.js index 4b7f43b..529fd28 100644 --- a/src/db/models/user.js +++ b/src/db/models/user.js @@ -24,13 +24,13 @@ module.exports = (sequelize, DataTypes) => { defaultValue: DataTypes.UUIDV4, primaryKey: true }, - firstName: { + first_name: { allowNull: false, type:DataTypes.STRING }, - lastName: { + last_name: { allowNull: false, type:DataTypes.STRING }, - secondName: DataTypes.STRING, + second_name: DataTypes.STRING, email: { type:DataTypes.STRING, unique:true, diff --git a/src/api/db/seeders/20221117052621-User.js b/src/db/seeders/20221117052621-User.js similarity index 78% rename from src/api/db/seeders/20221117052621-User.js rename to src/db/seeders/20221117052621-User.js index 5deb3f1..2f72668 100644 --- a/src/api/db/seeders/20221117052621-User.js +++ b/src/db/seeders/20221117052621-User.js @@ -15,20 +15,22 @@ module.exports = { */ await queryInterface.bulkInsert('Users', [{ id: "c7a9122e-6694-11ed-9022-0242ac120005", - firstName: 'John', - lastName: 'Doe', - secondName: 'Nok', + first_name: 'John', + last_name: 'Doe', + second_name: 'Nok', email: 'example@example2.com', + roleId:'c7a9122e-6694-11ed-9022-0242ac120001', password: 'nok', createdAt: new Date(), updatedAt: new Date() }, { id: "c7a9122e-6694-11ed-9022-0242ac120006", - firstName: 'John', - lastName: 'Doe', - secondName: 'Nok', + first_name: 'John', + last_name: 'Doe', + second_name: 'Nok', email: 'example@example3.com', + roleId: 'c7a9122e-6694-11ed-9022-0242ac120003', password: 'nok', createdAt: new Date(), updatedAt: new Date() diff --git a/src/api/db/seeders/20221117052728-Role.js b/src/db/seeders/20221117052728-Role.js similarity index 100% rename from src/api/db/seeders/20221117052728-Role.js rename to src/db/seeders/20221117052728-Role.js diff --git a/src/api/db/seeders/20221117052755-Notice.js b/src/db/seeders/20221117052755-Notice.js similarity index 100% rename from src/api/db/seeders/20221117052755-Notice.js rename to src/db/seeders/20221117052755-Notice.js diff --git a/src/api/db/seeders/20221117052807-Message.js b/src/db/seeders/20221117052807-Message.js similarity index 100% rename from src/api/db/seeders/20221117052807-Message.js rename to src/db/seeders/20221117052807-Message.js diff --git a/src/api/db/seeders/20221117052826-ClassTeacher.js b/src/db/seeders/20221117052826-ClassTeacher.js similarity index 100% rename from src/api/db/seeders/20221117052826-ClassTeacher.js rename to src/db/seeders/20221117052826-ClassTeacher.js diff --git a/src/api/db/seeders/20221117052849-ClassStudent.js b/src/db/seeders/20221117052849-ClassStudent.js similarity index 100% rename from src/api/db/seeders/20221117052849-ClassStudent.js rename to src/db/seeders/20221117052849-ClassStudent.js diff --git a/src/api/db/seeders/20221117052907-Class.js b/src/db/seeders/20221117052907-Class.js similarity index 100% rename from src/api/db/seeders/20221117052907-Class.js rename to src/db/seeders/20221117052907-Class.js diff --git a/src/api/db/seeders/20221117052927-Assignment.js b/src/db/seeders/20221117052927-Assignment.js similarity index 100% rename from src/api/db/seeders/20221117052927-Assignment.js rename to src/db/seeders/20221117052927-Assignment.js diff --git a/src/api/db/seeders/20221117052946-AssignmentScore.js b/src/db/seeders/20221117052946-AssignmentScore.js similarity index 100% rename from src/api/db/seeders/20221117052946-AssignmentScore.js rename to src/db/seeders/20221117052946-AssignmentScore.js From 68ec1b7508e80e58ce5702ced805e53c60c43549 Mon Sep 17 00:00:00 2001 From: Judy Date: Thu, 1 Dec 2022 10:38:27 +0000 Subject: [PATCH 09/25] edit README.md --- .env.example | 7 ++++++- README.md | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index 0b33b40..98db207 100644 --- a/.env.example +++ b/.env.example @@ -1 +1,6 @@ -PORT = \ No newline at end of file +PORT = 3000 +DBNAME = databaseName +DBUSER = databaseUser +DBPASSWORD = databasePassword +DBHOST = 127.0.0.1 +DBDIALECT = postgres \ No newline at end of file diff --git a/README.md b/README.md index c54cd67..2da1500 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,10 @@ Node.js, ExpressJs, Sequelize ORM, and PostgreSQL - Make sure to have Git and Node.js installed on your computer - Clone the project by running: `git clone https://https://github.com/devcareer/class-manager` - cd into the project and run `npm install` -- create a `config.js` file in the root folder and copy the content in the config.example.js`into it. -- run `sequelize db:migrate` to migrate to the database. +- create a `.env` file in the root folder and copy the content in the `.env.example`into it. +- run `npm run migrate` to migrate to the database. +- run `npm run migrate:undo` to undo migration. +- run `npm run seed` to seed the database. - run `npm start` to start the project. These are the HTTP response codes used in this project: @@ -16,6 +18,7 @@ These are the HTTP response codes used in this project: | --- | --- | | `200` | This `OK` status code indicates that a request has succeeded | | `400` | This `bad request error` status code indicates that the request sent to the server is incorrect | +| `404` | This `not found error` status code indicates that the resource is not found. | | `500` | This `internal server error` status code indicates that something has gone wrong on the web server |
From 07d64b9b08e8f4dc9193b736ca035f6c3c148063 Mon Sep 17 00:00:00 2001 From: Judy Date: Thu, 1 Dec 2022 11:35:36 +0000 Subject: [PATCH 10/25] initial commit --- src/controllers/scoreController.js | 106 +++++++++++++++++++++++++++++ src/index.js | 2 + src/routers/scoreRouter.js | 11 +++ src/services/scoreService.js | 68 ++++++++++++++++++ 4 files changed, 187 insertions(+) create mode 100644 src/controllers/scoreController.js create mode 100644 src/routers/scoreRouter.js create mode 100644 src/services/scoreService.js diff --git a/src/controllers/scoreController.js b/src/controllers/scoreController.js new file mode 100644 index 0000000..c829003 --- /dev/null +++ b/src/controllers/scoreController.js @@ -0,0 +1,106 @@ +import ScoreService from '../services/ScoreService.js'; +import Util from '../utils/Utils.js'; + +const util = new Util(); + +class ScoreController { + static async getAllScore(req, res) { + try { + const allScore = await ScoreService.getAllScores(); + if (allScores.length > 0) { + util.setSuccess(200, 'Scores retrieved', allScores); + } else { + util.setSuccess(200, 'No Score found'); + } + return util.send(res); + } catch (error) { + util.setError(400, error); + return util.send(res); + } + } + + static async addScore(req, res) { + if (!req.body.Score || !req.body.senderId || !req.body.receiverId) { + util.setError(400, 'Please provide complete details'); + return util.send(res); + } + const newScore = req.body; + try { + const createdScore = await ScoreService.addScore(newScore); + util.setSuccess(201, 'Score Added!', createdScore); + return util.send(res); + } catch (error) { + util.setError(400, error.Score); + return util.send(res); + } + } + + static async updatedScore(req, res) { + const alteredScore = req.body; + const { id } = req.params; + if (!Number(id)) { + util.setError(400, 'Please input a valid numeric value'); + return util.send(res); + } + try { + const updateScore = await ScoreService.updateScore(id, alteredScore); + if (!updateScore) { + util.setError(404, `Cannot find Score with the id: ${id}`); + } else { + util.setSuccess(200, 'Score updated', updateScore); + } + return util.send(res); + } catch (error) { + util.setError(404, error); + return util.send(res); + } + } + + static async getAScore(req, res) { + const { id } = req.params; + + if (!Number(id)) { + util.setError(400, 'Please input a valid numeric value'); + return util.send(res); + } + + try { + const theScore = await ScoreService.getAScore(id); + + if (!theScore) { + util.setError(404, `Cannot find Score with the id ${id}`); + } else { + util.setSuccess(200, 'Found Score', theScore); + } + return util.send(res); + } catch (error) { + util.setError(404, error); + return util.send(res); + } + } + + static async deleteScore(req, res) { + const { id } = req.params; + + if (!Number(id)) { + util.setError(400, 'Please provide a numeric value'); + return util.send(res); + } + + try { + const ScoreToDelete = await ScoreService.deleteScore(id); + + if (ScoreToDelete) { + util.setSuccess(200, 'Score deleted'); + } else { + util.setError(404, `Score with the id ${id} cannot be found`); + } + return util.send(res); + } catch (error) { + util.setError(400, error); + return util.send(res); + } + } +} + +export default ScoreController; \ No newline at end of file diff --git a/src/index.js b/src/index.js index 37930d1..26ec4f8 100644 --- a/src/index.js +++ b/src/index.js @@ -3,6 +3,7 @@ import dotenv from "dotenv"; import { assignmentRouter } from './api/routers/assignmentRouter.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/studentsRoutes.js'; +import { scoreRouter } from './routers/scoreRoutes.js'; const app = express(); dotenv.config(); @@ -12,6 +13,7 @@ app.use(express.urlencoded({ extended: true })); app.use('/api/message', messageRouter); app.use('/api/students', studentRouter); app.use('/api/assignment', assignmentRouter); +app.use('/api/score', scoreRouter); app.get('/', (req, res) => { diff --git a/src/routers/scoreRouter.js b/src/routers/scoreRouter.js new file mode 100644 index 0000000..aeda73b --- /dev/null +++ b/src/routers/scoreRouter.js @@ -0,0 +1,11 @@ +import { Router } from 'express'; +import scoreController from '../controllers/scoreController.js'; + +const scoreRouter = Router(); + + +scoreRouter.post('/', scoreController.addScore); +scoreRouter.put('/:id', scoreController.updatedScore); +scoreRouter.delete('/:id', scoreController.deleteScore); + +export default scoreRouter; \ No newline at end of file diff --git a/src/services/scoreService.js b/src/services/scoreService.js new file mode 100644 index 0000000..c551164 --- /dev/null +++ b/src/services/scoreService.js @@ -0,0 +1,68 @@ +import database from '../db/models/index.js'; + +class ScoreService { + static async getAllScores() { + try { + const result = await database.Score.findAll(); + return result; + } catch (error) { + throw error; + } + } + + static async addScore(newScore) { + try { + const result = await database.Score.create(newScore); + return result; + } catch (error) { + throw error; + } + } + + static async updateScore(id, updateScore) { + try { + const ScoreToUpdate = await database.Score.findOne({ + where: { id: Number(id) } + }); + + if (ScoreToUpdate) { + await database.Score.update(updateScore, { where: { id: Number(id) } }); + + return updateScore; + } + return null; + } catch (error) { + throw error; + } + } + + static async getScore(id) { + try { + const Score = await database.Score.findOne({ + where: { id: Number(id) } + }); + + return Score; + } catch (error) { + throw error; + } + } + + static async deleteScore(id) { + try { + const ScoreToDelete = await database.Score.findOne({ where: { id: Number(id) } }); + + if (ScoreToDelete) { + const deletedScore = await database.Score.destroy({ + where: { id: Number(id) } + }); + return deletedScore; + } + return null; + } catch (error) { + throw error; + } + } +} + +export default ScoreService; From 8966bf372ca67e641604ca763f218af539a00afc Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Thu, 1 Dec 2022 23:27:32 +0100 Subject: [PATCH 11/25] install passport --- package-lock.json | 51 +++++++++++++++++++++ package.json | 7 +-- src/controllers/userController.js | 41 +++++++++++++++++ src/middleware/auth.js | 61 ++++++++++++++++++++++++++ src/services/userService.js | 73 +++++++++++++++++++++++++++++++ 5 files changed, 230 insertions(+), 3 deletions(-) create mode 100644 src/controllers/userController.js create mode 100644 src/middleware/auth.js create mode 100644 src/services/userService.js diff --git a/package-lock.json b/package-lock.json index 5e98c35..7f9057b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "dotenv": "^16.0.3", "express": "^4.18.2", "faker": "^5.5.3", + "passport": "^0.6.0", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" @@ -6473,6 +6474,31 @@ "node": ">= 0.8" } }, + "node_modules/passport": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz", + "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==", + "dependencies": { + "passport-strategy": "1.x.x", + "pause": "0.0.1", + "utils-merge": "^1.0.1" + }, + "engines": { + "node": ">= 0.4.0" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/jaredhanson" + } + }, + "node_modules/passport-strategy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", + "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==", + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -6520,6 +6546,11 @@ "node": "*" } }, + "node_modules/pause": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", + "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" + }, "node_modules/pg": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz", @@ -13192,6 +13223,21 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, + "passport": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz", + "integrity": "sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==", + "requires": { + "passport-strategy": "1.x.x", + "pause": "0.0.1", + "utils-merge": "^1.0.1" + } + }, + "passport-strategy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", + "integrity": "sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==" + }, "path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -13227,6 +13273,11 @@ "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true }, + "pause": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", + "integrity": "sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==" + }, "pg": { "version": "8.8.0", "resolved": "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz", diff --git a/package.json b/package.json index f4b2dfe..f091382 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,9 @@ "scripts": { "start": "nodemon --exec babel-node ./src/server.js", "watch:dev": "nodemon ./src/server.js", - "migrate": "sequelize db:migrate", - "migrate:undo": "sequelize db:migrate:undo:all", - "seed": "sequelize db:seed:all", + "migrate": "sequelize db:migrate", + "migrate:undo": "sequelize db:migrate:undo:all", + "seed": "sequelize db:seed:all", "build": "rm -rf ./build && babel -d ./build ./src -s", "lint": "eslint --ext .js .", "lint:check": "eslint .", @@ -24,6 +24,7 @@ "dotenv": "^16.0.3", "express": "^4.18.2", "faker": "^5.5.3", + "passport": "^0.6.0", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" diff --git a/src/controllers/userController.js b/src/controllers/userController.js new file mode 100644 index 0000000..0140b22 --- /dev/null +++ b/src/controllers/userController.js @@ -0,0 +1,41 @@ +const { create, authenticate, find } = require("../services/userService"); + +const handleSignup = async (req, res, next) => { + try { + const { name, email, password } = req.body; + const user = await find({ email }); + + if (user) { + throw new Error("Email already exists!"); + } + // Create a token for the user + const { token } = await create({ name, email, password }); + + // Send a token to the client when a user signs up + res.json({ token }); + } catch (error) { + next(error); + } +}; + +const handleLogin = async (req, res, next) => { + try { + const { email, password } = req.body; + const user = await find({ email }); + + if (!user) { + throw new Error("Unable to login"); + } + + // Create a token for the user, if successfully authenticated + const { token } = await authenticate({ email, password }); + res.json({ token }); + } catch (error) { + next(error); + } +}; + +module.exports = { + handleSignup, + handleLogin, +}; \ No newline at end of file diff --git a/src/middleware/auth.js b/src/middleware/auth.js new file mode 100644 index 0000000..df13b70 --- /dev/null +++ b/src/middleware/auth.js @@ -0,0 +1,61 @@ +// import the libraries and classes we need +require("dotenv").config(); // loads the environment variables into process.env +const passport = require("passport"); +const { Strategy, ExtractJwt } = require("passport-jwt"); + +const { find: findUser } = require("../services/users"); + +const { JWT_SECRET } = process.env; + +// Create a new instance of the JWT Passport.js strategy +const strategy = new Strategy( + // Pass an object literal as the first argument + // to new Strategy to control how a token is extracted from the request + { + // Extract the 'bearer' token from the authorization header, + // where the encoded JWT string is stored + jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(), + // A string for verifying the token's signature + secretOrKey: JWT_SECRET, + }, + async (jwtPayload, done) => { + try { + // jwtPayload contains the decoded JWT payload, + // which includes the user's id + // Find that user in the database + const user = await findUser({ id: jwtPayload.id }); + + if (!user) { + const err = new Error("User not found"); + err.statusCode = 404; + throw err; + } + + // done is an error-first callback with signature done(error, user, info) + // pass the found user to the route handler + done(null, user); + } catch (error) { + done(error); + } + } +); + +// Register the strategy configured above so that Passport.js can use it authentication +passport.use(strategy); + +// A middleware for initializing passport +const initialize = () => { + return passport.initialize(); +}; + +// Add this middleware to privileged routes later on +const authenticate = () => { + // Since you are using JWTs, you don't need to create a session, so set it to false here. + // Otherwise, Passport.js will attempt to create a session. + return passport.authenticate("jwt", { session: false }); +}; + +module.exports = { + initialize, + authenticate, +}; \ No newline at end of file diff --git a/src/services/userService.js b/src/services/userService.js new file mode 100644 index 0000000..2239859 --- /dev/null +++ b/src/services/userService.js @@ -0,0 +1,73 @@ +require("dotenv").config(); +const bcrypt = require("bcrypt"); +const fs = require("fs").promises; +const jwt = require("jsonwebtoken"); +const path = require("path"); + +const { JWT_SECRET } = process.env; +const usersFilePath = path.join(__dirname, "../../db/users.json"); + +// Authenticate the user and return an authorization token for the user. +// Use this function to authenticate a user who's logging in. +const authenticate = async ({ id, email, password }) => { + const user = await find({ email }); + // Hash the user's password and compare the result with the hash + // saved in the database to see if the password is correct. + const isPasswordValid = await bcrypt.compare(password, user.password); + + // Call jwt.sign(), which returns an authentication token. + // The first argument is an object that contains the data to + // be embedded in the token. You can pass in a unique identifier for + // the user, such as the user's id stored in the database. + // The second argument is a string, which could be any random series + // of characters used to sign the token to ensure the token has not been tampered with + // when it is sent back to the server later on. + // The third argument is a configuration object for the token. + const token = jwt.sign({ id: user.id }, JWT_SECRET, { + expiresIn: 24 * 60 * 60, // Expire tokens after a certain amount of time so users can't stay logged in forever + }); + + return { token }; +}; + +// Save the new user to the database and return an authorization token for the user +const create = async ({ email, name, password }) => { + const users = JSON.parse(await fs.readFile(usersFilePath)); + + const newUser = { + id: users.length + 1, // Not a robust database incrementor; don't use in production + email, + name, + // Here, pass the user's password to bcrypt's hash function to create a hash, + // which is stored in the database instead of the user's original password. + // Hashing is a one-way operation, so the hash cannot be reversed to its original form. + // The first argument is the password to be encrypted, and the second argument + // is the number of salt rounds. The higher the number of salt rounds used, + // the stronger the resulting hashed password becomes + password: await bcrypt.hash(password, 10), + }; + + // Generate the JWT with jwt.sign. The return value is an + // authentication token + const token = jwt.sign({ id: newUser.id }, JWT_SECRET, { + expiresIn: 24 * 60 * 60, // Expire tokens after a certain amount of time so users can't stay logged in forever + }); + + users.push(newUser); + + // save the new user to our database + await fs.writeFile(usersFilePath, JSON.stringify(users)); + + return { token }; +}; + +const find = async ({ id, email }) => { + const users = JSON.parse(await fs.readFile(usersFilePath)); + return users.find((user) => user.id === parseInt(id) || user.email === email); +}; + +module.exports = { + authenticate, + create, + find, +}; \ No newline at end of file From f337418c227b3f8259fda7f591664547491606ae Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Thu, 1 Dec 2022 23:31:40 +0100 Subject: [PATCH 12/25] install passport --- package-lock.json | 208 +++++++++++++++++++++++++++++++++++++++++++++- package.json | 2 + 2 files changed, 207 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f9057b..afbaae4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,9 @@ "dotenv": "^16.0.3", "express": "^4.18.2", "faker": "^5.5.3", + "jsonwebtoken": "^8.5.1", "passport": "^0.6.0", + "passport-jwt": "^4.0.0", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" @@ -2959,6 +2961,11 @@ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" } }, + "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/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -3470,6 +3477,14 @@ "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.2.tgz", "integrity": "sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==" }, + "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", @@ -5407,6 +5422,51 @@ "node": ">=6" } }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "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/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -5485,12 +5545,47 @@ "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", "dev": true }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -6491,6 +6586,15 @@ "url": "https://github.com/sponsors/jaredhanson" } }, + "node_modules/passport-jwt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz", + "integrity": "sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==", + "dependencies": { + "jsonwebtoken": "^8.2.0", + "passport-strategy": "^1.0.0" + } + }, "node_modules/passport-strategy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", @@ -7240,7 +7344,6 @@ "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, "bin": { "semver": "bin/semver" } @@ -10622,6 +10725,11 @@ "update-browserslist-db": "^1.0.9" } }, + "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==" + }, "buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", @@ -11002,6 +11110,14 @@ "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.2.tgz", "integrity": "sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==" }, + "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==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -12423,6 +12539,49 @@ "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", "dev": true }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "dependencies": { + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + } + } + }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -12483,12 +12642,47 @@ "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", "dev": true }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==" + }, "lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==" + }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -13233,6 +13427,15 @@ "utils-merge": "^1.0.1" } }, + "passport-jwt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/passport-jwt/-/passport-jwt-4.0.0.tgz", + "integrity": "sha512-BwC0n2GP/1hMVjR4QpnvqA61TxenUMlmfNjYNgK0ZAs0HK4SOQkHcSv4L328blNTLtHq7DbmvyNJiH+bn6C5Mg==", + "requires": { + "jsonwebtoken": "^8.2.0", + "passport-strategy": "^1.0.0" + } + }, "passport-strategy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", @@ -13762,8 +13965,7 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" }, "send": { "version": "0.18.0", diff --git a/package.json b/package.json index f091382..b40b5ca 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ "dotenv": "^16.0.3", "express": "^4.18.2", "faker": "^5.5.3", + "jsonwebtoken": "^8.5.1", "passport": "^0.6.0", + "passport-jwt": "^4.0.0", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" From 825e2c4d554ab63e5c9ee2cc5dd7a46d4d100bd2 Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Fri, 2 Dec 2022 02:53:46 +0100 Subject: [PATCH 13/25] user registration and login --- .env.example | 3 +- package-lock.json | 755 ++++++++++++++++-- package.json | 2 + src/controllers/userController.js | 57 +- .../migrations/20221030092330-create-user.js | 6 +- src/db/models/user.js | 6 +- src/db/seeders/20221117052621-User.js | 12 +- src/index.js | 6 + src/middleware/auth.js | 78 +- src/routers/userRouter.js | 8 + src/server.js | 2 +- src/services/MessageService.js | 11 +- src/services/studentService.js | 3 + src/services/userService.js | 90 +-- 14 files changed, 850 insertions(+), 189 deletions(-) create mode 100644 src/routers/userRouter.js diff --git a/.env.example b/.env.example index 548c802..e27115f 100644 --- a/.env.example +++ b/.env.example @@ -3,4 +3,5 @@ DBUSER=postgres DBPASSWORD=password PORT=5432 DBHOST=127.0.0.1 -SECRETKEY=any_secret \ No newline at end of file +SECRETKEY=any_secret +JWT_SECRET= \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index afbaae4..6798577 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,9 @@ "name": "class-manager", "version": "1.0.0", "dependencies": { + "bcrypt": "^5.1.0", "body-parser": "^1.20.1", + "cors": "^2.8.5", "dotenv": "^16.0.3", "express": "^4.18.2", "faker": "^5.5.3", @@ -2153,6 +2155,75 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "dependencies": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dependencies": { + "semver": "^6.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir/node_modules/semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@mapbox/node-pre-gyp/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/@nicolo-ribaudo/chokidar-2": { "version": "2.1.8-no-fsevents.3", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz", @@ -2459,8 +2530,7 @@ "node_modules/abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "node_modules/accepts": { "version": "1.3.8", @@ -2505,6 +2575,38 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, + "node_modules/agent-base/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/agent-base/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -2556,7 +2658,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -2598,12 +2699,42 @@ "node": ">=8" } }, + "node_modules/aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, "node_modules/archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", "dev": true }, + "node_modules/are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "dependencies": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/are-we-there-yet/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -2861,8 +2992,20 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/bcrypt": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.0.tgz", + "integrity": "sha512-RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.10", + "node-addon-api": "^5.0.0" + }, + "engines": { + "node": ">= 10.0.0" + } }, "node_modules/big.js": { "version": "5.2.2", @@ -2909,7 +3052,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3159,6 +3301,14 @@ "fsevents": "~2.3.2" } }, + "node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", @@ -3218,6 +3368,14 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, + "node_modules/color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "bin": { + "color-support": "bin.js" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3254,8 +3412,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/confusing-browser-globals": { "version": "1.0.11", @@ -3263,6 +3420,11 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "dev": true }, + "node_modules/console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -3337,6 +3499,18 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "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/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -3426,6 +3600,11 @@ "node": ">=0.4.0" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, "node_modules/depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -3443,6 +3622,14 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==", + "engines": { + "node": ">=8" + } + }, "node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -3499,8 +3686,7 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/emojis-list": { "version": "3.0.0", @@ -4404,6 +4590,17 @@ } ] }, + "node_modules/fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "dependencies": { + "minipass": "^3.0.0" + }, + "engines": { + "node": ">= 8" + } + }, "node_modules/fs-readdir-recursive": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", @@ -4413,8 +4610,7 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.2", @@ -4462,6 +4658,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "dependencies": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -4531,7 +4746,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4654,6 +4868,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, "node_modules/hasha": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", @@ -4712,6 +4931,39 @@ "node": ">= 0.8" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/https-proxy-agent/node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -4784,7 +5036,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4918,7 +5169,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, "engines": { "node": ">=8" } @@ -5767,7 +6017,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5784,6 +6033,40 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "dependencies": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", + "bin": { + "mkdirp": "bin/cmd.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/mocha": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz", @@ -5999,6 +6282,11 @@ "dev": true, "peer": true }, + "node_modules/node-addon-api": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz", + "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==" + }, "node_modules/node-environment-flags": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", @@ -6009,6 +6297,25 @@ "semver": "^5.7.0" } }, + "node_modules/node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", @@ -6094,6 +6401,17 @@ "node": ">=0.10.0" } }, + "node_modules/npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, "node_modules/nyc": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", @@ -6348,6 +6666,14 @@ "node": ">=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.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", @@ -6447,7 +6773,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -6616,7 +6941,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7250,7 +7574,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -7506,8 +7829,7 @@ "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "node_modules/setprototypeof": { "version": "1.2.0", @@ -7563,8 +7885,7 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/simple-update-notifier": { "version": "1.0.7", @@ -7682,7 +8003,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "dependencies": { "safe-buffer": "~5.1.0" } @@ -7690,14 +8010,12 @@ "node_modules/string_decoder/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -7739,7 +8057,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -7839,6 +8156,22 @@ "node": ">=6" } }, + "node_modules/tar": { + "version": "6.1.12", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz", + "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==", + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/terser": { "version": "5.15.1", "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", @@ -7985,6 +8318,11 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "node_modules/tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -8181,8 +8519,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/utils-merge": { "version": "1.0.1", @@ -8242,6 +8579,11 @@ "node": ">=10.13.0" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "node_modules/webpack": { "version": "5.74.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", @@ -8343,6 +8685,15 @@ "url": "https://opencollective.com/webpack" } }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -8380,6 +8731,14 @@ "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", "dev": true }, + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "dependencies": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, "node_modules/wkx": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", @@ -8456,8 +8815,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/write-file-atomic": { "version": "3.0.3", @@ -10061,6 +10419,55 @@ "@jridgewell/sourcemap-codec": "1.4.14" } }, + "@mapbox/node-pre-gyp": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.10.tgz", + "integrity": "sha512-4ySo4CjzStuprMwk35H5pPbkymjv1SF3jGLj6rAHp/xT/RF7TL7bd9CTm1xDY49K2qF7jmR/g7k+SkLETP6opA==", + "requires": { + "detect-libc": "^2.0.0", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.7", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "dependencies": { + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "requires": { + "semver": "^6.0.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } + }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, + "semver": { + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "requires": { + "lru-cache": "^6.0.0" + } + } + } + }, "@nicolo-ribaudo/chokidar-2": { "version": "2.1.8-no-fsevents.3", "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz", @@ -10358,8 +10765,7 @@ "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, "accepts": { "version": "1.3.8", @@ -10391,6 +10797,29 @@ "dev": true, "requires": {} }, + "agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "requires": { + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -10429,8 +10858,7 @@ "ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" }, "ansi-styles": { "version": "3.2.1", @@ -10460,12 +10888,38 @@ "default-require-extensions": "^3.0.0" } }, + "aproba": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", + "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", "dev": true }, + "are-we-there-yet": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", + "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^3.6.0" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -10654,8 +11108,16 @@ "balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "bcrypt": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.0.tgz", + "integrity": "sha512-RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.10", + "node-addon-api": "^5.0.0" + } }, "big.js": { "version": "5.2.2", @@ -10692,7 +11154,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -10865,6 +11326,11 @@ "readdirp": "~3.6.0" } }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, "chrome-trace-event": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", @@ -10915,6 +11381,11 @@ "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", "dev": true }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==" + }, "combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -10945,8 +11416,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "confusing-browser-globals": { "version": "1.0.11", @@ -10954,6 +11424,11 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "dev": true }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==" + }, "content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -11010,6 +11485,15 @@ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "dev": true }, + "cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -11075,6 +11559,11 @@ "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==" + }, "depd": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", @@ -11085,6 +11574,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==" }, + "detect-libc": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz", + "integrity": "sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==" + }, "diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -11132,8 +11626,7 @@ "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "emojis-list": { "version": "3.0.0", @@ -11810,6 +12303,14 @@ "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", "dev": true }, + "fs-minipass": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", + "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", + "requires": { + "minipass": "^3.0.0" + } + }, "fs-readdir-recursive": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", @@ -11819,8 +12320,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "fsevents": { "version": "2.3.2", @@ -11852,6 +12352,22 @@ "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true }, + "gauge": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", + "requires": { + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "object-assign": "^4.1.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + } + }, "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -11900,7 +12416,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -11987,6 +12502,11 @@ "has-symbols": "^1.0.2" } }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==" + }, "hasha": { "version": "5.2.2", "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", @@ -12030,6 +12550,30 @@ "toidentifier": "1.0.1" } }, + "https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + } + } + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -12081,7 +12625,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -12175,8 +12718,7 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-glob": { "version": "4.0.3", @@ -12815,7 +13357,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -12826,6 +13367,28 @@ "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", "dev": true }, + "minipass": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", + "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", + "requires": { + "yallist": "^4.0.0" + } + }, + "minizlib": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", + "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", + "requires": { + "minipass": "^3.0.0", + "yallist": "^4.0.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, "mocha": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz", @@ -12988,6 +13551,11 @@ "dev": true, "peer": true }, + "node-addon-api": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.0.0.tgz", + "integrity": "sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==" + }, "node-environment-flags": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", @@ -12998,6 +13566,14 @@ "semver": "^5.7.0" } }, + "node-fetch": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", + "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "node-preload": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", @@ -13063,6 +13639,17 @@ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true }, + "npmlog": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz", + "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==", + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^3.0.0", + "set-blocking": "^2.0.0" + } + }, "nyc": { "version": "15.1.0", "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz", @@ -13259,6 +13846,11 @@ } } }, + "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==" + }, "object-inspect": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", @@ -13328,7 +13920,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "requires": { "wrappy": "1" } @@ -13450,8 +14041,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" }, "path-key": { "version": "3.1.1", @@ -13916,7 +14506,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "requires": { "glob": "^7.1.3" } @@ -14068,8 +14657,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" }, "setprototypeof": { "version": "1.2.0", @@ -14113,8 +14701,7 @@ "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "simple-update-notifier": { "version": "1.0.7", @@ -14206,7 +14793,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, "requires": { "safe-buffer": "~5.1.0" }, @@ -14214,8 +14800,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" } } }, @@ -14223,7 +14808,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -14256,7 +14840,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "requires": { "ansi-regex": "^5.0.1" } @@ -14330,6 +14913,19 @@ "dev": true, "peer": true }, + "tar": { + "version": "6.1.12", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz", + "integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==", + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, "terser": { "version": "5.15.1", "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", @@ -14431,6 +15027,11 @@ "nopt": "~1.0.10" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, "tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -14577,8 +15178,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "utils-merge": { "version": "1.0.1", @@ -14620,6 +15220,11 @@ "graceful-fs": "^4.1.2" } }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, "webpack": { "version": "5.74.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", @@ -14692,6 +15297,15 @@ "dev": true, "peer": true }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "requires": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -14720,6 +15334,14 @@ "integrity": "sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==", "dev": true }, + "wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", + "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", + "requires": { + "string-width": "^1.0.2 || 2 || 3 || 4" + } + }, "wkx": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/wkx/-/wkx-0.5.0.tgz", @@ -14780,8 +15402,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "write-file-atomic": { "version": "3.0.3", diff --git a/package.json b/package.json index b40b5ca..5f21d3e 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,9 @@ "coverage": "nyc npm test && npm run generate-lcov && npm run coveralls-coverage && npm run codeclimate-coverage" }, "dependencies": { + "bcrypt": "^5.1.0", "body-parser": "^1.20.1", + "cors": "^2.8.5", "dotenv": "^16.0.3", "express": "^4.18.2", "faker": "^5.5.3", diff --git a/src/controllers/userController.js b/src/controllers/userController.js index 0140b22..fde1f75 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -1,41 +1,66 @@ -const { create, authenticate, find } = require("../services/userService"); +import userService from "../services/userService"; +import Util from '../utils/Utils'; +const util = new Util(); const handleSignup = async (req, res, next) => { try { - const { name, email, password } = req.body; - const user = await find({ email }); + // try { + // const allMessages = await MessageService.getAllMessages(); + // if (allMessages.length > 0) { + // util.setSuccess(200, 'Messages retrieved', allMessages); + // } else { + // util.setSuccess(200, 'No Message found'); + // } + // return util.send(res); + // } catch (error) { + // util.setError(400, error); + // return util.send(res); + // } + + const { firstName, lastName, secondName, email, roleId, password } = req.body; + const user = await userService.findUser({email}); if (user) { - throw new Error("Email already exists!"); - } + util.setSuccess(200, 'Email already exists!'); + //throw new Error("Email already exists!"); + }else{ // Create a token for the user - const { token } = await create({ name, email, password }); - + const { token } = await userService.create({ firstName, lastName, secondName, email, roleId, password }); + const result = {token: token, user} + util.setSuccess(200, 'Registration Successful', result); + } // Send a token to the client when a user signs up - res.json({ token }); + return util.send(res); } catch (error) { - next(error); + util.setError(400, error); + return util.send(res); + //next(error); } }; const handleLogin = async (req, res, next) => { try { const { email, password } = req.body; - const user = await find({ email }); + const user = await userService.findUser({ email }); if (!user) { - throw new Error("Unable to login"); - } + util.setSuccess(200, 'Unable to login!'); + //throw new Error("Unable to login"); + }else{ // Create a token for the user, if successfully authenticated - const { token } = await authenticate({ email, password }); - res.json({ token }); + const { token } = await userService.authenticate({ email, password }); + const result = {token: token, user} + util.setSuccess(200, 'Login Successful', result); + } + return util.send(res); } catch (error) { - next(error); + util.setError(400, error); + return util.send(res); } }; -module.exports = { +export { handleSignup, handleLogin, }; \ No newline at end of file diff --git a/src/db/migrations/20221030092330-create-user.js b/src/db/migrations/20221030092330-create-user.js index fc40bcc..bcfd531 100644 --- a/src/db/migrations/20221030092330-create-user.js +++ b/src/db/migrations/20221030092330-create-user.js @@ -8,13 +8,13 @@ module.exports = { primaryKey: true, type: Sequelize.UUID }, - first_name: { + firstName: { type: Sequelize.STRING }, - last_name: { + lastName: { allowNull: false, type:Sequelize.STRING }, - second_name: Sequelize.STRING, + secondName: Sequelize.STRING, email: { type:Sequelize.STRING, unique:true, diff --git a/src/db/models/user.js b/src/db/models/user.js index 529fd28..4b7f43b 100644 --- a/src/db/models/user.js +++ b/src/db/models/user.js @@ -24,13 +24,13 @@ module.exports = (sequelize, DataTypes) => { defaultValue: DataTypes.UUIDV4, primaryKey: true }, - first_name: { + firstName: { allowNull: false, type:DataTypes.STRING }, - last_name: { + lastName: { allowNull: false, type:DataTypes.STRING }, - second_name: DataTypes.STRING, + secondName: DataTypes.STRING, email: { type:DataTypes.STRING, unique:true, diff --git a/src/db/seeders/20221117052621-User.js b/src/db/seeders/20221117052621-User.js index 2f72668..18d9ad1 100644 --- a/src/db/seeders/20221117052621-User.js +++ b/src/db/seeders/20221117052621-User.js @@ -15,9 +15,9 @@ module.exports = { */ await queryInterface.bulkInsert('Users', [{ id: "c7a9122e-6694-11ed-9022-0242ac120005", - first_name: 'John', - last_name: 'Doe', - second_name: 'Nok', + firstName: 'John', + lastName: 'Doe', + secondName: 'Nok', email: 'example@example2.com', roleId:'c7a9122e-6694-11ed-9022-0242ac120001', password: 'nok', @@ -26,9 +26,9 @@ module.exports = { }, { id: "c7a9122e-6694-11ed-9022-0242ac120006", - first_name: 'John', - last_name: 'Doe', - second_name: 'Nok', + firstName: 'John', + lastName: 'Doe', + secondName: 'Nok', email: 'example@example3.com', roleId: 'c7a9122e-6694-11ed-9022-0242ac120003', password: 'nok', diff --git a/src/index.js b/src/index.js index 2c7c9a7..9d7f779 100644 --- a/src/index.js +++ b/src/index.js @@ -1,15 +1,21 @@ import express from "express"; +import cors from "cors"; import dotenv from "dotenv"; +import { initialize, authenticate,} from './middleware/auth.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/studentsRoutes.js'; +import { userRouter } from './routers/userRouter.js'; const app = express(); dotenv.config(); // Middlewares +app.use(cors()); app.use(express.json()); app.use(express.urlencoded({ extended: true })); +app.use(initialize()); app.use('/api/message', messageRouter); app.use('/api/students', studentRouter); +app.use('/api/user', userRouter); app.get('/', (req, res) => { diff --git a/src/middleware/auth.js b/src/middleware/auth.js index df13b70..e44c4cf 100644 --- a/src/middleware/auth.js +++ b/src/middleware/auth.js @@ -1,43 +1,43 @@ // import the libraries and classes we need require("dotenv").config(); // loads the environment variables into process.env -const passport = require("passport"); -const { Strategy, ExtractJwt } = require("passport-jwt"); +import passport from "passport"; +import { Strategy, ExtractJwt } from "passport-jwt"; -const { find: findUser } = require("../services/users"); +import userService from "../services/userService"; -const { JWT_SECRET } = process.env; +const JWT_SECRET = process.env.JWT_SECRET; // Create a new instance of the JWT Passport.js strategy const strategy = new Strategy( - // Pass an object literal as the first argument - // to new Strategy to control how a token is extracted from the request - { - // Extract the 'bearer' token from the authorization header, - // where the encoded JWT string is stored - jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(), - // A string for verifying the token's signature - secretOrKey: JWT_SECRET, - }, - async (jwtPayload, done) => { - try { - // jwtPayload contains the decoded JWT payload, - // which includes the user's id - // Find that user in the database - const user = await findUser({ id: jwtPayload.id }); - - if (!user) { - const err = new Error("User not found"); - err.statusCode = 404; - throw err; - } - - // done is an error-first callback with signature done(error, user, info) - // pass the found user to the route handler - done(null, user); - } catch (error) { - done(error); + // Pass an object literal as the first argument + // to new Strategy to control how a token is extracted from the request + { + // Extract the 'bearer' token from the authorization header, + // where the encoded JWT string is stored + jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(), + // A string for verifying the token's signature + secretOrKey: JWT_SECRET, + }, + async (jwtPayload, done) => { + try { + // jwtPayload contains the decoded JWT payload, + // which includes the user's id + // Find that user in the database + const user = await userService.findUser({ id: jwtPayload.id }); + + if (!user) { + const err = new Error("User not found"); + err.statusCode = 404; + throw err; + } + + // done is an error-first callback with signature done(error, user, info) + // pass the found user to the route handler + done(null, user); + } catch (error) { + done(error); + } } - } ); // Register the strategy configured above so that Passport.js can use it authentication @@ -45,17 +45,17 @@ passport.use(strategy); // A middleware for initializing passport const initialize = () => { - return passport.initialize(); + return passport.initialize(); }; // Add this middleware to privileged routes later on const authenticate = () => { - // Since you are using JWTs, you don't need to create a session, so set it to false here. - // Otherwise, Passport.js will attempt to create a session. - return passport.authenticate("jwt", { session: false }); + // Since you are using JWTs, you don't need to create a session, so set it to false here. + // Otherwise, Passport.js will attempt to create a session. + return passport.authenticate("jwt", { session: false }); }; -module.exports = { - initialize, - authenticate, +export { + initialize, + authenticate, }; \ No newline at end of file diff --git a/src/routers/userRouter.js b/src/routers/userRouter.js new file mode 100644 index 0000000..2788f45 --- /dev/null +++ b/src/routers/userRouter.js @@ -0,0 +1,8 @@ +import { Router } from "express"; +const userRouter = Router(); +import { handleSignup, handleLogin } from '../controllers/userController.js'; + +userRouter.post('/login', handleLogin); +userRouter.post('/register', handleSignup); + +export { userRouter }; \ No newline at end of file diff --git a/src/server.js b/src/server.js index e53daff..e5ab5f4 100644 --- a/src/server.js +++ b/src/server.js @@ -2,7 +2,7 @@ import app from "../src/index.js"; import dotenv from "dotenv"; dotenv.config(); -const PORT = process.env.PORT || 3000 +const PORT = 3000 //process.env.PORT || 3000 app.listen(PORT, () => { console.log(`Server running on http://localhost:${PORT}`); diff --git a/src/services/MessageService.js b/src/services/MessageService.js index b029a35..cc91414 100644 --- a/src/services/MessageService.js +++ b/src/services/MessageService.js @@ -1,3 +1,4 @@ +/* eslint-disable no-useless-catch */ import database from '../db/models/index.js'; class MessageService { @@ -22,11 +23,11 @@ class MessageService { static async updateMessage(id, updateMessage) { try { const messageToUpdate = await database.Message.findOne({ - where: { id: Number(id) } + where: { id: id } }); if (messageToUpdate) { - await database.Message.update(updateMessage, { where: { id: Number(id) } }); + await database.Message.update(updateMessage, { where: { id: id } }); return updateMessage; } @@ -39,7 +40,7 @@ class MessageService { static async getAMessage(id) { try { const aMessage = await database.Message.findOne({ - where: { id: Number(id) } + where: { id: id} }); return aMessage; @@ -50,11 +51,11 @@ class MessageService { static async deleteMessage(id) { try { - const messageToDelete = await database.Message.findOne({ where: { id: Number(id) } }); + const messageToDelete = await database.Message.findOne({ where: { id: id } }); if (messageToDelete) { const deletedMessage = await database.Message.destroy({ - where: { id: Number(id) } + where: { id: id } }); return deletedMessage; } diff --git a/src/services/studentService.js b/src/services/studentService.js index 7465da9..26ecbfb 100644 --- a/src/services/studentService.js +++ b/src/services/studentService.js @@ -1,6 +1,9 @@ +/* eslint-disable no-useless-catch */ import database from '../db/models/index.js'; class StudentService { + constructor() { + } static async getAllStudents() { try { const result = await database.User.findAll(); diff --git a/src/services/userService.js b/src/services/userService.js index 2239859..14e72ca 100644 --- a/src/services/userService.js +++ b/src/services/userService.js @@ -1,73 +1,67 @@ +/* eslint-disable no-useless-catch */ require("dotenv").config(); -const bcrypt = require("bcrypt"); -const fs = require("fs").promises; -const jwt = require("jsonwebtoken"); -const path = require("path"); +import bcrypt from "bcrypt"; +import jwt from "jsonwebtoken"; +import database from '../db/models/index.js'; -const { JWT_SECRET } = process.env; -const usersFilePath = path.join(__dirname, "../../db/users.json"); +const users = database.User; +const JWT_SECRET = process.env.JWT_SECRET; + class UserService { -// Authenticate the user and return an authorization token for the user. -// Use this function to authenticate a user who's logging in. -const authenticate = async ({ id, email, password }) => { - const user = await find({ email }); - // Hash the user's password and compare the result with the hash - // saved in the database to see if the password is correct. + static async findUser ({id, email}) { + try { + if(id!= null){ + const aUser = await users.findOne({ + where: {id: email } + }); + return aUser + }else if(email !=null){ + const aUser = await users.findOne({ + where: {email: email } + }); + return aUser; + } + } catch (error) { + throw error; + } + }; + static async authenticate ({ id, email, password }) { + const user = await this.findUser({id, email }); const isPasswordValid = await bcrypt.compare(password, user.password); - - // Call jwt.sign(), which returns an authentication token. - // The first argument is an object that contains the data to - // be embedded in the token. You can pass in a unique identifier for - // the user, such as the user's id stored in the database. - // The second argument is a string, which could be any random series - // of characters used to sign the token to ensure the token has not been tampered with - // when it is sent back to the server later on. - // The third argument is a configuration object for the token. + + if(isPasswordValid){ const token = jwt.sign({ id: user.id }, JWT_SECRET, { expiresIn: 24 * 60 * 60, // Expire tokens after a certain amount of time so users can't stay logged in forever }); return { token }; +} }; // Save the new user to the database and return an authorization token for the user -const create = async ({ email, name, password }) => { - const users = JSON.parse(await fs.readFile(usersFilePath)); + static async create ({firstName, lastName, secondName, email, roleId, password }) { const newUser = { - id: users.length + 1, // Not a robust database incrementor; don't use in production + firstName, + lastName, + secondName, email, - name, - // Here, pass the user's password to bcrypt's hash function to create a hash, - // which is stored in the database instead of the user's original password. - // Hashing is a one-way operation, so the hash cannot be reversed to its original form. - // The first argument is the password to be encrypted, and the second argument - // is the number of salt rounds. The higher the number of salt rounds used, - // the stronger the resulting hashed password becomes - password: await bcrypt.hash(password, 10), - }; + roleId, + password: await bcrypt.hash(password, 10) + }; + // save the new user to our database + const result = await users.create(newUser); // Generate the JWT with jwt.sign. The return value is an // authentication token - const token = jwt.sign({ id: newUser.id }, JWT_SECRET, { + const token = jwt.sign({ id: result.id }, JWT_SECRET, { expiresIn: 24 * 60 * 60, // Expire tokens after a certain amount of time so users can't stay logged in forever }); - users.push(newUser); - - // save the new user to our database - await fs.writeFile(usersFilePath, JSON.stringify(users)); - return { token }; }; -const find = async ({ id, email }) => { - const users = JSON.parse(await fs.readFile(usersFilePath)); - return users.find((user) => user.id === parseInt(id) || user.email === email); -}; -module.exports = { - authenticate, - create, - find, -}; \ No newline at end of file +} +export default UserService + From fb53e2a65f96c6996003af3cde90e18796967b8d Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Fri, 2 Dec 2022 02:54:17 +0100 Subject: [PATCH 14/25] user registration and login --- src/controllers/userController.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/controllers/userController.js b/src/controllers/userController.js index fde1f75..1ef28d8 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -4,19 +4,6 @@ import Util from '../utils/Utils'; const util = new Util(); const handleSignup = async (req, res, next) => { try { - // try { - // const allMessages = await MessageService.getAllMessages(); - // if (allMessages.length > 0) { - // util.setSuccess(200, 'Messages retrieved', allMessages); - // } else { - // util.setSuccess(200, 'No Message found'); - // } - // return util.send(res); - // } catch (error) { - // util.setError(400, error); - // return util.send(res); - // } - const { firstName, lastName, secondName, email, roleId, password } = req.body; const user = await userService.findUser({email}); From 944e4aaae9e23b770832eafece40ef314929b027 Mon Sep 17 00:00:00 2001 From: Hazeem Date: Mon, 5 Dec 2022 15:22:32 +0100 Subject: [PATCH 15/25] chore(upload assignment):add route for student assignment upload --- package-lock.json | 52 ++++++++++++++++++++++++ package.json | 1 + src/controllers/assignmentsController.js | 18 ++++++++ src/index.js | 4 +- src/routers/assignmentRouter.js | 2 + src/services/assignmentService.js | 20 +++++++++ src/services/scoreService.js | 14 +++---- 7 files changed, 102 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index b964439..a258a0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "body-parser": "^1.20.1", "dotenv": "^16.0.3", "express": "^4.18.2", + "express-fileupload": "^1.4.0", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" @@ -2971,6 +2972,17 @@ "node": ">=4" } }, + "node_modules/busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "dependencies": { + "streamsearch": "^1.1.0" + }, + "engines": { + "node": ">=10.16.0" + } + }, "node_modules/bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -4171,6 +4183,17 @@ "node": ">= 0.10.0" } }, + "node_modules/express-fileupload": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/express-fileupload/-/express-fileupload-1.4.0.tgz", + "integrity": "sha512-RjzLCHxkv3umDeZKeFeMg8w7qe0V09w3B7oGZprr/oO2H/ISCgNzuqzn7gV3HRWb37GjRk429CCpSLS2KNTqMQ==", + "dependencies": { + "busboy": "^1.6.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -7538,6 +7561,14 @@ "node": ">= 0.8" } }, + "node_modules/streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", + "engines": { + "node": ">=10.0.0" + } + }, "node_modules/string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -10596,6 +10627,14 @@ "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" }, + "busboy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", + "requires": { + "streamsearch": "^1.1.0" + } + }, "bytes": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", @@ -11495,6 +11534,14 @@ "vary": "~1.1.2" } }, + "express-fileupload": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/express-fileupload/-/express-fileupload-1.4.0.tgz", + "integrity": "sha512-RjzLCHxkv3umDeZKeFeMg8w7qe0V09w3B7oGZprr/oO2H/ISCgNzuqzn7gV3HRWb37GjRk429CCpSLS2KNTqMQ==", + "requires": { + "busboy": "^1.6.0" + } + }, "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -13938,6 +13985,11 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, + "streamsearch": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==" + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", diff --git a/package.json b/package.json index 1499ac3..572d8fa 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "body-parser": "^1.20.1", "dotenv": "^16.0.3", "express": "^4.18.2", + "express-fileupload": "^1.4.0", "pg": "^8.8.0", "pg-hstore": "^2.3.4", "sequelize": "^6.25.3" diff --git a/src/controllers/assignmentsController.js b/src/controllers/assignmentsController.js index 45bd09c..9d62b7e 100644 --- a/src/controllers/assignmentsController.js +++ b/src/controllers/assignmentsController.js @@ -105,6 +105,24 @@ class AssignmentController { return util.send(res); } } + + static async uploadAssignment(req, res) { + const { id } = req.params; + if (!req.files) { + util.setError(400, 'Please select a file for upload'); + return util.send(res); + } + const newUpload = req.files; + try { + await AssignmentService.uploadAssignment(newUpload, id); + util.setSuccess(201, 'Assignment Uploaded Successfully!'); + return util.send(res); + } catch (error) { + util.setError(400, error.Assignment); + return util.send(res); + } + } + } export default AssignmentController; \ No newline at end of file diff --git a/src/index.js b/src/index.js index 26ec4f8..2a9dc97 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,9 @@ import express from "express"; import dotenv from "dotenv"; -import { assignmentRouter } from './api/routers/assignmentRouter.js'; +import { assignmentRouter } from './routers/assignmentRouter.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/studentsRoutes.js'; -import { scoreRouter } from './routers/scoreRoutes.js'; +import scoreRouter from './routers/scoreRouter.js'; const app = express(); dotenv.config(); diff --git a/src/routers/assignmentRouter.js b/src/routers/assignmentRouter.js index d4b7d2a..8b63f4c 100644 --- a/src/routers/assignmentRouter.js +++ b/src/routers/assignmentRouter.js @@ -1,4 +1,5 @@ import { Router } from "express"; +import fileUpload from "express-fileupload" const assignmentRouter = Router(); import AssignmentController from '../controllers/assignmentsController.js'; @@ -8,5 +9,6 @@ assignmentRouter.post('/', AssignmentController.addAssignment); assignmentRouter.get('/:id', AssignmentController.getAAssignment); assignmentRouter.put('/:id', AssignmentController.updatedAssignment); assignmentRouter.delete('/:id', AssignmentController.deleteAssignment); +assignmentRouter.post('/upload/:id', fileUpload({createParentPath: true}), AssignmentController.uploadAssignment); export { assignmentRouter }; \ No newline at end of file diff --git a/src/services/assignmentService.js b/src/services/assignmentService.js index 409fe23..ba7dcbd 100644 --- a/src/services/assignmentService.js +++ b/src/services/assignmentService.js @@ -1,4 +1,5 @@ import database from '../db/models/index.js'; +import path from 'path'; class AssignmentService { static async getAllAssignments() { @@ -63,6 +64,25 @@ class AssignmentService { throw error; } } + + static async uploadAssignment(files, id) { + // const validator = await database.Message.findOne({ + // where: { id: Number(id) } + // }) + // if(!validator){ + // util.setError(400, 'Please select a file for upload'); + // return util.send(res); + // } + try { + Object.keys(files).forEach(key => { + const filePath = path.join('./', 'files/assignmentSubmissions', `${id}`, files[key].name) + files[key].mv(filePath) + }) + } catch (error) { + throw error; + } + } + } export default AssignmentService; diff --git a/src/services/scoreService.js b/src/services/scoreService.js index c551164..2d0dd54 100644 --- a/src/services/scoreService.js +++ b/src/services/scoreService.js @@ -3,7 +3,7 @@ import database from '../db/models/index.js'; class ScoreService { static async getAllScores() { try { - const result = await database.Score.findAll(); + const result = await database.AssignmentScore.findAll(); return result; } catch (error) { throw error; @@ -12,7 +12,7 @@ class ScoreService { static async addScore(newScore) { try { - const result = await database.Score.create(newScore); + const result = await database.AssignmentScore.create(newScore); return result; } catch (error) { throw error; @@ -21,12 +21,12 @@ class ScoreService { static async updateScore(id, updateScore) { try { - const ScoreToUpdate = await database.Score.findOne({ + const ScoreToUpdate = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); if (ScoreToUpdate) { - await database.Score.update(updateScore, { where: { id: Number(id) } }); + await database.AssignmentScore.update(updateScore, { where: { id: Number(id) } }); return updateScore; } @@ -38,7 +38,7 @@ class ScoreService { static async getScore(id) { try { - const Score = await database.Score.findOne({ + const Score = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); @@ -50,10 +50,10 @@ class ScoreService { static async deleteScore(id) { try { - const ScoreToDelete = await database.Score.findOne({ where: { id: Number(id) } }); + const ScoreToDelete = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); if (ScoreToDelete) { - const deletedScore = await database.Score.destroy({ + const deletedScore = await database.AssignmentScore.destroy({ where: { id: Number(id) } }); return deletedScore; From 6fcb91f6ff5a9d4e8a6e387d6e232d7183815b16 Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Mon, 5 Dec 2022 17:50:10 +0100 Subject: [PATCH 16/25] email verification --- package-lock.json | 2239 +++++++---------- package.json | 1 + src/controllers/userController.js | 5 + src/controllers/verifyController.js | 79 + .../migrations/20221030092330-create-user.js | 8 + .../migrations/20221205043218-create-token.js | 28 + src/db/models/token.js | 35 + src/db/models/user.js | 6 + src/routers/userRouter.js | 1 + src/services/emailService.js | 63 + src/services/emailServiceMailtrap.js | 36 + src/services/userService.js | 5 + src/services/v.js | 60 + src/services/verify.js | 74 + src/services/verifyService.js | 76 + src/utils/email.js | 30 + 16 files changed, 1401 insertions(+), 1345 deletions(-) create mode 100644 src/controllers/verifyController.js create mode 100644 src/db/migrations/20221205043218-create-token.js create mode 100644 src/db/models/token.js create mode 100644 src/services/emailService.js create mode 100644 src/services/emailServiceMailtrap.js create mode 100644 src/services/v.js create mode 100644 src/services/verify.js create mode 100644 src/services/verifyService.js create mode 100644 src/utils/email.js diff --git a/package-lock.json b/package-lock.json index 6798577..2a0e894 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "express": "^4.18.2", "faker": "^5.5.3", "jsonwebtoken": "^8.5.1", + "nodemailer": "^6.8.0", "passport": "^0.6.0", "passport-jwt": "^4.0.0", "pg": "^8.8.0", @@ -99,30 +100,30 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.0.tgz", - "integrity": "sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz", + "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz", - "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz", + "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.6", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.6", - "@babel/helpers": "^7.19.4", - "@babel/parser": "^7.19.6", + "@babel/generator": "^7.20.5", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-module-transforms": "^7.20.2", + "@babel/helpers": "^7.20.5", + "@babel/parser": "^7.20.5", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.6", - "@babel/types": "^7.19.4", + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -137,45 +138,13 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@babel/core/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/generator": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.0.tgz", - "integrity": "sha512-GUPcXxWibClgmYJuIwC2Bc2Lg+8b9VjaJ+HlNdACEVt+Wlr1eoU1OPZjZRm7Hzl0gaTsUZNQfeihvZJhG7oc3w==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz", + "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==", "dev": true, "dependencies": { - "@babel/types": "^7.20.0", + "@babel/types": "^7.20.5", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -240,19 +209,10 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz", - "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz", + "integrity": "sha512-3RCdA/EmEaikrhayahwToF0fpweU/8o2p8vhc1c/1kftHOdTKuC65kik/TLc+qfbS8JKw4qqJbne4ovICDhmww==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.18.6", @@ -260,7 +220,7 @@ "@babel/helper-function-name": "^7.19.0", "@babel/helper-member-expression-to-functions": "^7.18.9", "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.9", + "@babel/helper-replace-supers": "^7.19.1", "@babel/helper-split-export-declaration": "^7.18.6" }, "engines": { @@ -271,13 +231,13 @@ } }, "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", - "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", + "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.1.0" + "regexpu-core": "^5.2.1" }, "engines": { "node": ">=6.9.0" @@ -303,38 +263,6 @@ "@babel/core": "^7.4.0-0" } }, - "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@babel/helper-define-polyfill-provider/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "node_modules/@babel/helper-define-polyfill-provider/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/helper-environment-visitor": { "version": "7.18.9", "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz", @@ -406,19 +334,19 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz", - "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", + "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.19.4", + "@babel/helper-simple-access": "^7.20.2", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.19.1", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.6", - "@babel/types": "^7.19.4" + "@babel/traverse": "^7.20.1", + "@babel/types": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -437,9 +365,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz", - "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", "dev": true, "engines": { "node": ">=6.9.0" @@ -480,12 +408,12 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz", - "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", "dev": true, "dependencies": { - "@babel/types": "^7.19.4" + "@babel/types": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -543,29 +471,29 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", - "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", + "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", "dev": true, "dependencies": { "@babel/helper-function-name": "^7.19.0", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.0", - "@babel/types": "^7.19.0" + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.0.tgz", - "integrity": "sha512-aGMjYraN0zosCEthoGLdqot1oRsmxVTQRHadsUPz5QM44Zej2PYRz7XiDE7GqnkZnNtLbOuxqoZw42vkU7+XEQ==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz", + "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==", "dev": true, "dependencies": { "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.0", - "@babel/types": "^7.20.0" + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5" }, "engines": { "node": ">=6.9.0" @@ -586,16 +514,16 @@ } }, "node_modules/@babel/node": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.20.0.tgz", - "integrity": "sha512-FEWKq7XC2I4ci05L46B9ghJVZc5mkqx1UKtxed0BUq7jaw+8HbpwjF4nsE7I5A4iolIWlMXycGRal1CcAe0PZA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.20.5.tgz", + "integrity": "sha512-ElSr40UtumWE4fYYF1xfLP2C6b9nfS/rswK7YYpLo9HDGEXGXEAWZaGCxIirxGIDyoV0rbl6jV1LyFMQ6ZOQSA==", "dev": true, "dependencies": { "@babel/register": "^7.18.9", "commander": "^4.0.1", - "core-js": "^3.25.1", + "core-js": "^3.26.0", "node-environment-flags": "^1.0.5", - "regenerator-runtime": "^0.13.10", + "regenerator-runtime": "^0.13.11", "v8flags": "^3.1.1" }, "bin": { @@ -609,9 +537,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz", - "integrity": "sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", + "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -653,9 +581,9 @@ } }, "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz", - "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==", + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", + "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", @@ -800,16 +728,16 @@ } }, "node_modules/@babel/plugin-proposal-object-rest-spread": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz", - "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz", + "integrity": "sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.19.4", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-plugin-utils": "^7.19.0", + "@babel/compat-data": "^7.20.1", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-plugin-utils": "^7.20.2", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.18.8" + "@babel/plugin-transform-parameters": "^7.20.1" }, "engines": { "node": ">=6.9.0" @@ -868,14 +796,14 @@ } }, "node_modules/@babel/plugin-proposal-private-property-in-object": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz", - "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", + "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.20.5", + "@babel/helper-plugin-utils": "^7.20.2", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" }, "engines": { @@ -1141,12 +1069,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz", - "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz", + "integrity": "sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -1156,18 +1084,18 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz", - "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", + "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==", "dev": true, "dependencies": { "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-compilation-targets": "^7.19.0", + "@babel/helper-compilation-targets": "^7.20.0", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "@babel/helper-replace-supers": "^7.18.9", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/helper-replace-supers": "^7.19.1", "@babel/helper-split-export-declaration": "^7.18.6", "globals": "^11.1.0" }, @@ -1194,12 +1122,12 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz", - "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", + "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -1385,13 +1313,13 @@ } }, "node_modules/@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", - "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", + "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", "dev": true, "dependencies": { - "@babel/helper-create-regexp-features-plugin": "^7.19.0", - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-create-regexp-features-plugin": "^7.20.5", + "@babel/helper-plugin-utils": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -1432,12 +1360,12 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz", - "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz", + "integrity": "sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -1462,13 +1390,13 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", - "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", + "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", "dev": true, "dependencies": { - "@babel/helper-plugin-utils": "^7.18.6", - "regenerator-transform": "^0.15.0" + "@babel/helper-plugin-utils": "^7.20.2", + "regenerator-transform": "^0.15.1" }, "engines": { "node": ">=6.9.0" @@ -1512,15 +1440,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/plugin-transform-runtime/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/plugin-transform-shorthand-properties": { "version": "7.18.6", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz", @@ -1629,18 +1548,18 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz", - "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", + "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.19.4", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-plugin-utils": "^7.19.0", + "@babel/compat-data": "^7.20.1", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-plugin-utils": "^7.20.2", "@babel/helper-validator-option": "^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.19.1", + "@babel/plugin-proposal-async-generator-functions": "^7.20.1", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-class-static-block": "^7.18.6", "@babel/plugin-proposal-dynamic-import": "^7.18.6", @@ -1649,7 +1568,7 @@ "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.19.4", + "@babel/plugin-proposal-object-rest-spread": "^7.20.2", "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", "@babel/plugin-proposal-optional-chaining": "^7.18.9", "@babel/plugin-proposal-private-methods": "^7.18.6", @@ -1660,7 +1579,7 @@ "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.18.6", + "@babel/plugin-syntax-import-assertions": "^7.20.0", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -1673,10 +1592,10 @@ "@babel/plugin-transform-arrow-functions": "^7.18.6", "@babel/plugin-transform-async-to-generator": "^7.18.6", "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.19.4", - "@babel/plugin-transform-classes": "^7.19.0", + "@babel/plugin-transform-block-scoping": "^7.20.2", + "@babel/plugin-transform-classes": "^7.20.2", "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.19.4", + "@babel/plugin-transform-destructuring": "^7.20.2", "@babel/plugin-transform-dotall-regex": "^7.18.6", "@babel/plugin-transform-duplicate-keys": "^7.18.9", "@babel/plugin-transform-exponentiation-operator": "^7.18.6", @@ -1684,14 +1603,14 @@ "@babel/plugin-transform-function-name": "^7.18.9", "@babel/plugin-transform-literals": "^7.18.9", "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.18.6", - "@babel/plugin-transform-modules-commonjs": "^7.18.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.0", + "@babel/plugin-transform-modules-amd": "^7.19.6", + "@babel/plugin-transform-modules-commonjs": "^7.19.6", + "@babel/plugin-transform-modules-systemjs": "^7.19.6", "@babel/plugin-transform-modules-umd": "^7.18.6", "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", "@babel/plugin-transform-new-target": "^7.18.6", "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.18.8", + "@babel/plugin-transform-parameters": "^7.20.1", "@babel/plugin-transform-property-literals": "^7.18.6", "@babel/plugin-transform-regenerator": "^7.18.6", "@babel/plugin-transform-reserved-words": "^7.18.6", @@ -1703,7 +1622,7 @@ "@babel/plugin-transform-unicode-escapes": "^7.18.10", "@babel/plugin-transform-unicode-regex": "^7.18.6", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.19.4", + "@babel/types": "^7.20.2", "babel-plugin-polyfill-corejs2": "^0.3.3", "babel-plugin-polyfill-corejs3": "^0.6.0", "babel-plugin-polyfill-regenerator": "^0.4.1", @@ -1717,15 +1636,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/@babel/preset-env/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/preset-modules": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz", @@ -1762,12 +1672,12 @@ } }, "node_modules/@babel/runtime": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.0.tgz", - "integrity": "sha512-NDYdls71fTXoU8TZHfbBWg7DiZfNzClcKui/+kyi6ppD2L1qnWW3VV6CjtaBXSUGGhiTWJ6ereOIkUvenif66Q==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", + "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", "dev": true, "dependencies": { - "regenerator-runtime": "^0.13.10" + "regenerator-runtime": "^0.13.11" }, "engines": { "node": ">=6.9.0" @@ -1788,19 +1698,19 @@ } }, "node_modules/@babel/traverse": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.0.tgz", - "integrity": "sha512-5+cAXQNARgjRUK0JWu2UBwja4JLSO/rBMPJzpsKb+oBF5xlUuCfljQepS4XypBQoiigL0VQjTZy6WiONtUdScQ==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz", + "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.0", + "@babel/generator": "^7.20.5", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.0", - "@babel/types": "^7.20.0", + "@babel/parser": "^7.20.5", + "@babel/types": "^7.20.5", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1808,33 +1718,10 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/traverse/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@babel/traverse/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/@babel/types": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz", - "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz", + "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.19.4", @@ -1868,27 +1755,10 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/@eslint/eslintrc/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -1900,12 +1770,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@eslint/eslintrc/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -1919,42 +1783,19 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz", - "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz", + "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" + "minimatch": "^3.0.5" }, "engines": { "node": ">=10.10.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -2196,20 +2037,6 @@ "semver": "bin/semver.js" } }, - "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "dependencies": { - "abbrev": "1" - }, - "bin": { - "nopt": "bin/nopt.js" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/@mapbox/node-pre-gyp/node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -2267,9 +2094,9 @@ } }, "node_modules/@types/chai": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz", - "integrity": "sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==", "dev": true }, "node_modules/@types/cookiejar": { @@ -2287,9 +2114,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.4.8", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.8.tgz", - "integrity": "sha512-zUCKQI1bUCTi+0kQs5ZQzQ/XILWRLIlh15FXWNykJ+NG3TMKMVvwwC6GP3DR1Ylga15fB7iAExSzc4PNlR5i3w==", + "version": "8.4.10", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", + "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", "dev": true, "peer": true, "dependencies": { @@ -2333,9 +2160,9 @@ "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==" }, "node_modules/@types/node": { - "version": "18.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz", - "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ==" + "version": "18.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.10.tgz", + "integrity": "sha512-juG3RWMBOqcOuXC643OAdSA525V44cVgGV6dUDuiFtss+8Fk5x1hI93Rsld43VeJVIeqlP9I7Fn9/qaVqoEAuQ==" }, "node_modules/@types/superagent": { "version": "3.8.7", @@ -2348,9 +2175,9 @@ } }, "node_modules/@types/validator": { - "version": "13.7.9", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.9.tgz", - "integrity": "sha512-y5KJ1PjGXPpU4CZ7lThDu31s+FqvzhqwMOR6Go/x6xaQMFjgzwfzfOvCwABsylr/5n8sB1qFQm1Vi7TaCB8P+A==" + "version": "13.7.10", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.10.tgz", + "integrity": "sha512-t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ==" }, "node_modules/@webassemblyjs/ast": { "version": "1.11.1", @@ -2586,27 +2413,6 @@ "node": ">= 6.0.0" } }, - "node_modules/agent-base/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/agent-base/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -2675,9 +2481,9 @@ } }, "node_modules/anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "dependencies": { "normalize-path": "^3.0.0", @@ -2722,19 +2528,6 @@ "node": ">=10" } }, - "node_modules/are-we-there-yet/node_modules/readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -2747,15 +2540,15 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "node_modules/array-includes": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", - "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.19.5", - "get-intrinsic": "^1.1.1", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", "is-string": "^1.0.7" }, "engines": { @@ -2766,14 +2559,14 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", - "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", + "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -2784,14 +2577,14 @@ } }, "node_modules/array.prototype.reduce": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz", - "integrity": "sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz", + "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-array-method-boxes-properly": "^1.0.0", "is-string": "^1.0.7" }, @@ -2818,9 +2611,9 @@ "dev": true }, "node_modules/babel-loader": { - "version": "8.2.5", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", - "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", + "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", "dev": true, "dependencies": { "find-cache-dir": "^3.3.1", @@ -2932,15 +2725,6 @@ "node": ">=8" } }, - "node_modules/babel-loader/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/babel-plugin-polyfill-corejs2": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz", @@ -2955,15 +2739,6 @@ "@babel/core": "^7.0.0-0" } }, - "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/babel-plugin-polyfill-corejs3": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz", @@ -3048,6 +2823,19 @@ "npm": "1.2.8000 || >= 1.4.16" } }, + "node_modules/body-parser/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/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3160,15 +2948,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/caching-transform/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/call-bind": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", @@ -3200,9 +2979,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001426", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz", - "integrity": "sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==", + "version": "1.0.30001436", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz", + "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==", "dev": true, "funding": [ { @@ -3216,14 +2995,14 @@ ] }, "node_modules/chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", + "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", "dev": true, "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", - "deep-eql": "^3.0.1", + "deep-eql": "^4.1.2", "get-func-name": "^2.0.0", "loupe": "^2.3.1", "pathval": "^1.1.1", @@ -3470,9 +3249,9 @@ "dev": true }, "node_modules/core-js": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz", - "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==", + "version": "3.26.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz", + "integrity": "sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==", "dev": true, "hasInstallScript": true, "funding": { @@ -3481,9 +3260,9 @@ } }, "node_modules/core-js-compat": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz", - "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==", + "version": "3.26.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.1.tgz", + "integrity": "sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==", "dev": true, "dependencies": { "browserslist": "^4.21.4" @@ -3526,11 +3305,19 @@ } }, "node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dependencies": { - "ms": "2.0.0" + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, "node_modules/decamelize": { @@ -3543,15 +3330,15 @@ } }, "node_modules/deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz", + "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==", "dev": true, "dependencies": { "type-detect": "^4.0.0" }, "engines": { - "node": ">=0.12" + "node": ">=6" } }, "node_modules/deep-is": { @@ -3706,9 +3493,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, "peer": true, "dependencies": { @@ -3826,9 +3613,9 @@ } }, "node_modules/eslint": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz", - "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", + "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.3", @@ -3894,19 +3681,10 @@ }, "engines": { "node": "^10.12.0 || >=12.0.0" - }, - "peerDependencies": { - "eslint": "^7.32.0 || ^8.2.0", - "eslint-plugin-import": "^2.25.2" - } - }, - "node_modules/eslint-config-airbnb-base/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" + }, + "peerDependencies": { + "eslint": "^7.32.0 || ^8.2.0", + "eslint-plugin-import": "^2.25.2" } }, "node_modules/eslint-config-prettier": { @@ -3940,12 +3718,6 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-import-resolver-node/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==", - "dev": true - }, "node_modules/eslint-module-utils": { "version": "2.7.4", "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz", @@ -3972,12 +3744,6 @@ "ms": "^2.1.1" } }, - "node_modules/eslint-module-utils/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==", - "dev": true - }, "node_modules/eslint-plugin": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/eslint-plugin/-/eslint-plugin-1.0.1.tgz", @@ -4017,6 +3783,15 @@ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" } }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, "node_modules/eslint-plugin-import/node_modules/doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -4029,6 +3804,12 @@ "node": ">=0.10.0" } }, + "node_modules/eslint-plugin-import/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/eslint-plugin-prettier": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz", @@ -4148,23 +3929,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "node_modules/eslint/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -4190,9 +3954,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4213,12 +3977,6 @@ "node": ">=8" } }, - "node_modules/eslint/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/eslint/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -4244,9 +4002,9 @@ } }, "node_modules/espree": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz", - "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", + "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", "dev": true, "dependencies": { "acorn": "^8.8.0", @@ -4374,6 +4132,19 @@ "node": ">= 0.10.0" } }, + "node_modules/express/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/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", @@ -4410,9 +4181,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", + "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -4459,6 +4230,19 @@ "node": ">= 0.8" } }, + "node_modules/finalhandler/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/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "node_modules/find-cache-dir": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", @@ -4943,27 +4727,6 @@ "node": ">= 6" } }, - "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/https-proxy-agent/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -4976,9 +4739,9 @@ } }, "node_modules/ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", + "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", "dev": true, "engines": { "node": ">= 4" @@ -5429,15 +5192,6 @@ "node": ">=8" } }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/istanbul-lib-processinfo": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", @@ -5493,15 +5247,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/istanbul-lib-report/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/istanbul-lib-report/node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -5528,29 +5273,6 @@ "node": ">=10" } }, - "node_modules/istanbul-lib-source-maps/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/istanbul-lib-source-maps/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/istanbul-reports": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz", @@ -5606,10 +5328,14 @@ } }, "node_modules/js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", - "dev": true + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "dev": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/js-sdsl" + } }, "node_modules/js-tokens": { "version": "4.0.0", @@ -5693,10 +5419,13 @@ "npm": ">=1.4.28" } }, - "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/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "bin": { + "semver": "bin/semver" + } }, "node_modules/jwa": { "version": "1.4.1", @@ -5923,9 +5652,9 @@ } }, "node_modules/loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", + "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", "dev": true, "dependencies": { "get-func-name": "^2.0.0" @@ -5955,6 +5684,15 @@ "node": ">=6" } }, + "node_modules/make-dir/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -6107,29 +5845,6 @@ "url": "https://opencollective.com/mochajs" } }, - "node_modules/mocha/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/mocha/node_modules/debug/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "node_modules/mocha/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -6234,9 +5949,9 @@ } }, "node_modules/moment-timezone": { - "version": "0.5.38", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz", - "integrity": "sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q==", + "version": "0.5.39", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.39.tgz", + "integrity": "sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w==", "dependencies": { "moment": ">= 2.9.0" }, @@ -6245,9 +5960,9 @@ } }, "node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nanoid": { "version": "3.3.3", @@ -6297,6 +6012,15 @@ "semver": "^5.7.0" } }, + "node_modules/node-environment-flags/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -6334,6 +6058,14 @@ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", "dev": true }, + "node_modules/nodemailer": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz", + "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==", + "engines": { + "node": ">=6.0.0" + } + }, "node_modules/nodemon": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", @@ -6371,17 +6103,19 @@ "ms": "^2.1.1" } }, - "node_modules/nodemon/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==", - "dev": true + "node_modules/nodemon/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } }, "node_modules/nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "dependencies": { "abbrev": "1" }, @@ -6389,7 +6123,7 @@ "nopt": "bin/nopt.js" }, "engines": { - "node": "*" + "node": ">=6" } }, "node_modules/normalize-path": { @@ -6602,15 +6336,6 @@ "node": ">=8" } }, - "node_modules/nyc/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/nyc/node_modules/wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -6710,29 +6435,29 @@ } }, "node_modules/object.entries": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", - "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", + "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.getownpropertydescriptors": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz", - "integrity": "sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz", + "integrity": "sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==", "dev": true, "dependencies": { - "array.prototype.reduce": "^1.0.4", + "array.prototype.reduce": "^1.0.5", "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.20.1" + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.8" @@ -6742,14 +6467,14 @@ } }, "node_modules/object.values": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", - "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" }, "engines": { "node": ">= 0.4" @@ -7218,9 +6943,9 @@ } }, "node_modules/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", + "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -7355,26 +7080,18 @@ } }, "node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" } }, - "node_modules/readable-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -7406,15 +7123,15 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.13.10", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", - "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==", + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", "dev": true }, "node_modules/regenerator-transform": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", - "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", + "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", "dev": true, "dependencies": { "@babel/runtime": "^7.8.4" @@ -7450,9 +7167,9 @@ } }, "node_modules/regexpu-core": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", - "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", + "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", "dev": true, "dependencies": { "regenerate": "^1.4.2", @@ -7460,7 +7177,7 @@ "regjsgen": "^0.7.1", "regjsparser": "^0.9.1", "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.0.0" + "unicode-match-property-value-ecmascript": "^2.1.0" }, "engines": { "node": ">=4" @@ -7664,11 +7381,12 @@ } }, "node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true, "bin": { - "semver": "bin/semver" + "semver": "bin/semver.js" } }, "node_modules/send": { @@ -7694,15 +7412,28 @@ "node": ">= 0.8.0" } }, + "node_modules/send/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/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, "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/sequelize": { - "version": "6.25.3", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.25.3.tgz", - "integrity": "sha512-sbbvDGft6UfSRdIC0dcZvMxxJYi6g0+IgWvIpTuk6ccEoIyLcr7Sk6nXWwGfkdlDabGeunhhhI4yH8PleVMvtw==", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.26.0.tgz", + "integrity": "sha512-Xv82z1FdSn/qwB1IObSxIHV519cFk/vSD28vWs8Y0VucQLn7pK2x2jYjf2Qg/rBUQbCVprDdU7RPf+55rrkc0A==", "funding": [ { "type": "opencollective", @@ -7768,27 +7499,6 @@ "node": ">= 10.0.0" } }, - "node_modules/sequelize/node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/sequelize/node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "node_modules/sequelize/node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -7888,9 +7598,9 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/simple-update-notifier": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", - "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", + "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", "dev": true, "dependencies": { "semver": "~7.0.0" @@ -7968,15 +7678,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/spawn-wrap/node_modules/semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/split2": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz", @@ -8000,18 +7701,13 @@ } }, "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dependencies": { - "safe-buffer": "~5.1.0" + "safe-buffer": "~5.2.0" } }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -8026,28 +7722,28 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", - "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", - "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" + "es-abstract": "^1.20.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8116,12 +7812,36 @@ "ms": "^2.1.1" } }, - "node_modules/superagent/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/superagent/node_modules/readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/superagent/node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true }, + "node_modules/superagent/node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, "node_modules/supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -8173,9 +7893,9 @@ } }, "node_modules/terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", + "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", "dev": true, "peer": true, "dependencies": { @@ -8318,6 +8038,21 @@ "nodetouch": "bin/nodetouch.js" } }, + "node_modules/touch/node_modules/nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, + "dependencies": { + "abbrev": "1" + }, + "bin": { + "nopt": "bin/nopt.js" + }, + "engines": { + "node": "*" + } + }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -8456,9 +8191,9 @@ } }, "node_modules/unicode-match-property-value-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", - "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", + "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", "dev": true, "engines": { "node": ">=4" @@ -8585,9 +8320,9 @@ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/webpack": { - "version": "5.74.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", - "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", + "version": "5.75.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", + "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", "dev": true, "peer": true, "dependencies": { @@ -8968,64 +8703,41 @@ } }, "@babel/compat-data": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.0.tgz", - "integrity": "sha512-Gt9jszFJYq7qzXVK4slhc6NzJXnOVmRECWcVjF/T23rNXD9NtWQ0W3qxdg+p9wWIB+VQw3GYV/U2Ha9bRTfs4w==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz", + "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==", "dev": true }, "@babel/core": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.19.6.tgz", - "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz", + "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.19.6", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-module-transforms": "^7.19.6", - "@babel/helpers": "^7.19.4", - "@babel/parser": "^7.19.6", + "@babel/generator": "^7.20.5", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-module-transforms": "^7.20.2", + "@babel/helpers": "^7.20.5", + "@babel/parser": "^7.20.5", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.6", - "@babel/types": "^7.19.4", + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.1", "semver": "^6.3.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "@babel/generator": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.0.tgz", - "integrity": "sha512-GUPcXxWibClgmYJuIwC2Bc2Lg+8b9VjaJ+HlNdACEVt+Wlr1eoU1OPZjZRm7Hzl0gaTsUZNQfeihvZJhG7oc3w==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz", + "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==", "dev": true, "requires": { - "@babel/types": "^7.20.0", + "@babel/types": "^7.20.5", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -9072,20 +8784,12 @@ "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.21.3", "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "@babel/helper-create-class-features-plugin": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz", - "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.5.tgz", + "integrity": "sha512-3RCdA/EmEaikrhayahwToF0fpweU/8o2p8vhc1c/1kftHOdTKuC65kik/TLc+qfbS8JKw4qqJbne4ovICDhmww==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", @@ -9093,18 +8797,18 @@ "@babel/helper-function-name": "^7.19.0", "@babel/helper-member-expression-to-functions": "^7.18.9", "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-replace-supers": "^7.18.9", + "@babel/helper-replace-supers": "^7.19.1", "@babel/helper-split-export-declaration": "^7.18.6" } }, "@babel/helper-create-regexp-features-plugin": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz", - "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz", + "integrity": "sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", - "regexpu-core": "^5.1.0" + "regexpu-core": "^5.2.1" } }, "@babel/helper-define-polyfill-provider": { @@ -9119,29 +8823,6 @@ "lodash.debounce": "^4.0.8", "resolve": "^1.14.2", "semver": "^6.1.2" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "@babel/helper-environment-visitor": { @@ -9197,19 +8878,19 @@ } }, "@babel/helper-module-transforms": { - "version": "7.19.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz", - "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", + "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-module-imports": "^7.18.6", - "@babel/helper-simple-access": "^7.19.4", + "@babel/helper-simple-access": "^7.20.2", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.19.1", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.6", - "@babel/types": "^7.19.4" + "@babel/traverse": "^7.20.1", + "@babel/types": "^7.20.2" } }, "@babel/helper-optimise-call-expression": { @@ -9222,9 +8903,9 @@ } }, "@babel/helper-plugin-utils": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz", - "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", "dev": true }, "@babel/helper-remap-async-to-generator": { @@ -9253,12 +8934,12 @@ } }, "@babel/helper-simple-access": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz", - "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz", + "integrity": "sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==", "dev": true, "requires": { - "@babel/types": "^7.19.4" + "@babel/types": "^7.20.2" } }, "@babel/helper-skip-transparent-expression-wrappers": { @@ -9298,26 +8979,26 @@ "dev": true }, "@babel/helper-wrap-function": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz", - "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz", + "integrity": "sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==", "dev": true, "requires": { "@babel/helper-function-name": "^7.19.0", "@babel/template": "^7.18.10", - "@babel/traverse": "^7.19.0", - "@babel/types": "^7.19.0" + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5" } }, "@babel/helpers": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.0.tgz", - "integrity": "sha512-aGMjYraN0zosCEthoGLdqot1oRsmxVTQRHadsUPz5QM44Zej2PYRz7XiDE7GqnkZnNtLbOuxqoZw42vkU7+XEQ==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz", + "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==", "dev": true, "requires": { "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.0", - "@babel/types": "^7.20.0" + "@babel/traverse": "^7.20.5", + "@babel/types": "^7.20.5" } }, "@babel/highlight": { @@ -9332,23 +9013,23 @@ } }, "@babel/node": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.20.0.tgz", - "integrity": "sha512-FEWKq7XC2I4ci05L46B9ghJVZc5mkqx1UKtxed0BUq7jaw+8HbpwjF4nsE7I5A4iolIWlMXycGRal1CcAe0PZA==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.20.5.tgz", + "integrity": "sha512-ElSr40UtumWE4fYYF1xfLP2C6b9nfS/rswK7YYpLo9HDGEXGXEAWZaGCxIirxGIDyoV0rbl6jV1LyFMQ6ZOQSA==", "dev": true, "requires": { "@babel/register": "^7.18.9", "commander": "^4.0.1", - "core-js": "^3.25.1", + "core-js": "^3.26.0", "node-environment-flags": "^1.0.5", - "regenerator-runtime": "^0.13.10", + "regenerator-runtime": "^0.13.11", "v8flags": "^3.1.1" } }, "@babel/parser": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.0.tgz", - "integrity": "sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", + "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -9372,9 +9053,9 @@ } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz", - "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==", + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz", + "integrity": "sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", @@ -9465,16 +9146,16 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz", - "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz", + "integrity": "sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.19.4", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-plugin-utils": "^7.19.0", + "@babel/compat-data": "^7.20.1", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-plugin-utils": "^7.20.2", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.18.8" + "@babel/plugin-transform-parameters": "^7.20.1" } }, "@babel/plugin-proposal-optional-catch-binding": { @@ -9509,14 +9190,14 @@ } }, "@babel/plugin-proposal-private-property-in-object": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz", - "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.20.5.tgz", + "integrity": "sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-create-class-features-plugin": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6", + "@babel/helper-create-class-features-plugin": "^7.20.5", + "@babel/helper-plugin-utils": "^7.20.2", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } }, @@ -9695,27 +9376,27 @@ } }, "@babel/plugin-transform-block-scoping": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz", - "integrity": "sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz", + "integrity": "sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.20.2" } }, "@babel/plugin-transform-classes": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz", - "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz", + "integrity": "sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==", "dev": true, "requires": { "@babel/helper-annotate-as-pure": "^7.18.6", - "@babel/helper-compilation-targets": "^7.19.0", + "@babel/helper-compilation-targets": "^7.20.0", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-optimise-call-expression": "^7.18.6", - "@babel/helper-plugin-utils": "^7.19.0", - "@babel/helper-replace-supers": "^7.18.9", + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/helper-replace-supers": "^7.19.1", "@babel/helper-split-export-declaration": "^7.18.6", "globals": "^11.1.0" } @@ -9730,12 +9411,12 @@ } }, "@babel/plugin-transform-destructuring": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz", - "integrity": "sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz", + "integrity": "sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-plugin-utils": "^7.20.2" } }, "@babel/plugin-transform-dotall-regex": { @@ -9849,13 +9530,13 @@ } }, "@babel/plugin-transform-named-capturing-groups-regex": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz", - "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz", + "integrity": "sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==", "dev": true, "requires": { - "@babel/helper-create-regexp-features-plugin": "^7.19.0", - "@babel/helper-plugin-utils": "^7.19.0" + "@babel/helper-create-regexp-features-plugin": "^7.20.5", + "@babel/helper-plugin-utils": "^7.20.2" } }, "@babel/plugin-transform-new-target": { @@ -9878,12 +9559,12 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.18.8", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz", - "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz", + "integrity": "sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.20.2" } }, "@babel/plugin-transform-property-literals": { @@ -9896,13 +9577,13 @@ } }, "@babel/plugin-transform-regenerator": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz", - "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz", + "integrity": "sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==", "dev": true, "requires": { - "@babel/helper-plugin-utils": "^7.18.6", - "regenerator-transform": "^0.15.0" + "@babel/helper-plugin-utils": "^7.20.2", + "regenerator-transform": "^0.15.1" } }, "@babel/plugin-transform-reserved-words": { @@ -9926,14 +9607,6 @@ "babel-plugin-polyfill-corejs3": "^0.6.0", "babel-plugin-polyfill-regenerator": "^0.4.1", "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "@babel/plugin-transform-shorthand-properties": { @@ -10002,18 +9675,18 @@ } }, "@babel/preset-env": { - "version": "7.19.4", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz", - "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz", + "integrity": "sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==", "dev": true, "requires": { - "@babel/compat-data": "^7.19.4", - "@babel/helper-compilation-targets": "^7.19.3", - "@babel/helper-plugin-utils": "^7.19.0", + "@babel/compat-data": "^7.20.1", + "@babel/helper-compilation-targets": "^7.20.0", + "@babel/helper-plugin-utils": "^7.20.2", "@babel/helper-validator-option": "^7.18.6", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9", - "@babel/plugin-proposal-async-generator-functions": "^7.19.1", + "@babel/plugin-proposal-async-generator-functions": "^7.20.1", "@babel/plugin-proposal-class-properties": "^7.18.6", "@babel/plugin-proposal-class-static-block": "^7.18.6", "@babel/plugin-proposal-dynamic-import": "^7.18.6", @@ -10022,7 +9695,7 @@ "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-proposal-numeric-separator": "^7.18.6", - "@babel/plugin-proposal-object-rest-spread": "^7.19.4", + "@babel/plugin-proposal-object-rest-spread": "^7.20.2", "@babel/plugin-proposal-optional-catch-binding": "^7.18.6", "@babel/plugin-proposal-optional-chaining": "^7.18.9", "@babel/plugin-proposal-private-methods": "^7.18.6", @@ -10033,7 +9706,7 @@ "@babel/plugin-syntax-class-static-block": "^7.14.5", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-export-namespace-from": "^7.8.3", - "@babel/plugin-syntax-import-assertions": "^7.18.6", + "@babel/plugin-syntax-import-assertions": "^7.20.0", "@babel/plugin-syntax-json-strings": "^7.8.3", "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4", "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", @@ -10046,10 +9719,10 @@ "@babel/plugin-transform-arrow-functions": "^7.18.6", "@babel/plugin-transform-async-to-generator": "^7.18.6", "@babel/plugin-transform-block-scoped-functions": "^7.18.6", - "@babel/plugin-transform-block-scoping": "^7.19.4", - "@babel/plugin-transform-classes": "^7.19.0", + "@babel/plugin-transform-block-scoping": "^7.20.2", + "@babel/plugin-transform-classes": "^7.20.2", "@babel/plugin-transform-computed-properties": "^7.18.9", - "@babel/plugin-transform-destructuring": "^7.19.4", + "@babel/plugin-transform-destructuring": "^7.20.2", "@babel/plugin-transform-dotall-regex": "^7.18.6", "@babel/plugin-transform-duplicate-keys": "^7.18.9", "@babel/plugin-transform-exponentiation-operator": "^7.18.6", @@ -10057,14 +9730,14 @@ "@babel/plugin-transform-function-name": "^7.18.9", "@babel/plugin-transform-literals": "^7.18.9", "@babel/plugin-transform-member-expression-literals": "^7.18.6", - "@babel/plugin-transform-modules-amd": "^7.18.6", - "@babel/plugin-transform-modules-commonjs": "^7.18.6", - "@babel/plugin-transform-modules-systemjs": "^7.19.0", + "@babel/plugin-transform-modules-amd": "^7.19.6", + "@babel/plugin-transform-modules-commonjs": "^7.19.6", + "@babel/plugin-transform-modules-systemjs": "^7.19.6", "@babel/plugin-transform-modules-umd": "^7.18.6", "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1", "@babel/plugin-transform-new-target": "^7.18.6", "@babel/plugin-transform-object-super": "^7.18.6", - "@babel/plugin-transform-parameters": "^7.18.8", + "@babel/plugin-transform-parameters": "^7.20.1", "@babel/plugin-transform-property-literals": "^7.18.6", "@babel/plugin-transform-regenerator": "^7.18.6", "@babel/plugin-transform-reserved-words": "^7.18.6", @@ -10076,20 +9749,12 @@ "@babel/plugin-transform-unicode-escapes": "^7.18.10", "@babel/plugin-transform-unicode-regex": "^7.18.6", "@babel/preset-modules": "^0.1.5", - "@babel/types": "^7.19.4", + "@babel/types": "^7.20.2", "babel-plugin-polyfill-corejs2": "^0.3.3", "babel-plugin-polyfill-corejs3": "^0.6.0", "babel-plugin-polyfill-regenerator": "^0.4.1", "core-js-compat": "^3.25.1", "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "@babel/preset-modules": { @@ -10119,12 +9784,12 @@ } }, "@babel/runtime": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.0.tgz", - "integrity": "sha512-NDYdls71fTXoU8TZHfbBWg7DiZfNzClcKui/+kyi6ppD2L1qnWW3VV6CjtaBXSUGGhiTWJ6ereOIkUvenif66Q==", + "version": "7.20.6", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.6.tgz", + "integrity": "sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==", "dev": true, "requires": { - "regenerator-runtime": "^0.13.10" + "regenerator-runtime": "^0.13.11" } }, "@babel/template": { @@ -10139,44 +9804,27 @@ } }, "@babel/traverse": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.0.tgz", - "integrity": "sha512-5+cAXQNARgjRUK0JWu2UBwja4JLSO/rBMPJzpsKb+oBF5xlUuCfljQepS4XypBQoiigL0VQjTZy6WiONtUdScQ==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz", + "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.0", + "@babel/generator": "^7.20.5", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.0", - "@babel/types": "^7.20.0", + "@babel/parser": "^7.20.5", + "@babel/types": "^7.20.5", "debug": "^4.1.0", "globals": "^11.1.0" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "@babel/types": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.0.tgz", - "integrity": "sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==", + "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz", + "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.19.4", @@ -10201,30 +9849,15 @@ "strip-json-comments": "^3.1.1" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, "globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "requires": { "type-fest": "^0.20.2" } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -10234,31 +9867,14 @@ } }, "@humanwhocodes/config-array": { - "version": "0.11.6", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.6.tgz", - "integrity": "sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg==", + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz", + "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", "debug": "^4.1.1", - "minimatch": "^3.0.4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } + "minimatch": "^3.0.5" } }, "@humanwhocodes/module-importer": { @@ -10450,14 +10066,6 @@ } } }, - "nopt": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", - "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", - "requires": { - "abbrev": "1" - } - }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -10502,9 +10110,9 @@ } }, "@types/chai": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.3.tgz", - "integrity": "sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw==", "dev": true }, "@types/cookiejar": { @@ -10522,9 +10130,9 @@ } }, "@types/eslint": { - "version": "8.4.8", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.8.tgz", - "integrity": "sha512-zUCKQI1bUCTi+0kQs5ZQzQ/XILWRLIlh15FXWNykJ+NG3TMKMVvwwC6GP3DR1Ylga15fB7iAExSzc4PNlR5i3w==", + "version": "8.4.10", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.10.tgz", + "integrity": "sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==", "dev": true, "peer": true, "requires": { @@ -10568,9 +10176,9 @@ "integrity": "sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==" }, "@types/node": { - "version": "18.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz", - "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ==" + "version": "18.11.10", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.10.tgz", + "integrity": "sha512-juG3RWMBOqcOuXC643OAdSA525V44cVgGV6dUDuiFtss+8Fk5x1hI93Rsld43VeJVIeqlP9I7Fn9/qaVqoEAuQ==" }, "@types/superagent": { "version": "3.8.7", @@ -10583,9 +10191,9 @@ } }, "@types/validator": { - "version": "13.7.9", - "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.9.tgz", - "integrity": "sha512-y5KJ1PjGXPpU4CZ7lThDu31s+FqvzhqwMOR6Go/x6xaQMFjgzwfzfOvCwABsylr/5n8sB1qFQm1Vi7TaCB8P+A==" + "version": "13.7.10", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.7.10.tgz", + "integrity": "sha512-t1yxFAR2n0+VO6hd/FJ9F2uezAZVWHLmpmlJzm1eX03+H7+HsuTAp7L8QJs+2pQCfWkP1+EXsGK9Z9v7o/qPVQ==" }, "@webassemblyjs/ast": { "version": "1.11.1", @@ -10803,21 +10411,6 @@ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "requires": { "debug": "4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "aggregate-error": { @@ -10870,9 +10463,9 @@ } }, "anymatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", - "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, "requires": { "normalize-path": "^3.0.0", @@ -10906,18 +10499,6 @@ "requires": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", - "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } } }, "argparse": { @@ -10932,39 +10513,39 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "array-includes": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.5.tgz", - "integrity": "sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", + "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.19.5", - "get-intrinsic": "^1.1.1", + "es-abstract": "^1.20.4", + "get-intrinsic": "^1.1.3", "is-string": "^1.0.7" } }, "array.prototype.flat": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz", - "integrity": "sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", + "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-shim-unscopables": "^1.0.0" } }, "array.prototype.reduce": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz", - "integrity": "sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz", + "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", "es-array-method-boxes-properly": "^1.0.0", "is-string": "^1.0.7" } @@ -10982,9 +10563,9 @@ "dev": true }, "babel-loader": { - "version": "8.2.5", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.2.5.tgz", - "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", + "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", "dev": true, "requires": { "find-cache-dir": "^3.3.1", @@ -11058,12 +10639,6 @@ "requires": { "find-up": "^4.0.0" } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true } } }, @@ -11074,16 +10649,8 @@ "dev": true, "requires": { "@babel/compat-data": "^7.17.7", - "@babel/helper-define-polyfill-provider": "^0.3.3", - "semver": "^6.1.1" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } + "@babel/helper-define-polyfill-provider": "^0.3.3", + "semver": "^6.1.1" } }, "babel-plugin-polyfill-corejs3": { @@ -11148,6 +10715,21 @@ "raw-body": "2.5.1", "type-is": "~1.6.18", "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } } }, "brace-expansion": { @@ -11227,12 +10809,6 @@ "requires": { "semver": "^6.0.0" } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true } } }, @@ -11258,20 +10834,20 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001426", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz", - "integrity": "sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==", + "version": "1.0.30001436", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz", + "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==", "dev": true }, "chai": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.6.tgz", - "integrity": "sha512-bbcp3YfHCUzMOvKqsztczerVgBKSsEijCySNlHHbX3VG1nskvqjz5Rfso1gGwD6w6oOV3eI60pKuMOV5MV7p3Q==", + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.7.tgz", + "integrity": "sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A==", "dev": true, "requires": { "assertion-error": "^1.1.0", "check-error": "^1.0.2", - "deep-eql": "^3.0.1", + "deep-eql": "^4.1.2", "get-func-name": "^2.0.0", "loupe": "^2.3.1", "pathval": "^1.1.1", @@ -11465,15 +11041,15 @@ "dev": true }, "core-js": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.0.tgz", - "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==", + "version": "3.26.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.26.1.tgz", + "integrity": "sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==", "dev": true }, "core-js-compat": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz", - "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==", + "version": "3.26.1", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.1.tgz", + "integrity": "sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==", "dev": true, "requires": { "browserslist": "^4.21.4" @@ -11506,11 +11082,11 @@ } }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "requires": { - "ms": "2.0.0" + "ms": "2.1.2" } }, "decamelize": { @@ -11520,9 +11096,9 @@ "dev": true }, "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.2.tgz", + "integrity": "sha512-gT18+YW4CcW/DBNTwAmqTtkJh7f9qqScu2qFVlx7kCoeY9tlBu9cUcr7+I+Z/noG8INehS3xQgLpTtd/QUTn4w==", "dev": true, "requires": { "type-detect": "^4.0.0" @@ -11640,9 +11216,9 @@ "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==" }, "enhanced-resolve": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz", - "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==", + "version": "5.12.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", + "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", "dev": true, "peer": true, "requires": { @@ -11739,9 +11315,9 @@ "dev": true }, "eslint": { - "version": "8.26.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.26.0.tgz", - "integrity": "sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg==", + "version": "8.29.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", + "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.3", @@ -11819,15 +11395,6 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -11844,9 +11411,9 @@ } }, "globals": { - "version": "13.17.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz", - "integrity": "sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==", + "version": "13.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.18.0.tgz", + "integrity": "sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -11858,12 +11425,6 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -11891,14 +11452,6 @@ "object.assign": "^4.1.2", "object.entries": "^1.1.5", "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "eslint-config-prettier": { @@ -11926,12 +11479,6 @@ "requires": { "ms": "^2.1.1" } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true } } }, @@ -11952,12 +11499,6 @@ "requires": { "ms": "^2.1.1" } - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true } } }, @@ -11991,6 +11532,15 @@ "tsconfig-paths": "^3.14.1" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, "doctrine": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", @@ -11999,6 +11549,12 @@ "requires": { "esutils": "^2.0.2" } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true } } }, @@ -12045,9 +11601,9 @@ "dev": true }, "espree": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.0.tgz", - "integrity": "sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz", + "integrity": "sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==", "dev": true, "requires": { "acorn": "^8.8.0", @@ -12139,6 +11695,21 @@ "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } } }, "extend": { @@ -12177,9 +11748,9 @@ "dev": true }, "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", + "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -12215,6 +11786,21 @@ "parseurl": "~1.3.3", "statuses": "2.0.1", "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } } }, "find-cache-dir": { @@ -12557,21 +12143,6 @@ "requires": { "agent-base": "6", "debug": "4" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - } } }, "iconv-lite": { @@ -12583,9 +12154,9 @@ } }, "ignore": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", - "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", + "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", "dev": true }, "ignore-by-default": { @@ -12893,14 +12464,6 @@ "@istanbuljs/schema": "^0.1.2", "istanbul-lib-coverage": "^3.0.0", "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } } }, "istanbul-lib-processinfo": { @@ -12943,12 +12506,6 @@ "semver": "^6.0.0" } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -12969,23 +12526,6 @@ "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", "source-map": "^0.6.1" - }, - "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } } }, "istanbul-reports": { @@ -13030,9 +12570,9 @@ } }, "js-sdsl": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.1.5.tgz", - "integrity": "sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", + "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", "dev": true }, "js-tokens": { @@ -13098,10 +12638,10 @@ "semver": "^5.6.0" }, "dependencies": { - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" } } }, @@ -13287,9 +12827,9 @@ } }, "loupe": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.4.tgz", - "integrity": "sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz", + "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==", "dev": true, "requires": { "get-func-name": "^2.0.0" @@ -13311,6 +12851,14 @@ "requires": { "pify": "^4.0.1", "semver": "^5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "media-typer": { @@ -13418,23 +12966,6 @@ "yargs-unparser": "2.0.0" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - }, - "dependencies": { - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -13515,17 +13046,17 @@ "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" }, "moment-timezone": { - "version": "0.5.38", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.38.tgz", - "integrity": "sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q==", + "version": "0.5.39", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.39.tgz", + "integrity": "sha512-hoB6suq4ISDj7BDgctiOy6zljBsdYT0++0ZzZm9rtxIvJhIbQ3nmbgSWe7dNFGurl6/7b1OUkHlmN9JWgXVz7w==", "requires": { "moment": ">= 2.9.0" } }, "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "nanoid": { "version": "3.3.3", @@ -13564,6 +13095,14 @@ "requires": { "object.getownpropertydescriptors": "^2.0.3", "semver": "^5.7.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } } }, "node-fetch": { @@ -13589,6 +13128,11 @@ "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", "dev": true }, + "nodemailer": { + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.8.0.tgz", + "integrity": "sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==" + }, "nodemon": { "version": "2.0.20", "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-2.0.20.tgz", @@ -13616,19 +13160,18 @@ "ms": "^2.1.1" } }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true } } }, "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", - "dev": true, + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "requires": { "abbrev": "1" } @@ -13792,12 +13335,6 @@ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, "wrap-ansi": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", @@ -13875,37 +13412,37 @@ } }, "object.entries": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.5.tgz", - "integrity": "sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz", + "integrity": "sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "object.getownpropertydescriptors": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz", - "integrity": "sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==", + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz", + "integrity": "sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==", "dev": true, "requires": { - "array.prototype.reduce": "^1.0.4", + "array.prototype.reduce": "^1.0.5", "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.20.1" + "es-abstract": "^1.20.4" } }, "object.values": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.5.tgz", - "integrity": "sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", + "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", "dev": true, "requires": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.1" + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" } }, "on-finished": { @@ -14242,9 +13779,9 @@ "dev": true }, "prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", + "integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==", "dev": true }, "prettier-linter-helpers": { @@ -14332,26 +13869,13 @@ } }, "readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", - "dev": true, + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } }, "readdirp": { @@ -14379,15 +13903,15 @@ } }, "regenerator-runtime": { - "version": "0.13.10", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz", - "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==", + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", "dev": true }, "regenerator-transform": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz", - "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==", + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz", + "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==", "dev": true, "requires": { "@babel/runtime": "^7.8.4" @@ -14411,9 +13935,9 @@ "dev": true }, "regexpu-core": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz", - "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.2.tgz", + "integrity": "sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==", "dev": true, "requires": { "regenerate": "^1.4.2", @@ -14421,7 +13945,7 @@ "regjsgen": "^0.7.1", "regjsparser": "^0.9.1", "unicode-match-property-ecmascript": "^2.0.0", - "unicode-match-property-value-ecmascript": "^2.0.0" + "unicode-match-property-value-ecmascript": "^2.1.0" } }, "regjsgen": { @@ -14552,9 +14076,10 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true }, "send": { "version": "0.18.0", @@ -14576,6 +14101,21 @@ "statuses": "2.0.1" }, "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + } + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -14584,9 +14124,9 @@ } }, "sequelize": { - "version": "6.25.3", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.25.3.tgz", - "integrity": "sha512-sbbvDGft6UfSRdIC0dcZvMxxJYi6g0+IgWvIpTuk6ccEoIyLcr7Sk6nXWwGfkdlDabGeunhhhI4yH8PleVMvtw==", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-6.26.0.tgz", + "integrity": "sha512-Xv82z1FdSn/qwB1IObSxIHV519cFk/vSD28vWs8Y0VucQLn7pK2x2jYjf2Qg/rBUQbCVprDdU7RPf+55rrkc0A==", "requires": { "@types/debug": "^4.1.7", "@types/validator": "^13.7.1", @@ -14606,19 +14146,6 @@ "wkx": "^0.5.0" }, "dependencies": { - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -14704,9 +14231,9 @@ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "simple-update-notifier": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", - "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz", + "integrity": "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==", "dev": true, "requires": { "semver": "~7.0.0" @@ -14764,12 +14291,6 @@ "requires": { "semver": "^6.0.0" } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true } } }, @@ -14790,18 +14311,11 @@ "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==" }, "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "requires": { - "safe-buffer": "~5.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } + "safe-buffer": "~5.2.0" } }, "string-width": { @@ -14815,25 +14329,25 @@ } }, "string.prototype.trimend": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz", - "integrity": "sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" + "es-abstract": "^1.20.4" } }, "string.prototype.trimstart": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz", - "integrity": "sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.4", - "es-abstract": "^1.19.5" + "es-abstract": "^1.20.4" } }, "strip-ansi": { @@ -14883,11 +14397,35 @@ "ms": "^2.1.1" } }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "readable-stream": { + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } } } }, @@ -14927,9 +14465,9 @@ } }, "terser": { - "version": "5.15.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz", - "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==", + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.16.1.tgz", + "integrity": "sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==", "dev": true, "peer": true, "requires": { @@ -15025,6 +14563,17 @@ "dev": true, "requires": { "nopt": "~1.0.10" + }, + "dependencies": { + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==", + "dev": true, + "requires": { + "abbrev": "1" + } + } } }, "tr46": { @@ -15140,9 +14689,9 @@ } }, "unicode-match-property-value-ecmascript": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", - "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz", + "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==", "dev": true }, "unicode-property-aliases-ecmascript": { @@ -15226,9 +14775,9 @@ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "webpack": { - "version": "5.74.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", - "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==", + "version": "5.75.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.75.0.tgz", + "integrity": "sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==", "dev": true, "peer": true, "requires": { diff --git a/package.json b/package.json index 5f21d3e..8d8c6e0 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "express": "^4.18.2", "faker": "^5.5.3", "jsonwebtoken": "^8.5.1", + "nodemailer": "^6.8.0", "passport": "^0.6.0", "passport-jwt": "^4.0.0", "pg": "^8.8.0", diff --git a/src/controllers/userController.js b/src/controllers/userController.js index 1ef28d8..6f163c9 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -1,5 +1,6 @@ import userService from "../services/userService"; import Util from '../utils/Utils'; +import Verify from "../services/VerifyService"; const util = new Util(); const handleSignup = async (req, res, next) => { @@ -8,12 +9,16 @@ const handleSignup = async (req, res, next) => { const user = await userService.findUser({email}); if (user) { + const name = firstName+' '+lastName+' '+secondName; + await Verify.sendMail(name, email) util.setSuccess(200, 'Email already exists!'); //throw new Error("Email already exists!"); }else{ // Create a token for the user const { token } = await userService.create({ firstName, lastName, secondName, email, roleId, password }); const result = {token: token, user} + const name = firstName+' '+lastName+' '+secondName; + await Verify.sendMail(name, email) util.setSuccess(200, 'Registration Successful', result); } // Send a token to the client when a user signs up diff --git a/src/controllers/verifyController.js b/src/controllers/verifyController.js new file mode 100644 index 0000000..2540b5e --- /dev/null +++ b/src/controllers/verifyController.js @@ -0,0 +1,79 @@ +import sendEmail from "../utils/email"; +import db from "../db/models/index"; +import { User, validate } from "../db/models/user"; +import crypto from 'crypto'; +import express from "express"; + + +const router = express.Router(); +class verifyController { + + + +// static async sendVerify(req, res) { +// try { + +// if (error) return res.status(400).send(error.details[0].message); + +// let user = await db.User.findOne({ email: req.body.email }); +// if (user) +// return res.status(400).send("User with given email already exist!"); + +// user = await new db.User({ +// name: req.body.name, +// email: req.body.email, +// }).save(); + +// let token = await new Token({ +// userId: user._id, +// token: crypto.randomBytes(32).toString("hex"), +// }).save(); + +// const message = `${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; +// await sendEmail(user.email, "Verify Email", message); + +// res.send("An Email sent to your account please verify"); +// } catch (error) { +// res.status(400).send("An error occured"); +// } +// }; + +// static async getAllMessages(req, res) { +// try { +// const allMessages = await MessageService.getAllMessages(); +// if (allMessages.length > 0) { +// util.setSuccess(200, 'Messages retrieved', allMessages); +// } else { +// util.setSuccess(200, 'No Message found'); +// } +// return util.send(res); +// } catch (error) { +// util.setError(400, error); +// return util.send(res); +// } +// }; + + async verify(req, res) { + try { + const user = await db.User.findOne({ _id: req.params.id }); + const verify =verify(token, id) + if (!user) return res.status(400).send("Invalid link"); + + const token = await db.Token.findOne({ + userId: user._id, + token: req.params.token, + }); + if (!token) return res.status(400).send("Invalid link"); + + await db.User.updateOne({ id: user._id, verified: true }); + //await Token.findByIdAndRemove(token._id); + + res.send("email verified sucessfully"); + } catch (error) { + res.status(400).send("An error occured"); + } + }; + + } +//} + export default verifyController; \ No newline at end of file diff --git a/src/db/migrations/20221030092330-create-user.js b/src/db/migrations/20221030092330-create-user.js index bcfd531..725c271 100644 --- a/src/db/migrations/20221030092330-create-user.js +++ b/src/db/migrations/20221030092330-create-user.js @@ -1,4 +1,7 @@ 'use strict'; + +const { toDefaultValue } = require('sequelize/types/utils'); + /** @type {import('sequelize-cli').Migration} */ module.exports = { async up(queryInterface, Sequelize) { @@ -24,6 +27,11 @@ module.exports = { type:Sequelize.STRING, allowNull:false }, + verify: { + type:Sequelize.BOOLEAN, + allowNull:false, + defaultValue: false + }, roleId: { type: Sequelize.UUID, allowNull:false diff --git a/src/db/migrations/20221205043218-create-token.js b/src/db/migrations/20221205043218-create-token.js new file mode 100644 index 0000000..7af9ddc --- /dev/null +++ b/src/db/migrations/20221205043218-create-token.js @@ -0,0 +1,28 @@ +'use strict'; +/** @type {import('sequelize-cli').Migration} */ +module.exports = { + async up(queryInterface, Sequelize) { + await queryInterface.createTable('Tokens', { + id: { + allowNull: false, + autoIncrement: true, + primaryKey: true, + type: Sequelize.INTEGER + }, + token: { + type: Sequelize.STRING(1234) + }, + createdAt: { + allowNull: false, + type: Sequelize.DATE + }, + updatedAt: { + allowNull: false, + type: Sequelize.DATE + } + }); + }, + async down(queryInterface, Sequelize) { + await queryInterface.dropTable('Tokens'); + } +}; \ No newline at end of file diff --git a/src/db/models/token.js b/src/db/models/token.js new file mode 100644 index 0000000..1c23adb --- /dev/null +++ b/src/db/models/token.js @@ -0,0 +1,35 @@ +'use strict'; +const { + Model +} = require('sequelize'); +module.exports = (sequelize, DataTypes) => { + class Token extends Model { + /** + * Helper method for defining associations. + * This method is not a part of Sequelize lifecycle. + * The `models/index` file will call this method automatically. + */ + static associate(models) { + // define association here + //Token.belongsTo(models.User, {foreignKey: 'userId', as: 'userId'}); + } + } + Token.init({ + id:{ + type: DataTypes.UUID, + defaultValue: DataTypes.UUIDV4, + allowNull:false, + primaryKey:true + }, + token: DataTypes.STRING(1234), + userId:{ + type: DataTypes.UUID, + allowNull:false, + foreignKey:true + }, + }, { + sequelize, + modelName: 'Token', + }); + return Token; +}; \ No newline at end of file diff --git a/src/db/models/user.js b/src/db/models/user.js index 4b7f43b..37e6ff0 100644 --- a/src/db/models/user.js +++ b/src/db/models/user.js @@ -16,6 +16,7 @@ module.exports = (sequelize, DataTypes) => { User.hasMany(models.Message, {foreignKey: 'senderId', as: 'sender'}); User.hasMany(models.Message, {foreignKey: 'receiverId', as: 'receiver'}); User.belongsTo(models.Role, {foreignKey: 'roleId', as: 'role'}) + //User.hasOne(models.Token, {foreignKey: 'userId', as: 'userId'}); } } User.init({ @@ -40,6 +41,11 @@ module.exports = (sequelize, DataTypes) => { type:DataTypes.STRING, allowNull:false }, + verify: { + type:DataTypes.BOOLEAN, + allowNull:false, + defaultValue: false + }, roleId: { type: DataTypes.UUID, allowNull:false diff --git a/src/routers/userRouter.js b/src/routers/userRouter.js index 2788f45..dedda8d 100644 --- a/src/routers/userRouter.js +++ b/src/routers/userRouter.js @@ -4,5 +4,6 @@ import { handleSignup, handleLogin } from '../controllers/userController.js'; userRouter.post('/login', handleLogin); userRouter.post('/register', handleSignup); +userRouter.get("/verify/:id/:token"); export { userRouter }; \ No newline at end of file diff --git a/src/services/emailService.js b/src/services/emailService.js new file mode 100644 index 0000000..b57f1e3 --- /dev/null +++ b/src/services/emailService.js @@ -0,0 +1,63 @@ +//import nodemailer from 'nodemailer'; +const { MailtrapClient } = require("mailtrap"); + +// For this example to work, you need to set up a sending domain, +// and obtain a token that is authorized to send from the domain +const TOKEN = "d73ac2c42caa3066d271b1dd88d04456"; +const SENDER_EMAIL = "mansuribrahimnok@gmail.com"; +const RECIPIENT_EMAIL = "princemi007@gmail.com"; + +const client = new MailtrapClient({ token: TOKEN }); + +const sender = { name: "Mailtrap Test", email: SENDER_EMAIL }; + +//const welcomeImage = fs.readFileSync(path.join(__dirname, "welcome.png")); + +client + .send({ + category: "test", + custom_variables: { + hello: "world", + year: 2022, + anticipated: true, + }, + from: sender, + to: [{ email: RECIPIENT_EMAIL }], + subject: "Hello from Mailtrap!", + html: ` + + + + + + +
+

Congrats for sending test email with Mailtrap!

+

Inspect it using the tabs you see above and learn how this email can be improved.

+ Inspect with Tabs +

Now send your email using our fake SMTP server and integration of your choice!

+

Good luck! Hope it works.

+
+ + + + + `, + // attachments: [ + // { + // filename: "welcome.png", + // content_id: "welcome.png", + // disposition: "inline", + // //content: welcomeImage, + // }, + // ], + }) + .then( + console.log('hjj'), + console.error('jkkjk') + ).catch(function () { + console.log("Promise Rejected"); + }); \ No newline at end of file diff --git a/src/services/emailServiceMailtrap.js b/src/services/emailServiceMailtrap.js new file mode 100644 index 0000000..ccb1f7e --- /dev/null +++ b/src/services/emailServiceMailtrap.js @@ -0,0 +1,36 @@ +const nodemailer =require( 'nodemailer'); + +class EmailSender{ + static async sendMail(to, subject, text) { +const transporter = nodemailer.createTransport({ + service: 'gmail', //'gmail', + host: "smtp.mailtrap.io", + port: 2525, + ssl: false, + tls: true, + auth: { + //Gmail user: 'mansuribrahimnok@gmail.com', + user: 'mansuribrahimnok@gmail.com',//8294e4f60324e9', + //Gmail pass: 'eugepkjqwvciaiap' // naturally, replace both with your real credentials or an application-specific password + pass: 'eugepkjqwvciaiap'//6ee4754d4902b5' // naturally, replace both with your real credentials or an application-specific password + } +}); + +const mailOptions = { + from: 'mansuribrahimnok@gmail.com', + to: to,//'princemi007@gmail.com', + subject: subject,//'Invoices due', + text: text//'Hey baby, Will you marry me.' +}; + +transporter.sendMail(mailOptions, function(error, info){ + if (error) { + console.log(error); + } else { + console.log('Email sent: ' + info.response); + } +}); + } +} +//EmailSender.sendMail('princemi007@gmail.com', 'subject', 'text') +module.exports = EmailSender; \ No newline at end of file diff --git a/src/services/userService.js b/src/services/userService.js index 14e72ca..6df9900 100644 --- a/src/services/userService.js +++ b/src/services/userService.js @@ -9,16 +9,21 @@ const JWT_SECRET = process.env.JWT_SECRET; class UserService { static async findUser ({id, email}) { + try { if(id!= null){ + console.log('name') const aUser = await users.findOne({ where: {id: email } }); + return aUser }else if(email !=null){ + console.log('name') const aUser = await users.findOne({ where: {email: email } }); + console.log('name') return aUser; } } catch (error) { diff --git a/src/services/v.js b/src/services/v.js new file mode 100644 index 0000000..c29dc3c --- /dev/null +++ b/src/services/v.js @@ -0,0 +1,60 @@ +// import sendEmail from "../utils/email"; +// import Token from "../db/models/token"; +// import { User, validate } from "../db/models/user"; +// import crypto from 'crypto'; +// import express from "express"; + + +// const router = express.Router(); + +// router.post("/", async (req, res) => { +// try { +// const { error } = validate(req.body); +// if (error) return res.status(400).send(error.details[0].message); + +// let user = await User.findOne({ email: req.body.email }); +// if (user) +// return res.status(400).send("User with given email already exist!"); + +// user = await new User({ +// name: req.body.name, +// email: req.body.email, +// }).save(); + +// let token = await new Token({ +// userId: user._id, +// token: crypto.randomBytes(32).toString("hex"), +// }).save(); + +// const message = `${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; +// await sendEmail(user.email, "Verify Email", message); + +// res.send("An Email sent to your account please verify"); +// } catch (error) { +// res.status(400).send("An error occured"); +// } +// }); + +// router.get("/verify/:id/:token", async (req, res) => { +// try { +// const user = await User.findOne({ _id: req.params.id }); +// if (!user) return res.status(400).send("Invalid link"); + +// const token = await Token.findOne({ +// userId: user._id, +// token: req.params.token, +// }); +// if (!token) return res.status(400).send("Invalid link"); + +// await User.updateOne({ _id: user._id, verified: true }); +// await Token.findByIdAndRemove(token._id); + +// res.send("email verified sucessfully"); +// } catch (error) { +// res.status(400).send("An error occured"); +// } +// }); + +// } + +// module.exports = router; \ No newline at end of file diff --git a/src/services/verify.js b/src/services/verify.js new file mode 100644 index 0000000..d067ca6 --- /dev/null +++ b/src/services/verify.js @@ -0,0 +1,74 @@ +/* eslint-disable no-useless-catch */ +//import sendEmail from "../utils/email"; +const sendEmail = require( "./emailServiceMailtrap.js"); +const db = require( "../db/models/index.js"); +const crypto = require('crypto'); + + +// const router = express.Router(); +//class Verify { + +const sendVerify = async (name, email)=>{ + console.log(name); +try { + //const { error } = validate(err); + // if (error) return res.status(400).send(error.details[0].message); + console.log(name); + let user = await db.User.findOne({ + where: { email: email } + }); + console.log(name); + if (user){ + // return res.status(400).send("User with given email already exist!"); + + let token = await db.Token.create({ + userId: user.id, + token: crypto.randomBytes(32).toString("hex"), + }); + console.log(token); + const message = `${name} click this link to verify your email ${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; + console.log(token); + await sendEmail.sendMail(email, "Verify Email", message); + }else{ + console.log(token); + return null + } + //res.send("An Email sent to your account please verify"); + } catch (error) { + console.log(error); + //console.log("An error occured"); //res.status(400).send("An error occured"); + } +} + +// async verify(token, id) { +// try { +// const user = await db.User.findOne({where:{ id: id }}); +// //if (!user) return res.status(400).send("Invalid link"); + +// const token = await db.Token.findOne({where:{ +// userId: user.id, +// token: token, +// }}); +// if (!token){ +// return false; +// }else{ +// await db.User.updateOne({where:{ id: id, verified: true }}); +// await db.Token.destroy({ +// where: { +// id: token.id +// } +// }); + +// return true; +// } +// // res.send("email verified sucessfully"); + +// } catch (error) { +// return error;// res.status(400).send("An error occured"); +// } +// }; + + +// } + sendVerify('name', 'princemi007@gmail.com') + // export default Verify diff --git a/src/services/verifyService.js b/src/services/verifyService.js new file mode 100644 index 0000000..5a7649d --- /dev/null +++ b/src/services/verifyService.js @@ -0,0 +1,76 @@ +/* eslint-disable no-useless-catch */ +require("dotenv").config(); +import bcrypt from "bcrypt"; +import jwt from "jsonwebtoken"; +import database from '../db/models/index.js'; +import sendEmail from "./emailServiceMailtrap.js"; +import crypto from 'crypto'; + +const users = database.User; +const tokens = database.Token; +const JWT_SECRET = process.env.JWT_SECRET; + class VerifyService { + static async sendMail (name, email) { + try { + let user = await this.findUser({ email }) + console.log('verify1') + if (user){ + console.log('verify2') + let token = await tokens.create({ + userId: user.id, + token: crypto.randomBytes(32).toString("hex"), + }); + console.log('verify3') + const message = `${name} click this link to verify your email ${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; + await sendEmail.sendMail(email, "Verify Email", message); + }else{ + return null + } + + } catch (error) { + throw error; + } + }; + + + static async findUser ({email}) { + try { + + if(email !=null){ + const aUser = await users.findOne({ + where: {email: email } + }); + return aUser; + } + } catch (error) { + throw error; + } + }; + +// Save the new user to the database and return an authorization token for the user + static async create ({firstName, lastName, secondName, email, roleId, password }) { + + const newUser = { + firstName, + lastName, + secondName, + email, + roleId, + password: await bcrypt.hash(password, 10) + + }; + // save the new user to our database + const result = await users.create(newUser); + // Generate the JWT with jwt.sign. The return value is an + // authentication token + const token = jwt.sign({ id: result.id }, JWT_SECRET, { + expiresIn: 24 * 60 * 60, // Expire tokens after a certain amount of time so users can't stay logged in forever + }); + + return { token }; +}; + + +} +export default VerifyService + diff --git a/src/utils/email.js b/src/utils/email.js new file mode 100644 index 0000000..80c7e7e --- /dev/null +++ b/src/utils/email.js @@ -0,0 +1,30 @@ +const nodemailer = require("nodemailer"); + +const sendEmail = async (email, subject, text) => { + try { + const transporter = nodemailer.createTransport({ + host: process.env.EMAIL_HOST, + service: process.env.EMAIL_SERVICE, + port: process.env.EMAIL_PORT, + //secure: true, + auth: { + user: process.env.EMAIL_USER, + pass: process.env.EMAIL_PASS, + }, + }); + + await transporter.sendMail({ + from: process.env.EMAIL_USER, + to: email, + subject: subject, + text: text, + }); + console.log("email sent sucessfully"); + } catch (error) { + console.log("email not sent"); + console.log(error); + } +}; +sendEmail('princemi007@gmail.com', 'subject', 'text') + +// export default sendEmail; \ No newline at end of file From 855538f40ca14432e998c25d7a6bc923661365ea Mon Sep 17 00:00:00 2001 From: Judy Date: Wed, 7 Dec 2022 19:31:52 +0000 Subject: [PATCH 17/25] testing --- src/controllers/scoreController.js | 12 ++++++------ src/index.js | 4 ++-- src/routers/scoreRouter.js | 11 ++++++----- src/services/scoreService.js | 22 +++++++++++----------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/controllers/scoreController.js b/src/controllers/scoreController.js index c829003..f651137 100644 --- a/src/controllers/scoreController.js +++ b/src/controllers/scoreController.js @@ -1,12 +1,12 @@ -import ScoreService from '../services/ScoreService.js'; +import ScoreService from '../services/scoreService.js'; import Util from '../utils/Utils.js'; const util = new Util(); class ScoreController { - static async getAllScore(req, res) { + static async getAllScores(req, res) { try { - const allScore = await ScoreService.getAllScores(); + const allScores = await ScoreService.getAllScores(); if (allScores.length > 0) { util.setSuccess(200, 'Scores retrieved', allScores); } else { @@ -20,7 +20,7 @@ class ScoreController { } static async addScore(req, res) { - if (!req.body.Score || !req.body.senderId || !req.body.receiverId) { + if (!req.body.score || !req.body.assignmentId || !req.body.teacherId || !req.body.studentId) { util.setError(400, 'Please provide complete details'); return util.send(res); } @@ -30,7 +30,7 @@ class ScoreController { util.setSuccess(201, 'Score Added!', createdScore); return util.send(res); } catch (error) { - util.setError(400, error.Score); + util.setError(400, error.score); return util.send(res); } } @@ -65,7 +65,7 @@ class ScoreController { } try { - const theScore = await ScoreService.getAScore(id); + const theScore = await ScoreService.getASore(id); if (!theScore) { util.setError(404, `Cannot find Score with the id ${id}`); diff --git a/src/index.js b/src/index.js index 26ec4f8..f7f97de 100644 --- a/src/index.js +++ b/src/index.js @@ -1,9 +1,9 @@ import express from "express"; import dotenv from "dotenv"; -import { assignmentRouter } from './api/routers/assignmentRouter.js'; +import { assignmentRouter } from './routers/assignmentRouter.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/studentsRoutes.js'; -import { scoreRouter } from './routers/scoreRoutes.js'; +import { scoreRouter } from './routers/scoreRouter.js'; const app = express(); dotenv.config(); diff --git a/src/routers/scoreRouter.js b/src/routers/scoreRouter.js index aeda73b..6b0e44c 100644 --- a/src/routers/scoreRouter.js +++ b/src/routers/scoreRouter.js @@ -1,11 +1,12 @@ import { Router } from 'express'; -import scoreController from '../controllers/scoreController.js'; +import ScoreController from '../controllers/scoreController.js'; const scoreRouter = Router(); - -scoreRouter.post('/', scoreController.addScore); -scoreRouter.put('/:id', scoreController.updatedScore); -scoreRouter.delete('/:id', scoreController.deleteScore); +scoreRouter.get('/', ScoreController.getAllScores); +scoreRouter.post('/', ScoreController.addScore); +scoreRouter.get('/:id', ScoreController.getAScore); +scoreRouter.put('/:id', ScoreController.updatedScore); +scoreRouter.delete('/:id', ScoreController.deleteScore); export default scoreRouter; \ No newline at end of file diff --git a/src/services/scoreService.js b/src/services/scoreService.js index c551164..e5b650a 100644 --- a/src/services/scoreService.js +++ b/src/services/scoreService.js @@ -3,7 +3,7 @@ import database from '../db/models/index.js'; class ScoreService { static async getAllScores() { try { - const result = await database.Score.findAll(); + const result = await database.AssignmentScore.findAll(); return result; } catch (error) { throw error; @@ -12,7 +12,7 @@ class ScoreService { static async addScore(newScore) { try { - const result = await database.Score.create(newScore); + const result = await database.AssignmentScore.create(newScore); return result; } catch (error) { throw error; @@ -21,12 +21,12 @@ class ScoreService { static async updateScore(id, updateScore) { try { - const ScoreToUpdate = await database.Score.findOne({ + const scoreToUpdate = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); - if (ScoreToUpdate) { - await database.Score.update(updateScore, { where: { id: Number(id) } }); + if (scoreToUpdate) { + await database.AssignmentScore.update(updateScore, { where: { id: Number(id) } }); return updateScore; } @@ -36,13 +36,13 @@ class ScoreService { } } - static async getScore(id) { + static async getAScore(id) { try { - const Score = await database.Score.findOne({ + const aScore = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); - return Score; + return aScore; } catch (error) { throw error; } @@ -50,10 +50,10 @@ class ScoreService { static async deleteScore(id) { try { - const ScoreToDelete = await database.Score.findOne({ where: { id: Number(id) } }); + const scoreToDelete = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); - if (ScoreToDelete) { - const deletedScore = await database.Score.destroy({ + if (scoreToDelete) { + const deletedScore = await database.AssignmentScore.destroy({ where: { id: Number(id) } }); return deletedScore; From e611867c07867dbe6873303317bf60493cb0a612 Mon Sep 17 00:00:00 2001 From: Judy Date: Sat, 10 Dec 2022 14:23:15 +0000 Subject: [PATCH 18/25] delete score files --- src/controllers/scoreController.js | 106 ----------------------------- src/index.js | 2 +- src/routers/scoreRouter.js | 12 ---- src/services/scoreService.js | 68 ------------------ 4 files changed, 1 insertion(+), 187 deletions(-) delete mode 100644 src/controllers/scoreController.js delete mode 100644 src/routers/scoreRouter.js delete mode 100644 src/services/scoreService.js diff --git a/src/controllers/scoreController.js b/src/controllers/scoreController.js deleted file mode 100644 index f651137..0000000 --- a/src/controllers/scoreController.js +++ /dev/null @@ -1,106 +0,0 @@ -import ScoreService from '../services/scoreService.js'; -import Util from '../utils/Utils.js'; - -const util = new Util(); - -class ScoreController { - static async getAllScores(req, res) { - try { - const allScores = await ScoreService.getAllScores(); - if (allScores.length > 0) { - util.setSuccess(200, 'Scores retrieved', allScores); - } else { - util.setSuccess(200, 'No Score found'); - } - return util.send(res); - } catch (error) { - util.setError(400, error); - return util.send(res); - } - } - - static async addScore(req, res) { - if (!req.body.score || !req.body.assignmentId || !req.body.teacherId || !req.body.studentId) { - util.setError(400, 'Please provide complete details'); - return util.send(res); - } - const newScore = req.body; - try { - const createdScore = await ScoreService.addScore(newScore); - util.setSuccess(201, 'Score Added!', createdScore); - return util.send(res); - } catch (error) { - util.setError(400, error.score); - return util.send(res); - } - } - - static async updatedScore(req, res) { - const alteredScore = req.body; - const { id } = req.params; - if (!Number(id)) { - util.setError(400, 'Please input a valid numeric value'); - return util.send(res); - } - try { - const updateScore = await ScoreService.updateScore(id, alteredScore); - if (!updateScore) { - util.setError(404, `Cannot find Score with the id: ${id}`); - } else { - util.setSuccess(200, 'Score updated', updateScore); - } - return util.send(res); - } catch (error) { - util.setError(404, error); - return util.send(res); - } - } - - static async getAScore(req, res) { - const { id } = req.params; - - if (!Number(id)) { - util.setError(400, 'Please input a valid numeric value'); - return util.send(res); - } - - try { - const theScore = await ScoreService.getASore(id); - - if (!theScore) { - util.setError(404, `Cannot find Score with the id ${id}`); - } else { - util.setSuccess(200, 'Found Score', theScore); - } - return util.send(res); - } catch (error) { - util.setError(404, error); - return util.send(res); - } - } - - static async deleteScore(req, res) { - const { id } = req.params; - - if (!Number(id)) { - util.setError(400, 'Please provide a numeric value'); - return util.send(res); - } - - try { - const ScoreToDelete = await ScoreService.deleteScore(id); - - if (ScoreToDelete) { - util.setSuccess(200, 'Score deleted'); - } else { - util.setError(404, `Score with the id ${id} cannot be found`); - } - return util.send(res); - } catch (error) { - util.setError(400, error); - return util.send(res); - } - } -} - -export default ScoreController; \ No newline at end of file diff --git a/src/index.js b/src/index.js index f7f97de..721f43f 100644 --- a/src/index.js +++ b/src/index.js @@ -3,7 +3,7 @@ import dotenv from "dotenv"; import { assignmentRouter } from './routers/assignmentRouter.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/studentsRoutes.js'; -import { scoreRouter } from './routers/scoreRouter.js'; + const app = express(); dotenv.config(); diff --git a/src/routers/scoreRouter.js b/src/routers/scoreRouter.js deleted file mode 100644 index 6b0e44c..0000000 --- a/src/routers/scoreRouter.js +++ /dev/null @@ -1,12 +0,0 @@ -import { Router } from 'express'; -import ScoreController from '../controllers/scoreController.js'; - -const scoreRouter = Router(); - -scoreRouter.get('/', ScoreController.getAllScores); -scoreRouter.post('/', ScoreController.addScore); -scoreRouter.get('/:id', ScoreController.getAScore); -scoreRouter.put('/:id', ScoreController.updatedScore); -scoreRouter.delete('/:id', ScoreController.deleteScore); - -export default scoreRouter; \ No newline at end of file diff --git a/src/services/scoreService.js b/src/services/scoreService.js deleted file mode 100644 index e5b650a..0000000 --- a/src/services/scoreService.js +++ /dev/null @@ -1,68 +0,0 @@ -import database from '../db/models/index.js'; - -class ScoreService { - static async getAllScores() { - try { - const result = await database.AssignmentScore.findAll(); - return result; - } catch (error) { - throw error; - } - } - - static async addScore(newScore) { - try { - const result = await database.AssignmentScore.create(newScore); - return result; - } catch (error) { - throw error; - } - } - - static async updateScore(id, updateScore) { - try { - const scoreToUpdate = await database.AssignmentScore.findOne({ - where: { id: Number(id) } - }); - - if (scoreToUpdate) { - await database.AssignmentScore.update(updateScore, { where: { id: Number(id) } }); - - return updateScore; - } - return null; - } catch (error) { - throw error; - } - } - - static async getAScore(id) { - try { - const aScore = await database.AssignmentScore.findOne({ - where: { id: Number(id) } - }); - - return aScore; - } catch (error) { - throw error; - } - } - - static async deleteScore(id) { - try { - const scoreToDelete = await database.AssignmentScore.findOne({ where: { id: Number(id) } }); - - if (scoreToDelete) { - const deletedScore = await database.AssignmentScore.destroy({ - where: { id: Number(id) } - }); - return deletedScore; - } - return null; - } catch (error) { - throw error; - } - } -} - -export default ScoreService; From 631fb3c6bf7b85694f7e7961907f91433ed4cc67 Mon Sep 17 00:00:00 2001 From: Judy Date: Sat, 10 Dec 2022 16:43:55 +0000 Subject: [PATCH 19/25] correction --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 721f43f..d138cfb 100644 --- a/src/index.js +++ b/src/index.js @@ -13,7 +13,7 @@ app.use(express.urlencoded({ extended: true })); app.use('/api/message', messageRouter); app.use('/api/students', studentRouter); app.use('/api/assignment', assignmentRouter); -app.use('/api/score', scoreRouter); + app.get('/', (req, res) => { From 35cd0ee8194114572344d1193011ce54daf16eee Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Mon, 12 Dec 2022 11:34:43 +0100 Subject: [PATCH 20/25] Authenticate verify users --- config.example.js | 7 ++ package.json | 1 + src/controllers/MessageController.js | 14 +-- src/controllers/studentController.js | 8 +- src/controllers/userController.js | 81 ++++++++++-- src/controllers/verifyController.js | 79 ++---------- .../migrations/20221030092330-create-user.js | 7 +- .../migrations/20221030101744-create-role.js | 3 + .../migrations/20221205043218-create-token.js | 8 +- src/db/models/role.js | 3 + src/db/models/token.js | 9 +- src/db/models/user.js | 16 ++- src/db/seeders/20221117052728-Role.js | 7 +- src/db/seeders/20221117052755-Notice.js | 2 +- src/db/seeders/20221117052849-ClassStudent.js | 2 +- src/index.js | 4 +- src/middleware/auth.js | 10 +- src/routers/userRouter.js | 10 +- src/services/MessageService.js | 10 +- src/services/RoleService.js | 40 ++++++ src/services/TeacherService.js | 0 src/services/emailService.js | 116 +++++++++--------- src/services/emailServiceMailtrap.js | 66 +++++----- src/services/studentService.js | 22 ++-- src/services/userService.js | 5 +- src/services/v.js | 60 --------- src/services/verify.js | 2 +- src/services/verifyService.js | 66 +++++----- src/utils/email.js | 6 +- 29 files changed, 343 insertions(+), 321 deletions(-) create mode 100644 config.example.js create mode 100644 src/services/RoleService.js create mode 100644 src/services/TeacherService.js delete mode 100644 src/services/v.js diff --git a/config.example.js b/config.example.js new file mode 100644 index 0000000..8d2620e --- /dev/null +++ b/config.example.js @@ -0,0 +1,7 @@ +module.exports = { + "username": "username", + "password": "password", + "database": "databaseName", + "host": "127.0.0.1", + "dialect": "postgres" +} \ No newline at end of file diff --git a/package.json b/package.json index 8d8c6e0..815d26f 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ "migrate": "sequelize db:migrate", "migrate:undo": "sequelize db:migrate:undo:all", "seed": "sequelize db:seed:all", + "seed:undo": "sequelize db:seed:undo:all", "build": "rm -rf ./build && babel -d ./build ./src -s", "lint": "eslint --ext .js .", "lint:check": "eslint .", diff --git a/src/controllers/MessageController.js b/src/controllers/MessageController.js index 79d9bd1..9ce4a2b 100644 --- a/src/controllers/MessageController.js +++ b/src/controllers/MessageController.js @@ -14,7 +14,7 @@ class MessageController { } return util.send(res); } catch (error) { - util.setError(400, error); + util.setError(400, error.message); return util.send(res); } } @@ -38,7 +38,7 @@ class MessageController { static async updatedMessage(req, res) { const alteredMessage = req.body; const { id } = req.params; - if (!Number(id)) { + if (id) { util.setError(400, 'Please input a valid numeric value'); return util.send(res); } @@ -51,7 +51,7 @@ class MessageController { } return util.send(res); } catch (error) { - util.setError(404, error); + util.setError(404, error.message); return util.send(res); } } @@ -59,7 +59,7 @@ class MessageController { static async getAMessage(req, res) { const { id } = req.params; - if (!Number(id)) { + if (id) { util.setError(400, 'Please input a valid numeric value'); return util.send(res); } @@ -74,7 +74,7 @@ class MessageController { } return util.send(res); } catch (error) { - util.setError(404, error); + util.setError(404, error.message); return util.send(res); } } @@ -82,7 +82,7 @@ class MessageController { static async deleteMessage(req, res) { const { id } = req.params; - if (!Number(id)) { + if (id) { util.setError(400, 'Please provide a numeric value'); return util.send(res); } @@ -97,7 +97,7 @@ class MessageController { } return util.send(res); } catch (error) { - util.setError(400, error); + util.setError(400, error.message); return util.send(res); } } diff --git a/src/controllers/studentController.js b/src/controllers/studentController.js index cd3414e..bb808a8 100644 --- a/src/controllers/studentController.js +++ b/src/controllers/studentController.js @@ -18,7 +18,7 @@ class StudentController { } return util.send(res); } catch (error) { - util.setError(400, error); + util.setError(400, error.message); return util.send(res); } } @@ -55,7 +55,7 @@ class StudentController { } return util.send(res); } catch (error) { - util.setError(404, error); + util.setError(404, error.message); return util.send(res); } } @@ -78,7 +78,7 @@ class StudentController { } return util.send(res); } catch (error) { - util.setError(404, error); + util.setError(404, error.message); return util.send(res); } } @@ -101,7 +101,7 @@ class StudentController { } return util.send(res); } catch (error) { - util.setError(400, error); + util.setError(400, error.message); return util.send(res); } } diff --git a/src/controllers/userController.js b/src/controllers/userController.js index 6f163c9..fcd55e6 100644 --- a/src/controllers/userController.js +++ b/src/controllers/userController.js @@ -1,12 +1,51 @@ import userService from "../services/userService"; import Util from '../utils/Utils'; import Verify from "../services/VerifyService"; +import RoleService from "../services/RoleService"; const util = new Util(); -const handleSignup = async (req, res, next) => { +class UserController{ + static async addStudent(req, res) { + try { + const userRole = await RoleService.getRole(req.user.roleId); + if(userRole.slug === 'sl_teacher'|| userRole.slug ==='sl_admin'){ + const { firstName, lastName, secondName, email, password } = req.body; + const user = await userService.findUser({email}); + const role = await RoleService.getRoleBySlug('sl_student'); + const roleId = role.id; + + if (user) { + util.setError(400, 'Student already exists!'); + //throw new Error("Email already exists!"); + }else{ + // Create a token for the user + const { token } = await userService.create({ firstName, lastName, secondName, email, roleId:roleId, password }); + + const result = {token: token} + const name = firstName+' '+lastName+' '+secondName; + //send email verification link to the new student + await Verify.sendMail(name, email) + util.setSuccess(200, 'Registration Successful', result); + } + }else{ + util.setError(404, 'Only a Teacher can register a student'); + } + // Send a token to the client when a user signs up + return util.send(res); + } catch (error) { + util.setError(400, error.message); + return util.send(res); + //next(error); + } + }; + + static async handleSignup(req, res, next) { try { - const { firstName, lastName, secondName, email, roleId, password } = req.body; + const { firstName, lastName, secondName, email, password } = req.body; const user = await userService.findUser({email}); + const role = await RoleService.getRoleBySlug('sl_teacher'); + const roleId = role.id; + if (user) { const name = firstName+' '+lastName+' '+secondName; @@ -16,7 +55,7 @@ const handleSignup = async (req, res, next) => { }else{ // Create a token for the user const { token } = await userService.create({ firstName, lastName, secondName, email, roleId, password }); - const result = {token: token, user} + const result = {token: token} const name = firstName+' '+lastName+' '+secondName; await Verify.sendMail(name, email) util.setSuccess(200, 'Registration Successful', result); @@ -24,13 +63,13 @@ const handleSignup = async (req, res, next) => { // Send a token to the client when a user signs up return util.send(res); } catch (error) { - util.setError(400, error); + util.setError(400, error.message); return util.send(res); //next(error); } }; -const handleLogin = async (req, res, next) => { +static async handleLogin (req, res, next) { try { const { email, password } = req.body; const user = await userService.findUser({ email }); @@ -47,12 +86,34 @@ const handleLogin = async (req, res, next) => { } return util.send(res); } catch (error) { - util.setError(400, error); + util.setError(400, error.message); return util.send(res); } }; -export { - handleSignup, - handleLogin, -}; \ No newline at end of file +static async verify (req, res) { + try { + console.log('v1') + //const {token, id} = req.params + const verify = await Verify.verify(req.params.token, req.params.id) + console.log('v2') + if (!verify) { + return util.setSuccess(400, "Invalid link"); + }else{ + util.setSuccess(200, "email verified sucessfully"); + } + return util.send(res); + } catch (error) { + util.setError(400, error.message); + return util.send(res); + } + }; + + } + + +export default UserController //{ +// handleSignup, +// handleLogin, +// addStudent +// }; \ No newline at end of file diff --git a/src/controllers/verifyController.js b/src/controllers/verifyController.js index 2540b5e..6786387 100644 --- a/src/controllers/verifyController.js +++ b/src/controllers/verifyController.js @@ -1,76 +1,23 @@ import sendEmail from "../utils/email"; -import db from "../db/models/index"; -import { User, validate } from "../db/models/user"; -import crypto from 'crypto'; -import express from "express"; +import VerifyService from "../services/VerifyService"; +import Util from "../utils/Utils"; - -const router = express.Router(); +const util = new Util(); class verifyController { - - - -// static async sendVerify(req, res) { -// try { - -// if (error) return res.status(400).send(error.details[0].message); - -// let user = await db.User.findOne({ email: req.body.email }); -// if (user) -// return res.status(400).send("User with given email already exist!"); - -// user = await new db.User({ -// name: req.body.name, -// email: req.body.email, -// }).save(); - -// let token = await new Token({ -// userId: user._id, -// token: crypto.randomBytes(32).toString("hex"), -// }).save(); - -// const message = `${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; -// await sendEmail(user.email, "Verify Email", message); - -// res.send("An Email sent to your account please verify"); -// } catch (error) { -// res.status(400).send("An error occured"); -// } -// }; - -// static async getAllMessages(req, res) { -// try { -// const allMessages = await MessageService.getAllMessages(); -// if (allMessages.length > 0) { -// util.setSuccess(200, 'Messages retrieved', allMessages); -// } else { -// util.setSuccess(200, 'No Message found'); -// } -// return util.send(res); -// } catch (error) { -// util.setError(400, error); -// return util.send(res); -// } -// }; async verify(req, res) { try { - const user = await db.User.findOne({ _id: req.params.id }); - const verify =verify(token, id) - if (!user) return res.status(400).send("Invalid link"); - - const token = await db.Token.findOne({ - userId: user._id, - token: req.params.token, - }); - if (!token) return res.status(400).send("Invalid link"); - - await db.User.updateOne({ id: user._id, verified: true }); - //await Token.findByIdAndRemove(token._id); - - res.send("email verified sucessfully"); + const {token, id} = req.params + const verify = VerifyService.verify(token, id) + if (!verify) { + return util.setSuccess(200, "Invalid link"); + }else{ + util.setSuccess(200, "email verified sucessfully"); + } + return util.send(res); } catch (error) { - res.status(400).send("An error occured"); + util.setError(400, error); + return util.send(res); } }; diff --git a/src/db/migrations/20221030092330-create-user.js b/src/db/migrations/20221030092330-create-user.js index 725c271..6a07773 100644 --- a/src/db/migrations/20221030092330-create-user.js +++ b/src/db/migrations/20221030092330-create-user.js @@ -1,7 +1,4 @@ 'use strict'; - -const { toDefaultValue } = require('sequelize/types/utils'); - /** @type {import('sequelize-cli').Migration} */ module.exports = { async up(queryInterface, Sequelize) { @@ -9,7 +6,9 @@ module.exports = { id: { allowNull: false, primaryKey: true, - type: Sequelize.UUID + type: Sequelize.UUID, + + defaultValue: Sequelize.UUIDV4, }, firstName: { type: Sequelize.STRING diff --git a/src/db/migrations/20221030101744-create-role.js b/src/db/migrations/20221030101744-create-role.js index 59ecb5f..697dcd3 100644 --- a/src/db/migrations/20221030101744-create-role.js +++ b/src/db/migrations/20221030101744-create-role.js @@ -9,6 +9,9 @@ module.exports = { type: Sequelize.UUID, defaultValue: Sequelize.UUIDV4 }, + slug: { + type: Sequelize.STRING + }, role: { type: Sequelize.STRING }, diff --git a/src/db/migrations/20221205043218-create-token.js b/src/db/migrations/20221205043218-create-token.js index 7af9ddc..8327070 100644 --- a/src/db/migrations/20221205043218-create-token.js +++ b/src/db/migrations/20221205043218-create-token.js @@ -5,9 +5,13 @@ module.exports = { await queryInterface.createTable('Tokens', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, - type: Sequelize.INTEGER + type: Sequelize.UUID + }, + userId:{ + type: Sequelize .UUID, + allowNull:false, + foreignKey:true }, token: { type: Sequelize.STRING(1234) diff --git a/src/db/models/role.js b/src/db/models/role.js index 14537fa..7a61b60 100644 --- a/src/db/models/role.js +++ b/src/db/models/role.js @@ -20,6 +20,9 @@ module.exports = (sequelize, DataTypes) => { defaultValue: DataTypes.UUIDV4, primaryKey: true }, + slug: { + type: DataTypes.STRING + }, role: { type: DataTypes.UUID, allowNull:false diff --git a/src/db/models/token.js b/src/db/models/token.js index 1c23adb..0536253 100644 --- a/src/db/models/token.js +++ b/src/db/models/token.js @@ -11,17 +11,16 @@ module.exports = (sequelize, DataTypes) => { */ static associate(models) { // define association here - //Token.belongsTo(models.User, {foreignKey: 'userId', as: 'userId'}); + Token.belongsTo(models.User, {foreignKey: 'userId', as: 'user'}); } } Token.init({ id:{ type: DataTypes.UUID, defaultValue: DataTypes.UUIDV4, - allowNull:false, - primaryKey:true - }, - token: DataTypes.STRING(1234), + primaryKey: true + }, + token: DataTypes.STRING, userId:{ type: DataTypes.UUID, allowNull:false, diff --git a/src/db/models/user.js b/src/db/models/user.js index 37e6ff0..d54997c 100644 --- a/src/db/models/user.js +++ b/src/db/models/user.js @@ -2,6 +2,7 @@ const { Model } = require('sequelize'); +const db = require('./index') module.exports = (sequelize, DataTypes) => { class User extends Model { /** @@ -16,7 +17,7 @@ module.exports = (sequelize, DataTypes) => { User.hasMany(models.Message, {foreignKey: 'senderId', as: 'sender'}); User.hasMany(models.Message, {foreignKey: 'receiverId', as: 'receiver'}); User.belongsTo(models.Role, {foreignKey: 'roleId', as: 'role'}) - //User.hasOne(models.Token, {foreignKey: 'userId', as: 'userId'}); + User.hasOne(models.Token, {foreignKey: 'userId', as: 'user'}); } } User.init({ @@ -49,7 +50,18 @@ module.exports = (sequelize, DataTypes) => { roleId: { type: DataTypes.UUID, allowNull:false - } + }, + // roleSlug: { + // type: DataTypes.VIRTUAL, + // get() { + // const r = db.Role.findOne({ + // where: { id: this.roleId } + // }) + // return `${r.slug}`; + // },set(value) { + // throw new Error('Do not try to set the `fullName` value!'); + // } + // } }, { sequelize, modelName: 'User', diff --git a/src/db/seeders/20221117052728-Role.js b/src/db/seeders/20221117052728-Role.js index f6ccb3e..66d5898 100644 --- a/src/db/seeders/20221117052728-Role.js +++ b/src/db/seeders/20221117052728-Role.js @@ -14,18 +14,23 @@ module.exports = { */ await queryInterface.bulkInsert('Roles', [{ id: "c7a9122e-6694-11ed-9022-0242ac120001", + slug:'sl_admin', role: 'Admin', createdAt: new Date(), updatedAt: new Date() }, { - id: "c7a9122e-6694-11ed-9022-0242ac120002", + id: "3f6a7b7c-e4fc-461c-b4a8-fd71485d90d2", + 3f6a7b7c-e4fc-461c-b4a8-fd71485d90d2 + + slug:'sl_student', role: 'Student', createdAt: new Date(), updatedAt: new Date() }, { id: "c7a9122e-6694-11ed-9022-0242ac120003", + slug:'sl_teacher', role: 'Teacher', createdAt: new Date(), updatedAt: new Date() diff --git a/src/db/seeders/20221117052755-Notice.js b/src/db/seeders/20221117052755-Notice.js index c8cca3f..0fb3581 100644 --- a/src/db/seeders/20221117052755-Notice.js +++ b/src/db/seeders/20221117052755-Notice.js @@ -35,6 +35,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ - return await queryInterface.bulkDelete('People', null, {}); + return await queryInterface.bulkDelete('Notices', null, {}); } }; diff --git a/src/db/seeders/20221117052849-ClassStudent.js b/src/db/seeders/20221117052849-ClassStudent.js index 1439f3c..9c17d7d 100644 --- a/src/db/seeders/20221117052849-ClassStudent.js +++ b/src/db/seeders/20221117052849-ClassStudent.js @@ -34,6 +34,6 @@ module.exports = { * Example: * await queryInterface.bulkDelete('People', null, {}); */ - return await queryInterface.bulkDelete('People', null, {}); + return await queryInterface.bulkDelete('ClassStudents', null, {}); } }; diff --git a/src/index.js b/src/index.js index 9d7f779..647d344 100644 --- a/src/index.js +++ b/src/index.js @@ -3,8 +3,8 @@ import cors from "cors"; import dotenv from "dotenv"; import { initialize, authenticate,} from './middleware/auth.js'; import messageRouter from "./routers/MessageRouter.js"; -import { studentRouter } from './routers/studentsRoutes.js'; -import { userRouter } from './routers/userRouter.js'; +import { studentRouter } from './routers/StudentsRoutes.js'; +import { userRouter } from './routers/UserRouter.js'; const app = express(); dotenv.config(); diff --git a/src/middleware/auth.js b/src/middleware/auth.js index e44c4cf..6260db2 100644 --- a/src/middleware/auth.js +++ b/src/middleware/auth.js @@ -2,9 +2,10 @@ require("dotenv").config(); // loads the environment variables into process.env import passport from "passport"; import { Strategy, ExtractJwt } from "passport-jwt"; - +import Util from "../utils/Utils"; import userService from "../services/userService"; +const util = new Util(); const JWT_SECRET = process.env.JWT_SECRET; // Create a new instance of the JWT Passport.js strategy @@ -26,15 +27,14 @@ const strategy = new Strategy( const user = await userService.findUser({ id: jwtPayload.id }); if (!user) { - const err = new Error("User not found"); - err.statusCode = 404; - throw err; + util.setError(404, "User not found"); + //throw erro; } // done is an error-first callback with signature done(error, user, info) // pass the found user to the route handler done(null, user); - } catch (error) { + }catch (error) { done(error); } } diff --git a/src/routers/userRouter.js b/src/routers/userRouter.js index dedda8d..f088c99 100644 --- a/src/routers/userRouter.js +++ b/src/routers/userRouter.js @@ -1,9 +1,11 @@ import { Router } from "express"; const userRouter = Router(); -import { handleSignup, handleLogin } from '../controllers/userController.js'; +import userController from '../controllers/UserController.js'; +import {authenticate,} from '../middleware/auth' -userRouter.post('/login', handleLogin); -userRouter.post('/register', handleSignup); -userRouter.get("/verify/:id/:token"); +userRouter.post('/login', userController.handleLogin); +userRouter.post('/register', userController.handleSignup); +userRouter.post('/addstudent', authenticate(), userController.addStudent); +userRouter.get("/verify/:id/:token", userController.verify); export { userRouter }; \ No newline at end of file diff --git a/src/services/MessageService.js b/src/services/MessageService.js index cc91414..91c62cd 100644 --- a/src/services/MessageService.js +++ b/src/services/MessageService.js @@ -23,11 +23,11 @@ class MessageService { static async updateMessage(id, updateMessage) { try { const messageToUpdate = await database.Message.findOne({ - where: { id: id } + where: { id: Number(id) } }); if (messageToUpdate) { - await database.Message.update(updateMessage, { where: { id: id } }); + await database.Message.update(updateMessage, { where: { id: Number(id) } }); return updateMessage; } @@ -40,7 +40,7 @@ class MessageService { static async getAMessage(id) { try { const aMessage = await database.Message.findOne({ - where: { id: id} + where: { id: Number(id) } }); return aMessage; @@ -51,11 +51,11 @@ class MessageService { static async deleteMessage(id) { try { - const messageToDelete = await database.Message.findOne({ where: { id: id } }); + const messageToDelete = await database.Message.findOne({ where: { id: Number(id) } }); if (messageToDelete) { const deletedMessage = await database.Message.destroy({ - where: { id: id } + where: { id: Number(id) } }); return deletedMessage; } diff --git a/src/services/RoleService.js b/src/services/RoleService.js new file mode 100644 index 0000000..52dd4c0 --- /dev/null +++ b/src/services/RoleService.js @@ -0,0 +1,40 @@ +/* eslint-disable no-useless-catch */ +import database from '../db/models/index.js'; + +class RoleService { + static async getAllRoles() { + try { + const result = await database.Role.findAll(); + return result; + } catch (error) { + throw error; + } + } + + static async getRoleBySlug(slug) { + try { + const role = await database.Role.findOne({ + where: { slug: slug } + }); + + return role; + } catch (error) { + throw error; + } + } + + static async getRole(id){ + try { + const role = await database.Role.findOne({ + where: { id: id } + }); + + return role; + } catch (error) { + throw error; + } + } + +} + +export default RoleService; diff --git a/src/services/TeacherService.js b/src/services/TeacherService.js new file mode 100644 index 0000000..e69de29 diff --git a/src/services/emailService.js b/src/services/emailService.js index b57f1e3..e77d926 100644 --- a/src/services/emailService.js +++ b/src/services/emailService.js @@ -1,63 +1,63 @@ -//import nodemailer from 'nodemailer'; -const { MailtrapClient } = require("mailtrap"); +// //import nodemailer from 'nodemailer'; +// const { MailtrapClient } = require("mailtrap"); -// For this example to work, you need to set up a sending domain, -// and obtain a token that is authorized to send from the domain -const TOKEN = "d73ac2c42caa3066d271b1dd88d04456"; -const SENDER_EMAIL = "mansuribrahimnok@gmail.com"; -const RECIPIENT_EMAIL = "princemi007@gmail.com"; +// // For this example to work, you need to set up a sending domain, +// // and obtain a token that is authorized to send from the domain +// const TOKEN = "d73ac2c42caa3066d271b1dd88d04456"; +// const SENDER_EMAIL = "mansuribrahimnok@gmail.com"; +// const RECIPIENT_EMAIL = "princemi007@gmail.com"; -const client = new MailtrapClient({ token: TOKEN }); +// const client = new MailtrapClient({ token: TOKEN }); -const sender = { name: "Mailtrap Test", email: SENDER_EMAIL }; +// const sender = { name: "Mailtrap Test", email: SENDER_EMAIL }; -//const welcomeImage = fs.readFileSync(path.join(__dirname, "welcome.png")); +// //const welcomeImage = fs.readFileSync(path.join(__dirname, "welcome.png")); -client - .send({ - category: "test", - custom_variables: { - hello: "world", - year: 2022, - anticipated: true, - }, - from: sender, - to: [{ email: RECIPIENT_EMAIL }], - subject: "Hello from Mailtrap!", - html: ` - - - - - - -
-

Congrats for sending test email with Mailtrap!

-

Inspect it using the tabs you see above and learn how this email can be improved.

- Inspect with Tabs -

Now send your email using our fake SMTP server and integration of your choice!

-

Good luck! Hope it works.

-
- - - - - `, - // attachments: [ - // { - // filename: "welcome.png", - // content_id: "welcome.png", - // disposition: "inline", - // //content: welcomeImage, - // }, - // ], - }) - .then( - console.log('hjj'), - console.error('jkkjk') - ).catch(function () { - console.log("Promise Rejected"); - }); \ No newline at end of file +// client +// .send({ +// category: "test", +// custom_variables: { +// hello: "world", +// year: 2022, +// anticipated: true, +// }, +// from: sender, +// to: [{ email: RECIPIENT_EMAIL }], +// subject: "Hello from Mailtrap!", +// html: ` +// +// +// +// +// +// +//
+//

Congrats for sending test email with Mailtrap!

+//

Inspect it using the tabs you see above and learn how this email can be improved.

+// Inspect with Tabs +//

Now send your email using our fake SMTP server and integration of your choice!

+//

Good luck! Hope it works.

+//
+// +// +// +// +// `, +// // attachments: [ +// // { +// // filename: "welcome.png", +// // content_id: "welcome.png", +// // disposition: "inline", +// // //content: welcomeImage, +// // }, +// // ], +// }) +// .then( +// console.log('hjj'), +// console.error('jkkjk') +// ).catch(function () { +// console.log("Promise Rejected"); +// }); \ No newline at end of file diff --git a/src/services/emailServiceMailtrap.js b/src/services/emailServiceMailtrap.js index ccb1f7e..2ead188 100644 --- a/src/services/emailServiceMailtrap.js +++ b/src/services/emailServiceMailtrap.js @@ -1,36 +1,36 @@ -const nodemailer =require( 'nodemailer'); +// import nodemailer from 'nodemailer'; -class EmailSender{ - static async sendMail(to, subject, text) { -const transporter = nodemailer.createTransport({ - service: 'gmail', //'gmail', - host: "smtp.mailtrap.io", - port: 2525, - ssl: false, - tls: true, - auth: { - //Gmail user: 'mansuribrahimnok@gmail.com', - user: 'mansuribrahimnok@gmail.com',//8294e4f60324e9', - //Gmail pass: 'eugepkjqwvciaiap' // naturally, replace both with your real credentials or an application-specific password - pass: 'eugepkjqwvciaiap'//6ee4754d4902b5' // naturally, replace both with your real credentials or an application-specific password - } -}); +// class EmailSender{ +// static async sendMail(to, subject, text) { +// const transporter = nodemailer.createTransport({ +// service: 'gmail', //'gmail', +// host: "smtp.mailtrap.io", +// port: 2525, +// ssl: false, +// tls: true, +// auth: { +// //Gmail user: 'mansuribrahimnok@gmail.com', +// user: 'mansuribrahimnok@gmail.com',//8294e4f60324e9', +// //Gmail pass: 'eugepkjqwvciaiap' // naturally, replace both with your real credentials or an application-specific password +// pass: 'eugepkjqwvciaiap'//6ee4754d4902b5' // naturally, replace both with your real credentials or an application-specific password +// } +// }); -const mailOptions = { - from: 'mansuribrahimnok@gmail.com', - to: to,//'princemi007@gmail.com', - subject: subject,//'Invoices due', - text: text//'Hey baby, Will you marry me.' -}; +// const mailOptions = { +// from: 'mansuribrahimnok@gmail.com', +// to: to,//'princemi007@gmail.com', +// subject: subject,//'Invoices due', +// text: text//'Hey baby, Will you marry me.' +// }; -transporter.sendMail(mailOptions, function(error, info){ - if (error) { - console.log(error); - } else { - console.log('Email sent: ' + info.response); - } -}); - } -} -//EmailSender.sendMail('princemi007@gmail.com', 'subject', 'text') -module.exports = EmailSender; \ No newline at end of file +// transporter.sendMail(mailOptions, function(error, info){ +// if (error) { +// console.log(error); +// } else { +// console.log('Email sent: ' + info.response); +// } +// }); +// } +// } +// //EmailSender.sendMail('princemi007@gmail.com', 'subject', 'text') +// export default EmailSender; \ No newline at end of file diff --git a/src/services/studentService.js b/src/services/studentService.js index 26ecbfb..1f42be1 100644 --- a/src/services/studentService.js +++ b/src/services/studentService.js @@ -1,21 +1,13 @@ /* eslint-disable no-useless-catch */ import database from '../db/models/index.js'; +const role = database.Role.findOne({where:{slug: 'sl_student'}}) class StudentService { constructor() { } static async getAllStudents() { try { - const result = await database.User.findAll(); - return result; - } catch (error) { - throw error; - } - } - - static async addStudent(newStudent) { - try { - const result = await database.User.create(newStudent); + const result = await database.User.findAll({where:{roleId: role.id}}); return result; } catch (error) { throw error; @@ -25,11 +17,11 @@ class StudentService { static async updateStudent(id, updateStudent) { try { const studentToUpdate = await database.User.findOne({ - where: { id: id } + where: { id: id, roleId: role.id} }); if (studentToUpdate) { - await database.User.update(updateStudent, { where: { id: id } }); + await database.User.update(updateStudent, { where: { id: id, roleId: role.id } }); return updateStudent; } @@ -42,7 +34,7 @@ class StudentService { static async getAStudent(id) { try { const aStudent = await database.User.findOne({ - where: { id: id } + where: { id: id, roleId: role.id} }); return aStudent; @@ -53,11 +45,11 @@ class StudentService { static async deleteStudent(id) { try { - const StudentToDelete = await database.User.findOne({ where: { id: id } }); + const StudentToDelete = await database.User.findOne({ where: { id: id, roleId: role.id} }); if (StudentToDelete) { const deletedStudent = await database.User.destroy({ - where: { id: id } + where: { id: id, roleId: role.id} }); return deletedStudent; } diff --git a/src/services/userService.js b/src/services/userService.js index 6df9900..04293fd 100644 --- a/src/services/userService.js +++ b/src/services/userService.js @@ -12,18 +12,15 @@ const JWT_SECRET = process.env.JWT_SECRET; try { if(id!= null){ - console.log('name') const aUser = await users.findOne({ - where: {id: email } + where: {id: id } }); return aUser }else if(email !=null){ - console.log('name') const aUser = await users.findOne({ where: {email: email } }); - console.log('name') return aUser; } } catch (error) { diff --git a/src/services/v.js b/src/services/v.js deleted file mode 100644 index c29dc3c..0000000 --- a/src/services/v.js +++ /dev/null @@ -1,60 +0,0 @@ -// import sendEmail from "../utils/email"; -// import Token from "../db/models/token"; -// import { User, validate } from "../db/models/user"; -// import crypto from 'crypto'; -// import express from "express"; - - -// const router = express.Router(); - -// router.post("/", async (req, res) => { -// try { -// const { error } = validate(req.body); -// if (error) return res.status(400).send(error.details[0].message); - -// let user = await User.findOne({ email: req.body.email }); -// if (user) -// return res.status(400).send("User with given email already exist!"); - -// user = await new User({ -// name: req.body.name, -// email: req.body.email, -// }).save(); - -// let token = await new Token({ -// userId: user._id, -// token: crypto.randomBytes(32).toString("hex"), -// }).save(); - -// const message = `${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; -// await sendEmail(user.email, "Verify Email", message); - -// res.send("An Email sent to your account please verify"); -// } catch (error) { -// res.status(400).send("An error occured"); -// } -// }); - -// router.get("/verify/:id/:token", async (req, res) => { -// try { -// const user = await User.findOne({ _id: req.params.id }); -// if (!user) return res.status(400).send("Invalid link"); - -// const token = await Token.findOne({ -// userId: user._id, -// token: req.params.token, -// }); -// if (!token) return res.status(400).send("Invalid link"); - -// await User.updateOne({ _id: user._id, verified: true }); -// await Token.findByIdAndRemove(token._id); - -// res.send("email verified sucessfully"); -// } catch (error) { -// res.status(400).send("An error occured"); -// } -// }); - -// } - -// module.exports = router; \ No newline at end of file diff --git a/src/services/verify.js b/src/services/verify.js index d067ca6..91207aa 100644 --- a/src/services/verify.js +++ b/src/services/verify.js @@ -1,6 +1,6 @@ /* eslint-disable no-useless-catch */ //import sendEmail from "../utils/email"; -const sendEmail = require( "./emailServiceMailtrap.js"); +const sendEmail = require( "./EmailServiceMailtrap.js"); const db = require( "../db/models/index.js"); const crypto = require('crypto'); diff --git a/src/services/verifyService.js b/src/services/verifyService.js index 5a7649d..5bf192e 100644 --- a/src/services/verifyService.js +++ b/src/services/verifyService.js @@ -1,28 +1,25 @@ /* eslint-disable no-useless-catch */ require("dotenv").config(); -import bcrypt from "bcrypt"; -import jwt from "jsonwebtoken"; import database from '../db/models/index.js'; -import sendEmail from "./emailServiceMailtrap.js"; +// import sendEmail from "./EmailServiceMailtrap.js"; +import sendEmail from '../utils/email' import crypto from 'crypto'; +import UserService from "./userService.js"; const users = database.User; const tokens = database.Token; -const JWT_SECRET = process.env.JWT_SECRET; +const url = process.env.BASE_URL; class VerifyService { static async sendMail (name, email) { try { let user = await this.findUser({ email }) - console.log('verify1') if (user){ - console.log('verify2') let token = await tokens.create({ userId: user.id, token: crypto.randomBytes(32).toString("hex"), }); - console.log('verify3') - const message = `${name} click this link to verify your email ${process.env.BASE_URL}/user/verify/${user.id}/${token.token}`; - await sendEmail.sendMail(email, "Verify Email", message); + const message = `${name} click this link to verify your email ${url}/user/verify/${user.id}/${token.token}`; + await sendEmail(email, "Verify Email", message); }else{ return null } @@ -47,28 +44,41 @@ const JWT_SECRET = process.env.JWT_SECRET; } }; -// Save the new user to the database and return an authorization token for the user - static async create ({firstName, lastName, secondName, email, roleId, password }) { - - const newUser = { - firstName, - lastName, - secondName, - email, - roleId, - password: await bcrypt.hash(password, 10) + static async verify(token, id) { + try { + const user = await UserService.findUser({ id }); + if(!user){ + return false + } + const userToken = await tokens.findOne({where:{ + userId: user.id, + token: token, + }}); + if (!userToken){ + return false; + }else{ + await users.update({ verified: true }, { + where: { + id: id + } + });; + await tokens.destroy({ + where: { + userId: userToken.userId + } + }); + + return true; + } + // res.send("email verified sucessfully"); + +} catch (error) { + return error;// res.status(400).send("An error occured"); + } }; - // save the new user to our database - const result = await users.create(newUser); - // Generate the JWT with jwt.sign. The return value is an - // authentication token - const token = jwt.sign({ id: result.id }, JWT_SECRET, { - expiresIn: 24 * 60 * 60, // Expire tokens after a certain amount of time so users can't stay logged in forever - }); - return { token }; -}; +// Save the new user to the database and return an authorization token for the user } diff --git a/src/utils/email.js b/src/utils/email.js index 80c7e7e..bcbd317 100644 --- a/src/utils/email.js +++ b/src/utils/email.js @@ -1,5 +1,5 @@ const nodemailer = require("nodemailer"); - +require('dotenv').config() const sendEmail = async (email, subject, text) => { try { const transporter = nodemailer.createTransport({ @@ -25,6 +25,6 @@ const sendEmail = async (email, subject, text) => { console.log(error); } }; -sendEmail('princemi007@gmail.com', 'subject', 'text') +//sendEmail('princemi007@gmail.com', 'subject', 'text') -// export default sendEmail; \ No newline at end of file + export default sendEmail; \ No newline at end of file From 26cb6febdac352178a832b5c4b6a9a874f098c22 Mon Sep 17 00:00:00 2001 From: Judy Date: Mon, 12 Dec 2022 11:06:13 +0000 Subject: [PATCH 21/25] updating branch --- src/db/migrations/20221030102005-create-class-student.js | 1 - src/db/models/classstudent.js | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/db/migrations/20221030102005-create-class-student.js b/src/db/migrations/20221030102005-create-class-student.js index 6d4a512..46b5a14 100644 --- a/src/db/migrations/20221030102005-create-class-student.js +++ b/src/db/migrations/20221030102005-create-class-student.js @@ -8,7 +8,6 @@ module.exports = { await queryInterface.createTable('ClassStudents', { id: { allowNull: false, - autoIncrement: true, primaryKey: true, type: Sequelize.UUID }, diff --git a/src/db/models/classstudent.js b/src/db/models/classstudent.js index d4d2874..f417ef5 100644 --- a/src/db/models/classstudent.js +++ b/src/db/models/classstudent.js @@ -27,6 +27,11 @@ module.exports = (sequelize, DataTypes) => { type: DataTypes.UUID, allowNull:false, foreignKey:true + }, + classId:{ + type: DataTypes.UUID, + allowNull:false, + foreignKey:true } }, { sequelize, From 2111b1268179d980088ff7fc61a3cd49f7a14996 Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Mon, 12 Dec 2022 12:25:04 +0100 Subject: [PATCH 22/25] update --- src/db/seeders/20221117052728-Role.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/db/seeders/20221117052728-Role.js b/src/db/seeders/20221117052728-Role.js index 66d5898..93a2261 100644 --- a/src/db/seeders/20221117052728-Role.js +++ b/src/db/seeders/20221117052728-Role.js @@ -20,9 +20,7 @@ module.exports = { updatedAt: new Date() }, { - id: "3f6a7b7c-e4fc-461c-b4a8-fd71485d90d2", - 3f6a7b7c-e4fc-461c-b4a8-fd71485d90d2 - + id: "c7a9122e-6694-11ed-9022-0242ac120002", slug:'sl_student', role: 'Student', createdAt: new Date(), From 801345d9ccbf8a8be4a1c6bf80600c0b577057ff Mon Sep 17 00:00:00 2001 From: Judy Date: Mon, 12 Dec 2022 14:15:06 +0000 Subject: [PATCH 23/25] assignment update --- src/index.js | 3 +++ src/services/studentService.js | 1 + 2 files changed, 4 insertions(+) diff --git a/src/index.js b/src/index.js index 647d344..cb2a69d 100644 --- a/src/index.js +++ b/src/index.js @@ -5,6 +5,7 @@ import { initialize, authenticate,} from './middleware/auth.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/StudentsRoutes.js'; import { userRouter } from './routers/UserRouter.js'; +import { assignmentRouter } from './routers/assignmentRouter.js' const app = express(); dotenv.config(); @@ -16,6 +17,8 @@ app.use(initialize()); app.use('/api/message', messageRouter); app.use('/api/students', studentRouter); app.use('/api/user', userRouter); +app.use('/api/assignment', assignmentRouter); + app.get('/', (req, res) => { diff --git a/src/services/studentService.js b/src/services/studentService.js index 1f42be1..49a00d8 100644 --- a/src/services/studentService.js +++ b/src/services/studentService.js @@ -2,6 +2,7 @@ import database from '../db/models/index.js'; const role = database.Role.findOne({where:{slug: 'sl_student'}}) +console.log(role.slug) class StudentService { constructor() { } From 24b77afcbade4df4876b81fc89b483471131d235 Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Tue, 13 Dec 2022 12:03:19 +0100 Subject: [PATCH 24/25] fix error --- src/controllers/assignmentsController.js | 4 +++- src/db/models/assignment.js | 1 + src/db/models/user.js | 3 ++- src/index.js | 2 +- src/routers/assignmentRouter.js | 4 ++-- src/server.js | 2 +- src/services/MessageService.js | 1 + src/services/assignmentService.js | 21 +++++++++++++++------ src/services/studentService.js | 1 + 9 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/controllers/assignmentsController.js b/src/controllers/assignmentsController.js index 45bd09c..089ffe3 100644 --- a/src/controllers/assignmentsController.js +++ b/src/controllers/assignmentsController.js @@ -10,7 +10,9 @@ class AssignmentController { static async getAllAssignments(req, res) { try { + console.log('controller') const allAssignments = await AssignmentService.getAllAssignments(); + console.log('controller2') if (allAssignments.length > 0) { util.setSuccess(200, 'Assignments retrieved', allAssignments); } else { @@ -60,7 +62,7 @@ class AssignmentController { } } - static async getAAssignment(req, res) { + static async getAssignment(req, res) { const { id } = req.params; if (!Number(id)) { diff --git a/src/db/models/assignment.js b/src/db/models/assignment.js index 0c12c0b..c2f096b 100644 --- a/src/db/models/assignment.js +++ b/src/db/models/assignment.js @@ -13,6 +13,7 @@ module.exports = (sequelize, DataTypes) => { // define association here // Assignment.belongsTo(models.User, {foreignKey: 'teacherId', as: 'teacher'}); Assignment.belongsTo(models.User, {foreignKey: 'studentId', as: 'student'}); + Assignment.belongsTo(models.User, {foreignKey: 'teacherId', as: 'teacher'}); Assignment.belongsTo(models.Class, {foreignKey: 'classId', as: 'class'}); } } diff --git a/src/db/models/user.js b/src/db/models/user.js index 529fd28..02c8c63 100644 --- a/src/db/models/user.js +++ b/src/db/models/user.js @@ -11,7 +11,8 @@ module.exports = (sequelize, DataTypes) => { */ static associate(models) { // define association here - User.hasMany(models.Assignment, {foreignKey: 'assignmentId', as: 'assignment'}) + User.hasMany(models.Assignment, {foreignKey: 'studentId', as: 'studentAssignment'}) + User.hasMany(models.Assignment, {foreignKey: 'teacherId', as: 'teacherAssignment'}) User.hasMany(models.AssignmentScore, {foreignKey: 'assignmentScoreId', as: 'assignmentScore'}) User.hasMany(models.Message, {foreignKey: 'senderId', as: 'sender'}); User.hasMany(models.Message, {foreignKey: 'receiverId', as: 'receiver'}); diff --git a/src/index.js b/src/index.js index 37930d1..91e8242 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,6 @@ import express from "express"; import dotenv from "dotenv"; -import { assignmentRouter } from './api/routers/assignmentRouter.js'; +import { assignmentRouter } from './routers/assignmentRouter.js'; import messageRouter from "./routers/MessageRouter.js"; import { studentRouter } from './routers/studentsRoutes.js'; const app = express(); diff --git a/src/routers/assignmentRouter.js b/src/routers/assignmentRouter.js index d4b7d2a..4693c3c 100644 --- a/src/routers/assignmentRouter.js +++ b/src/routers/assignmentRouter.js @@ -1,11 +1,11 @@ import { Router } from "express"; -const assignmentRouter = Router(); import AssignmentController from '../controllers/assignmentsController.js'; +const assignmentRouter = Router(); assignmentRouter.get('/home', AssignmentController.home); assignmentRouter.get('/', AssignmentController.getAllAssignments); assignmentRouter.post('/', AssignmentController.addAssignment); -assignmentRouter.get('/:id', AssignmentController.getAAssignment); +assignmentRouter.get('/:id', AssignmentController.getAssignment); assignmentRouter.put('/:id', AssignmentController.updatedAssignment); assignmentRouter.delete('/:id', AssignmentController.deleteAssignment); diff --git a/src/server.js b/src/server.js index e53daff..03c69f6 100644 --- a/src/server.js +++ b/src/server.js @@ -2,7 +2,7 @@ import app from "../src/index.js"; import dotenv from "dotenv"; dotenv.config(); -const PORT = process.env.PORT || 3000 +const PORT = 3000 app.listen(PORT, () => { console.log(`Server running on http://localhost:${PORT}`); diff --git a/src/services/MessageService.js b/src/services/MessageService.js index b029a35..91c62cd 100644 --- a/src/services/MessageService.js +++ b/src/services/MessageService.js @@ -1,3 +1,4 @@ +/* eslint-disable no-useless-catch */ import database from '../db/models/index.js'; class MessageService { diff --git a/src/services/assignmentService.js b/src/services/assignmentService.js index 409fe23..61e10c6 100644 --- a/src/services/assignmentService.js +++ b/src/services/assignmentService.js @@ -1,3 +1,4 @@ +/* eslint-disable no-useless-catch */ import database from '../db/models/index.js'; class AssignmentService { @@ -8,6 +9,14 @@ class AssignmentService { } catch (error) { throw error; } + // try { + // console.log('service') + // const result = await database.Assignment.findAll(); + // console.log('service1') + // return result; + // } catch (error) { + // throw error; + // } } static async addAssignment(newAssignment) { @@ -22,11 +31,11 @@ class AssignmentService { static async updateAssignment(id, updateAssignment) { try { const AssignmentToUpdate = await database.Assignment.findOne({ - where: { id: Number(id) } + where: { id: id } }); if (AssignmentToUpdate) { - await database.Assignment.update(updateAssignment, { where: { id: Number(id) } }); + await database.Assignment.update(updateAssignment, { where: { id: id } }); return updateAssignment; } @@ -36,10 +45,10 @@ class AssignmentService { } } - static async getAAssignment(id) { + static async getAssignment(id) { try { const aAssignment = await database.Assignment.findOne({ - where: { id: Number(id) } + where: { id: id } }); return aAssignment; @@ -50,11 +59,11 @@ class AssignmentService { static async deleteAssignment(id) { try { - const AssignmentToDelete = await database.Assignment.findOne({ where: { id: Number(id) } }); + const AssignmentToDelete = await database.Assignment.findOne({ where: { id: id } }); if (AssignmentToDelete) { const deletedAssignment = await database.Assignment.destroy({ - where: { id: Number(id) } + where: { id: id } }); return deletedAssignment; } diff --git a/src/services/studentService.js b/src/services/studentService.js index 7465da9..83f0972 100644 --- a/src/services/studentService.js +++ b/src/services/studentService.js @@ -1,3 +1,4 @@ +/* eslint-disable no-useless-catch */ import database from '../db/models/index.js'; class StudentService { From a8bce8896caafd03dfce391823b0f2743626dc1e Mon Sep 17 00:00:00 2001 From: Ibrahim Nok Mansur Date: Tue, 13 Dec 2022 12:57:27 +0100 Subject: [PATCH 25/25] fix error --- src/controllers/assignmentsController.js | 2 -- src/services/assignmentService.js | 8 -------- 2 files changed, 10 deletions(-) diff --git a/src/controllers/assignmentsController.js b/src/controllers/assignmentsController.js index 089ffe3..99b371b 100644 --- a/src/controllers/assignmentsController.js +++ b/src/controllers/assignmentsController.js @@ -10,9 +10,7 @@ class AssignmentController { static async getAllAssignments(req, res) { try { - console.log('controller') const allAssignments = await AssignmentService.getAllAssignments(); - console.log('controller2') if (allAssignments.length > 0) { util.setSuccess(200, 'Assignments retrieved', allAssignments); } else { diff --git a/src/services/assignmentService.js b/src/services/assignmentService.js index 61e10c6..d5006b4 100644 --- a/src/services/assignmentService.js +++ b/src/services/assignmentService.js @@ -9,14 +9,6 @@ class AssignmentService { } catch (error) { throw error; } - // try { - // console.log('service') - // const result = await database.Assignment.findAll(); - // console.log('service1') - // return result; - // } catch (error) { - // throw error; - // } } static async addAssignment(newAssignment) {