bump dependencies + add dependabot config

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+ - package-ecosystem: "npm"
+ directory: "/"
+ schedule:
+ interval: "weekly"
+ ignore:
+ # For all packages, ignore all patch updates
+ - dependency-name: "*"
+ update-types: ["version-update:semver-patch"]
+ assignees:
+ - "dev-jotape"

package.json

@@ -21,7 +21,8 @@
  "services/*"
  ],
  "devDependencies": {
- "lerna": "^4.0.0"
+ "lerna": "^4.0.0",
+ "eslint-config-impact-market": "2.2.0"
  },
  "scripts": {
  "dev": "lerna exec --scope @impactmarket/api yarn dev",

packages/api/package.json

@@ -21,52 +21,47 @@
  "eslint": "eslint --fix \"./**/*.ts\" --max-warnings=0"
  },
  "devDependencies": {
- "@types/cors": "2.8.12",
- "@types/express": "4.17.13",
- "@types/express-rate-limit": "5.1.3",
+ "@types/cors": "2.8.13",
+ "@types/express": "4.17.17",
+ "@types/express-rate-limit": "6.0.0",
  "@types/json2csv": "5.0.3",
- "@types/jsonwebtoken": "8.5.6",
- "@types/mocha": "9.0.0",
- "@types/morgan": "1.9.3",
+ "@types/jsonwebtoken": "9.0.2",
+ "@types/mocha": "10.0.1",
+ "@types/morgan": "1.9.4",
  "@types/multer": "1.4.7",
- "@types/rate-limit-redis": "1.7.4",
- "autocannon": "7.10.0",
+ "@types/rate-limit-redis": "3.0.0",
+ "autocannon": "7.11.0",
  "climem": "1.0.3",
- "eslint": "7.3.1",
- "eslint-config-impact-market": "2.0.3",
- "eslint-config-prettier": "6.11.0",
- "eslint-plugin-sort-class-members": "1.14.1",
- "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
  "express-status-monitor": "1.3.4",
- "mocha": "9.1.3",
- "nodemon": "2.0.15",
+ "mocha": "10.2.0",
+ "nodemon": "2.0.22",
  "prettier": "2.4.1"
  },
  "dependencies": {
- "@appsignal/nodejs": "3.0.2",
+ "@appsignal/nodejs": "3.0.14",
  "@celo/base": "3.2.0",
  "@celo/identity": "3.2.0",
  "@impactmarket/core": "1.0.0",
  "@slack/events-api": "3.0.1",
- "bignumber.js": "9.0.0",
- "body-parser": "1.19.0",
- "celebrate": "15.0.0",
+ "bignumber.js": "9.1.1",
+ "body-parser": "1.20.2",
+ "celebrate": "15.0.1",
  "cors": "2.8.5",
  "csvtojson": "2.0.10",
- "ethers": "5.5.1",
- "express": "4.17.3",
+ "ethers": "5.7.2",
+ "express": "4.18.2",
  "express-rate-limit": "6.7.0",
  "helmet": "4.6.0",
  "json2csv": "5.0.7",
  "jsonwebtoken": "9.0.0",
  "module-alias": "2.2.2",
  "morgan": "1.10.0",
  "multer": "1.4.5-lts.1",
- "rate-limit-redis": "3.0.1",
- "swagger-jsdoc": "6.1.0",
- "swagger-ui-express": "4.3.0",
- "ts-node": "10.4.0",
- "twilio": "3.84.0",
- "typescript": "4.5.2"
+ "rate-limit-redis": "3.0.2",
+ "swagger-jsdoc": "6.2.8",
+ "swagger-ui-express": "4.6.3",
+ "ts-node": "10.9.1",
+ "twilio": "4.11.0",
+ "typescript": "4.9.5"
  }
 }

packages/api/src/middlewares/index.ts

@@ -2,7 +2,7 @@ import { config, database } from '@impactmarket/core';
 import { ethers } from 'ethers';
 import { Response, NextFunction, Request } from 'express';
 import rateLimit from 'express-rate-limit';
-import jwt from 'jsonwebtoken';
+import { verify } from 'jsonwebtoken';
 import RedisStore from 'rate-limit-redis';
 
 import { RequestWithUser, UserInRequest } from './core';
@@ -26,8 +26,9 @@ export function authenticateToken(
  return;
  }
 
- jwt.verify(token, config.jwtSecret, async (err, _user) => {
- if (err) {
+ verify(token, config.jwtSecret, async (err, _user) => {
+ // prevent error when token is not valid and _user undefined or string
+ if (err || typeof _user !== 'object') {
  res.sendStatus(403);
  return;
  }
@@ -102,7 +103,7 @@ export function adminAuthentication(
  return;
  }
 
- jwt.verify(token, config.jwtSecret, (err, _admin) => {
+ verify(token, config.jwtSecret, (err, _admin) => {
  if (err) {
  res.sendStatus(403);
  return;

packages/api/src/routes/v2/story.ts

@@ -361,7 +361,7 @@ export default (app: Router): void => {
  * delete:
  * tags:
  * - "stories"
- * summary: Delete a story
+ * summary: Delete a story comment
  * parameters:
  * - in: path
  * name: id

packages/api/src/services/attestation/index.ts

@@ -105,12 +105,14 @@ export const verify = async (
 ) => {
  // check if code exists and is valid
  // TODO: create startup process to delete expired codes
+ const { gt } = Op;
  const validCode = await database.models.appUserValidationCode.findOne({
  attributes: ['id'],
  where: {
  code,
  userId,
- expiresAt: { [Op.gt]: Date.now() },
+ // lol, using Op.gt gives typescript error after sequelize >6.29.0
+ expiresAt: { [gt]: Date.now() },
  },
  });
 

packages/core/package.json

@@ -17,68 +17,56 @@
  },
  "devDependencies": {
  "@istanbuljs/nyc-config-typescript": "1.0.1",
- "@types/bluebird": "3.5.33",
- "@types/chai": "4.2.18",
- "@types/connect-timeout": "0.0.36",
- "@types/express": "4.17.13",
- "@types/mocha": "9.0.0",
- "@types/node": "14.14.12",
- "@types/pg": "8.6.1",
+ "@types/bluebird": "3.5.38",
+ "@types/chai": "4.3.5",
+ "@types/connect-timeout": "0.0.37",
+ "@types/express": "4.17.17",
+ "@types/mocha": "10.0.1",
+ "@types/node": "18.16.5",
+ "@types/pg": "8.6.6",
  "@types/redis": "4.0.11",
- "@types/sinon": "10.0.2",
- "@types/validator": "13.0.0",
- "@typescript-eslint/eslint-plugin": "3.4.0",
- "@typescript-eslint/parser": "3.4.0",
- "chai": "4.3.4",
+ "@types/sinon": "10.0.14",
+ "@types/validator": "13.7.16",
+ "chai": "4.3.7",
  "chai-http": "4.3.0",
  "chai-subset": "1.6.0",
  "coveralls": "3.1.1",
- "eslint": "7.3.1",
- "eslint-config-impact-market": "2.0.3",
- "eslint-config-prettier": "6.11.0",
- "eslint-plugin-sort-class-members": "1.14.1",
- "eslint-plugin-sort-imports-es6-autofix": "0.6.0",
- "fake": "0.2.2",
- "mocha": "9.1.3",
+ "mocha": "10.2.0",
  "nyc": "15.1.0",
- "prettier": "2.4.1",
  "proxyquire": "2.1.3",
  "sequelize-mock": "0.10.2",
  "sequelize-test-helpers": "1.4.2",
- "sinon": "12.0.1",
+ "sinon": "15.0.4",
  "source-map-support": "0.5.21",
  "timekeeper": "2.2.0",
- "ts-node": "10.4.0",
- "typescript": "4.5.2"
+ "ts-node": "10.9.1",
+ "typescript": "4.9.5"
  },
  "dependencies": {
- "@hubspot/api-client": "5.0.0",
  "@impactmarket/worker": "1.0.0",
- "@prismicio/client": "6.3.0",
- "@sendgrid/mail": "7.6.0",
+ "@faker-js/faker": "7.6.0",
+ "@prismicio/client": "6.7.3",
+ "@sendgrid/mail": "7.7.0",
  "@turf/distance": "6.5.0",
  "@turf/points-within-polygon": "6.5.0",
- "aws-sdk": "2.1034.0",
+ "aws-sdk": "2.1373.0",
  "axios": "0.24.0",
  "axios-retry": "3.3.1",
- "bignumber.js": "9.0.0",
+ "bignumber.js": "9.1.1",
  "connect-timeout": "1.9.0",
- "dotenv": "10.0.0",
- "envalid": "7.2.2",
- "ethers": "5.5.1",
- "express": "4.17.3",
- "faker": "5.5.3",
- "firebase-admin": "11.5.0",
- "graphql": "15.8.0",
- "ioredis": "5.2.4",
- "lodash": "4.17.21",
+ "dotenv": "16.0.3",
+ "envalid": "7.3.1",
+ "ethers": "5.7.2",
+ "express": "4.18.2",
+ "firebase-admin": "11.8.0",
+ "graphql": "16.6.0",
+ "ioredis": "5.3.2",
  "moment": "2.29.4",
- "pg": "8.7.1",
+ "pg": "8.10.0",
  "pg-hstore": "2.3.4",
  "pg-native": "3.0.1",
- "sequelize": "6.29.0",
- "sequelize-cli": "6.3.0",
- "sha3": "2.1.4",
- "winston": "3.3.3"
+ "sequelize": "6.31.1",
+ "sequelize-cli": "6.6.0",
+ "winston": "3.8.2"
  }
 }

packages/core/src/database/seeders/20210727135114-demo-user.js

@@ -1,6 +1,6 @@
 'use strict';
 const { ethers } = require('ethers');
-const faker = require('faker');
+const { faker } = require('@faker-js/faker');
 
 module.exports = {
  up: async (queryInterface, Sequelize) => {

packages/core/tests/factories/community.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import faker from 'faker';
+import { faker } from '@faker-js/faker';
 
 import { Community } from '../../src/database/models/ubi/community';
 import { UbiCommunityContractModel } from '../../src/database/models/ubi/communityContract';
@@ -52,7 +52,7 @@ const data = async (props: ICreateProps) => {
  longitude: 0,
  },
  language: 'pt',
- name: props.name ? props.name : faker.company.companyName(),
+ name: props.name ? props.name : faker.company.name(),
  coverMediaPath: 'cover/image.jpg',
  started: props.started ? props.started : new Date(),
  status: props.status ? props.status : 'valid',

packages/core/tests/factories/user.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers';
-import faker from 'faker';
+import { faker } from '@faker-js/faker';
 
 import { AppUserModel } from '../../src/database/models/app/appUser';
 import {
@@ -32,7 +32,7 @@ const data = async (props?: ICreateProps) => {
  gender: props?.gender ? props?.gender : 'u',
  pushNotificationToken: '',
  suspect: props?.suspect ? props.suspect : false,
- phone: props?.phone ? props.phone : faker.phone.phoneNumber(),
+ phone: props?.phone ? props.phone : faker.phone.number(),
  active: props?.active,
  year: props?.year,
  };

packages/core/tests/integration/v2/user.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { ethers } from 'ethers';
-import faker from 'faker';
+import { faker } from '@faker-js/faker';
 import { Sequelize } from 'sequelize';
 import { SinonStub, stub, restore } from 'sinon';
 

packages/worker/package.json

@@ -34,7 +34,7 @@
  "node-schedule": "2.0.0",
  "sequelize": "6.29.0",
  "subscriptions-transport-ws": "0.11.0",
- "ts-node": "10.4.0",
- "typescript": "4.5.2"
+ "ts-node": "10.9.1",
+ "typescript": "4.9.5"
  }
 }

packages/worker/src/jobs/cron/community.ts

@@ -8,34 +8,36 @@ export async function internalNotifyNewCommunities(): Promise<void> {
  const sevenDaysAgo = new Date();
  sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
 
+ const { gte } = Op;
+
  const totalPending = await database.models.community.findAndCountAll({
- where: { createdAt: { [Op.gte]: sevenDaysAgo }, status: 'pending' },
+ where: { createdAt: { [gte]: sevenDaysAgo }, status: 'pending' },
  order: ['review'],
  });
  const pending = await database.models.community.count({
  where: {
- createdAt: { [Op.gte]: sevenDaysAgo },
+ createdAt: { [gte]: sevenDaysAgo },
  status: 'pending',
  review: 'pending',
  },
  });
  const inReview = await database.models.community.count({
  where: {
- createdAt: { [Op.gte]: sevenDaysAgo },
+ createdAt: { [gte]: sevenDaysAgo },
  status: 'pending',
  review: 'in-progress',
  },
  });
  const halted = await database.models.community.count({
  where: {
- createdAt: { [Op.gte]: sevenDaysAgo },
+ createdAt: { [gte]: sevenDaysAgo },
  status: 'pending',
  review: 'halted',
  },
  });
  const closed = await database.models.community.count({
  where: {
- createdAt: { [Op.gte]: sevenDaysAgo },
+ createdAt: { [gte]: sevenDaysAgo },
  status: 'pending',
  review: 'closed',
  },

packages/worker/src/jobs/cron/user.ts

@@ -1,16 +1,18 @@
 import { database } from '@impactmarket/core';
-import { Op } from 'sequelize';
+import { Op, WhereOptions } from 'sequelize';
 
 export async function verifyDeletedAccounts(): Promise<void> {
  const t = await database.sequelize.transaction();
  try {
  const date = new Date();
  date.setDate(date.getDate() - 15);
 
+ const { lt } = Op;
+
  const users = await database.models.appUser.findAll({
  attributes: ['address'],
  where: {
- deletedAt: { [Op.lt]: date },
+ deletedAt: { [lt]: date },
  },
  });
 
@@ -19,7 +21,7 @@ export async function verifyDeletedAccounts(): Promise<void> {
  await database.models.appUser.destroy({
  where: {
  address: { [Op.in]: addresses },
- },
+ } as WhereOptions,
  transaction: t,
  });
 

packages/worker/src/subscription.ts

@@ -206,14 +206,15 @@ export const userActivitySubscription = async () => {
  userActivity.timestamp
  );
  if (user && userRole) {
+ const { gte } = Op;
  const notification =
  await database.models.appNotification.findOne(
  {
  where: {
  userId: user.id,
  type: userRole,
  createdAt: {
- [Op.gte]: new Date(
+ [gte]: new Date(
  userActivity.timestamp *
  1000
  ),