From ea6b2d73d044e9fa888db5e7da512ba53e31baa0 Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Tue, 19 Oct 2021 08:27:36 +0200 Subject: [PATCH 001/128] Chaned Prisma shema due to Issue: #8 - Added Role model - Added Roles to disciplinese and Participants --- prisma/schema.prisma | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 7487192..0be5b1e 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -47,17 +47,29 @@ model Campaign { } model Discipline { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String - minTeamSize Int @default(1) - maxTeamSize Int @default(1) + minTeamSize Int @default(1) + maxTeamSize Int @default(1) + roles Roles[] teams Team[] event Event @relation(fields: [eventId], references: [id]) eventId Int } +model Roles { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + + roles Participant @relation(fields: [participantId], references: [id]) + discipline Discipline? @relation(fields: [disciplineId], references: [id]) + disciplineId Int? + participantId Int +} + model Team { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid @@ -75,8 +87,9 @@ model Participant { lastName String email String - team Team @relation(fields: [teamId], references: [id]) + team Team @relation(fields: [teamId], references: [id]) teamId Int + Roles Roles[] } model Oragnisation { From e816e0beee44ef70011e1140ca10e78bf6c8a81f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 19 Oct 2021 11:53:53 +0200 Subject: [PATCH 002/128] Check formatting on the dev branch The dev branch should also enforce correct formatting; --- .github/workflows/prettier-check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/prettier-check.yml b/.github/workflows/prettier-check.yml index b594990..9f6847c 100644 --- a/.github/workflows/prettier-check.yml +++ b/.github/workflows/prettier-check.yml @@ -4,9 +4,9 @@ name: Check prettier formatting on: push: - branches: [ main ] + branches: [ main, dev ] pull_request: - branches: [ main ] + branches: [ main, dev ] workflow_dispatch: From 5c0bc20bfd06054ab821567d6735a990c8e5f1db Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 28 Oct 2021 16:08:16 +0200 Subject: [PATCH 003/128] Added docker-compose + start script for people who cant remember --- docker-compose.yml | 22 ++++++++++++++++++++++ scripts/start.sh | 3 +++ 2 files changed, 25 insertions(+) create mode 100755 docker-compose.yml create mode 100755 scripts/start.sh diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100755 index 0000000..c5d44ac --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3" +services: + mail: + image: boky/postfix + restart: always + environment: + - ALLOWED_SENDER_DOMAINS=mail.${DOMAIN} + ports: + - "587:587" + container_name: "postfix" + postgres: + image: postgres + restart: always + environment: + - POSTGRES_PASSWORD=${DATABASE_PASSWORD} + ports: + - 5432:5432 + container_name: "postgres" + #server: + # build: . + # restart: always + # container_name: "server" \ No newline at end of file diff --git a/scripts/start.sh b/scripts/start.sh new file mode 100755 index 0000000..06d3063 --- /dev/null +++ b/scripts/start.sh @@ -0,0 +1,3 @@ +#! /bin/bash + +docker-compose up -d From 30ffd094bd832405e3de73982332d40023e71a43 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Mon, 1 Nov 2021 18:19:41 +0100 Subject: [PATCH 004/128] Normalize schema --- prisma/schema.prisma | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 0be5b1e..d8291d6 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -52,22 +52,22 @@ model Discipline { name String minTeamSize Int @default(1) maxTeamSize Int @default(1) - roles Roles[] + roles Role[] teams Team[] event Event @relation(fields: [eventId], references: [id]) eventId Int } -model Roles { +model Role { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String + schema Json - roles Participant @relation(fields: [participantId], references: [id]) - discipline Discipline? @relation(fields: [disciplineId], references: [id]) - disciplineId Int? - participantId Int + participant Participant[] + discipline Discipline @relation(fields: [disciplineId], references: [id]) + disciplineId Int } model Team { @@ -89,7 +89,7 @@ model Participant { team Team @relation(fields: [teamId], references: [id]) teamId Int - Roles Roles[] + roles Role[] } model Oragnisation { From 124773cce32fce2cf7c1715a5adb66087a28b680 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Mon, 1 Nov 2021 18:45:05 +0100 Subject: [PATCH 005/128] Add leader fields --- prisma/schema.prisma | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index d8291d6..6a80bbc 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -75,9 +75,11 @@ model Team { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String - participants Participant[] + participants Participant[] @relation(name: "participants") discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int + leader Participant @relation(name: "leader", fields: [leaderId], references: [id]) + leaderId Int } model Participant { @@ -87,8 +89,9 @@ model Participant { lastName String email String - team Team @relation(fields: [teamId], references: [id]) + team Team @relation(name: "participants", fields: [teamId], references: [id]) teamId Int + leaderOf Team? @relation(name: "leader") roles Role[] } From d596670f6be5b005decb17afe598404dc7ff9c16 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 3 Nov 2021 11:01:37 +0100 Subject: [PATCH 006/128] Add mail functionality into the development branch (#12) * Added basic code for sending emails + Added tests for emails + Modified README.md to reflect changes to .env file * [create-pull-request] push formatted files * Added dkim * Fixed mistake in docker-compose.yml Co-authored-by: Stefan <32109571+Stefan-5422@users.noreply.github.com> --- .gitignore | 3 + README.md | 4 + docker-compose.yml | 42 +- package-lock.json | 2154 +++++++++++++++++++++++++++++++++++++++- package.json | 16 +- scripts/dkim.sh | 33 + src/Tests/mail.test.ts | 17 + src/lib/mail.ts | 50 + 8 files changed, 2254 insertions(+), 65 deletions(-) create mode 100755 scripts/dkim.sh create mode 100644 src/Tests/mail.test.ts create mode 100644 src/lib/mail.ts diff --git a/.gitignore b/.gitignore index 1ad5ca1..a674f3d 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,6 @@ dist # Prisma prisma/migrations + +# Ignore config files for docker +host/ \ No newline at end of file diff --git a/README.md b/README.md index 67a50a4..24171fb 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,9 @@ Before Runningthis on you local machine some things have to be setup ``` DATABASE_URL: ADDRESS TO YOUR DATABASE + DATABASE_PASSWORD: PASSOWRD OF THE DATABASE PORT: PORT WHERE THE API SHOULD RUN + DOMAIN: THE DOMAIN NAME OF THE SERVER + MAILPASSWORD: THE PASSWORD FOR THE MAIL ACCOUNT + DEV: SWITCH FOR DEV MODE AFFECTS EMAIL SERVER ``` diff --git a/docker-compose.yml b/docker-compose.yml index c5d44ac..3edb025 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,24 @@ version: "3" services: - mail: - image: boky/postfix - restart: always - environment: - - ALLOWED_SENDER_DOMAINS=mail.${DOMAIN} - ports: - - "587:587" - container_name: "postfix" - postgres: - image: postgres - restart: always - environment: - - POSTGRES_PASSWORD=${DATABASE_PASSWORD} - ports: - - 5432:5432 - container_name: "postgres" - #server: - # build: . - # restart: always - # container_name: "server" \ No newline at end of file + mail: + image: boky/postfix + restart: always + environment: + - ALLOWED_SENDER_DOMAINS=mail.${DOMAIN} + ports: + - "587:587" + container_name: "postfix" + volumes: + - ./host/keys/:/etc/opendkim/keys + postgres: + image: postgres + restart: always + environment: + - POSTGRES_PASSWORD=${DATABASE_PASSWORD} + ports: + - 5432:5432 + container_name: "postgres" + #server: + # build: . + # restart: always + # container_name: "server" diff --git a/package-lock.json b/package-lock.json index 4372f3e..298b852 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,8 +1,2029 @@ { "name": "server", "version": "1.0.0", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "server", + "version": "1.0.0", + "license": "ISC", + "dependencies": { + "@prisma/client": "^3.3.0", + "@types/node": "^16.10.3", + "@types/nodemailer": "^6.4.4", + "dotenv": "^10.0.0", + "express": "^4.17.1", + "nodemailer": "^6.7.0" + }, + "devDependencies": { + "@types/chai": "^4.2.22", + "@types/chai-as-promised": "^7.1.4", + "@types/chai-http": "^4.2.0", + "@types/express": "^4.17.13", + "@types/mocha": "^9.0.0", + "chai": "^4.3.4", + "chai-as-promised": "^7.1.1", + "chai-http": "^4.3.0", + "mocha": "^9.1.3", + "prisma": "^3.3.0", + "ts-node": "^10.2.1", + "typescript": "^4.4.3" + } + }, + "node_modules/@cspotcode/source-map-consumer": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", + "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==", + "dev": true, + "engines": { + "node": ">= 12" + } + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.6.1.tgz", + "integrity": "sha512-DX3Z+T5dt1ockmPdobJS/FAsQPW4V4SrWEhD2iYQT2Cb2tQsiMnYxrcUH9By/Z3B+v0S5LMBkQtV/XOBbpLEOg==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-consumer": "0.8.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@prisma/client": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.3.0.tgz", + "integrity": "sha512-34tonDW2v74VcG1mx+k/IUGG/eSHKwDiYKfFIZgaPLq/C0h8YQxh7pro272xpOf1pt6duX1Bi90dpGijh1MYgQ==", + "hasInstallScript": true, + "dependencies": { + "@prisma/engines-version": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c" + }, + "engines": { + "node": ">=12.6" + }, + "peerDependencies": { + "prisma": "*" + }, + "peerDependenciesMeta": { + "prisma": { + "optional": true + } + } + }, + "node_modules/@prisma/engines": { + "version": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c.tgz", + "integrity": "sha512-T3nEnRWmoneNZJPd9IBR29G8ZDUjNelA8+cG5y8/lh6vySm6ryWSNxj1s377U9YzFYyZmXiA9vK1iyxMoRff/g==", + "devOptional": true, + "hasInstallScript": true + }, + "node_modules/@prisma/engines-version": { + "version": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c.tgz", + "integrity": "sha512-g21xPYq0zHoJ/xUkNxIf5Hle0oiDyelZHU8gwq7J3RNVrccjbUZ28S99KT4yUabV8SQQRNSnR0QMLGMv9Eqs/A==" + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.8.tgz", + "integrity": "sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==", + "dev": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.9.tgz", + "integrity": "sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==", + "dev": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.1.tgz", + "integrity": "sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==", + "dev": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.2.tgz", + "integrity": "sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==", + "dev": true + }, + "node_modules/@types/body-parser": { + "version": "1.19.1", + "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.1.tgz", + "integrity": "sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==", + "dev": true, + "dependencies": { + "@types/connect": "*", + "@types/node": "*" + } + }, + "node_modules/@types/chai": { + "version": "4.2.22", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.22.tgz", + "integrity": "sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ==", + "dev": true + }, + "node_modules/@types/chai-as-promised": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.4.tgz", + "integrity": "sha512-1y3L1cHePcIm5vXkh1DSGf/zQq5n5xDKG1fpCvf18+uOkpce0Z1ozNFPkyWsVswK7ntN1sZBw3oU6gmN+pDUcA==", + "dev": true, + "dependencies": { + "@types/chai": "*" + } + }, + "node_modules/@types/chai-http": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@types/chai-http/-/chai-http-4.2.0.tgz", + "integrity": "sha512-yb8+55cAuiVB7/yfnHIME5Ppw0LMUE6QFbuBFk5LewleI5pvYvtoXIEUAst3z3m0wZ2hLp1XeqllzffOSJSQuA==", + "deprecated": "This is a stub types definition. chai-http provides its own type definitions, so you do not need this installed.", + "dev": true, + "dependencies": { + "chai-http": "*" + } + }, + "node_modules/@types/connect": { + "version": "3.4.35", + "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz", + "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==", + "dev": true, + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/cookiejar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==", + "dev": true + }, + "node_modules/@types/express": { + "version": "4.17.13", + "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz", + "integrity": "sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==", + "dev": true, + "dependencies": { + "@types/body-parser": "*", + "@types/express-serve-static-core": "^4.17.18", + "@types/qs": "*", + "@types/serve-static": "*" + } + }, + "node_modules/@types/express-serve-static-core": { + "version": "4.17.24", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz", + "integrity": "sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/qs": "*", + "@types/range-parser": "*" + } + }, + "node_modules/@types/mime": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", + "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", + "dev": true + }, + "node_modules/@types/mocha": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz", + "integrity": "sha512-scN0hAWyLVAvLR9AyW7HoFF5sJZglyBsbPuHO4fv7JRvfmPBMfp1ozWqOf/e4wwPNxezBZXRfWzMb6iFLgEVRA==", + "dev": true + }, + "node_modules/@types/node": { + "version": "16.10.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz", + "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==" + }, + "node_modules/@types/nodemailer": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.4.tgz", + "integrity": "sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==", + "dependencies": { + "@types/node": "*" + } + }, + "node_modules/@types/qs": { + "version": "6.9.7", + "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", + "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==", + "dev": true + }, + "node_modules/@types/range-parser": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz", + "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", + "dev": true + }, + "node_modules/@types/serve-static": { + "version": "1.13.10", + "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", + "integrity": "sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==", + "dev": true, + "dependencies": { + "@types/mime": "^1", + "@types/node": "*" + } + }, + "node_modules/@types/superagent": { + "version": "3.8.7", + "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.7.tgz", + "integrity": "sha512-9KhCkyXv268A2nZ1Wvu7rQWM+BmdYUVkycFeNnYrUL5Zwu7o8wPQ3wBfW59dDP+wuoxw0ww8YKgTNv8j/cgscA==", + "dev": true, + "dependencies": { + "@types/cookiejar": "*", + "@types/node": "*" + } + }, + "node_modules/@ungap/promise-all-settled": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz", + "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", + "dev": true + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/acorn": { + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/anymatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", + "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", + "dev": true + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" + }, + "node_modules/assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "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 + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dependencies": { + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/brace-expansion": { + "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" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "dev": true + }, + "node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/chai": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz", + "integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==", + "dev": true, + "dependencies": { + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.1", + "type-detect": "^4.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, + "dependencies": { + "check-error": "^1.0.2" + }, + "peerDependencies": { + "chai": ">= 2.1.2 < 5" + } + }, + "node_modules/chai-http": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/chai-http/-/chai-http-4.3.0.tgz", + "integrity": "sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==", + "dev": true, + "dependencies": { + "@types/chai": "4", + "@types/superagent": "^3.8.3", + "cookiejar": "^2.1.1", + "is-ip": "^2.0.0", + "methods": "^1.1.2", + "qs": "^6.5.1", + "superagent": "^3.7.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/chokidar": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", + "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "dev": true, + "dependencies": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + } + }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "node_modules/content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "dependencies": { + "safe-buffer": "5.1.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + }, + "node_modules/cookiejar": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz", + "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==", + "dev": true + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", + "dev": true + }, + "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/decamelize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", + "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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==", + "dev": true, + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "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 + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dependencies": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, + "node_modules/form-data": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", + "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/formidable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz", + "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==", + "dev": true, + "funding": { + "url": "https://ko-fi.com/tunnckoCore/commissions" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-func-name": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz", + "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/glob": { + "version": "7.1.7", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", + "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true, + "engines": { + "node": ">=4.x" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, + "bin": { + "he": "bin/he" + } + }, + "node_modules/http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "node_modules/ip-regex": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/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, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-ip": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz", + "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=", + "dev": true, + "dependencies": { + "ip-regex": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-plain-obj": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", + "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", + "dev": true + }, + "node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "dev": true, + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.50.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.50.0.tgz", + "integrity": "sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.33", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.33.tgz", + "integrity": "sha512-plLElXp7pRDd0bNZHw+nMd52vRYjLwQjygaNg7ddJ2uJtTlmnTCjWuPKxVu6//AdaRuME84SvLW91sIkBqGT0g==", + "dependencies": { + "mime-db": "1.50.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/mocha": { + "version": "9.1.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", + "integrity": "sha512-Xcpl9FqXOAYqI3j79pEtHBBnQgVXIhpULjGQa7DVb0Po+VzmSIK9kanAiWLHoRR/dbZ2qpdPshuXr8l1VaHCzw==", + "dev": true, + "dependencies": { + "@ungap/promise-all-settled": "1.1.2", + "ansi-colors": "4.1.1", + "browser-stdout": "1.3.1", + "chokidar": "3.5.2", + "debug": "4.3.2", + "diff": "5.0.0", + "escape-string-regexp": "4.0.0", + "find-up": "5.0.0", + "glob": "7.1.7", + "growl": "1.10.5", + "he": "1.2.0", + "js-yaml": "4.1.0", + "log-symbols": "4.1.0", + "minimatch": "3.0.4", + "ms": "2.1.3", + "nanoid": "3.1.25", + "serialize-javascript": "6.0.0", + "strip-json-comments": "3.1.1", + "supports-color": "8.1.1", + "which": "2.0.2", + "workerpool": "6.1.5", + "yargs": "16.2.0", + "yargs-parser": "20.2.4", + "yargs-unparser": "2.0.0" + }, + "bin": { + "_mocha": "bin/_mocha", + "mocha": "bin/mocha" + }, + "engines": { + "node": ">= 12.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/mochajs" + } + }, + "node_modules/mocha/node_modules/debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "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/diff": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", + "integrity": "sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==", + "dev": true, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/mocha/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/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "node_modules/nanoid": { + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", + "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/nodemailer": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz", + "integrity": "sha512-AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" + }, + "node_modules/pathval": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/prisma": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.3.0.tgz", + "integrity": "sha512-E7C9mXRwZVpcnSeJT533qGHUVrYULsE9ihFvAtQMuxhTXkxoRlMLyo/1ZOyeu9GdXP8DJ7ruLOw06kEs/N3dVg==", + "devOptional": true, + "hasInstallScript": true, + "dependencies": { + "@prisma/engines": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c" + }, + "bin": { + "prisma": "build/index.js", + "prisma2": "build/index.js" + }, + "engines": { + "node": ">=12.6" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dependencies": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "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/readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "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/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "dependencies": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, + "node_modules/serialize-javascript": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz", + "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, + "node_modules/serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, + "node_modules/statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "engines": { + "node": ">= 0.6" + } + }, + "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/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", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "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" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/superagent": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", + "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", + "dev": true, + "dependencies": { + "component-emitter": "^1.2.0", + "cookiejar": "^2.1.0", + "debug": "^3.1.0", + "extend": "^3.0.0", + "form-data": "^2.3.1", + "formidable": "^1.2.0", + "methods": "^1.1.1", + "mime": "^1.4.1", + "qs": "^6.5.1", + "readable-stream": "^2.3.5" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/superagent/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "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==", + "dev": true + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/ts-node": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", + "integrity": "sha512-hCnyOyuGmD5wHleOQX6NIjJtYVIO8bPP8F2acWkB4W06wdlkgyvJtubO/I9NkI88hCFECbsEgoLc0VNkYmcSfw==", + "dev": true, + "dependencies": { + "@cspotcode/source-map-support": "0.6.1", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/typescript": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/workerpool": { + "version": "6.1.5", + "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", + "integrity": "sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==", + "dev": true + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-parser": { + "version": "20.2.4", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", + "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", + "dev": true, + "dependencies": { + "camelcase": "^6.0.0", + "decamelize": "^4.0.0", + "flat": "^5.0.2", + "is-plain-obj": "^2.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + } + }, "dependencies": { "@cspotcode/source-map-consumer": { "version": "0.8.0", @@ -20,23 +2041,23 @@ } }, "@prisma/client": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.2.1.tgz", - "integrity": "sha512-nakt9YoDFD4cgTkRTSVbzG40AKmmbVEtXE3csVqBdDXsm0/L4PQdtbtzILNzq28xv8HH8oHgFKWnsItM23mSDw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.3.0.tgz", + "integrity": "sha512-34tonDW2v74VcG1mx+k/IUGG/eSHKwDiYKfFIZgaPLq/C0h8YQxh7pro272xpOf1pt6duX1Bi90dpGijh1MYgQ==", "requires": { - "@prisma/engines-version": "3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c" + "@prisma/engines-version": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c" } }, "@prisma/engines": { - "version": "3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c", - "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c.tgz", - "integrity": "sha512-wnHODKLQGKkE2ZCHxHQEf/4Anq/EP0ZCvX++D5w34033mwZ94iZiOsEKZZ31fgki7MTh28F1VNF5ZSFdnRjgvQ==", - "dev": true + "version": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c", + "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c.tgz", + "integrity": "sha512-T3nEnRWmoneNZJPd9IBR29G8ZDUjNelA8+cG5y8/lh6vySm6ryWSNxj1s377U9YzFYyZmXiA9vK1iyxMoRff/g==", + "devOptional": true }, "@prisma/engines-version": { - "version": "3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c", - "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c.tgz", - "integrity": "sha512-O4dHSbqfX7yAjFMawIEzv6wefv3LRMDK4J20Y70NvE3otbE3CnChlmghkCvMsQ1CGF1QuGlrqfw20aI2JfZcaw==" + "version": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c", + "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c.tgz", + "integrity": "sha512-g21xPYq0zHoJ/xUkNxIf5Hle0oiDyelZHU8gwq7J3RNVrccjbUZ28S99KT4yUabV8SQQRNSnR0QMLGMv9Eqs/A==" }, "@tsconfig/node10": { "version": "1.0.8", @@ -75,12 +2096,23 @@ "@types/chai": { "version": "4.2.22", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.22.tgz", - "integrity": "sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ==" + "integrity": "sha512-tFfcE+DSTzWAgifkjik9AySNqIyNoYwmR+uecPwwD/XRNfvOjmC/FjCxpiUGDkDVDphPfCUecSQVFw+lN3M3kQ==", + "dev": true + }, + "@types/chai-as-promised": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/@types/chai-as-promised/-/chai-as-promised-7.1.4.tgz", + "integrity": "sha512-1y3L1cHePcIm5vXkh1DSGf/zQq5n5xDKG1fpCvf18+uOkpce0Z1ozNFPkyWsVswK7ntN1sZBw3oU6gmN+pDUcA==", + "dev": true, + "requires": { + "@types/chai": "*" + } }, "@types/chai-http": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/@types/chai-http/-/chai-http-4.2.0.tgz", "integrity": "sha512-yb8+55cAuiVB7/yfnHIME5Ppw0LMUE6QFbuBFk5LewleI5pvYvtoXIEUAst3z3m0wZ2hLp1XeqllzffOSJSQuA==", + "dev": true, "requires": { "chai-http": "*" } @@ -97,7 +2129,8 @@ "@types/cookiejar": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==" + "integrity": "sha512-t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog==", + "dev": true }, "@types/express": { "version": "4.17.13", @@ -139,6 +2172,14 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-16.10.3.tgz", "integrity": "sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==" }, + "@types/nodemailer": { + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.4.tgz", + "integrity": "sha512-Ksw4t7iliXeYGvIQcSIgWQ5BLuC/mljIEbjf615svhZL10PE9t+ei8O9gDaD3FPCasUJn9KTLwz2JFJyiiyuqw==", + "requires": { + "@types/node": "*" + } + }, "@types/qs": { "version": "6.9.7", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz", @@ -165,6 +2206,7 @@ "version": "3.8.7", "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.7.tgz", "integrity": "sha512-9KhCkyXv268A2nZ1Wvu7rQWM+BmdYUVkycFeNnYrUL5Zwu7o8wPQ3wBfW59dDP+wuoxw0ww8YKgTNv8j/cgscA==", + "dev": true, "requires": { "@types/cookiejar": "*", "@types/node": "*" @@ -254,7 +2296,8 @@ "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true }, "balanced-match": { "version": "1.0.2", @@ -335,10 +2378,20 @@ "type-detect": "^4.0.5" } }, + "chai-as-promised": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", + "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", + "dev": true, + "requires": { + "check-error": "^1.0.2" + } + }, "chai-http": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/chai-http/-/chai-http-4.3.0.tgz", "integrity": "sha512-zFTxlN7HLMv+7+SPXZdkd5wUlK+KxH6Q7bIEMiEx0FK3zuuMqL7cwICAQ0V1+yYRozBburYuxN1qZstgHpFZQg==", + "dev": true, "requires": { "@types/chai": "4", "@types/superagent": "^3.8.3", @@ -422,6 +2475,7 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -429,7 +2483,8 @@ "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, "concat-map": { "version": "0.0.1", @@ -463,12 +2518,14 @@ "cookiejar": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz", - "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==" + "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==", + "dev": true }, "core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true }, "create-require": { "version": "1.1.1", @@ -502,7 +2559,8 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true }, "depd": { "version": "1.1.2", @@ -603,7 +2661,8 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true }, "fill-range": { "version": "7.0.1", @@ -648,6 +2707,7 @@ "version": "2.5.1", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.1.tgz", "integrity": "sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==", + "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -657,7 +2717,8 @@ "formidable": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz", - "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==" + "integrity": "sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q==", + "dev": true }, "forwarded": { "version": "0.2.0", @@ -773,7 +2834,8 @@ "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", + "dev": true }, "ipaddr.js": { "version": "1.9.1", @@ -814,6 +2876,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ip/-/is-ip-2.0.0.tgz", "integrity": "sha1-aO6gfooKCpTC0IDdZ0xzGrKkYas=", + "dev": true, "requires": { "ip-regex": "^2.0.0" } @@ -839,7 +2902,8 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true }, "isexe": { "version": "2.0.0", @@ -1002,6 +3066,11 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "nodemailer": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz", + "integrity": "sha512-AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==" + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -1078,18 +3147,19 @@ "dev": true }, "prisma": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.2.1.tgz", - "integrity": "sha512-nXhldcFYemNSMqdTAEziggVWBNbCHTrr0amkCJruP3G2AFpzxrKtksPRLYNetxdKMJAt7aRRumusbtmTTDgyzw==", - "dev": true, + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prisma/-/prisma-3.3.0.tgz", + "integrity": "sha512-E7C9mXRwZVpcnSeJT533qGHUVrYULsE9ihFvAtQMuxhTXkxoRlMLyo/1ZOyeu9GdXP8DJ7ruLOw06kEs/N3dVg==", + "devOptional": true, "requires": { - "@prisma/engines": "3.2.1-1.b71d8cb16c4ddc7e3e9821f42fd09b0f82d7934c" + "@prisma/engines": "3.3.0-30.33838b0f78f1fe9052cf9a00e9761c9dc097a63c" } }, "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true }, "proxy-addr": { "version": "2.0.7", @@ -1134,6 +3204,7 @@ "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", @@ -1226,6 +3297,15 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "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" + } + }, "string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -1237,14 +3317,6 @@ "strip-ansi": "^6.0.1" } }, - "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==", - "requires": { - "safe-buffer": "~5.1.0" - } - }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -1264,6 +3336,7 @@ "version": "3.8.3", "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", + "dev": true, "requires": { "component-emitter": "^1.2.0", "cookiejar": "^2.1.0", @@ -1281,6 +3354,7 @@ "version": "3.2.7", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, "requires": { "ms": "^2.1.1" } @@ -1288,7 +3362,8 @@ "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true } } }, @@ -1364,7 +3439,8 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "utils-merge": { "version": "1.0.1", diff --git a/package.json b/package.json index 6f2a6ad..c5b93b5 100644 --- a/package.json +++ b/package.json @@ -19,20 +19,24 @@ }, "homepage": "https://github.com/detleph/server#readme", "dependencies": { - "@prisma/client": "^3.2.1", - "@types/chai-http": "^4.2.0", - "chai-http": "^4.3.0", + "@prisma/client": "^3.3.0", + "@types/node": "^16.10.3", + "@types/nodemailer": "^6.4.4", "dotenv": "^10.0.0", - "express": "^4.17.1" + "express": "^4.17.1", + "nodemailer": "^6.7.0" }, "devDependencies": { "@types/chai": "^4.2.22", + "@types/chai-as-promised": "^7.1.4", + "@types/chai-http": "^4.2.0", "@types/express": "^4.17.13", "@types/mocha": "^9.0.0", - "@types/node": "^16.10.3", "chai": "^4.3.4", + "chai-as-promised": "^7.1.1", + "chai-http": "^4.3.0", "mocha": "^9.1.3", - "prisma": "^3.2.1", + "prisma": "^3.3.0", "ts-node": "^10.2.1", "typescript": "^4.4.3" } diff --git a/scripts/dkim.sh b/scripts/dkim.sh new file mode 100755 index 0000000..b97d405 --- /dev/null +++ b/scripts/dkim.sh @@ -0,0 +1,33 @@ +#! /bin/bash + + +#load .env file + +[[ -f .env ]] || { echo "`tput setaf 1`✗`tput sgr0` Could not find .env file are you in the correct directory (you should be in the server directory)"; exit 1;} + +set -o allexport +[[ -f .env ]] && source .env +set +o allexport + +#static variables +NC='tput sgr0' #No Color +GREEN='tput setaf 2' +RED='tput setaf 1' + + +#check dependencies +command -v opendkim-genkey >/dev/null 2>&1 || { echo >&2 "`$RED`✗`$NC` Opendkim not installed install with your favorite package manager (opendkim-tools | opendkim-utils)"; exit 1;} + +#generate dkim keys +mkdir -p ./host/keys +echo "`$GREEN`✓`$NC` Created folder" + +cd ./host/keys +opendkim-genkey -b 2048 -h rsa-sha256 -r -v --subdomains -s mail -d mail.$DOMAIN +sed -i 's/h=rsa-sha256/sha256/' mail.txt +mv mail.private mail.$DOMAIN.private +mv mail.txt mail.$DOMAIN.txt + +echo "`$GREEN`✓`$NC` Generated dkim keys" + +exit 0 \ No newline at end of file diff --git a/src/Tests/mail.test.ts b/src/Tests/mail.test.ts new file mode 100644 index 0000000..6c56b91 --- /dev/null +++ b/src/Tests/mail.test.ts @@ -0,0 +1,17 @@ +process.env.NODE_ENV = "test"; + +import chai, { expect } from "chai"; +import chaiaspromised from "chai-as-promised"; +import mail from "../lib/mail"; + +chai.use(chaiaspromised); +const should = chai.should(); + +describe("mail", () => { + it("should succesfully send a email", async () => { + //NOTE THESE TESTS ONLY WORK WITH DEV BEING TRUE + const info = await mail.sendMail('"Chai Testing suite" ', "test@example.com", "Hello", "Test"); + info.rejected.length.should.eq(0); + info.accepted.length.should.eq(1); + }); +}); diff --git a/src/lib/mail.ts b/src/lib/mail.ts new file mode 100644 index 0000000..de4a30c --- /dev/null +++ b/src/lib/mail.ts @@ -0,0 +1,50 @@ +import nodemailer from "nodemailer"; +import SMTPTransport from "nodemailer/lib/smtp-transport"; + +let mailAccount = { user: process.env.MAILUSER + "@mail." + process.env.DOMAIN, pass: process.env.MAILPASSWORD }; + +let transporter = nodemailer.createTransport( + new SMTPTransport({ + host: "localhost", + port: 587, + secure: false, + auth: { + user: mailAccount.user, + pass: mailAccount.pass, + }, + tls: { + rejectUnauthorized: false, + secureProtocol: "TLSv1_method", + }, + }) +); + +if (process.env.DEV == "true") { + (async () => { + mailAccount = await nodemailer.createTestAccount(); + if (process.env.NODE_ENV != "test") { + console.log(mailAccount); + } + transporter = nodemailer.createTransport({ + host: "smtp.ethereal.email", + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: mailAccount.user, // generated ethereal user + pass: mailAccount.pass, // generated ethereal password + }, + }); + })(); +} + +const sendMail = async (from: string, to: string, subject: string, text?: string, html?: string) => { + return await transporter.sendMail({ + from: from, + to: to, + subject: subject, + text: text, + html: html, + }); +}; + +export default { sendMail, mailAccount }; From 5223c50881730944ebeb6e7d019819ed9770710d Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Wed, 3 Nov 2021 14:57:14 +0100 Subject: [PATCH 007/128] update campaign, participants, group --- prisma/schema.prisma | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 6a80bbc..8c52d75 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -18,7 +18,6 @@ model Event { disciplines Discipline[] admins Admin[] organisations Oragnisation[] - campaigns Campaign[] } model Admin { @@ -36,14 +35,10 @@ model Campaign { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid expiresAt DateTime - user_limit Int @default(40) - user_number Int @default(0) - links String[] + link String group Group @relation(fields: [groupId], references: [id]) groupId Int - event Event @relation(fields: [eventId], references: [id]) - eventId Int } model Discipline { @@ -89,10 +84,13 @@ model Participant { lastName String email String + group Group @relation(fields: [groupId], references: [id]) + groupId Int team Team @relation(name: "participants", fields: [teamId], references: [id]) teamId Int leaderOf Team? @relation(name: "leader") roles Role[] + } model Oragnisation { @@ -106,11 +104,14 @@ model Oragnisation { } model Group { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String + user_limit Int @default(40) + user_number Int @default(0) oragnisation Oragnisation @relation(fields: [oragnisationId], references: [id]) oragnisationId Int - campaign Campaign[] + participants Participant[] + campaign Campaign[] } From eff8dd0860c6b47a0a5dd2b5c0fdc8a57c59d383 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 9 Nov 2021 12:25:56 +0100 Subject: [PATCH 008/128] Add the redis server to docker-compose.yml --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3edb025..78e6b35 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,10 @@ services: ports: - 5432:5432 container_name: "postgres" + redis: + image: redis + restart: always + #server: # build: . # restart: always From 1d87860be09f03b64a0d9d8c764c5e621b9c3d81 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:17:20 +0100 Subject: [PATCH 009/128] Adding LinkObject; adjust details --- prisma/schema.prisma | 51 +++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 8c52d75..a07eefb 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -17,7 +17,32 @@ model Event { disciplines Discipline[] admins Admin[] - organisations Oragnisation[] + organisations Organisation[] + campaign Campaign? +} + +model Campaign { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + expiresAt DateTime + user_limit Int @default(40) + user_number Int @default(0) + + event Event? @relation(fields: [eventId], references: [id]) + links LinkObject[] + eventId Int + +} + +model LinkObject { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + link String + + campaign Campaign @relation(fields: [campaignId], references: [id]) + campaignId Int + group Group @relation(fields: [groupId], references: [id]) + groupId Int } model Admin { @@ -31,22 +56,12 @@ model Admin { eventId Int } -model Campaign { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - expiresAt DateTime - link String - - group Group @relation(fields: [groupId], references: [id]) - groupId Int -} - model Discipline { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String - minTeamSize Int @default(1) - maxTeamSize Int @default(1) + minTeamSize Int + maxTeamSize Int roles Role[] teams Team[] @@ -73,7 +88,7 @@ model Team { participants Participant[] @relation(name: "participants") discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int - leader Participant @relation(name: "leader", fields: [leaderId], references: [id]) + leader Participant? @relation(name: "leader", fields: [leaderId], references: [id]) leaderId Int } @@ -83,6 +98,7 @@ model Participant { firstName String lastName String email String + gender String group Group @relation(fields: [groupId], references: [id]) groupId Int @@ -93,7 +109,7 @@ model Participant { } -model Oragnisation { +model Organisation { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String @@ -109,9 +125,10 @@ model Group { name String user_limit Int @default(40) user_number Int @default(0) + level Int - oragnisation Oragnisation @relation(fields: [oragnisationId], references: [id]) + oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) oragnisationId Int participants Participant[] - campaign Campaign[] + link LinkObject? } From a0d033672a3524753a4f8d37c4d7fc5abd357885 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:39:09 +0100 Subject: [PATCH 010/128] Adding enum (Gender, AdminLevel) --- prisma/schema.prisma | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index a07eefb..c037ab6 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -28,7 +28,7 @@ model Campaign { user_limit Int @default(40) user_number Int @default(0) - event Event? @relation(fields: [eventId], references: [id]) + event Event @relation(fields: [eventId], references: [id]) links LinkObject[] eventId Int @@ -50,7 +50,7 @@ model Admin { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String password String // TODO: Probably specify hash size (VarChar or some other type) - permission_level Int // TODO: Maybe extract into an enum + permission_level permission_level @default(STANDARD) event Event @relation(fields: [eventId], references: [id]) eventId Int @@ -98,7 +98,7 @@ model Participant { firstName String lastName String email String - gender String + gender Gender group Group @relation(fields: [groupId], references: [id]) groupId Int @@ -132,3 +132,14 @@ model Group { participants Participant[] link LinkObject? } + +enum permission_level { + STANDARD + ELEVATED +} + +enum Gender { + MALE + FEMALE + OTHERS +} \ No newline at end of file From 8299060d00337c261f78a84c7cefb05e4ad2c899 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Tue, 9 Nov 2021 15:44:15 +0100 Subject: [PATCH 011/128] Format schema, Adjust enum naming --- prisma/schema.prisma | 88 ++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index c037ab6..0df1552 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -18,47 +18,45 @@ model Event { disciplines Discipline[] admins Admin[] organisations Organisation[] - campaign Campaign? + campaign Campaign? } model Campaign { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - expiresAt DateTime - user_limit Int @default(40) - user_number Int @default(0) - - event Event @relation(fields: [eventId], references: [id]) + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + expiresAt DateTime + + event Event @relation(fields: [eventId], references: [id]) links LinkObject[] - eventId Int + eventId Int @unique } model LinkObject { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - link String + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + link String - campaign Campaign @relation(fields: [campaignId], references: [id]) + campaign Campaign @relation(fields: [campaignId], references: [id]) campaignId Int - group Group @relation(fields: [groupId], references: [id]) - groupId Int + group Group @relation(fields: [groupId], references: [id]) + groupId Int @unique } model Admin { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String password String // TODO: Probably specify hash size (VarChar or some other type) - permission_level permission_level @default(STANDARD) + permission_level LevelAdmin @default(STANDARD) event Event @relation(fields: [eventId], references: [id]) eventId Int } model Discipline { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String minTeamSize Int maxTeamSize Int @@ -70,14 +68,14 @@ model Discipline { } model Role { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String schema Json - participant Participant[] - discipline Discipline @relation(fields: [disciplineId], references: [id]) - disciplineId Int + participant Participant[] + discipline Discipline @relation(fields: [disciplineId], references: [id]) + disciplineId Int } model Team { @@ -88,8 +86,8 @@ model Team { participants Participant[] @relation(name: "participants") discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int - leader Participant? @relation(name: "leader", fields: [leaderId], references: [id]) - leaderId Int + leader Participant? @relation(name: "leader", fields: [leaderId], references: [id]) + leaderId Int @unique } model Participant { @@ -100,13 +98,13 @@ model Participant { email String gender Gender - group Group @relation(fields: [groupId], references: [id]) - groupId Int - team Team @relation(name: "participants", fields: [teamId], references: [id]) - teamId Int - leaderOf Team? @relation(name: "leader") - roles Role[] - + group Group @relation(fields: [groupId], references: [id]) + groupId Int + team Team @relation(name: "participants", fields: [teamId], references: [id]) + teamId Int + leaderOf Team? @relation(name: "leader") + roles Role[] + } model Organisation { @@ -120,20 +118,20 @@ model Organisation { } model Group { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - user_limit Int @default(40) - user_number Int @default(0) - level Int + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + user_limit Int @default(40) + user_number Int @default(0) + level Int - oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) + oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) oragnisationId Int - participants Participant[] - link LinkObject? + participants Participant[] + link LinkObject? } -enum permission_level { +enum LevelAdmin { STANDARD ELEVATED } From 3d961ab53df8ef8e7c1a81d809010a2dc666d87f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 08:19:17 +0100 Subject: [PATCH 012/128] Add controller for authenticating with admin name and password + Add function to create a JWT with the required payload --- package.json | 3 + src/Controllers/admin_auth.controller.ts | 74 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 src/Controllers/admin_auth.controller.ts diff --git a/package.json b/package.json index c5b93b5..04bfa10 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,13 @@ "homepage": "https://github.com/detleph/server#readme", "dependencies": { "@prisma/client": "^3.3.0", + "@types/jsonwebtoken": "^8.5.5", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", + "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", + "jsonwebtoken": "^8.5.1", "nodemailer": "^6.7.0" }, "devDependencies": { diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts new file mode 100644 index 0000000..d65fc03 --- /dev/null +++ b/src/Controllers/admin_auth.controller.ts @@ -0,0 +1,74 @@ +import { Request, Response } from "express"; +import { Admin } from ".prisma/client"; +import prisma from "../lib/prisma"; +import argon2 from "argon2"; +import jwt from "jsonwebtoken"; + +const JWT_SECRET = process.env.JWT_SECRET || "secret"; + +function createAdminJWT(admin: Admin) { + let payload: { name: string; permission_level: number; revision: string; group?: string } = { + name: admin.name, + permission_level: admin.permission_level, + revision: "", // TODO: Revision in the schema is pending + }; + + if (admin.permission_level > 0) { + payload = { ...payload, group: "" }; // TODO: Group association for admins in the schema is pending + } + + return jwt.sign(payload, JWT_SECRET, { expiresIn: "4 hours" }); +} + +interface AuthenticateUserBody { + name?: string; + password?: string; +} + +export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody>, res: Response) => { + // TODO: Provide more useful error messages (Maybe express-validator?) + + const { name, password } = req.body; + + if (name == null || password == null) { + return res.status(400).json({ + type: "error", + payload: { + message: "The body must contain 'name' and 'password' attributes of type string", + }, + }); + } + + const user = await prisma.admin.findFirst({ where: { name } }); + + // REVIEW: It is possible to initiate a timing attack here (To see which users exist) + // This should, however, not be of too much concern, as one can basically do nothing + // with only the username + + if (!user) { + return res.status(404).json({ + type: "error", + payload: { + message: `The provided credentials are not valid`, + }, + }); + } + + const param_password_hash = await argon2.hash(password, { type: argon2.argon2id }); + + if (param_password_hash === user.password) { + return { + type: "success", + payload: { + token: createAdminJWT(user), + }, + }; + } + + return { + type: "error", + payload: { + message: "The provided credentials are not valid", + }, + }; +}; From 4319620bfd8747b97f0f714d9ad0b4b2e86eb2a5 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Wed, 10 Nov 2021 08:28:23 +0100 Subject: [PATCH 013/128] small changes from feedback --- prisma/schema.prisma | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 0df1552..9be7150 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -18,7 +18,7 @@ model Event { disciplines Discipline[] admins Admin[] organisations Organisation[] - campaign Campaign? + campaign Campaign[] } model Campaign { @@ -27,12 +27,11 @@ model Campaign { expiresAt DateTime event Event @relation(fields: [eventId], references: [id]) - links LinkObject[] + links Link[] eventId Int @unique - } -model LinkObject { +model Link { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid link String @@ -48,7 +47,7 @@ model Admin { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String password String // TODO: Probably specify hash size (VarChar or some other type) - permission_level LevelAdmin @default(STANDARD) + permission_level AdminLevel @default(STANDARD) event Event @relation(fields: [eventId], references: [id]) eventId Int @@ -122,16 +121,15 @@ model Group { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String user_limit Int @default(40) - user_number Int @default(0) level Int oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) oragnisationId Int participants Participant[] - link LinkObject? + link Link? } -enum LevelAdmin { +enum AdminLevel { STANDARD ELEVATED } From eb64432ad45187b380238cd831b32416931c1c73 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:04:00 +0100 Subject: [PATCH 014/128] Admin + small changes --- prisma/schema.prisma | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 9be7150..b0560ee 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -14,6 +14,7 @@ model Event { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key date DateTime name String + description String disciplines Discipline[] admins Admin[] @@ -24,6 +25,7 @@ model Event { model Campaign { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + start DateTime expiresAt DateTime event Event @relation(fields: [eventId], references: [id]) @@ -38,7 +40,7 @@ model Link { campaign Campaign @relation(fields: [campaignId], references: [id]) campaignId Int - group Group @relation(fields: [groupId], references: [id]) + group Group? @relation(fields: [groupId], references: [id]) groupId Int @unique } @@ -48,6 +50,8 @@ model Admin { name String password String // TODO: Probably specify hash size (VarChar or some other type) permission_level AdminLevel @default(STANDARD) + revision String + groups Group[] event Event @relation(fields: [eventId], references: [id]) eventId Int @@ -127,6 +131,7 @@ model Group { oragnisationId Int participants Participant[] link Link? + admins Admin[] } enum AdminLevel { @@ -137,5 +142,5 @@ enum AdminLevel { enum Gender { MALE FEMALE - OTHERS + OTHER } \ No newline at end of file From 0eb284a00daa5dbeee44a61fc0dfb3aa0cbcab92 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Wed, 10 Nov 2021 10:40:06 +0100 Subject: [PATCH 015/128] formated last commit --- prisma/schema.prisma | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index b0560ee..cabd3e2 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -10,10 +10,10 @@ generator client { } model Event { - id Int @id @default(autoincrement()) // Primary key - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key - date DateTime - name String + id Int @id @default(autoincrement()) // Primary key + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key + date DateTime + name String description String disciplines Discipline[] @@ -28,9 +28,9 @@ model Campaign { start DateTime expiresAt DateTime - event Event @relation(fields: [eventId], references: [id]) links Link[] - eventId Int @unique + event Event @relation(fields: [eventId], references: [id]) + eventId Int @unique } model Link { @@ -121,11 +121,11 @@ model Organisation { } model Group { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - user_limit Int @default(40) - level Int + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + user_limit Int @default(40) + level Int oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) oragnisationId Int From aec6604d24aacfc993d9a51655372ca59f3ee472 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 11:15:51 +0100 Subject: [PATCH 016/128] Update the code to use the latest database schema --- src/Controllers/admin_auth.controller.ts | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index d65fc03..f4672ea 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -1,23 +1,21 @@ import { Request, Response } from "express"; -import { Admin } from ".prisma/client"; +import { Admin, AdminLevel, Group } from "@prisma/client"; import prisma from "../lib/prisma"; import argon2 from "argon2"; import jwt from "jsonwebtoken"; const JWT_SECRET = process.env.JWT_SECRET || "secret"; +const TOKEN_EXPIRY = "4 days"; -function createAdminJWT(admin: Admin) { - let payload: { name: string; permission_level: number; revision: string; group?: string } = { +function createAdminJWT(admin: Admin & { groups: Group[] }) { + const payload: { name: string; permission_level: AdminLevel; revision: string; groups: string[] } = { name: admin.name, permission_level: admin.permission_level, - revision: "", // TODO: Revision in the schema is pending + revision: admin.revision, + groups: admin.groups.map((group) => group.pid), }; - if (admin.permission_level > 0) { - payload = { ...payload, group: "" }; // TODO: Group association for admins in the schema is pending - } - - return jwt.sign(payload, JWT_SECRET, { expiresIn: "4 hours" }); + return jwt.sign(payload, JWT_SECRET, { expiresIn: TOKEN_EXPIRY }); } interface AuthenticateUserBody { @@ -39,7 +37,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody }); } - const user = await prisma.admin.findFirst({ where: { name } }); + const user = await prisma.admin.findFirst({ where: { name }, include: { groups: true } }); // REVIEW: It is possible to initiate a timing attack here (To see which users exist) // This should, however, not be of too much concern, as one can basically do nothing From 5ee5218d5aa478a2a00e501a6ac4c4ee6f6c4b82 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 11:31:22 +0100 Subject: [PATCH 017/128] Use the description attribute in add and get controllers --- src/Controllers/event.controller.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 2cdaba3..814766e 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -5,6 +5,7 @@ const getAllEvents = async (req: Request, res: Response) => { const events = await prisma.event.findMany({ select: { name: true, + description: true, date: true, pid: true, id: false, @@ -26,6 +27,7 @@ const addEvent = async (req: Request, res: Response) => { data: { name: req.body.name, date: req.body.date, + description: req.body.description, }, select: { name: true, From fc78f730bd83569571fe686d8f7d924494428acb Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 12:08:07 +0100 Subject: [PATCH 018/128] Add redis + Add a public lib file for redis + Add an indexed auth client + Add a function to create promisified partial clients + Add password revisions to the auth redis index --- package.json | 4 +++- src/Controllers/admin_auth.controller.ts | 4 ++++ src/lib/redis.ts | 27 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/lib/redis.ts diff --git a/package.json b/package.json index 04bfa10..4166d94 100644 --- a/package.json +++ b/package.json @@ -23,11 +23,13 @@ "@types/jsonwebtoken": "^8.5.5", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", + "@types/redis": "^2.8.32", "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", - "nodemailer": "^6.7.0" + "nodemailer": "^6.7.0", + "redis": "^3.1.2" }, "devDependencies": { "@types/chai": "^4.2.22", diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index f4672ea..5fb01fa 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -1,5 +1,6 @@ import { Request, Response } from "express"; import { Admin, AdminLevel, Group } from "@prisma/client"; +import { authClient } from "../lib/redis"; import prisma from "../lib/prisma"; import argon2 from "argon2"; import jwt from "jsonwebtoken"; @@ -55,6 +56,9 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody const param_password_hash = await argon2.hash(password, { type: argon2.argon2id }); if (param_password_hash === user.password) { + // Set password revision ID in redis + await authClient.set(user.pid, user.revision); + return { type: "success", payload: { diff --git a/src/lib/redis.ts b/src/lib/redis.ts new file mode 100644 index 0000000..afe01f5 --- /dev/null +++ b/src/lib/redis.ts @@ -0,0 +1,27 @@ +import redis from "redis"; +import { promisify } from "util"; + +const REDIS_INDICES = { + auth: 0, +}; + +const REDIS_HOST = process.env.REDIS_HOST || "redis"; +const REDIS_PORT = process.env.REDIS_PORT ? parseInt(process.env.REDIS_PORT) : 6379; + +// TODO: Extend +function createAsyncClient(client: redis.RedisClient) { + return { + get: promisify(client.get).bind(client), + set: promisify(client.set).bind(client), + }; +} + +// ----------------- // +// Redis auth client // +// ----------------- // + +const auth = redis.createClient({ host: REDIS_HOST, port: REDIS_PORT }); + +auth.select(REDIS_INDICES.auth); + +export const authClient = createAsyncClient(auth); From 1b7a40cf7c21a9ef1ec6cacc90fc180c91cb21be Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 15:11:29 +0100 Subject: [PATCH 019/128] Add the pid to the JWT payload --- src/Controllers/admin_auth.controller.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 5fb01fa..3a190b6 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -8,8 +8,17 @@ import jwt from "jsonwebtoken"; const JWT_SECRET = process.env.JWT_SECRET || "secret"; const TOKEN_EXPIRY = "4 days"; +export interface AuthJWTPayload { + pid: string; + name: string; + permission_level: AdminLevel; + revision: string; + groups: string[]; +} + function createAdminJWT(admin: Admin & { groups: Group[] }) { - const payload: { name: string; permission_level: AdminLevel; revision: string; groups: string[] } = { + const payload: AuthJWTPayload = { + pid: admin.pid, name: admin.name, permission_level: admin.permission_level, revision: admin.revision, From c869863aeae7969965409961c94870c3f8b179f2 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 16:04:26 +0100 Subject: [PATCH 020/128] Add middleware to require authentication on an endpoint --- src/Middleware/auth/auth.ts | 88 +++++++++++++++++++++++++++++++++++++ src/custom.d.ts | 7 +++ 2 files changed, 95 insertions(+) create mode 100644 src/Middleware/auth/auth.ts create mode 100644 src/custom.d.ts diff --git a/src/Middleware/auth/auth.ts b/src/Middleware/auth/auth.ts new file mode 100644 index 0000000..ae8e63b --- /dev/null +++ b/src/Middleware/auth/auth.ts @@ -0,0 +1,88 @@ +import { NextFunction, Request, Response } from "express"; +import { AuthJWTPayload } from "../../Controllers/admin_auth.controller"; +import { authClient } from "../../lib/redis"; +import jwt, { JsonWebTokenError, JwtPayload } from "jsonwebtoken"; +import prisma from "../../lib/prisma"; + +const JWT_SECRET = process.env.JWT_SECRET || "secret"; + +const verifyAuthorizationFormat = (authorization: string) => /^Bearer .+$/.test(authorization); + +const getBearerToken = (authorization: string) => authorization.slice(7); + +const requireAuthentication = async (req: Request, res: Response, next: NextFunction) => { + const { authorization } = req.headers; + + if (!authorization) { + return res.status(403).send({ + type: "error", + payload: { + message: "The requeset did not include the Authorization header", + }, + }); + } + + if (!verifyAuthorizationFormat(authorization)) { + return res.status(400).send({ + type: "error", + payload: { + message: "Malformed Authorization header", + format: "Bearer ", + }, + }); + } + + let token_payload_: string | JwtPayload; + + try { + token_payload_ = jwt.verify(getBearerToken(authorization), JWT_SECRET); + } catch (e) { + if (e instanceof JsonWebTokenError) { + return res.status(403).json({ + type: "error", + payload: { + message: "Token could not be verified; It might be expired", + }, + }); + } + + throw e; + } + + const token_payload = token_payload_ as AuthJWTPayload; + + const { pid, revision } = token_payload; + + let db_revision = await authClient.get(pid); + + if (db_revision === null) { + // Load the revision ID from the main DB and cache it in redis + const user = await prisma.admin.findUnique({ where: { pid }, select: { revision: true } }); + + if (user) { + db_revision = user.revision; + + await authClient.set(pid, db_revision); + } + } + + if (revision !== db_revision || !revision || !db_revision) { + return res.status(403).json({ + type: "error", + payload: { + message: "Token could not be verified; It might be expired", + }, + }); + } + + req.auth = { + isAuthenticated: true, + pid: token_payload.pid, + name: token_payload.name, + permission_level: token_payload.permission_level, + groups: token_payload.groups, + revision: token_payload.revision, + }; + + next(); +}; diff --git a/src/custom.d.ts b/src/custom.d.ts new file mode 100644 index 0000000..bb6296a --- /dev/null +++ b/src/custom.d.ts @@ -0,0 +1,7 @@ +import { AuthJWTPayload } from "./Controllers/admin_auth.controller"; + +declare module "express-serve-static-core" { + interface Request { + auth?: AuthJWTPayload & { isAuthenticated: boolean }; + } +} From 60f7c8fff525325fab838804d2668d491ae40550 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 10 Nov 2021 16:12:55 +0100 Subject: [PATCH 021/128] Export requireAuthentication --- src/Middleware/auth/auth.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware/auth/auth.ts b/src/Middleware/auth/auth.ts index ae8e63b..cac4a95 100644 --- a/src/Middleware/auth/auth.ts +++ b/src/Middleware/auth/auth.ts @@ -10,7 +10,7 @@ const verifyAuthorizationFormat = (authorization: string) => /^Bearer .+$/.test( const getBearerToken = (authorization: string) => authorization.slice(7); -const requireAuthentication = async (req: Request, res: Response, next: NextFunction) => { +export const requireAuthentication = async (req: Request, res: Response, next: NextFunction) => { const { authorization } = req.headers; if (!authorization) { From 4fd8a4c978b2746d1346ae5627ec776414af6326 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 11 Nov 2021 11:57:36 +0100 Subject: [PATCH 022/128] Add reference to custom Request typings --- src/Middleware/auth/auth.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Middleware/auth/auth.ts b/src/Middleware/auth/auth.ts index cac4a95..37853b5 100644 --- a/src/Middleware/auth/auth.ts +++ b/src/Middleware/auth/auth.ts @@ -1,3 +1,5 @@ +/// + import { NextFunction, Request, Response } from "express"; import { AuthJWTPayload } from "../../Controllers/admin_auth.controller"; import { authClient } from "../../lib/redis"; From 6c535b16d1829ce1e57dd838eb31cb76afa4cb05 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 11 Nov 2021 12:02:48 +0100 Subject: [PATCH 023/128] Bugfix authentication controller --- src/Controllers/admin_auth.controller.ts | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 3a190b6..97161d9 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -36,7 +36,7 @@ interface AuthenticateUserBody { export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody>, res: Response) => { // TODO: Provide more useful error messages (Maybe express-validator?) - const { name, password } = req.body; + const { name, password } = req.body || {}; if (name == null || password == null) { return res.status(400).json({ @@ -62,24 +62,22 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody }); } - const param_password_hash = await argon2.hash(password, { type: argon2.argon2id }); - - if (param_password_hash === user.password) { + if (await argon2.verify(user.password, password, { type: argon2.argon2id })) { // Set password revision ID in redis await authClient.set(user.pid, user.revision); - return { + return res.status(200).json({ type: "success", payload: { token: createAdminJWT(user), }, - }; + }); } - return { + return res.status(403).json({ type: "error", payload: { message: "The provided credentials are not valid", }, - }; + }); }; From 1cdbddf7539fdb596f0e6026d3f3b9ecb697e52f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 12 Nov 2021 10:18:13 +0100 Subject: [PATCH 024/128] Dockerize the server + Add Dockerfile + Update 'server' docker-compose service --- .dockerignore | 2 ++ Dockerfile | 29 +++++++++++++++++++++++++++++ docker-compose.yml | 14 ++++++++++---- scripts/docker-entrypoint.sh | 11 +++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 scripts/docker-entrypoint.sh diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..e7b3e6b --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +*.env +dist/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..242306b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +# Dockerfile for the event management server + +FROM node:17-alpine3.12 + +# Create directory for the app +RUN mkdir /home/server + +# Selectively copy the required files and directories +ADD prisma/ /home/app/prisma/ +ADD scripts/ /home/app/scripts/ +ADD src/ /home/app/src/ +COPY package-lock.json /home/app +COPY package.json /home/app +COPY tsconfig.json /home/app + +# Change directory into the container +WORKDIR /home/app + +# Install dependencies +RUN npm i -g typescript +RUN npm i + +# Generate the prisma client +RUN npx prisma generate + +# Compile TypeScript to JavaScript +RUN tsc + +CMD ["sh", "scripts/docker-entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index 3edb025..2157a8f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,13 @@ services: ports: - 5432:5432 container_name: "postgres" - #server: - # build: . - # restart: always - # container_name: "server" + server: + build: . + restart: always + container_name: "server" + ports: + - ${PORT}:${PORT} + environment: + - PORT=${PORT} + - DATABASE_URL=${DATABASE_URL} + - DATABASE_PASSWORD=${DATABASE_PASSWORD} diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh new file mode 100644 index 0000000..fd37bb0 --- /dev/null +++ b/scripts/docker-entrypoint.sh @@ -0,0 +1,11 @@ +# Entry point for docker + +if ! test -f INITIALIZED; then + # Migrate the database + # TODO: Update to use prisma migrate + npx prisma db push + touch INITIALIZED +fi + +# Start the server +node ./dist/app.js From 5a62d156ae839b0f7b12eb00e05b128722ccf0a7 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 12 Nov 2021 11:55:38 +0100 Subject: [PATCH 025/128] Add defaults for some environment variables + Remove port bindings for the 'postgres' service --- docker-compose.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2157a8f..72d2e5c 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,17 +14,17 @@ services: image: postgres restart: always environment: + - POSTGRES_USER=server - POSTGRES_PASSWORD=${DATABASE_PASSWORD} - ports: - - 5432:5432 container_name: "postgres" server: build: . restart: always container_name: "server" ports: - - ${PORT}:${PORT} + - ${PORT:-3000}:${PORT:-3000} environment: - - PORT=${PORT} - - DATABASE_URL=${DATABASE_URL} + - PORT=${PORT:-3000} + - DATABASE_URL=postgresql://server:${DATABASE_PASSWORD}@postgres:5432/management?schema=public + - DATABASE_USER=server - DATABASE_PASSWORD=${DATABASE_PASSWORD} From c53e325f06805a8a56b67cf0f696a4c409e5beb8 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 15 Nov 2021 08:41:18 +0100 Subject: [PATCH 026/128] Change layer order (make caching more effecient) --- Dockerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 242306b..8916e84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,23 +3,24 @@ FROM node:17-alpine3.12 # Create directory for the app -RUN mkdir /home/server +RUN mkdir /app -# Selectively copy the required files and directories -ADD prisma/ /home/app/prisma/ -ADD scripts/ /home/app/scripts/ -ADD src/ /home/app/src/ -COPY package-lock.json /home/app -COPY package.json /home/app -COPY tsconfig.json /home/app +# Copy dependency files +COPY package.json package-lock.json /app # Change directory into the container -WORKDIR /home/app +WORKDIR /app # Install dependencies RUN npm i -g typescript RUN npm i +# Selectively copy the required files and directories +ADD prisma/ /app/prisma/ +ADD scripts/ /app/scripts/ +ADD src/ /app/src/ +COPY tsconfig.json /app + # Generate the prisma client RUN npx prisma generate From 8f85f062d79461b040aadcf07a0501a272d6597b Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 15 Nov 2021 08:48:37 +0100 Subject: [PATCH 027/128] HOTFIX: Add ending slash to copy commands --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8916e84..f97ac4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM node:17-alpine3.12 RUN mkdir /app # Copy dependency files -COPY package.json package-lock.json /app +COPY package.json package-lock.json /app/ # Change directory into the container WORKDIR /app @@ -19,7 +19,7 @@ RUN npm i ADD prisma/ /app/prisma/ ADD scripts/ /app/scripts/ ADD src/ /app/src/ -COPY tsconfig.json /app +COPY tsconfig.json /app/ # Generate the prisma client RUN npx prisma generate From fcde6f222222efa1c3f40bafb9ce467c06734e4d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 17 Nov 2021 15:39:04 +0100 Subject: [PATCH 028/128] [create-pull-request] push formatted files (#19) --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index cef3d4b..dc6dfea 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,4 +30,4 @@ services: - PORT=${PORT:-3000} - DATABASE_URL=postgresql://server:${DATABASE_PASSWORD}@postgres:5432/management?schema=public - DATABASE_USER=server - - DATABASE_PASSWORD=${DATABASE_PASSWORD} \ No newline at end of file + - DATABASE_PASSWORD=${DATABASE_PASSWORD} From ae4ceb8d85231ad6792ffd0d8aa44b09d5f138ae Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Wed, 17 Nov 2021 16:01:59 +0100 Subject: [PATCH 029/128] Fix: added Container name to redis --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index dc6dfea..ec86be9 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ services: - POSTGRES_PASSWORD=${DATABASE_PASSWORD} container_name: "postgres" redis: + name: redis image: redis restart: always server: From 7553364313903aa4535e5b3983aaf133b1a33a3e Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Wed, 17 Nov 2021 16:09:57 +0100 Subject: [PATCH 030/128] fixed my fix I'm to stupid to write container_name --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ec86be9..8e594b2 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - POSTGRES_PASSWORD=${DATABASE_PASSWORD} container_name: "postgres" redis: - name: redis + container_name: redis image: redis restart: always server: From 36ddf78fc970ec795133bac259925bf552e5b435 Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:27:20 +0100 Subject: [PATCH 031/128] FIX: Issue with docker network Issue with docker-compose caused server to refuse to build on Server due to not being able to download from the Internet. Might need to be reviewed at a later point --- docker-compose.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8e594b2..b706db3 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.4" services: mail: image: boky/postfix @@ -22,7 +22,10 @@ services: image: redis restart: always server: - build: . + # REVIEW: This is setting the network context to host (during build time) which is generally considered a bad idea + build: + context: . + network: host restart: always container_name: "server" ports: From 01ba2bd0c0b5c396392fd32ce0e8c430d3f90054 Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Wed, 17 Nov 2021 21:36:06 +0100 Subject: [PATCH 032/128] FIX: Due to changes in Prisma schema tests broke Added property description broke stuff :-( --- src/Tests/events.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Tests/events.test.ts b/src/Tests/events.test.ts index bf3c107..846596b 100644 --- a/src/Tests/events.test.ts +++ b/src/Tests/events.test.ts @@ -28,7 +28,7 @@ describe("events", () => { it("should return an array with all the objects", (done) => { prisma.event .create({ - data: { date: new Date(Date.now()).toISOString(), name: "yes" }, + data: { date: new Date(Date.now()).toISOString(), name: "yes", description: "Hallo hansi" }, }) .then((a) => { chai @@ -62,6 +62,7 @@ describe("events", () => { res.body.should.have.property("pid"); res.body.should.have.property("name"); res.body.should.have.property("date"); + res.body.should.have.property("description"); done(); }); }); From 6b6ca57639e5cefe40f092d135c42f0718b3fdcc Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 30 Nov 2021 09:59:57 +0100 Subject: [PATCH 033/128] Add submodule for email templates --- .gitmodules | 3 +++ resources/email/templates | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 resources/email/templates diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..281cfcc --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "resources/email/templates"] + path = resources/email/templates + url = ../email-templates.git diff --git a/resources/email/templates b/resources/email/templates new file mode 160000 index 0000000..387e493 --- /dev/null +++ b/resources/email/templates @@ -0,0 +1 @@ +Subproject commit 387e49326d56dedc7400ccee0d76678531c240f6 From 2b061c5f651eb2e6163ec775ee0807648f0a15c3 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 2 Dec 2021 10:44:52 +0100 Subject: [PATCH 034/128] Add a docker dev environment that starts a container without building the image + Add dev.sh script to start the dev environment + Add generated flags to the .gitignore file --- .gitignore | 5 ++++- dev.sh | 26 ++++++++++++++++++++++++++ scripts/docker-entrypoint.dev.sh | 13 +++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100755 dev.sh create mode 100755 scripts/docker-entrypoint.dev.sh diff --git a/.gitignore b/.gitignore index a674f3d..f3b78d7 100644 --- a/.gitignore +++ b/.gitignore @@ -107,4 +107,7 @@ dist prisma/migrations # Ignore config files for docker -host/ \ No newline at end of file +host/ + +# Ignore flags +INITIALIZED diff --git a/dev.sh b/dev.sh new file mode 100755 index 0000000..6675d41 --- /dev/null +++ b/dev.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +DATABASE_PASSWORD=server docker-compose up -d mail postgres redis + +if [ ! "$(docker ps -a | grep server_dev)" ]; then + echo Creating "server_dev" container + + docker run -it \ + --name server_dev \ + --mount type=bind,source="$(pwd)",target=/app \ + --network server_default \ + -p 3000:3000 -e PORT=3000 \ + -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \ + -e DATABASE_USER=server \ + -e DATABASE_PASSWORD=server \ + --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \ + node +else + echo "Container \"server_dev\" already exists; Starting container" + + docker start -ia server_dev +fi + +# After container termination + +docker-compose stop diff --git a/scripts/docker-entrypoint.dev.sh b/scripts/docker-entrypoint.dev.sh new file mode 100755 index 0000000..02a4c50 --- /dev/null +++ b/scripts/docker-entrypoint.dev.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if ! test -f INITIALIZED; then + touch INITIALIZED + + cd /app + + npm i -g ts-node nodemon + npm i + npx prisma db push +fi + +nodemon /app/src/app.ts From a138bca256cdd1ca678a2eb3d31930dcf8cf170a Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 2 Dec 2021 10:55:26 +0100 Subject: [PATCH 035/128] Fix quotes --- dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev.sh b/dev.sh index 6675d41..0b96319 100755 --- a/dev.sh +++ b/dev.sh @@ -3,7 +3,7 @@ DATABASE_PASSWORD=server docker-compose up -d mail postgres redis if [ ! "$(docker ps -a | grep server_dev)" ]; then - echo Creating "server_dev" container + echo "Creating \"server_dev\" container" docker run -it \ --name server_dev \ From 2a5e631d1fcc7f5766719d8d9e1bcf48236ff4ac Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 3 Dec 2021 10:18:30 +0100 Subject: [PATCH 036/128] Fix bug where nodemon restarts multiple times - Nodemon was watching the whole file system and not only the /app directory --- scripts/docker-entrypoint.dev.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/docker-entrypoint.dev.sh b/scripts/docker-entrypoint.dev.sh index 02a4c50..f71097b 100755 --- a/scripts/docker-entrypoint.dev.sh +++ b/scripts/docker-entrypoint.dev.sh @@ -10,4 +10,4 @@ if ! test -f INITIALIZED; then npx prisma db push fi -nodemon /app/src/app.ts +nodemon --watch /app /app/src/app.ts From db9ea4b36a8dcae64204eee7bdc3eb213064b03f Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sat, 11 Dec 2021 14:04:51 +0100 Subject: [PATCH 037/128] Added compile code for mail templates --- package-lock.json | 2916 +++++++++++++++++++++++++++++++++++++++++++-- package.json | 2 + src/lib/mjml.ts | 23 + 3 files changed, 2821 insertions(+), 120 deletions(-) create mode 100644 src/lib/mjml.ts diff --git a/package-lock.json b/package-lock.json index 298b852..e586a32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,18 @@ "license": "ISC", "dependencies": { "@prisma/client": "^3.3.0", + "@types/jsonwebtoken": "^8.5.5", + "@types/mjml": "^4.7.0", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", + "@types/redis": "^2.8.32", + "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", - "nodemailer": "^6.7.0" + "jsonwebtoken": "^8.5.1", + "mjml": "^4.11.0", + "nodemailer": "^6.7.0", + "redis": "^3.1.2" }, "devDependencies": { "@types/chai": "^4.2.22", @@ -31,6 +38,17 @@ "typescript": "^4.4.3" } }, + "node_modules/@babel/runtime": { + "version": "7.16.3", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz", + "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", + "dependencies": { + "regenerator-runtime": "^0.13.4" + }, + "engines": { + "node": ">=6.9.0" + } + }, "node_modules/@cspotcode/source-map-consumer": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", @@ -52,6 +70,33 @@ "node": ">=12" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.7.tgz", + "integrity": "sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==", + "dependencies": { + "detect-libc": "^1.0.3", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.5", + "nopt": "^5.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + }, + "bin": { + "node-pre-gyp": "bin/node-pre-gyp" + } + }, + "node_modules/@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/@prisma/client": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.3.0.tgz", @@ -181,12 +226,33 @@ "@types/range-parser": "*" } }, + "node_modules/@types/jsonwebtoken": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz", + "integrity": "sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, + "node_modules/@types/mjml": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@types/mjml/-/mjml-4.7.0.tgz", + "integrity": "sha512-aWWu8Lxq2SexXGs+lBPRUpN3kFf0sDRo3Y4jz7BQ15cQvMfyZOadgFJsNlHmDqI6D2Qjx0PIK+1f9IMXgq9vTA==", + "dependencies": { + "@types/mjml-core": "*" + } + }, + "node_modules/@types/mjml-core": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/@types/mjml-core/-/mjml-core-4.7.1.tgz", + "integrity": "sha512-k5IRafi93tyZBGF+0BTrcBDvG47OueI+Q7TC4V4UjGQn0AMVvL3Y+S26QF/UHMmMJW5r1hxLyv3StX2/+FatFg==" + }, "node_modules/@types/mocha": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz", @@ -218,6 +284,14 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", "dev": true }, + "node_modules/@types/redis": { + "version": "2.8.32", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", + "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/serve-static": { "version": "1.13.10", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", @@ -244,6 +318,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "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==" + }, "node_modules/accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -277,11 +356,42 @@ "node": ">=0.4.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.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true, "engines": { "node": ">=6" } @@ -290,7 +400,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" } @@ -299,7 +408,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -314,7 +422,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -323,12 +430,57 @@ "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/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/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, + "node_modules/argon2": { + "version": "0.28.3", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.3.tgz", + "integrity": "sha512-NkEJOImg+T7nnkx6/Fy8EbjZsF20hbBBKdVP/YUxujuLTAjIODmrFeY4vVpekKwGAGDm6roXxluFQ+CIaoVrbg==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.7", + "@phc/format": "^1.0.0", + "node-addon-api": "^4.2.0", + "opencollective-postinstall": "^2.0.3" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -358,14 +510,12 @@ "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/binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true, "engines": { "node": ">=8" } @@ -390,11 +540,15 @@ "node": ">= 0.8" } }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, "node_modules/brace-expansion": { "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" @@ -404,7 +558,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -418,6 +571,11 @@ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, + "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": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "node_modules/bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -426,6 +584,15 @@ "node": ">= 0.8" } }, + "node_modules/camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "dependencies": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, "node_modules/camelcase": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", @@ -522,11 +689,45 @@ "node": "*" } }, + "node_modules/cheerio": { + "version": "1.0.0-rc.10", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", + "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", + "dependencies": { + "cheerio-select": "^1.5.0", + "dom-serializer": "^1.3.2", + "domhandler": "^4.2.0", + "htmlparser2": "^6.1.0", + "parse5": "^6.0.1", + "parse5-htmlparser2-tree-adapter": "^6.0.1", + "tslib": "^2.2.0" + }, + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/cheeriojs/cheerio?sponsor=1" + } + }, + "node_modules/cheerio-select": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz", + "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==", + "dependencies": { + "css-select": "^4.1.3", + "css-what": "^5.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0", + "domutils": "^2.7.0" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, "node_modules/chokidar": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", - "dev": true, "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -543,11 +744,29 @@ "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/clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "dependencies": { + "source-map": "~0.6.0" + }, + "engines": { + "node": ">= 4.0" + } + }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -558,7 +777,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -569,8 +787,15 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "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", @@ -584,6 +809,11 @@ "node": ">= 0.8" } }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, "node_modules/component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -593,8 +823,21 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "node_modules/config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "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": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "node_modules/content-disposition": { "version": "0.5.3", @@ -646,6 +889,32 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, + "node_modules/css-select": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", + "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^5.0.0", + "domhandler": "^4.2.0", + "domutils": "^2.6.0", + "nth-check": "^2.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-what": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", + "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -687,6 +956,19 @@ "node": ">=0.4.0" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "node_modules/denque": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz", + "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==", + "engines": { + "node": ">=0.10" + } + }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -700,6 +982,22 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -709,6 +1007,57 @@ "node": ">=0.3.1" } }, + "node_modules/dom-serializer": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ] + }, + "node_modules/domhandler": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", + "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", + "dependencies": { + "domelementtype": "^2.2.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "dependencies": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, "node_modules/dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -717,6 +1066,36 @@ "node": ">=10" } }, + "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/editorconfig": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", + "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", + "dependencies": { + "commander": "^2.19.0", + "lru-cache": "^4.1.5", + "semver": "^5.6.0", + "sigmund": "^1.0.1" + }, + "bin": { + "editorconfig": "bin/editorconfig" + } + }, + "node_modules/editorconfig/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/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -725,8 +1104,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/encodeurl": { "version": "1.0.2", @@ -736,15 +1114,33 @@ "node": ">= 0.8" } }, + "node_modules/entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true, "engines": { "node": ">=6" } }, + "node_modules/escape-goat": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz", + "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -820,7 +1216,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -909,17 +1304,26 @@ "node": ">= 0.6" } }, + "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.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -929,11 +1333,29 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/gauge": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", + "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", + "dependencies": { + "ansi-regex": "^5.0.1", + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -951,7 +1373,6 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -971,7 +1392,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -997,15 +1417,57 @@ "node": ">=8" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, "bin": { "he": "bin/he" } }, + "node_modules/html-minifier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", + "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", + "dependencies": { + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" + }, + "bin": { + "html-minifier": "cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "funding": [ + "https://github.com/fb55/htmlparser2?sponsor=1", + { + "type": "github", + "url": "https://github.com/sponsors/fb55" + } + ], + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } + }, "node_modules/http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", @@ -1021,6 +1483,39 @@ "node": ">= 0.6" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/https-proxy-agent/node_modules/debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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", @@ -1036,7 +1531,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -1047,6 +1541,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "node_modules/ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, "node_modules/ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", @@ -1068,7 +1567,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -1080,7 +1578,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1089,7 +1586,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" } @@ -1098,7 +1594,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -1122,7 +1617,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, "engines": { "node": ">=0.12.0" } @@ -1160,6 +1654,25 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "node_modules/js-beautify": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz", + "integrity": "sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==", + "dependencies": { + "config-chain": "^1.1.12", + "editorconfig": "^0.15.3", + "glob": "^7.1.3", + "nopt": "^5.0.0" + }, + "bin": { + "css-beautify": "js/bin/css-beautify.js", + "html-beautify": "js/bin/html-beautify.js", + "js-beautify": "js/bin/js-beautify.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -1172,6 +1685,85 @@ "js-yaml": "bin/js-yaml.js" } }, + "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/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/juice": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/juice/-/juice-7.0.0.tgz", + "integrity": "sha512-AjKQX31KKN+uJs+zaf+GW8mBO/f/0NqSh2moTMyvwBY+4/lXIYTU8D8I2h6BAV3Xnz6GGsbalUyFqbYMe+Vh+Q==", + "dependencies": { + "cheerio": "^1.0.0-rc.3", + "commander": "^5.1.0", + "mensch": "^0.3.4", + "slick": "^1.12.2", + "web-resource-inliner": "^5.0.0" + }, + "bin": { + "juice": "bin/juice" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/juice/node_modules/commander": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", + "engines": { + "node": ">= 6" + } + }, + "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/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -1187,6 +1779,46 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -1203,6 +1835,42 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" + }, + "node_modules/lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dependencies": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "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/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/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -1217,6 +1885,11 @@ "node": ">= 0.6" } }, + "node_modules/mensch": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz", + "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==" + }, "node_modules/merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -1264,7 +1937,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1272,6 +1944,448 @@ "node": "*" } }, + "node_modules/minipass": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", + "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/minipass/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "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/minizlib/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/mjml": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.11.0.tgz", + "integrity": "sha512-kYuCAds/8F7m7xNEs3TFkrc0jxnNYIkexQIUNByPLQJFoFRltpgXLSdoyreGAniQtDGITPE+p8FIocLUBKsOHg==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "mjml-cli": "4.11.0", + "mjml-core": "4.11.0", + "mjml-migrate": "4.11.0", + "mjml-preset-core": "4.11.0", + "mjml-validator": "4.11.0" + }, + "bin": { + "mjml": "bin/mjml" + } + }, + "node_modules/mjml-accordion": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.11.0.tgz", + "integrity": "sha512-u6cPMl4z8JeRIq0sGHWfzwE5SqwBhSPHJ8wElhfU7CK6gAoUTz4BIL/03da2whXk0S34n5CSU453JpuWV+3bQQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-body": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.11.0.tgz", + "integrity": "sha512-+SQXOjKOr9IMblmslrUbv+ahF/SkqT7mAuix1P/F9ev3aS+WN7Gy/lyJLaq1zhSQCmzrBDovHez3bJ7NGToU0g==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-button": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.11.0.tgz", + "integrity": "sha512-v/MwA2Kq2MlHJwrajdAqUihjAQivD8FpkpOAcqdgqI1ffaEDzd6FGFt5qOtVD9BncChQ4a51haOnPd+kbBLlCA==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-carousel": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.11.0.tgz", + "integrity": "sha512-/owKKSg3DNes1rauPPhlGCFdZ4zzoxdztPLGOm9TSjkbL5q2cN9NMfzNdTYLnnVG5G5XWX0THjDeeq+bGnHw8w==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-cli": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.11.0.tgz", + "integrity": "sha512-jgkxNY+sY+CwiUlO6VX8cwVjlLBXIzE7X4fXkQ2RjXpbAvsN8uDafST8oL8PDlxNIjOwK6YJySzZSLXSKTF5Zg==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "chokidar": "^3.0.0", + "glob": "^7.1.1", + "html-minifier": "^4.0.0", + "js-beautify": "^1.6.14", + "lodash": "^4.17.21", + "mjml-core": "4.11.0", + "mjml-migrate": "4.11.0", + "mjml-parser-xml": "4.11.0", + "mjml-validator": "4.11.0", + "yargs": "^16.1.0" + }, + "bin": { + "mjml-cli": "bin/mjml" + } + }, + "node_modules/mjml-column": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.11.0.tgz", + "integrity": "sha512-yuupexywYXuXTvxxGLPZw6S/D6fz4b41ZarOkEPW8Pbj7FkfnBTO3QokAS5KapJ9x6sIAVs+cCgUul87dwOBzg==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-core": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.11.0.tgz", + "integrity": "sha512-UTI1exu9/0lOF40aacAzC9A7RrJPcay7WYurYsb+X2LbDyfBlSx5ZCtuUTHwLfIz3PL6rSg8yrZ3KtlmhQJ/kQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "cheerio": "1.0.0-rc.10", + "detect-node": "2.0.4", + "html-minifier": "^4.0.0", + "js-beautify": "^1.6.14", + "juice": "^7.0.0", + "lodash": "^4.17.21", + "mjml-migrate": "4.11.0", + "mjml-parser-xml": "4.11.0", + "mjml-validator": "4.11.0" + } + }, + "node_modules/mjml-divider": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.11.0.tgz", + "integrity": "sha512-jS8Sa7uuFTmThtrcV3FICtbqmA0yJplldaNJwW5upiq7MEXuSwLNzjNeodaTpsVWevf/stE3C4lBA3+V4ascMg==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-group": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.11.0.tgz", + "integrity": "sha512-Yv1ZcPNk4bxOK/eol6bjJvRJBaOCzVY88QO8IfCQifAZuiXhatxwsuwaRKNcTi4cB+IHwl4JguZHgsFRi/Gf/g==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.11.0.tgz", + "integrity": "sha512-KNaSsOlf5FNwHyZQD6YNZN2Eo/o7n+mZISFLyp9MvNFaT3NKIRJDaInD1WjN+w2aHdXAw4sDV3+/9/EET2bh1A==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-attributes": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.11.0.tgz", + "integrity": "sha512-azeDRLGH7cU6PoXLd08E/H3UDHFsblBTcme++OWrj5B21vaFguOBySO2eWFTyWLthy+xst8FftWV46f8BWvciw==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-breakpoint": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.11.0.tgz", + "integrity": "sha512-OQ/WpXHagGoiUmBjoMHuxdigyLQrHNL6+Op0LHO87vN1GH2ap4YLcSSegIsThQLi/I7V4/JFZbzS5jV4xd4SMg==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-font": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.11.0.tgz", + "integrity": "sha512-AJQ9lhNzNr0hwPjUID76LNna3U8ycmFH1lyipZOWHTivOVGkSYs8PaboxORfU/QAEDKo/p8LafBAoDPEdSigxA==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-html-attributes": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.11.0.tgz", + "integrity": "sha512-Gew9EAuqFu9QR3g+8FyE9WHNMszx1ejzo8dRDIuTaBCDEpaIaPVO7G5rGhT7ADqZufeYtRhBXfXjcShPD/a30g==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-preview": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.11.0.tgz", + "integrity": "sha512-f79+OtwC8CYcQpglGNfm3s74qVecdwLlDm9DD/LJvZwIdaALeIfZF36nz6+rtCLMhND+wxgqxqkmbbuS6AbO+A==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-style": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.11.0.tgz", + "integrity": "sha512-jw0r9Ld56SkJmDUBx+27xOH+oY2O06FBcKSJIkZLJ/sefbjgJa2/ti2eso/LeGgrmTw8zge7g1pp0Fl+kPjsGA==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-head-title": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.11.0.tgz", + "integrity": "sha512-mjYsKoE9+5LI8V0mK9SAKVKspF19TVius2q5I1FXLRdBmt4Ei87CdrSui+iixGrug0Lwt4P2W3+mK8kVGNnJAQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-hero": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.11.0.tgz", + "integrity": "sha512-tZDCGjQrDICwbsDnLvfVEsQ5+GdrIozB3oO3NxC6m2Eq04VKNBkIqq+QvJyouOxzJ3CZgO2B4rylzxc6YXuHsw==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-image": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.11.0.tgz", + "integrity": "sha512-qjvKS/x2arDNgKppPecmg69VyXdQbb1CNVqPwowJLyfjioTw4hxQ93suWoBKJJojRjkwauj9IRMC8TR9ffn0HQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-migrate": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.11.0.tgz", + "integrity": "sha512-Y+9U4w9LwlTkfTkHX9GdalIQDO4JQxboG4PM8g7vRKNhKSZDZH8QSr0SNhX0+fMQmjb9b0nztWbMVVvNZfMoPQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "js-beautify": "^1.6.14", + "lodash": "^4.17.21", + "mjml-core": "4.11.0", + "mjml-parser-xml": "4.11.0", + "yargs": "^16.1.0" + }, + "bin": { + "migrate": "lib/cli.js" + } + }, + "node_modules/mjml-navbar": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.11.0.tgz", + "integrity": "sha512-FEd+8RD6ra8652jXdMbhfhzT1YY8TA30c34qjJ+ULlFgvLH4GNnYRIOHp/Mgd/L38Qf3bhK/rK9ELBidJ36dLQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-parser-xml": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.11.0.tgz", + "integrity": "sha512-3toQ9UKyfzXWXJ7PlTExBjzGXAzJNORv39sorPv5sG2KJsvPC6NE+e+/1GyqYFhk4JffHoDfd4mQ6w050qYATQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "detect-node": "2.0.4", + "htmlparser2": "^4.1.0", + "lodash": "^4.17.15" + } + }, + "node_modules/mjml-parser-xml/node_modules/domhandler": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", + "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", + "dependencies": { + "domelementtype": "^2.0.1" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/mjml-parser-xml/node_modules/htmlparser2": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", + "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^3.0.0", + "domutils": "^2.0.0", + "entities": "^2.0.0" + } + }, + "node_modules/mjml-preset-core": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.11.0.tgz", + "integrity": "sha512-HU9ZFzS+A7Dx0B/EbnqYjdcIQQuxpOVRfFReQBlllZYwjWaRUjDIeIjF+cdnCb9QveuSNo4msIG00h/MKPYiGQ==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "mjml-accordion": "4.11.0", + "mjml-body": "4.11.0", + "mjml-button": "4.11.0", + "mjml-carousel": "4.11.0", + "mjml-column": "4.11.0", + "mjml-divider": "4.11.0", + "mjml-group": "4.11.0", + "mjml-head": "4.11.0", + "mjml-head-attributes": "4.11.0", + "mjml-head-breakpoint": "4.11.0", + "mjml-head-font": "4.11.0", + "mjml-head-html-attributes": "4.11.0", + "mjml-head-preview": "4.11.0", + "mjml-head-style": "4.11.0", + "mjml-head-title": "4.11.0", + "mjml-hero": "4.11.0", + "mjml-image": "4.11.0", + "mjml-navbar": "4.11.0", + "mjml-raw": "4.11.0", + "mjml-section": "4.11.0", + "mjml-social": "4.11.0", + "mjml-spacer": "4.11.0", + "mjml-table": "4.11.0", + "mjml-text": "4.11.0", + "mjml-wrapper": "4.11.0" + } + }, + "node_modules/mjml-raw": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.11.0.tgz", + "integrity": "sha512-DyUwC/JrE8tF7v9XaKQpQ/yAg5tT2uAWSDI6J5x3t3TNFJmRPd3iorSu8v6t1s3OiekuxfagsDDPLFuzpGwZSw==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-section": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.11.0.tgz", + "integrity": "sha512-OpinxE019Z1symrEFku3UddsvSql2aolcAiOThFuAAXz3+tUuooofGMy/XyyMOuOnktOx/5PMcVFsV84/Jye/g==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-social": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.11.0.tgz", + "integrity": "sha512-tM5njGtang0VRWt+XCuMTnZP2IJehUd+kdsC7CnMKQhYI2X4vzEaOBLgXRWvhcT4pSBzEJkXB9sQ+y7JmLO10g==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-spacer": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.11.0.tgz", + "integrity": "sha512-9s6PjFgznKEFgFZCSa4vTYVDQ6kRH5ucMHGraoHS4VMZLA8QIaVakHd4Sl0n+SGWCqair4xZ3vYYMhOBKIXmMw==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-table": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.11.0.tgz", + "integrity": "sha512-ccniRz1MoDqKS6zoNM59xi81M7zy/tkvd/6weyH9XAZiU7ATgOxoBuIMy+d0uSTlKPWNwoi2FqR5YSedxT2YPw==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-text": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.11.0.tgz", + "integrity": "sha512-xrY5+uepxUg+q5KKuKX2s9KQnnlsMN5aoCt0JSbjt4H9ZwBpqXPD4Z2uJ8eZS33FvnXzUYPNVdKralvXnrsXKA==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "node_modules/mjml-validator": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-validator/-/mjml-validator-4.11.0.tgz", + "integrity": "sha512-oDL9tHcL4PaCZMwH6T/lLpS7LV9cm9lIwnzJy+y5/S81MGMV6kPr6xXHgS0A01G7sseg6+rHgqBnUgzUob4Ilg==", + "dependencies": { + "@babel/runtime": "^7.14.6" + } + }, + "node_modules/mjml-wrapper": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.11.0.tgz", + "integrity": "sha512-WXGKxS+DlYalx5ofwq3bttj26BLEcaueeQ+0BcffXIELojUzd0+xTyX09v0QemUCBmKpHB2QaKMGhzYuSkupyg==", + "dependencies": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0", + "mjml-section": "4.11.0" + } + }, + "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": "9.1.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", @@ -1378,6 +2492,30 @@ "node": ">= 0.6" } }, + "node_modules/no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "dependencies": { + "lower-case": "^1.1.1" + } + }, + "node_modules/node-addon-api": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz", + "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==" + }, + "node_modules/node-fetch": { + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", + "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + } + }, "node_modules/nodemailer": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz", @@ -1386,15 +2524,53 @@ "node": ">=6.0.0" } }, + "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/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/npmlog": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", + "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", + "dependencies": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.0", + "set-blocking": "^2.0.0" + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16" + } + }, + "node_modules/nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -1410,11 +2586,18 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "dependencies": { "wrappy": "1" } }, + "node_modules/opencollective-postinstall": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", + "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", + "bin": { + "opencollective-postinstall": "index.js" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -1445,6 +2628,27 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "dependencies": { + "no-case": "^2.2.0" + } + }, + "node_modules/parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "node_modules/parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "dependencies": { + "parse5": "^6.0.1" + } + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -1466,7 +2670,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1489,7 +2692,6 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", - "dev": true, "engines": { "node": ">=8.6" }, @@ -1520,6 +2722,11 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "node_modules/proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -1532,6 +2739,11 @@ "node": ">= 0.10" } }, + "node_modules/pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, "node_modules/qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", @@ -1590,7 +2802,6 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -1598,15 +2809,83 @@ "node": ">=8.10.0" } }, + "node_modules/redis": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz", + "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==", + "dependencies": { + "denque": "^1.5.0", + "redis-commands": "^1.7.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-redis" + } + }, + "node_modules/redis-commands": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", + "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" + }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, + "node_modules/relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true, "engines": { "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1617,6 +2896,36 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/semver/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -1668,11 +2977,42 @@ "node": ">= 0.8.0" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "node_modules/setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, + "node_modules/sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, + "node_modules/signal-exit": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" + }, + "node_modules/slick": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz", + "integrity": "sha1-vQSN23TefRymkV+qSldXCzVQwtc=", + "engines": { + "node": "*" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -1685,7 +3025,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" } @@ -1694,7 +3033,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, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1708,7 +3046,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" }, @@ -1779,11 +3116,31 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "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/tar/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -1799,6 +3156,11 @@ "node": ">=0.6" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "node_modules/ts-node": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", @@ -1843,6 +3205,11 @@ } } }, + "node_modules/tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -1877,6 +3244,17 @@ "node": ">=4.2.0" } }, + "node_modules/uglify-js": { + "version": "3.14.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.4.tgz", + "integrity": "sha512-AbiSR44J0GoCeV81+oxcy/jDOElO2Bx3d0MfQCUShq7JRXaM4KtQopZsq2vFv8bCq2yMaGrw1FgygUd03RyRDA==", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -1885,11 +3263,15 @@ "node": ">= 0.8" } }, + "node_modules/upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" + }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/utils-merge": { "version": "1.0.1", @@ -1899,6 +3281,14 @@ "node": ">= 0.4.0" } }, + "node_modules/valid-data-url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", + "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==", + "engines": { + "node": ">=10" + } + }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -1907,6 +3297,72 @@ "node": ">= 0.8" } }, + "node_modules/web-resource-inliner": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-5.0.0.tgz", + "integrity": "sha512-AIihwH+ZmdHfkJm7BjSXiEClVt4zUFqX4YlFAzjL13wLtDuUneSaFvDBTbdYRecs35SiU7iNKbMnN+++wVfb6A==", + "dependencies": { + "ansi-colors": "^4.1.1", + "escape-goat": "^3.0.0", + "htmlparser2": "^4.0.0", + "mime": "^2.4.6", + "node-fetch": "^2.6.0", + "valid-data-url": "^3.0.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/web-resource-inliner/node_modules/domhandler": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", + "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", + "dependencies": { + "domelementtype": "^2.0.1" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/web-resource-inliner/node_modules/htmlparser2": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", + "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", + "dependencies": { + "domelementtype": "^2.0.1", + "domhandler": "^3.0.0", + "domutils": "^2.0.0", + "entities": "^2.0.0" + } + }, + "node_modules/web-resource-inliner/node_modules/mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "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", @@ -1922,6 +3378,14 @@ "node": ">= 8" } }, + "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/workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -1932,7 +3396,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1948,23 +3411,25 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, "engines": { "node": ">=10" } }, + "node_modules/yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, "node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -1982,7 +3447,6 @@ "version": "20.2.4", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true, "engines": { "node": ">=10" } @@ -2025,6 +3489,14 @@ } }, "dependencies": { + "@babel/runtime": { + "version": "7.16.3", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz", + "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + }, "@cspotcode/source-map-consumer": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", @@ -2040,6 +3512,27 @@ "@cspotcode/source-map-consumer": "0.8.0" } }, + "@mapbox/node-pre-gyp": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.7.tgz", + "integrity": "sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==", + "requires": { + "detect-libc": "^1.0.3", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.5", + "nopt": "^5.0.0", + "npmlog": "^6.0.0", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + } + }, + "@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==" + }, "@prisma/client": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.3.0.tgz", @@ -2155,12 +3648,33 @@ "@types/range-parser": "*" } }, + "@types/jsonwebtoken": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz", + "integrity": "sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==", + "requires": { + "@types/node": "*" + } + }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, + "@types/mjml": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/@types/mjml/-/mjml-4.7.0.tgz", + "integrity": "sha512-aWWu8Lxq2SexXGs+lBPRUpN3kFf0sDRo3Y4jz7BQ15cQvMfyZOadgFJsNlHmDqI6D2Qjx0PIK+1f9IMXgq9vTA==", + "requires": { + "@types/mjml-core": "*" + } + }, + "@types/mjml-core": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/@types/mjml-core/-/mjml-core-4.7.1.tgz", + "integrity": "sha512-k5IRafi93tyZBGF+0BTrcBDvG47OueI+Q7TC4V4UjGQn0AMVvL3Y+S26QF/UHMmMJW5r1hxLyv3StX2/+FatFg==" + }, "@types/mocha": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz", @@ -2192,6 +3706,14 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", "dev": true }, + "@types/redis": { + "version": "2.8.32", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", + "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", + "requires": { + "@types/node": "*" + } + }, "@types/serve-static": { "version": "1.13.10", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", @@ -2218,6 +3740,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -2239,23 +3766,43 @@ "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, + "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.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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==" + } + } + }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", - "dev": true + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" }, "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": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -2264,18 +3811,54 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", - "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, + "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==" + }, + "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" + } + } + } + }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, + "argon2": { + "version": "0.28.3", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.3.tgz", + "integrity": "sha512-NkEJOImg+T7nnkx6/Fy8EbjZsF20hbBBKdVP/YUxujuLTAjIODmrFeY4vVpekKwGAGDm6roXxluFQ+CIaoVrbg==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.7", + "@phc/format": "^1.0.0", + "node-addon-api": "^4.2.0", + "opencollective-postinstall": "^2.0.3" + } + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -2302,14 +3885,12 @@ "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==" }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", - "dev": true + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" }, "body-parser": { "version": "1.19.0", @@ -2328,11 +3909,15 @@ "type-is": "~1.6.17" } }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" + }, "brace-expansion": { "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" @@ -2342,7 +3927,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -2353,11 +3937,25 @@ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, + "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": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, + "camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "requires": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, "camelcase": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", @@ -2429,11 +4027,36 @@ "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "dev": true }, + "cheerio": { + "version": "1.0.0-rc.10", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", + "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", + "requires": { + "cheerio-select": "^1.5.0", + "dom-serializer": "^1.3.2", + "domhandler": "^4.2.0", + "htmlparser2": "^6.1.0", + "parse5": "^6.0.1", + "parse5-htmlparser2-tree-adapter": "^6.0.1", + "tslib": "^2.2.0" + } + }, + "cheerio-select": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz", + "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==", + "requires": { + "css-select": "^4.1.3", + "css-what": "^5.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0", + "domutils": "^2.7.0" + } + }, "chokidar": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", - "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -2445,11 +4068,23 @@ "readdirp": "~3.6.0" } }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "clean-css": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", + "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", + "requires": { + "source-map": "~0.6.0" + } + }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -2460,7 +4095,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "requires": { "color-name": "~1.1.4" } @@ -2468,8 +4102,12 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "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", @@ -2480,6 +4118,11 @@ "delayed-stream": "~1.0.0" } }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" + }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -2489,8 +4132,21 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "config-chain": { + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", + "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", + "requires": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" + } + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "content-disposition": { "version": "0.5.3", @@ -2533,6 +4189,23 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, + "css-select": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", + "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", + "requires": { + "boolbase": "^1.0.0", + "css-what": "^5.0.0", + "domhandler": "^4.2.0", + "domutils": "^2.6.0", + "nth-check": "^2.0.0" + } + }, + "css-what": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", + "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==" + }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -2562,6 +4235,16 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "denque": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz", + "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -2572,17 +4255,86 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, + "detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, + "dom-serializer": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", + "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.2.0", + "entities": "^2.0.0" + } + }, + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + }, + "domhandler": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", + "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", + "requires": { + "domelementtype": "^2.2.0" + } + }, + "domutils": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", + "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", + "requires": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.2.0" + } + }, "dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" }, + "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" + } + }, + "editorconfig": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", + "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", + "requires": { + "commander": "^2.19.0", + "lru-cache": "^4.1.5", + "semver": "^5.6.0", + "sigmund": "^1.0.1" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -2591,19 +4343,27 @@ "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==" }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, + "entities": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" + }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", - "dev": true + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, + "escape-goat": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz", + "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==" }, "escape-html": { "version": "1.0.3", @@ -2668,7 +4428,6 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -2730,24 +4489,45 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "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.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "optional": true }, + "gauge": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", + "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", + "requires": { + "ansi-regex": "^5.0.1", + "aproba": "^1.0.3 || ^2.0.0", + "color-support": "^1.1.2", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.1", + "signal-exit": "^3.0.0", + "string-width": "^4.2.3", + "strip-ansi": "^6.0.1", + "wide-align": "^1.1.2" + } + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-func-name": { "version": "2.0.0", @@ -2759,7 +4539,6 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2773,7 +4552,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -2790,11 +4568,40 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + }, + "html-minifier": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", + "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", + "requires": { + "camel-case": "^3.0.0", + "clean-css": "^4.2.1", + "commander": "^2.19.0", + "he": "^1.2.0", + "param-case": "^2.1.1", + "relateurl": "^0.2.7", + "uglify-js": "^3.5.1" + } + }, + "htmlparser2": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", + "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.5.2", + "entities": "^2.0.0" + } }, "http-errors": { "version": "1.7.2", @@ -2808,6 +4615,30 @@ "toidentifier": "1.0.0" } }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "requires": { + "agent-base": "6", + "debug": "4" + }, + "dependencies": { + "debug": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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", @@ -2820,7 +4651,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -2831,6 +4661,11 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, + "ini": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + }, "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", @@ -2846,7 +4681,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -2854,20 +4688,17 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "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", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -2884,8 +4715,7 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, "is-plain-obj": { "version": "2.1.0", @@ -2911,6 +4741,17 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "js-beautify": { + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz", + "integrity": "sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==", + "requires": { + "config-chain": "^1.1.12", + "editorconfig": "^0.15.3", + "glob": "^7.1.3", + "nopt": "^5.0.0" + } + }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -2920,6 +4761,73 @@ "argparse": "^2.0.1" } }, + "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==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "juice": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/juice/-/juice-7.0.0.tgz", + "integrity": "sha512-AjKQX31KKN+uJs+zaf+GW8mBO/f/0NqSh2moTMyvwBY+4/lXIYTU8D8I2h6BAV3Xnz6GGsbalUyFqbYMe+Vh+Q==", + "requires": { + "cheerio": "^1.0.0-rc.3", + "commander": "^5.1.0", + "mensch": "^0.3.4", + "slick": "^1.12.2", + "web-resource-inliner": "^5.0.0" + }, + "dependencies": { + "commander": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", + "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" + } + } + }, + "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" + } + }, "locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -2929,6 +4837,46 @@ "p-locate": "^5.0.0" } }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -2939,6 +4887,35 @@ "is-unicode-supported": "^0.1.0" } }, + "lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "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==" + } + } + }, "make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -2950,6 +4927,11 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, + "mensch": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz", + "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==" + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -2982,11 +4964,431 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } }, + "minipass": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", + "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", + "requires": { + "yallist": "^4.0.0" + }, + "dependencies": { + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "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" + }, + "dependencies": { + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, + "mjml": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.11.0.tgz", + "integrity": "sha512-kYuCAds/8F7m7xNEs3TFkrc0jxnNYIkexQIUNByPLQJFoFRltpgXLSdoyreGAniQtDGITPE+p8FIocLUBKsOHg==", + "requires": { + "@babel/runtime": "^7.14.6", + "mjml-cli": "4.11.0", + "mjml-core": "4.11.0", + "mjml-migrate": "4.11.0", + "mjml-preset-core": "4.11.0", + "mjml-validator": "4.11.0" + } + }, + "mjml-accordion": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.11.0.tgz", + "integrity": "sha512-u6cPMl4z8JeRIq0sGHWfzwE5SqwBhSPHJ8wElhfU7CK6gAoUTz4BIL/03da2whXk0S34n5CSU453JpuWV+3bQQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-body": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.11.0.tgz", + "integrity": "sha512-+SQXOjKOr9IMblmslrUbv+ahF/SkqT7mAuix1P/F9ev3aS+WN7Gy/lyJLaq1zhSQCmzrBDovHez3bJ7NGToU0g==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-button": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.11.0.tgz", + "integrity": "sha512-v/MwA2Kq2MlHJwrajdAqUihjAQivD8FpkpOAcqdgqI1ffaEDzd6FGFt5qOtVD9BncChQ4a51haOnPd+kbBLlCA==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-carousel": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.11.0.tgz", + "integrity": "sha512-/owKKSg3DNes1rauPPhlGCFdZ4zzoxdztPLGOm9TSjkbL5q2cN9NMfzNdTYLnnVG5G5XWX0THjDeeq+bGnHw8w==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-cli": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.11.0.tgz", + "integrity": "sha512-jgkxNY+sY+CwiUlO6VX8cwVjlLBXIzE7X4fXkQ2RjXpbAvsN8uDafST8oL8PDlxNIjOwK6YJySzZSLXSKTF5Zg==", + "requires": { + "@babel/runtime": "^7.14.6", + "chokidar": "^3.0.0", + "glob": "^7.1.1", + "html-minifier": "^4.0.0", + "js-beautify": "^1.6.14", + "lodash": "^4.17.21", + "mjml-core": "4.11.0", + "mjml-migrate": "4.11.0", + "mjml-parser-xml": "4.11.0", + "mjml-validator": "4.11.0", + "yargs": "^16.1.0" + } + }, + "mjml-column": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.11.0.tgz", + "integrity": "sha512-yuupexywYXuXTvxxGLPZw6S/D6fz4b41ZarOkEPW8Pbj7FkfnBTO3QokAS5KapJ9x6sIAVs+cCgUul87dwOBzg==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-core": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.11.0.tgz", + "integrity": "sha512-UTI1exu9/0lOF40aacAzC9A7RrJPcay7WYurYsb+X2LbDyfBlSx5ZCtuUTHwLfIz3PL6rSg8yrZ3KtlmhQJ/kQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "cheerio": "1.0.0-rc.10", + "detect-node": "2.0.4", + "html-minifier": "^4.0.0", + "js-beautify": "^1.6.14", + "juice": "^7.0.0", + "lodash": "^4.17.21", + "mjml-migrate": "4.11.0", + "mjml-parser-xml": "4.11.0", + "mjml-validator": "4.11.0" + } + }, + "mjml-divider": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.11.0.tgz", + "integrity": "sha512-jS8Sa7uuFTmThtrcV3FICtbqmA0yJplldaNJwW5upiq7MEXuSwLNzjNeodaTpsVWevf/stE3C4lBA3+V4ascMg==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-group": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.11.0.tgz", + "integrity": "sha512-Yv1ZcPNk4bxOK/eol6bjJvRJBaOCzVY88QO8IfCQifAZuiXhatxwsuwaRKNcTi4cB+IHwl4JguZHgsFRi/Gf/g==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.11.0.tgz", + "integrity": "sha512-KNaSsOlf5FNwHyZQD6YNZN2Eo/o7n+mZISFLyp9MvNFaT3NKIRJDaInD1WjN+w2aHdXAw4sDV3+/9/EET2bh1A==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-attributes": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.11.0.tgz", + "integrity": "sha512-azeDRLGH7cU6PoXLd08E/H3UDHFsblBTcme++OWrj5B21vaFguOBySO2eWFTyWLthy+xst8FftWV46f8BWvciw==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-breakpoint": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.11.0.tgz", + "integrity": "sha512-OQ/WpXHagGoiUmBjoMHuxdigyLQrHNL6+Op0LHO87vN1GH2ap4YLcSSegIsThQLi/I7V4/JFZbzS5jV4xd4SMg==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-font": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.11.0.tgz", + "integrity": "sha512-AJQ9lhNzNr0hwPjUID76LNna3U8ycmFH1lyipZOWHTivOVGkSYs8PaboxORfU/QAEDKo/p8LafBAoDPEdSigxA==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-html-attributes": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.11.0.tgz", + "integrity": "sha512-Gew9EAuqFu9QR3g+8FyE9WHNMszx1ejzo8dRDIuTaBCDEpaIaPVO7G5rGhT7ADqZufeYtRhBXfXjcShPD/a30g==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-preview": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.11.0.tgz", + "integrity": "sha512-f79+OtwC8CYcQpglGNfm3s74qVecdwLlDm9DD/LJvZwIdaALeIfZF36nz6+rtCLMhND+wxgqxqkmbbuS6AbO+A==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-style": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.11.0.tgz", + "integrity": "sha512-jw0r9Ld56SkJmDUBx+27xOH+oY2O06FBcKSJIkZLJ/sefbjgJa2/ti2eso/LeGgrmTw8zge7g1pp0Fl+kPjsGA==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-head-title": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.11.0.tgz", + "integrity": "sha512-mjYsKoE9+5LI8V0mK9SAKVKspF19TVius2q5I1FXLRdBmt4Ei87CdrSui+iixGrug0Lwt4P2W3+mK8kVGNnJAQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-hero": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.11.0.tgz", + "integrity": "sha512-tZDCGjQrDICwbsDnLvfVEsQ5+GdrIozB3oO3NxC6m2Eq04VKNBkIqq+QvJyouOxzJ3CZgO2B4rylzxc6YXuHsw==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-image": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.11.0.tgz", + "integrity": "sha512-qjvKS/x2arDNgKppPecmg69VyXdQbb1CNVqPwowJLyfjioTw4hxQ93suWoBKJJojRjkwauj9IRMC8TR9ffn0HQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-migrate": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.11.0.tgz", + "integrity": "sha512-Y+9U4w9LwlTkfTkHX9GdalIQDO4JQxboG4PM8g7vRKNhKSZDZH8QSr0SNhX0+fMQmjb9b0nztWbMVVvNZfMoPQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "js-beautify": "^1.6.14", + "lodash": "^4.17.21", + "mjml-core": "4.11.0", + "mjml-parser-xml": "4.11.0", + "yargs": "^16.1.0" + } + }, + "mjml-navbar": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.11.0.tgz", + "integrity": "sha512-FEd+8RD6ra8652jXdMbhfhzT1YY8TA30c34qjJ+ULlFgvLH4GNnYRIOHp/Mgd/L38Qf3bhK/rK9ELBidJ36dLQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-parser-xml": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.11.0.tgz", + "integrity": "sha512-3toQ9UKyfzXWXJ7PlTExBjzGXAzJNORv39sorPv5sG2KJsvPC6NE+e+/1GyqYFhk4JffHoDfd4mQ6w050qYATQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "detect-node": "2.0.4", + "htmlparser2": "^4.1.0", + "lodash": "^4.17.15" + }, + "dependencies": { + "domhandler": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", + "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", + "requires": { + "domelementtype": "^2.0.1" + } + }, + "htmlparser2": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", + "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^3.0.0", + "domutils": "^2.0.0", + "entities": "^2.0.0" + } + } + } + }, + "mjml-preset-core": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.11.0.tgz", + "integrity": "sha512-HU9ZFzS+A7Dx0B/EbnqYjdcIQQuxpOVRfFReQBlllZYwjWaRUjDIeIjF+cdnCb9QveuSNo4msIG00h/MKPYiGQ==", + "requires": { + "@babel/runtime": "^7.14.6", + "mjml-accordion": "4.11.0", + "mjml-body": "4.11.0", + "mjml-button": "4.11.0", + "mjml-carousel": "4.11.0", + "mjml-column": "4.11.0", + "mjml-divider": "4.11.0", + "mjml-group": "4.11.0", + "mjml-head": "4.11.0", + "mjml-head-attributes": "4.11.0", + "mjml-head-breakpoint": "4.11.0", + "mjml-head-font": "4.11.0", + "mjml-head-html-attributes": "4.11.0", + "mjml-head-preview": "4.11.0", + "mjml-head-style": "4.11.0", + "mjml-head-title": "4.11.0", + "mjml-hero": "4.11.0", + "mjml-image": "4.11.0", + "mjml-navbar": "4.11.0", + "mjml-raw": "4.11.0", + "mjml-section": "4.11.0", + "mjml-social": "4.11.0", + "mjml-spacer": "4.11.0", + "mjml-table": "4.11.0", + "mjml-text": "4.11.0", + "mjml-wrapper": "4.11.0" + } + }, + "mjml-raw": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.11.0.tgz", + "integrity": "sha512-DyUwC/JrE8tF7v9XaKQpQ/yAg5tT2uAWSDI6J5x3t3TNFJmRPd3iorSu8v6t1s3OiekuxfagsDDPLFuzpGwZSw==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-section": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.11.0.tgz", + "integrity": "sha512-OpinxE019Z1symrEFku3UddsvSql2aolcAiOThFuAAXz3+tUuooofGMy/XyyMOuOnktOx/5PMcVFsV84/Jye/g==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-social": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.11.0.tgz", + "integrity": "sha512-tM5njGtang0VRWt+XCuMTnZP2IJehUd+kdsC7CnMKQhYI2X4vzEaOBLgXRWvhcT4pSBzEJkXB9sQ+y7JmLO10g==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-spacer": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.11.0.tgz", + "integrity": "sha512-9s6PjFgznKEFgFZCSa4vTYVDQ6kRH5ucMHGraoHS4VMZLA8QIaVakHd4Sl0n+SGWCqair4xZ3vYYMhOBKIXmMw==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-table": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.11.0.tgz", + "integrity": "sha512-ccniRz1MoDqKS6zoNM59xi81M7zy/tkvd/6weyH9XAZiU7ATgOxoBuIMy+d0uSTlKPWNwoi2FqR5YSedxT2YPw==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-text": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.11.0.tgz", + "integrity": "sha512-xrY5+uepxUg+q5KKuKX2s9KQnnlsMN5aoCt0JSbjt4H9ZwBpqXPD4Z2uJ8eZS33FvnXzUYPNVdKralvXnrsXKA==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0" + } + }, + "mjml-validator": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-validator/-/mjml-validator-4.11.0.tgz", + "integrity": "sha512-oDL9tHcL4PaCZMwH6T/lLpS7LV9cm9lIwnzJy+y5/S81MGMV6kPr6xXHgS0A01G7sseg6+rHgqBnUgzUob4Ilg==", + "requires": { + "@babel/runtime": "^7.14.6" + } + }, + "mjml-wrapper": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.11.0.tgz", + "integrity": "sha512-WXGKxS+DlYalx5ofwq3bttj26BLEcaueeQ+0BcffXIELojUzd0+xTyX09v0QemUCBmKpHB2QaKMGhzYuSkupyg==", + "requires": { + "@babel/runtime": "^7.14.6", + "lodash": "^4.17.21", + "mjml-core": "4.11.0", + "mjml-section": "4.11.0" + } + }, + "mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, "mocha": { "version": "9.1.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", @@ -3066,16 +5468,63 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "no-case": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", + "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", + "requires": { + "lower-case": "^1.1.1" + } + }, + "node-addon-api": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz", + "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==" + }, + "node-fetch": { + "version": "2.6.6", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", + "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "requires": { + "whatwg-url": "^5.0.0" + } + }, "nodemailer": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz", "integrity": "sha512-AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==" }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "npmlog": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", + "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", + "requires": { + "are-we-there-yet": "^2.0.0", + "console-control-strings": "^1.1.0", + "gauge": "^4.0.0", + "set-blocking": "^2.0.0" + } + }, + "nth-check": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", + "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "requires": { + "boolbase": "^1.0.0" + } }, "on-finished": { "version": "2.3.0", @@ -3089,11 +5538,15 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } }, + "opencollective-postinstall": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", + "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==" + }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -3112,6 +5565,27 @@ "p-limit": "^3.0.2" } }, + "param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "requires": { + "no-case": "^2.2.0" + } + }, + "parse5": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" + }, + "parse5-htmlparser2-tree-adapter": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", + "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", + "requires": { + "parse5": "^6.0.1" + } + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -3126,8 +5600,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-to-regexp": { "version": "0.1.7", @@ -3143,8 +5616,7 @@ "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", - "dev": true + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==" }, "prisma": { "version": "3.3.0", @@ -3161,6 +5633,11 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "proto-list": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", + "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" + }, "proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -3170,6 +5647,11 @@ "ipaddr.js": "1.9.1" } }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, "qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", @@ -3219,16 +5701,61 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, "requires": { "picomatch": "^2.2.1" } }, + "redis": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz", + "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==", + "requires": { + "denque": "^1.5.0", + "redis-commands": "^1.7.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0" + } + }, + "redis-commands": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", + "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" + }, + "redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=" + }, + "redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=", + "requires": { + "redis-errors": "^1.0.0" + } + }, + "regenerator-runtime": { + "version": "0.13.9", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", + "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + }, + "relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } }, "safe-buffer": { "version": "5.1.2", @@ -3240,6 +5767,29 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, "send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -3287,11 +5837,36 @@ "send": "0.17.1" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, + "sigmund": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", + "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" + }, + "signal-exit": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" + }, + "slick": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz", + "integrity": "sha1-vQSN23TefRymkV+qSldXCzVQwtc=" + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -3301,7 +5876,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" } @@ -3310,7 +5884,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", @@ -3321,7 +5894,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" } @@ -3376,11 +5948,30 @@ "has-flag": "^4.0.0" } }, + "tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "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" + }, + "dependencies": { + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + } + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "requires": { "is-number": "^7.0.0" } @@ -3390,6 +5981,11 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "ts-node": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", @@ -3410,6 +6006,11 @@ "yn": "3.1.1" } }, + "tslib": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", + "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + }, "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -3431,27 +6032,94 @@ "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "dev": true }, + "uglify-js": { + "version": "3.14.4", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.4.tgz", + "integrity": "sha512-AbiSR44J0GoCeV81+oxcy/jDOElO2Bx3d0MfQCUShq7JRXaM4KtQopZsq2vFv8bCq2yMaGrw1FgygUd03RyRDA==" + }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, + "upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, + "valid-data-url": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", + "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==" + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, + "web-resource-inliner": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-5.0.0.tgz", + "integrity": "sha512-AIihwH+ZmdHfkJm7BjSXiEClVt4zUFqX4YlFAzjL13wLtDuUneSaFvDBTbdYRecs35SiU7iNKbMnN+++wVfb6A==", + "requires": { + "ansi-colors": "^4.1.1", + "escape-goat": "^3.0.0", + "htmlparser2": "^4.0.0", + "mime": "^2.4.6", + "node-fetch": "^2.6.0", + "valid-data-url": "^3.0.0" + }, + "dependencies": { + "domhandler": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", + "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", + "requires": { + "domelementtype": "^2.0.1" + } + }, + "htmlparser2": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", + "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^3.0.0", + "domutils": "^2.0.0", + "entities": "^2.0.0" + } + }, + "mime": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", + "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==" + } + } + }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "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", @@ -3461,6 +6129,14 @@ "isexe": "^2.0.0" } }, + "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" + } + }, "workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -3471,7 +6147,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -3481,20 +6156,22 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -3508,8 +6185,7 @@ "yargs-parser": { "version": "20.2.4", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", - "dev": true + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==" }, "yargs-unparser": { "version": "2.0.0", diff --git a/package.json b/package.json index 4166d94..9791421 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "dependencies": { "@prisma/client": "^3.3.0", "@types/jsonwebtoken": "^8.5.5", + "@types/mjml": "^4.7.0", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", "@types/redis": "^2.8.32", @@ -28,6 +29,7 @@ "dotenv": "^10.0.0", "express": "^4.17.1", "jsonwebtoken": "^8.5.1", + "mjml": "^4.11.0", "nodemailer": "^6.7.0", "redis": "^3.1.2" }, diff --git a/src/lib/mjml.ts b/src/lib/mjml.ts new file mode 100644 index 0000000..2a6cd02 --- /dev/null +++ b/src/lib/mjml.ts @@ -0,0 +1,23 @@ +import fs from "fs"; +import path from "path"; +import mjml from "mjml"; + +const template_folder = "../../resources/email/templates"; + +const compileTemplates = () => { + fs.readdir(template_folder, (err, files) => { + if (err) console.log(err); + + files.forEach(file => { + + if(path.extname(file) !== ".mjml") return; + + + let content = fs.readFileSync(template_folder + files) + let mjmlres = mjml(content.toString()); + + let hbs = template_folder + file.replace(".mjml",".hbs"); + fs.writeFileSync(hbs,mjmlres.html); + }) + }); +}; From b4528f3d531f1f619f00e1c6a51b5e27851193bc Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Mon, 13 Dec 2021 13:17:31 +0100 Subject: [PATCH 038/128] - Added Code to get template by name - Sending mail with compiled template to target --- src/lib/mail.ts | 14 ++++++++++++++ src/lib/mjml.ts | 26 +++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/src/lib/mail.ts b/src/lib/mail.ts index de4a30c..a1b8e03 100644 --- a/src/lib/mail.ts +++ b/src/lib/mail.ts @@ -1,6 +1,10 @@ +import { writeFile } from "fs"; import nodemailer from "nodemailer"; import SMTPTransport from "nodemailer/lib/smtp-transport"; +import mjml from "./mjml" + + let mailAccount = { user: process.env.MAILUSER + "@mail." + process.env.DOMAIN, pass: process.env.MAILPASSWORD }; let transporter = nodemailer.createTransport( @@ -47,4 +51,14 @@ const sendMail = async (from: string, to: string, subject: string, text?: string }); }; +const verificationMail = async (to: string, ) => { + const message = mjml.getTemplate("emailVerification") + + //TODO: replace handlebars with code + //TODO: Implement verification codes + //TODO: Write endpoints to verify codes + + sendMail(mailAccount.user,to,"Verify Email",undefined,message); +} + export default { sendMail, mailAccount }; diff --git a/src/lib/mjml.ts b/src/lib/mjml.ts index 2a6cd02..29fb6b0 100644 --- a/src/lib/mjml.ts +++ b/src/lib/mjml.ts @@ -8,16 +8,24 @@ const compileTemplates = () => { fs.readdir(template_folder, (err, files) => { if (err) console.log(err); - files.forEach(file => { + files.forEach((file) => { + if (path.extname(file) !== ".mjml") return; - if(path.extname(file) !== ".mjml") return; - + let content = fs.readFileSync(template_folder + files); + let mjmlres = mjml(content.toString()); - let content = fs.readFileSync(template_folder + files) - let mjmlres = mjml(content.toString()); - - let hbs = template_folder + file.replace(".mjml",".hbs"); - fs.writeFileSync(hbs,mjmlres.html); - }) + let hbs = template_folder + file.replace(".mjml", ".hbs"); + fs.writeFileSync(hbs, mjmlres.html); + }); }); }; + +compileTemplates(); // This will compile all templates when this file is first included + +const getTemplate = (name: string): string => { + let file = ""; + file = fs.readFileSync(path.join(template_folder, name, ".hbs")).toString(); + return file; +}; + +export default { getTemplate }; From 584903e55d5b1c7f0416b34e042958ec3e569781 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:08:40 +0100 Subject: [PATCH 039/128] FIX: The dev script can now run in any directory Initially, the directory was required to be called 'server'; This is not the case anymore --- dev.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev.sh b/dev.sh index 0b96319..d6b8e5a 100755 --- a/dev.sh +++ b/dev.sh @@ -1,14 +1,14 @@ #!/bin/bash -DATABASE_PASSWORD=server docker-compose up -d mail postgres redis +DATABASE_PASSWORD=server COMPOSE_PROJECT_NAME=detleph_server docker-compose up -d mail postgres redis -if [ ! "$(docker ps -a | grep server_dev)" ]; then - echo "Creating \"server_dev\" container" +if [ ! "$(docker ps -a | grep detleph_server_dev)" ]; then + echo "Creating the server container" docker run -it \ - --name server_dev \ + --name detleph_server_dev \ --mount type=bind,source="$(pwd)",target=/app \ - --network server_default \ + --network detleph_server_default \ -p 3000:3000 -e PORT=3000 \ -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \ -e DATABASE_USER=server \ @@ -16,11 +16,11 @@ if [ ! "$(docker ps -a | grep server_dev)" ]; then --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \ node else - echo "Container \"server_dev\" already exists; Starting container" + echo "The server container already exists; Starting..." - docker start -ia server_dev + docker start -ia detleph_server_dev fi # After container termination -docker-compose stop +COMPOSE_PROJECT_NAME=detleph_server docker-compose stop From eb70a14c6125e9d67123952d6166f020410b9362 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:12:43 +0100 Subject: [PATCH 040/128] Add routes for admin authentication endpoints + Add router to the app --- src/Routes/admin_auth.routes.ts | 8 ++++++++ src/app.ts | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 src/Routes/admin_auth.routes.ts diff --git a/src/Routes/admin_auth.routes.ts b/src/Routes/admin_auth.routes.ts new file mode 100644 index 0000000..e9408d3 --- /dev/null +++ b/src/Routes/admin_auth.routes.ts @@ -0,0 +1,8 @@ +import express from "express"; +import { authenticateUser } from "../Controllers/admin_auth.controller"; + +const router = express.Router(); + +router.post("/", authenticateUser); + +export default router; diff --git a/src/app.ts b/src/app.ts index 84e6cee..7507b63 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,6 +1,7 @@ import express from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; +import adminAuthRouter from "./Routes/admin_auth.routes"; require("dotenv").config(); // Load dotenv config @@ -13,6 +14,9 @@ async function main() { app.use(express.urlencoded({ extended: true })); app.use(express.json()); + // Admin authentication endpoints + app.use("/api/authentication", adminAuthRouter); + // All API endpoints are behind /api/... app.use("/api/events", eventRouter); From 59f4d53af5ba2c08714bba7282ff8648cf90960c Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 1 Dec 2021 16:37:28 +0100 Subject: [PATCH 041/128] Add a controller for getting all admin user details + Requires Authentication --- src/Controllers/admin.controller.ts | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/Controllers/admin.controller.ts diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts new file mode 100644 index 0000000..bdd64d0 --- /dev/null +++ b/src/Controllers/admin.controller.ts @@ -0,0 +1,40 @@ +import prisma from "../lib/prisma"; +import { Request, Response } from "express"; + +// requires: auth(elevated) +export const getAllAdmins = async (req: Request, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json({ + type: "failure", + payload: { + message: "The server was not able to validate your credentials; Please try again later", + }, + }); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json({ + type: "error", + payload: { + message: "You do not have sufficient permissions to use this feature", + }, + _links: [ + { + rel: "authentication", + href: "/api/authentication", + type: "POST", + }, + ], + }); + } + + // TODO: Add exception handling + const users = await prisma.admin.findMany({ select: { pid: true, name: true, permission_level: true } }); + + res.status(200).json({ + type: "success", + payload: { + users, + }, + }); +}; From 913e0ee0e05b4d4e7d5fdffe41926062980939e2 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 3 Dec 2021 13:15:50 +0100 Subject: [PATCH 042/128] Remove event <-> admin association and introduce a default value for revision --- prisma/schema.prisma | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index cabd3e2..0a4bcbe 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -17,7 +17,6 @@ model Event { description String disciplines Discipline[] - admins Admin[] organisations Organisation[] campaign Campaign[] } @@ -47,14 +46,11 @@ model Link { model Admin { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String + name String // TODO: This should maybe be unique password String // TODO: Probably specify hash size (VarChar or some other type) permission_level AdminLevel @default(STANDARD) - revision String + revision String @default(dbgenerated("gen_random_uuid()")) @db.Uuid groups Group[] - - event Event @relation(fields: [eventId], references: [id]) - eventId Int } model Discipline { @@ -143,4 +139,4 @@ enum Gender { MALE FEMALE OTHER -} \ No newline at end of file +} From b82a84322b2fced9d5a70811942e1d97b7436c2c Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 08:48:04 +0100 Subject: [PATCH 043/128] Extract code for error messages for better reusability + Create function for generating permission errors --- src/Controllers/admin.controller.ts | 44 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index bdd64d0..083d3c9 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -1,31 +1,37 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; +import { AdminLevel } from "@prisma/client"; + +const AUTH_ERROR = { + type: "failure", + payload: { + message: "The server was not able to validate your credentials; Please try again later", + }, +}; + +const createInsufficientPermissionsError = (required: AdminLevel = "ELEVATED") => ({ + type: "error", + payload: { + message: "You do not have sufficient permissions to use this feature", + required_level: required, + }, + _links: [ + { + rel: "authentication", + href: "/api/authentication", + type: "POST", + }, + ], +}); // requires: auth(elevated) export const getAllAdmins = async (req: Request, res: Response) => { if (!req.auth?.isAuthenticated) { - return res.status(500).json({ - type: "failure", - payload: { - message: "The server was not able to validate your credentials; Please try again later", - }, - }); + return res.status(500).json(AUTH_ERROR); } if (req.auth.permission_level !== "ELEVATED") { - return res.status(403).json({ - type: "error", - payload: { - message: "You do not have sufficient permissions to use this feature", - }, - _links: [ - { - rel: "authentication", - href: "/api/authentication", - type: "POST", - }, - ], - }); + return res.status(403).json(createInsufficientPermissionsError()); } // TODO: Add exception handling From b57315d916c647f46de3545a1116c9fda428eba2 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 09:06:05 +0100 Subject: [PATCH 044/128] Add controller for adding a user + Add function to narrow type of string to AdminLevel --- src/Controllers/admin.controller.ts | 56 +++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 083d3c9..526d80f 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -1,6 +1,7 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; +import argon2 from "argon2"; const AUTH_ERROR = { type: "failure", @@ -44,3 +45,58 @@ export const getAllAdmins = async (req: Request, res: Response) => { }, }); }; + +interface CreateAdminBody { + name?: string; + password: string; + permission_level: string; + // TODO: Add groups or events +} + +const PERMISSION_LEVELS: readonly AdminLevel[] = ["ELEVATED", "STANDARD"]; // TODO: Enforce completeness + +const isPermissionLevel = (level: string): level is AdminLevel => PERMISSION_LEVELS.includes(level as any); + +// requires: auth(elevated) +export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { name, password, permission_level } = req.body || {}; + + if (!(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level))) { + return res.status(400).json({ + type: "error", + payload: { + message: "The body of your request did not conform to the requirements", + schema: { + body: { + name: "string", + password_level: "string", + permission_level: "'STANDARD' | 'ELEVATED'", + }, + }, + }, + }); + } + + const password_hash = await argon2.hash(password, { type: argon2.argon2id }); + + // TODO: Check for uniqueness of the name + const user = await prisma.admin.create({ + data: { name, password: password_hash, permission_level }, + select: { pid: true, name: true, permission_level: true }, + }); + + res.status(201).json({ + type: "success", + payload: { + user, + }, + }); +}; From 9b2c8b17c61acbd2510146961b80c375b702910a Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 09:11:46 +0100 Subject: [PATCH 045/128] Add router for the /admin endpoint --- src/Routes/admin.routes.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/Routes/admin.routes.ts diff --git a/src/Routes/admin.routes.ts b/src/Routes/admin.routes.ts new file mode 100644 index 0000000..49fe551 --- /dev/null +++ b/src/Routes/admin.routes.ts @@ -0,0 +1,11 @@ +import express from "express"; +import { getAllAdmins, createAdmin } from "../Controllers/admin.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; + +const router = express.Router(); + +router.get("/", requireAuthentication, getAllAdmins); + +router.post("/", requireAuthentication, createAdmin); + +export default router; From 3363039f79bb63087fc2a07afe87df65d13bc0d6 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 10:12:06 +0100 Subject: [PATCH 046/128] Add code that ensures that an (admin) user is always present --- src/app.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app.ts b/src/app.ts index 7507b63..ce9c33f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -2,12 +2,20 @@ import express from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; +import argon2 from "argon2"; require("dotenv").config(); // Load dotenv config const app = express(); async function main() { + // Dev + await prisma.admin.upsert({ + where: { id: 1 }, + create: { name: "admin", password: await argon2.hash("test", { type: argon2.argon2id }) }, + update: {}, + }); + // Todo: Everything // Bodyparser and urlencoded to parse post request bodies From 97fee47c6e27eefd900e4eacf9f87c9bc5dfacfb Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:19:17 +0100 Subject: [PATCH 047/128] Allow for groups to be specified when POSTing /api/admins + Add the admin router to the global app --- src/Controllers/admin.controller.ts | 29 +++++++++++++++++++++++++---- src/app.ts | 3 +++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 526d80f..d15d720 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -50,7 +50,7 @@ interface CreateAdminBody { name?: string; password: string; permission_level: string; - // TODO: Add groups or events + groups?: string[]; } const PERMISSION_LEVELS: readonly AdminLevel[] = ["ELEVATED", "STANDARD"]; // TODO: Enforce completeness @@ -67,9 +67,13 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re return res.status(403).json(createInsufficientPermissionsError()); } - const { name, password, permission_level } = req.body || {}; + const { name, password, permission_level, groups } = req.body || {}; - if (!(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level))) { + const groupsIsValid = groups ? groups.filter((e) => typeof e !== "string").length === 0 : true; + + if ( + !(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level) && groupsIsValid) + ) { return res.status(400).json({ type: "error", payload: { @@ -87,9 +91,26 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re const password_hash = await argon2.hash(password, { type: argon2.argon2id }); + // Check if all gropus exist + for (const groupId of groups || []) { + if (!(await prisma.group.findUnique({ where: { pid: groupId } }))) { + return res.status(404).json({ + type: "error", + payload: { + message: `The group with ID '${groupId}' could not be found!`, + }, + }); + } + } + // TODO: Check for uniqueness of the name const user = await prisma.admin.create({ - data: { name, password: password_hash, permission_level }, + data: { + name, + password: password_hash, + permission_level, + groups: { connect: groups?.map((group) => ({ pid: group })) }, + }, select: { pid: true, name: true, permission_level: true }, }); diff --git a/src/app.ts b/src/app.ts index ce9c33f..75f3c95 100644 --- a/src/app.ts +++ b/src/app.ts @@ -3,6 +3,7 @@ import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; import argon2 from "argon2"; +import adminRouter from "./Routes/admin.routes"; require("dotenv").config(); // Load dotenv config @@ -28,6 +29,8 @@ async function main() { // All API endpoints are behind /api/... app.use("/api/events", eventRouter); + app.use("/api/admins", adminRouter); + app.listen(process.env.PORT, () => { console.log(`Listening on Port: ${process.env.PORT}`); }); From bfca7e8672adaba09f091efc1e44fa44872652d3 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 21 Dec 2021 16:16:29 +0100 Subject: [PATCH 048/128] Add the permission_level 'ELEVATED' to the default user --- src/app.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app.ts b/src/app.ts index 75f3c95..deffe8a 100644 --- a/src/app.ts +++ b/src/app.ts @@ -13,7 +13,11 @@ async function main() { // Dev await prisma.admin.upsert({ where: { id: 1 }, - create: { name: "admin", password: await argon2.hash("test", { type: argon2.argon2id }) }, + create: { + name: "admin", + password: await argon2.hash("test", { type: argon2.argon2id }), + permission_level: "ELEVATED", + }, update: {}, }); From 5b02905d7169a0a1b272fadf22aa178d084f4dbe Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 31 Dec 2021 00:11:04 +0100 Subject: [PATCH 049/128] Add a controller and router to update a user's password + Add a function to update the password internally + The current interface could be improved (made more RESTful) --- src/Controllers/admin.controller.ts | 92 +++++++++++++++++++++++++++++ src/Routes/admin.routes.ts | 5 +- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index d15d720..46ee403 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -121,3 +121,95 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re }, }); }; + +interface UpdatePasswordBody { + name?: string; + password?: string; + new_password: string; +} + +// Expects a valid username (Should be tested beforehand) +const updatePasswordField = async (name: string, new_password: string) => { + const new_password_hash = await argon2.hash(new_password, { type: argon2.argon2id }); + + await prisma.admin.updateMany({ where: { name }, data: { password: new_password_hash } }); +}; + +// requires: auth +export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + const name = req.body.name || req.auth.name; + + if (typeof req.body.new_password !== "string") { + return res.status(400).json({ + type: "error", + payload: { + message: "The body of your request did not conform to the requirements", + schema: { + body: { + new_password: "string", + }, + }, + }, + }); + } + + const user_to_upate = await prisma.admin.findFirst({ where: { name } }); + + if (!user_to_upate) { + // REVIEW: This allows potential attackers (which are authorized with some account) + // to test account names + return res.status(404).json({ + type: "error", + payload: { + message: "The requested user was not found", + }, + }); + } + + if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { + updatePasswordField(name, req.body.new_password); + + res.status(200).json({ + type: "success", + }); + } else if (req.auth.name === name) { + if (typeof req.body.password !== "string") { + return res.status(400).json({ + type: "error", + payload: "The body of your request did not conform to the requirements", + schema: { + body: { + password: "string", + new_password: "string", + }, + }, + }); + } + + if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { + updatePasswordField(name, req.body.new_password); + + return res.status(200).json({ + type: "success", + }); + } + + return res.status(401).json({ + type: "error", + payload: { + message: "The provided password is not valid", + }, + }); + } else { + res.status(403).json({ + type: "error", + payload: { + message: "Operation not permitted; Try logging in as another user", + }, + }); + } +}; diff --git a/src/Routes/admin.routes.ts b/src/Routes/admin.routes.ts index 49fe551..20d5df7 100644 --- a/src/Routes/admin.routes.ts +++ b/src/Routes/admin.routes.ts @@ -1,5 +1,5 @@ import express from "express"; -import { getAllAdmins, createAdmin } from "../Controllers/admin.controller"; +import { getAllAdmins, createAdmin, updatePassword } from "../Controllers/admin.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; const router = express.Router(); @@ -8,4 +8,7 @@ router.get("/", requireAuthentication, getAllAdmins); router.post("/", requireAuthentication, createAdmin); +// TODO: Use URL parameters to specify the user to update +router.put("/password", requireAuthentication, updatePassword); + export default router; From cc1c394dcecb922bcc7f210e15ec68dbf9f6b2be Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 15:46:47 +0100 Subject: [PATCH 050/128] Change the controller for changing passwords to use PIDs and not usernames --- src/Controllers/admin.controller.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 46ee403..9cf735c 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -123,16 +123,16 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re }; interface UpdatePasswordBody { - name?: string; + pid?: string; password?: string; new_password: string; } // Expects a valid username (Should be tested beforehand) -const updatePasswordField = async (name: string, new_password: string) => { +const updatePasswordField = async (pid: string, new_password: string) => { const new_password_hash = await argon2.hash(new_password, { type: argon2.argon2id }); - await prisma.admin.updateMany({ where: { name }, data: { password: new_password_hash } }); + await prisma.admin.update({ where: { pid }, data: { password: new_password_hash } }); }; // requires: auth @@ -141,7 +141,7 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r return res.status(500).json(AUTH_ERROR); } - const name = req.body.name || req.auth.name; + const pid = req.body.pid || req.auth.pid; if (typeof req.body.new_password !== "string") { return res.status(400).json({ @@ -157,7 +157,7 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r }); } - const user_to_upate = await prisma.admin.findFirst({ where: { name } }); + const user_to_upate = await prisma.admin.findUnique({ where: { pid } }); if (!user_to_upate) { // REVIEW: This allows potential attackers (which are authorized with some account) @@ -171,12 +171,12 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r } if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { - updatePasswordField(name, req.body.new_password); + updatePasswordField(pid, req.body.new_password); res.status(200).json({ type: "success", }); - } else if (req.auth.name === name) { + } else if (req.auth.pid === pid) { if (typeof req.body.password !== "string") { return res.status(400).json({ type: "error", @@ -191,7 +191,7 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r } if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { - updatePasswordField(name, req.body.new_password); + updatePasswordField(pid, req.body.new_password); return res.status(200).json({ type: "success", From 4d23eccba64f3d64ffbcbe1f3a36ca7ac6ca8146 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 16:49:01 +0100 Subject: [PATCH 051/128] Restructure the process of changing a password + Requests are now dispatched to the according user ressource, not the collection + The current user can be referenced by setting the pid to 'current' + Refactored the error logic --- src/Controllers/admin.controller.ts | 119 +++++++++++++++------------- src/Controllers/common.ts | 20 +++++ src/Routes/admin.routes.ts | 6 +- 3 files changed, 88 insertions(+), 57 deletions(-) create mode 100644 src/Controllers/common.ts diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 9cf735c..1cd66a1 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -2,6 +2,7 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; import argon2 from "argon2"; +import { DataType, generateInvalidBodyError } from "./common"; const AUTH_ERROR = { type: "failure", @@ -122,12 +123,6 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re }); }; -interface UpdatePasswordBody { - pid?: string; - password?: string; - new_password: string; -} - // Expects a valid username (Should be tested beforehand) const updatePasswordField = async (pid: string, new_password: string) => { const new_password_hash = await argon2.hash(new_password, { type: argon2.argon2id }); @@ -135,28 +130,72 @@ const updatePasswordField = async (pid: string, new_password: string) => { await prisma.admin.update({ where: { pid }, data: { password: new_password_hash } }); }; -// requires: auth -export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, res: Response) => { +interface UpdateForeignPasswordBody { + new_password?: string; +} + +interface UpdateForeignPasswordQueryParams { + pid: string; +} + +export const updateForeignPassword = async ( + req: Request, + res: Response +) => { if (!req.auth?.isAuthenticated) { return res.status(500).json(AUTH_ERROR); } - const pid = req.body.pid || req.auth.pid; - if (typeof req.body.new_password !== "string") { - return res.status(400).json({ + return res.status(400).json(generateInvalidBodyError({ new_password: DataType.STRING })); + } + + const user_to_upate = await prisma.admin.findUnique({ where: { pid: req.params.pid } }); + + if (!user_to_upate) { + // REVIEW: This allows potential attackers (which are authorized with some account) + // to test account names + return res.status(404).json({ type: "error", payload: { - message: "The body of your request did not conform to the requirements", - schema: { - body: { - new_password: "string", - }, - }, + message: "The requested user was not found", }, }); } + if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { + updatePasswordField(req.params.pid, req.body.new_password); + + res.status(200).json({ + type: "success", + }); + } else { + res.status(403).json({ + type: "error", + payload: { + message: "Operation not permitted; Try logging in as another user", + }, + }); + } +}; + +interface UpdatePasswordBody { + password?: string; + new_password?: string; +} + +// requires: auth +export const updateOwnPassword = async (req: Request<{}, {}, UpdatePasswordBody>, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + const pid = req.auth.pid; + + if (typeof req.body.password !== "string" || typeof req.body.new_password !== "string") { + return res.status(400).json(generateInvalidBodyError({ password: DataType.STRING, new_password: DataType.STRING })); + } + const user_to_upate = await prisma.admin.findUnique({ where: { pid } }); if (!user_to_upate) { @@ -170,46 +209,18 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r }); } - if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { + if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { updatePasswordField(pid, req.body.new_password); - res.status(200).json({ + return res.status(200).json({ type: "success", }); - } else if (req.auth.pid === pid) { - if (typeof req.body.password !== "string") { - return res.status(400).json({ - type: "error", - payload: "The body of your request did not conform to the requirements", - schema: { - body: { - password: "string", - new_password: "string", - }, - }, - }); - } - - if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { - updatePasswordField(pid, req.body.new_password); - - return res.status(200).json({ - type: "success", - }); - } - - return res.status(401).json({ - type: "error", - payload: { - message: "The provided password is not valid", - }, - }); - } else { - res.status(403).json({ - type: "error", - payload: { - message: "Operation not permitted; Try logging in as another user", - }, - }); } + + return res.status(401).json({ + type: "error", + payload: { + message: "The provided password is not valid", + }, + }); }; diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts new file mode 100644 index 0000000..2adc291 --- /dev/null +++ b/src/Controllers/common.ts @@ -0,0 +1,20 @@ +export enum DataType { + STRING = "string", + NUMBER = "number", + INTEGER = "integer", + PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", +} + +interface Body { + [k: string]: DataType; +} + +export function generateInvalidBodyError(body: Body) { + return { + type: "error", + payload: { + message: "The body of your request did not conform to the requirements", + schema: { body }, + }, + }; +} diff --git a/src/Routes/admin.routes.ts b/src/Routes/admin.routes.ts index 20d5df7..b4be6ce 100644 --- a/src/Routes/admin.routes.ts +++ b/src/Routes/admin.routes.ts @@ -1,5 +1,5 @@ import express from "express"; -import { getAllAdmins, createAdmin, updatePassword } from "../Controllers/admin.controller"; +import { getAllAdmins, createAdmin, updateOwnPassword, updateForeignPassword } from "../Controllers/admin.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; const router = express.Router(); @@ -8,7 +8,7 @@ router.get("/", requireAuthentication, getAllAdmins); router.post("/", requireAuthentication, createAdmin); -// TODO: Use URL parameters to specify the user to update -router.put("/password", requireAuthentication, updatePassword); +router.put("/current/password", requireAuthentication, updateOwnPassword); +router.put<"/:pid/password", { pid: string }>("/:pid/password", requireAuthentication, updateForeignPassword); export default router; From 08419d581bb5b972215cd5904d95b18cb2e0c84b Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 17:26:20 +0100 Subject: [PATCH 052/128] Update the admin revision on password change + Update type of revision to DateTime --- prisma/schema.prisma | 2 +- src/Controllers/admin.controller.ts | 18 ++++++++++++++++-- src/Controllers/admin_auth.controller.ts | 4 ++-- src/Middleware/auth/auth.ts | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 0a4bcbe..7d830ce 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -49,7 +49,7 @@ model Admin { name String // TODO: This should maybe be unique password String // TODO: Probably specify hash size (VarChar or some other type) permission_level AdminLevel @default(STANDARD) - revision String @default(dbgenerated("gen_random_uuid()")) @db.Uuid + revision DateTime @default(now()) groups Group[] } diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 1cd66a1..69dd28f 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -3,6 +3,18 @@ import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; import argon2 from "argon2"; import { DataType, generateInvalidBodyError } from "./common"; +import { authClient } from "../lib/redis"; + +export const regenerateRevision = async (pid: string) => { + // TOOO: Add error handling + const { revision } = await prisma.admin.update({ + where: { pid }, + data: { revision: new Date() }, + select: { revision: true }, + }); + + await authClient.set(pid, revision.toISOString()); +}; const AUTH_ERROR = { type: "failure", @@ -164,7 +176,8 @@ export const updateForeignPassword = async ( } if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { - updatePasswordField(req.params.pid, req.body.new_password); + await updatePasswordField(req.params.pid, req.body.new_password); // REVIEW: Should this be awaited? + await regenerateRevision(req.params.pid); res.status(200).json({ type: "success", @@ -210,7 +223,8 @@ export const updateOwnPassword = async (req: Request<{}, {}, UpdatePasswordBody> } if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { - updatePasswordField(pid, req.body.new_password); + await updatePasswordField(pid, req.body.new_password); + await regenerateRevision(pid); return res.status(200).json({ type: "success", diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 97161d9..8d1ec0e 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -21,7 +21,7 @@ function createAdminJWT(admin: Admin & { groups: Group[] }) { pid: admin.pid, name: admin.name, permission_level: admin.permission_level, - revision: admin.revision, + revision: admin.revision.toISOString(), groups: admin.groups.map((group) => group.pid), }; @@ -64,7 +64,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody if (await argon2.verify(user.password, password, { type: argon2.argon2id })) { // Set password revision ID in redis - await authClient.set(user.pid, user.revision); + await authClient.set(user.pid, user.revision.toISOString()); return res.status(200).json({ type: "success", diff --git a/src/Middleware/auth/auth.ts b/src/Middleware/auth/auth.ts index 37853b5..0b66952 100644 --- a/src/Middleware/auth/auth.ts +++ b/src/Middleware/auth/auth.ts @@ -62,7 +62,7 @@ export const requireAuthentication = async (req: Request, res: Response, next: N const user = await prisma.admin.findUnique({ where: { pid }, select: { revision: true } }); if (user) { - db_revision = user.revision; + db_revision = user.revision.toISOString(); await authClient.set(pid, db_revision); } From 064497a4cabe02965c10eb86cd8a12a891bbffdc Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 17:36:21 +0100 Subject: [PATCH 053/128] Refactor the endpoints to share common code --- src/Controllers/admin.controller.ts | 20 +++++++------------- src/Controllers/admin_auth.controller.ts | 8 ++------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 69dd28f..714d98c 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -87,19 +87,13 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re if ( !(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level) && groupsIsValid) ) { - return res.status(400).json({ - type: "error", - payload: { - message: "The body of your request did not conform to the requirements", - schema: { - body: { - name: "string", - password_level: "string", - permission_level: "'STANDARD' | 'ELEVATED'", - }, - }, - }, - }); + return res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + password: DataType.STRING, + permission_level: DataType.PERMISSION_LEVEL, + }) + ); } const password_hash = await argon2.hash(password, { type: argon2.argon2id }); diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 8d1ec0e..33ce37b 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -4,6 +4,7 @@ import { authClient } from "../lib/redis"; import prisma from "../lib/prisma"; import argon2 from "argon2"; import jwt from "jsonwebtoken"; +import { DataType, generateInvalidBodyError } from "./common"; const JWT_SECRET = process.env.JWT_SECRET || "secret"; const TOKEN_EXPIRY = "4 days"; @@ -39,12 +40,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody const { name, password } = req.body || {}; if (name == null || password == null) { - return res.status(400).json({ - type: "error", - payload: { - message: "The body must contain 'name' and 'password' attributes of type string", - }, - }); + return res.status(400).json(generateInvalidBodyError({ name: DataType.STRING, password: DataType.STRING })); } const user = await prisma.admin.findFirst({ where: { name }, include: { groups: true } }); From 893f351e28d63bef021a6d6d6bab9a9850420571 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 14:28:01 +0100 Subject: [PATCH 054/128] Update Dockerfile to include templates in the server; --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index f97ac4d..d4a542d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ RUN npm i ADD prisma/ /app/prisma/ ADD scripts/ /app/scripts/ ADD src/ /app/src/ +ADD resources/ /app/resources COPY tsconfig.json /app/ # Generate the prisma client From a84fcdce8f1a0e425cb0327d447b808b52b26b3f Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 14:28:52 +0100 Subject: [PATCH 055/128] Fix fix bugs in the mail & mjml library files; --- src/lib/mail.ts | 42 +++++++++++++++++++----------------------- src/lib/mjml.ts | 8 +++++--- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/lib/mail.ts b/src/lib/mail.ts index a1b8e03..64ecc70 100644 --- a/src/lib/mail.ts +++ b/src/lib/mail.ts @@ -5,9 +5,23 @@ import SMTPTransport from "nodemailer/lib/smtp-transport"; import mjml from "./mjml" -let mailAccount = { user: process.env.MAILUSER + "@mail." + process.env.DOMAIN, pass: process.env.MAILPASSWORD }; +export let mailAccount = { user: process.env.MAILUSER + "@mail." + process.env.DOMAIN, pass: process.env.MAILPASSWORD }; -let transporter = nodemailer.createTransport( +let transporter = (process.env.DEV == "true" || process.env.DOMAIN == undefined) ? (async () => { + mailAccount = await nodemailer.createTestAccount(); + if (process.env.NODE_ENV != "test") { + console.log(mailAccount); + } + return nodemailer.createTransport({ + host: "smtp.ethereal.email", + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: mailAccount.user, // generated ethereal user + pass: mailAccount.pass, // generated ethereal password + }, + }); +})() : nodemailer.createTransport( new SMTPTransport({ host: "localhost", port: 587, @@ -23,26 +37,8 @@ let transporter = nodemailer.createTransport( }) ); -if (process.env.DEV == "true") { - (async () => { - mailAccount = await nodemailer.createTestAccount(); - if (process.env.NODE_ENV != "test") { - console.log(mailAccount); - } - transporter = nodemailer.createTransport({ - host: "smtp.ethereal.email", - port: 587, - secure: false, // true for 465, false for other ports - auth: { - user: mailAccount.user, // generated ethereal user - pass: mailAccount.pass, // generated ethereal password - }, - }); - })(); -} - const sendMail = async (from: string, to: string, subject: string, text?: string, html?: string) => { - return await transporter.sendMail({ + return await (await transporter).sendMail({ from: from, to: to, subject: subject, @@ -51,7 +47,7 @@ const sendMail = async (from: string, to: string, subject: string, text?: string }); }; -const verificationMail = async (to: string, ) => { +export const verificationMail = async (to: string, ) => { const message = mjml.getTemplate("emailVerification") //TODO: replace handlebars with code @@ -61,4 +57,4 @@ const verificationMail = async (to: string, ) => { sendMail(mailAccount.user,to,"Verify Email",undefined,message); } -export default { sendMail, mailAccount }; +export default { sendMail}; diff --git a/src/lib/mjml.ts b/src/lib/mjml.ts index 29fb6b0..012d516 100644 --- a/src/lib/mjml.ts +++ b/src/lib/mjml.ts @@ -2,16 +2,18 @@ import fs from "fs"; import path from "path"; import mjml from "mjml"; -const template_folder = "../../resources/email/templates"; +const template_folder = "/app/resources/email/templates/"; const compileTemplates = () => { + console.log("Compiling templates: ") + fs.readdir(template_folder, (err, files) => { if (err) console.log(err); files.forEach((file) => { if (path.extname(file) !== ".mjml") return; - let content = fs.readFileSync(template_folder + files); + let content = fs.readFileSync(template_folder + file); let mjmlres = mjml(content.toString()); let hbs = template_folder + file.replace(".mjml", ".hbs"); @@ -24,7 +26,7 @@ compileTemplates(); // This will compile all templates when this file is first i const getTemplate = (name: string): string => { let file = ""; - file = fs.readFileSync(path.join(template_folder, name, ".hbs")).toString(); + file = fs.readFileSync(path.join(template_folder, name + ".hbs")).toString(); return file; }; From c96537f5b43097c734eb5e296aefdf569ec9b2d9 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 14:58:27 +0100 Subject: [PATCH 056/128] Add handlebars; --- package-lock.json | 81 +++++++++++++++++++++++++++++++++++++++++ package.json | 2 ++ src/lib/mail.ts | 92 ++++++++++++++++++++++++++--------------------- 3 files changed, 135 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index e586a32..59872b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "license": "ISC", "dependencies": { "@prisma/client": "^3.3.0", + "@types/handlebars": "^4.1.0", "@types/jsonwebtoken": "^8.5.5", "@types/mjml": "^4.7.0", "@types/node": "^16.10.3", @@ -18,6 +19,7 @@ "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", + "handlebars": "^4.7.7", "jsonwebtoken": "^8.5.1", "mjml": "^4.11.0", "nodemailer": "^6.7.0", @@ -226,6 +228,15 @@ "@types/range-parser": "*" } }, + "node_modules/@types/handlebars": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.1.0.tgz", + "integrity": "sha512-gq9YweFKNNB1uFK71eRqsd4niVkXrxHugqWFQkeLRJvGjnxsLr16bYtcsG4tOFwmYi0Bax+wCkbf1reUfdl4kA==", + "deprecated": "This is a stub types definition. handlebars provides its own type definitions, so you do not need this installed.", + "dependencies": { + "handlebars": "*" + } + }, "node_modules/@types/jsonwebtoken": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz", @@ -1408,6 +1419,26 @@ "node": ">=4.x" } }, + "node_modules/handlebars": { + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "dependencies": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "wordwrap": "^1.0.0" + }, + "bin": { + "handlebars": "bin/handlebars" + }, + "engines": { + "node": ">=0.4.7" + }, + "optionalDependencies": { + "uglify-js": "^3.1.4" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1944,6 +1975,11 @@ "node": "*" } }, + "node_modules/minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, "node_modules/minipass": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", @@ -2492,6 +2528,11 @@ "node": ">= 0.6" } }, + "node_modules/neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + }, "node_modules/no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", @@ -3386,6 +3427,11 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, + "node_modules/wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" + }, "node_modules/workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -3648,6 +3694,14 @@ "@types/range-parser": "*" } }, + "@types/handlebars": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.1.0.tgz", + "integrity": "sha512-gq9YweFKNNB1uFK71eRqsd4niVkXrxHugqWFQkeLRJvGjnxsLr16bYtcsG4tOFwmYi0Bax+wCkbf1reUfdl4kA==", + "requires": { + "handlebars": "*" + } + }, "@types/jsonwebtoken": { "version": "8.5.6", "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz", @@ -4562,6 +4616,18 @@ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, + "handlebars": { + "version": "4.7.7", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", + "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", + "requires": { + "minimist": "^1.2.5", + "neo-async": "^2.6.0", + "source-map": "^0.6.1", + "uglify-js": "^3.1.4", + "wordwrap": "^1.0.0" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -4968,6 +5034,11 @@ "brace-expansion": "^1.1.7" } }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + }, "minipass": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", @@ -5468,6 +5539,11 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" + }, "no-case": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", @@ -6137,6 +6213,11 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" + }, "workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", diff --git a/package.json b/package.json index 9791421..9b40eca 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "homepage": "https://github.com/detleph/server#readme", "dependencies": { "@prisma/client": "^3.3.0", + "@types/handlebars": "^4.1.0", "@types/jsonwebtoken": "^8.5.5", "@types/mjml": "^4.7.0", "@types/node": "^16.10.3", @@ -28,6 +29,7 @@ "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", + "handlebars": "^4.7.7", "jsonwebtoken": "^8.5.1", "mjml": "^4.11.0", "nodemailer": "^6.7.0", diff --git a/src/lib/mail.ts b/src/lib/mail.ts index 64ecc70..a6f9d4b 100644 --- a/src/lib/mail.ts +++ b/src/lib/mail.ts @@ -1,44 +1,51 @@ import { writeFile } from "fs"; +import Handlebars, { template } from "handlebars"; +import { emailClient } from "./redis"; import nodemailer from "nodemailer"; import SMTPTransport from "nodemailer/lib/smtp-transport"; -import mjml from "./mjml" - +import mjml from "./mjml"; +import { randomUUID } from "crypto"; export let mailAccount = { user: process.env.MAILUSER + "@mail." + process.env.DOMAIN, pass: process.env.MAILPASSWORD }; -let transporter = (process.env.DEV == "true" || process.env.DOMAIN == undefined) ? (async () => { - mailAccount = await nodemailer.createTestAccount(); - if (process.env.NODE_ENV != "test") { - console.log(mailAccount); - } - return nodemailer.createTransport({ - host: "smtp.ethereal.email", - port: 587, - secure: false, // true for 465, false for other ports - auth: { - user: mailAccount.user, // generated ethereal user - pass: mailAccount.pass, // generated ethereal password - }, - }); -})() : nodemailer.createTransport( - new SMTPTransport({ - host: "localhost", - port: 587, - secure: false, - auth: { - user: mailAccount.user, - pass: mailAccount.pass, - }, - tls: { - rejectUnauthorized: false, - secureProtocol: "TLSv1_method", - }, - }) -); +let transporter = + process.env.DEV == "true" || process.env.DOMAIN == undefined + ? (async () => { + mailAccount = await nodemailer.createTestAccount(); + if (process.env.NODE_ENV != "test") { + console.log(mailAccount); + } + return nodemailer.createTransport({ + host: "smtp.ethereal.email", + port: 587, + secure: false, // true for 465, false for other ports + auth: { + user: mailAccount.user, // generated ethereal user + pass: mailAccount.pass, // generated ethereal password + }, + }); + })() + : nodemailer.createTransport( + new SMTPTransport({ + host: "localhost", + port: 587, + secure: false, + auth: { + user: mailAccount.user, + pass: mailAccount.pass, + }, + tls: { + rejectUnauthorized: false, + secureProtocol: "TLSv1_method", + }, + }) + ); const sendMail = async (from: string, to: string, subject: string, text?: string, html?: string) => { - return await (await transporter).sendMail({ + return await ( + await transporter + ).sendMail({ from: from, to: to, subject: subject, @@ -47,14 +54,19 @@ const sendMail = async (from: string, to: string, subject: string, text?: string }); }; -export const verificationMail = async (to: string, ) => { - const message = mjml.getTemplate("emailVerification") - - //TODO: replace handlebars with code +export const verificationMail = async (to: string, eventName: string, verificationLink: string) => { + const raw = mjml.getTemplate("emailVerification"); + + //TODO: Replace other handlebars with final values + const message = Handlebars.compile(raw); + + const data = { eventName, verificationLink }; + const compiled = message(data); + + sendMail(mailAccount.user, to, "Verify Email", undefined, compiled); + //TODO: Implement verification codes //TODO: Write endpoints to verify codes +}; - sendMail(mailAccount.user,to,"Verify Email",undefined,message); -} - -export default { sendMail}; +export default { sendMail }; From 907c2c68fa7913d54e2369d36513e6708f3e0f4d Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 15:31:20 +0100 Subject: [PATCH 057/128] Fix json parser return stack trace see Issue #24; --- src/app.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app.ts b/src/app.ts index deffe8a..6ef80fa 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,4 +1,4 @@ -import express from "express"; +import express, { ErrorRequestHandler, NextFunction, Request, Response } from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; @@ -27,6 +27,17 @@ async function main() { app.use(express.urlencoded({ extended: true })); app.use(express.json()); + app.use((err: any, req: Request, res: Response, next: NextFunction) => { + if (err) { + res.status(400).send({ + type: "error", + payload: "The body of your request did not contain valid data" + }) + } else { + next() + } + }); + // Admin authentication endpoints app.use("/api/authentication", adminAuthRouter); From 626ae40683a7626854a1dba3710306b5c3a20681 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:37:51 +0100 Subject: [PATCH 058/128] [create-pull-request] push formatted files (#27) Co-authored-by: Stefan-5422 --- src/app.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.ts b/src/app.ts index 6ef80fa..6af2048 100644 --- a/src/app.ts +++ b/src/app.ts @@ -31,10 +31,10 @@ async function main() { if (err) { res.status(400).send({ type: "error", - payload: "The body of your request did not contain valid data" - }) + payload: "The body of your request did not contain valid data", + }); } else { - next() + next(); } }); From c0ce7f32ca9b279c1c7b79cba56b7ea374ffd4eb Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Sun, 13 Mar 2022 02:34:20 +0100 Subject: [PATCH 059/128] updating Role model (v.2.0) --- prisma/schema.prisma | 47 +++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 7d830ce..4106c5f 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -46,8 +46,9 @@ model Link { model Admin { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String // TODO: This should maybe be unique + name String @unique password String // TODO: Probably specify hash size (VarChar or some other type) + permission_level AdminLevel @default(STANDARD) revision DateTime @default(now()) groups Group[] @@ -59,34 +60,33 @@ model Discipline { name String minTeamSize Int maxTeamSize Int - roles Role[] + roles RoleSchema[] teams Team[] event Event @relation(fields: [eventId], references: [id]) eventId Int } -model Role { +model RoleSchema { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String schema Json - participant Participant[] - discipline Discipline @relation(fields: [disciplineId], references: [id]) + roles Role[] + discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int } model Team { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + leaderEmail String - participants Participant[] @relation(name: "participants") - discipline Discipline @relation(fields: [disciplineId], references: [id]) + roles Role[] @relation(name: "participants") + discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int - leader Participant? @relation(name: "leader", fields: [leaderId], references: [id]) - leaderId Int @unique } model Participant { @@ -94,16 +94,26 @@ model Participant { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid firstName String lastName String - email String gender Gender group Group @relation(fields: [groupId], references: [id]) groupId Int - team Team @relation(name: "participants", fields: [teamId], references: [id]) - teamId Int - leaderOf Team? @relation(name: "leader") roles Role[] +} +model Role { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random")) + name String //e.g. runner, swimmer,... + importance Job + score String + + participant Participant? @relation(fields: [participantId], references: [id]) + participantId Int? + team Team @relation(name: "participants", fields: [teamId], references: [id]) + teamId Int + schema RoleSchema @relation(fields: [schemaId], references: [id]) + schemaId Int } model Organisation { @@ -140,3 +150,8 @@ enum Gender { FEMALE OTHER } + +enum Job { + TEAMLEADER + MEMBER +} \ No newline at end of file From fe31a7fa34530fec7595eafa5e3116983cb8519d Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Sun, 20 Mar 2022 14:34:49 +0100 Subject: [PATCH 060/128] Adding VisualElement (v.2.1) --- prisma/schema.prisma | 328 ++++++++++++++++++++++--------------------- 1 file changed, 171 insertions(+), 157 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 4106c5f..03ea4e4 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -1,157 +1,171 @@ -// Schema for the main database - -datasource db { - provider = "postgresql" - url = env("DATABASE_URL") -} - -generator client { - provider = "prisma-client-js" -} - -model Event { - id Int @id @default(autoincrement()) // Primary key - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key - date DateTime - name String - description String - - disciplines Discipline[] - organisations Organisation[] - campaign Campaign[] -} - -model Campaign { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - start DateTime - expiresAt DateTime - - links Link[] - event Event @relation(fields: [eventId], references: [id]) - eventId Int @unique -} - -model Link { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - link String - - campaign Campaign @relation(fields: [campaignId], references: [id]) - campaignId Int - group Group? @relation(fields: [groupId], references: [id]) - groupId Int @unique -} - -model Admin { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String @unique - password String // TODO: Probably specify hash size (VarChar or some other type) - - permission_level AdminLevel @default(STANDARD) - revision DateTime @default(now()) - groups Group[] -} - -model Discipline { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - minTeamSize Int - maxTeamSize Int - roles RoleSchema[] - - teams Team[] - event Event @relation(fields: [eventId], references: [id]) - eventId Int -} - -model RoleSchema { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - schema Json - - roles Role[] - discipline Discipline @relation(fields: [disciplineId], references: [id]) - disciplineId Int -} - -model Team { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - leaderEmail String - - roles Role[] @relation(name: "participants") - discipline Discipline @relation(fields: [disciplineId], references: [id]) - disciplineId Int -} - -model Participant { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - firstName String - lastName String - gender Gender - - group Group @relation(fields: [groupId], references: [id]) - groupId Int - roles Role[] -} - -model Role { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random")) - name String //e.g. runner, swimmer,... - importance Job - score String - - participant Participant? @relation(fields: [participantId], references: [id]) - participantId Int? - team Team @relation(name: "participants", fields: [teamId], references: [id]) - teamId Int - schema RoleSchema @relation(fields: [schemaId], references: [id]) - schemaId Int -} - -model Organisation { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - - groups Group[] - event Event @relation(fields: [eventId], references: [id]) - eventId Int -} - -model Group { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - user_limit Int @default(40) - level Int - - oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) - oragnisationId Int - participants Participant[] - link Link? - admins Admin[] -} - -enum AdminLevel { - STANDARD - ELEVATED -} - -enum Gender { - MALE - FEMALE - OTHER -} - -enum Job { - TEAMLEADER - MEMBER -} \ No newline at end of file +// Schema for the main database + +datasource db { + provider = "postgresql" + url = env("DATABASE_URL") +} + +generator client { + provider = "prisma-client-js" +} + +model Event { + id Int @id @default(autoincrement()) // Primary key + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key + date DateTime + name String + description String + + disciplines Discipline[] + organisations Organisation[] + campaign Campaign[] + visual VisualElement[] +} + +model Campaign { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + start DateTime + expiresAt DateTime + + links Link[] + event Event @relation(fields: [eventId], references: [id]) + eventId Int @unique +} + +model Link { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + link String + + campaign Campaign @relation(fields: [campaignId], references: [id]) + campaignId Int + group Group? @relation(fields: [groupId], references: [id]) + groupId Int @unique +} + +model Admin { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String @unique + password String // TODO: Probably specify hash size (VarChar or some other type) + + permission_level AdminLevel @default(STANDARD) + revision DateTime @default(now()) + groups Group[] +} + +model Discipline { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + minTeamSize Int + maxTeamSize Int + roles RoleSchema[] + + teams Team[] + event Event @relation(fields: [eventId], references: [id]) + eventId Int + visual VisualElement[] +} + +model RoleSchema { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + schema Json + + roles Role[] + discipline Discipline @relation(fields: [disciplineId], references: [id]) + disciplineId Int + visual VisualElement[] +} + +model Team { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + leaderEmail String + + roles Role[] @relation(name: "participants") + discipline Discipline @relation(fields: [disciplineId], references: [id]) + disciplineId Int +} + +model Participant { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + firstName String + lastName String + gender Gender + relevance Job + + group Group @relation(fields: [groupId], references: [id]) + groupId Int + roles Role[] +} + +model Role { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random")) + name String //e.g. runner, swimmer,... + score String + + participant Participant? @relation(fields: [participantId], references: [id]) + participantId Int? + team Team @relation(name: "participants", fields: [teamId], references: [id]) + teamId Int + schema RoleSchema @relation(fields: [schemaId], references: [id]) + schemaId Int +} + +model Organisation { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + + groups Group[] + event Event @relation(fields: [eventId], references: [id]) + eventId Int +} + +model Group { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + user_limit Int @default(40) + level Int + + oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) + oragnisationId Int + participants Participant[] + link Link? + admins Admin[] +} + +model VisualElement { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + description String + location String + + event Event[] + discipline Discipline[] + role RoleSchema[] +} + +enum AdminLevel { + STANDARD + ELEVATED +} + +enum Gender { + MALE + FEMALE + OTHER +} + +enum Job { + TEAMLEADER + MEMBER +} From 9b8c6b18b714868efb31aa4c4ef83a45c9b3da33 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:14:34 +0100 Subject: [PATCH 061/128] Updated Media, Adding referential actions(v.2.2) --- prisma/schema.prisma | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 03ea4e4..a4103a3 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -19,7 +19,7 @@ model Event { disciplines Discipline[] organisations Organisation[] campaign Campaign[] - visual VisualElement[] + visual Media[] } model Campaign { @@ -29,7 +29,7 @@ model Campaign { expiresAt DateTime links Link[] - event Event @relation(fields: [eventId], references: [id]) + event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) eventId Int @unique } @@ -38,9 +38,9 @@ model Link { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid link String - campaign Campaign @relation(fields: [campaignId], references: [id]) + campaign Campaign @relation(fields: [campaignId], references: [id], onDelete: Cascade) campaignId Int - group Group? @relation(fields: [groupId], references: [id]) + group Group @relation(fields: [groupId], references: [id], onDelete: Cascade) groupId Int @unique } @@ -56,17 +56,17 @@ model Admin { } model Discipline { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String minTeamSize Int maxTeamSize Int - roles RoleSchema[] + roles RoleSchema[] teams Team[] - event Event @relation(fields: [eventId], references: [id]) + event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) eventId Int - visual VisualElement[] + visual Media[] } model RoleSchema { @@ -76,9 +76,9 @@ model RoleSchema { schema Json roles Role[] - discipline Discipline @relation(fields: [disciplineId], references: [id]) + discipline Discipline @relation(fields: [disciplineId], references: [id], onDelete: Cascade) disciplineId Int - visual VisualElement[] + visual Media[] } model Team { @@ -88,7 +88,7 @@ model Team { leaderEmail String roles Role[] @relation(name: "participants") - discipline Discipline @relation(fields: [disciplineId], references: [id]) + discipline Discipline @relation(fields: [disciplineId], references: [id], onDelete: Cascade) disciplineId Int } @@ -100,7 +100,7 @@ model Participant { gender Gender relevance Job - group Group @relation(fields: [groupId], references: [id]) + group Group @relation(fields: [groupId], references: [id], onDelete: Cascade) groupId Int roles Role[] } @@ -108,14 +108,13 @@ model Participant { model Role { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random")) - name String //e.g. runner, swimmer,... score String - participant Participant? @relation(fields: [participantId], references: [id]) + participant Participant? @relation(fields: [participantId], references: [id], onDelete: SetNull) participantId Int? - team Team @relation(name: "participants", fields: [teamId], references: [id]) + team Team @relation(name: "participants", fields: [teamId], references: [id], onDelete: Cascade) teamId Int - schema RoleSchema @relation(fields: [schemaId], references: [id]) + schema RoleSchema @relation(fields: [schemaId], references: [id], onDelete: Cascade) schemaId Int } @@ -125,7 +124,7 @@ model Organisation { name String groups Group[] - event Event @relation(fields: [eventId], references: [id]) + event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) eventId Int } @@ -136,18 +135,18 @@ model Group { user_limit Int @default(40) level Int - oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) + oragnisation Organisation @relation(fields: [oragnisationId], references: [id], onDelete: Cascade) oragnisationId Int participants Participant[] link Link? admins Admin[] } -model VisualElement { +model Media { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid description String - location String + location String @unique event Event[] discipline Discipline[] From cdacc56f7f1b66c50f2293c5803c02413c75decf Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:29:25 +0100 Subject: [PATCH 062/128] Update Event Endpoints to give better errors; --- src/Controllers/common.ts | 2 + src/Controllers/event.controller.ts | 93 +++++++++++++++++++++++++---- src/Routes/event.routes.ts | 7 ++- 3 files changed, 90 insertions(+), 12 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index 2adc291..f327a5d 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -3,6 +3,8 @@ export enum DataType { NUMBER = "number", INTEGER = "integer", PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", + DATETIME = "ISOstring (8601)", + UUID = "UUID string", } interface Body { diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 814766e..00256c9 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -1,7 +1,9 @@ +import { Prisma } from "@prisma/client"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; +import { DataType, generateInvalidBodyError } from "./common"; -const getAllEvents = async (req: Request, res: Response) => { +export const getAllEvents = async (req: Request, res: Response) => { const events = await prisma.event.findMany({ select: { name: true, @@ -11,17 +13,84 @@ const getAllEvents = async (req: Request, res: Response) => { id: false, }, }); - if (events.length > 0) res.status(200).send(events); - else res.status(204).send(); + if (events.length > 0) res.status(200).json(events); + else res.status(200).json([]); }; -const addEvent = async (req: Request, res: Response) => { - // TODO: Add checks if user has admin permissions +export const getEvent = async (req: Request, res: Response) => { + const eventId = req.params.eventId; - if (req.body.name == null || undefined || req.body.date == null || undefined) { - res.status(400).send("Malformed request"); + if (eventId === undefined || null) { + res.status(400).json( + generateInvalidBodyError({ + eventId: DataType.STRING, + }) + ); return; } + try { + const event = await prisma.event.findUnique({ + where: { + pid: eventId, + }, + select: { + name: true, + description: true, + date: true, + pid: true, + id: false, + }, + }); + + res.status(200).json(event); + } catch (e) { + if (e instanceof Prisma.PrismaClientKnownRequestError) { + res.status(500).json({ + type: "error", + payload: { + message: `Internal Server error occured. Try again later`, + }, + }); + return; + } + if (e instanceof Prisma.PrismaClientUnknownRequestError) { + res.status(500).json({ + type: "error", + payload: { + message: "Unknown error occured with your request. Check if your parameters are correct", + shema: { + eventId: DataType.UUID, + }, + }, + }); + return; + } + } +}; + +export const addEvent = async (req: Request, res: Response) => { + if ( + req.body.name == null || + undefined || + typeof req.body.name !== "string" || + req.body.date == null || + undefined || + typeof req.body.date !== "string" || + req.body.description == null || + undefined || + typeof req.body.description !== "string" + ) { + res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + date: DataType.DATETIME, + description: DataType.STRING, + }) + ); + return; + } + + //TODO: Check if date is valid const event = await prisma.event.create({ data: { @@ -36,7 +105,11 @@ const addEvent = async (req: Request, res: Response) => { id: false, }, }); - res.status(201).send(event); -}; -export { getAllEvents, addEvent }; + res.status(201).json({ + type: "succes", + payload: { + event, + }, + }); +}; diff --git a/src/Routes/event.routes.ts b/src/Routes/event.routes.ts index de0cfde..2ce9e38 100644 --- a/src/Routes/event.routes.ts +++ b/src/Routes/event.routes.ts @@ -1,9 +1,12 @@ import Express from "express"; -import { addEvent, getAllEvents } from "../Controllers/event.controller"; +import { addEvent, getAllEvents, getEvent } from "../Controllers/event.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; const router = Express.Router(); router.get("/", getAllEvents); -router.post("/", addEvent); +router.get("/:eventId", getEvent); + +router.post("/", requireAuthentication, addEvent); export default router; From 0f3b1ac707f2322329cb73e75b7fef6f83d1c950 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:50:11 +0100 Subject: [PATCH 063/128] Update common.ts types because nagging. --- src/Controllers/common.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index f327a5d..f568c75 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -3,8 +3,8 @@ export enum DataType { NUMBER = "number", INTEGER = "integer", PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", - DATETIME = "ISOstring (8601)", - UUID = "UUID string", + DATETIME = "ISOstring", + UUID = "string", } interface Body { From 68b9044a9dc88c32c5c9e2c0a58c9be2f8db9b10 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Tue, 22 Mar 2022 07:37:21 +0100 Subject: [PATCH 064/128] Minor changes Fixed complaints for PR #30 --- src/Controllers/event.controller.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 00256c9..df5a8a4 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -57,7 +57,7 @@ export const getEvent = async (req: Request, res: Response) => { res.status(500).json({ type: "error", payload: { - message: "Unknown error occured with your request. Check if your parameters are correct", + message: "Unknown error occurred with your request. Check if your parameters are correct", shema: { eventId: DataType.UUID, }, @@ -70,14 +70,8 @@ export const getEvent = async (req: Request, res: Response) => { export const addEvent = async (req: Request, res: Response) => { if ( - req.body.name == null || - undefined || typeof req.body.name !== "string" || - req.body.date == null || - undefined || typeof req.body.date !== "string" || - req.body.description == null || - undefined || typeof req.body.description !== "string" ) { res.status(400).json( @@ -103,6 +97,7 @@ export const addEvent = async (req: Request, res: Response) => { date: true, pid: true, id: false, + description: true, }, }); From 43bb7baa882524bfaba860ad0ac793265e0445a2 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Mon, 28 Mar 2022 11:52:25 +0200 Subject: [PATCH 065/128] Minor changes --- package-lock.json | 1123 +++++++++++++++++++++++++-- src/Controllers/event.controller.ts | 6 +- 2 files changed, 1076 insertions(+), 53 deletions(-) diff --git a/package-lock.json b/package-lock.json index 298b852..9948b4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,16 @@ "license": "ISC", "dependencies": { "@prisma/client": "^3.3.0", + "@types/jsonwebtoken": "^8.5.5", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", + "@types/redis": "^2.8.32", + "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", - "nodemailer": "^6.7.0" + "jsonwebtoken": "^8.5.1", + "nodemailer": "^6.7.0", + "redis": "^3.1.2" }, "devDependencies": { "@types/chai": "^4.2.22", @@ -52,6 +57,33 @@ "node": ">=12" } }, + "node_modules/@mapbox/node-pre-gyp": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz", + "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==", + "dependencies": { + "detect-libc": "^1.0.3", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.5", + "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/@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==", + "engines": { + "node": ">=10" + } + }, "node_modules/@prisma/client": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.3.0.tgz", @@ -181,6 +213,14 @@ "@types/range-parser": "*" } }, + "node_modules/@types/jsonwebtoken": { + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz", + "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -218,6 +258,14 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", "dev": true }, + "node_modules/@types/redis": { + "version": "2.8.32", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", + "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/serve-static": { "version": "1.13.10", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", @@ -244,6 +292,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "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==" + }, "node_modules/accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -277,6 +330,38 @@ "node": ">=0.4.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/ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -290,7 +375,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" } @@ -323,12 +407,56 @@ "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/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/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, + "node_modules/argon2": { + "version": "0.28.5", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.5.tgz", + "integrity": "sha512-kGFCctzc3VWmR1aCOYjNgvoTmVF5uVBUtWlXCKKO54d1K+31zRz45KAcDIqMo2746ozv/52d25nfEekitaXP0w==", + "hasInstallScript": true, + "dependencies": { + "@mapbox/node-pre-gyp": "^1.0.8", + "@phc/format": "^1.0.0", + "node-addon-api": "^4.3.0" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -358,8 +486,7 @@ "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/binary-extensions": { "version": "2.2.0", @@ -394,7 +521,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" @@ -418,6 +544,11 @@ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, + "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": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "node_modules/bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -543,6 +674,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/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -572,6 +711,14 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "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", @@ -593,8 +740,12 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "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": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "node_modules/content-disposition": { "version": "0.5.3", @@ -687,6 +838,19 @@ "node": ">=0.4.0" } }, + "node_modules/delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "node_modules/denque": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz", + "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==", + "engines": { + "node": ">=0.10" + } + }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -700,6 +864,17 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -717,6 +892,14 @@ "node": ">=10" } }, + "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", @@ -725,8 +908,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/encodeurl": { "version": "1.0.2", @@ -909,11 +1091,21 @@ "node": ">= 0.6" } }, + "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.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "node_modules/fsevents": { "version": "2.3.2", @@ -929,6 +1121,25 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "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/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -951,7 +1162,6 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -997,6 +1207,11 @@ "node": ">=8" } }, + "node_modules/has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "node_modules/he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -1021,6 +1236,39 @@ "node": ">= 0.6" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "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", @@ -1036,7 +1284,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -1089,7 +1336,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" } @@ -1172,6 +1418,59 @@ "js-yaml": "bin/js-yaml.js" } }, + "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/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", + "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/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -1187,6 +1486,41 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -1203,6 +1537,39 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/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/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/make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -1264,7 +1631,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1272,6 +1638,40 @@ "node": "*" } }, + "node_modules/minipass": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", + "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", + "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": "9.1.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", @@ -1378,6 +1778,30 @@ "node": ">= 0.6" } }, + "node_modules/node-addon-api": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==" + }, + "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/nodemailer": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz", @@ -1386,6 +1810,20 @@ "node": ">=6.0.0" } }, + "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/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -1395,6 +1833,25 @@ "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/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -1410,7 +1867,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "dependencies": { "wrappy": "1" } @@ -1466,7 +1922,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -1598,6 +2053,48 @@ "node": ">=8.10.0" } }, + "node_modules/redis": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz", + "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==", + "dependencies": { + "denque": "^1.5.0", + "redis-commands": "^1.7.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-redis" + } + }, + "node_modules/redis-commands": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", + "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" + }, + "node_modules/redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=", + "engines": { + "node": ">=4" + } + }, + "node_modules/redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=", + "dependencies": { + "redis-errors": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -1607,6 +2104,20 @@ "node": ">=0.10.0" } }, + "node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -1617,6 +2128,20 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "node_modules/semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -1668,11 +2193,21 @@ "node": ">= 0.8.0" } }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "node_modules/setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, + "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==" + }, "node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -1685,7 +2220,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" } @@ -1694,7 +2228,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, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1708,7 +2241,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" }, @@ -1779,6 +2311,22 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, + "node_modules/tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "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/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1799,6 +2347,11 @@ "node": ">=0.6" } }, + "node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "node_modules/ts-node": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", @@ -1888,8 +2441,7 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "node_modules/utils-merge": { "version": "1.0.1", @@ -1907,6 +2459,20 @@ "node": ">= 0.8" } }, + "node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "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", @@ -1922,6 +2488,14 @@ "node": ">= 8" } }, + "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/workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -1948,8 +2522,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "node_modules/y18n": { "version": "5.0.8", @@ -1960,6 +2533,11 @@ "node": ">=10" } }, + "node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", @@ -2040,6 +2618,27 @@ "@cspotcode/source-map-consumer": "0.8.0" } }, + "@mapbox/node-pre-gyp": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz", + "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==", + "requires": { + "detect-libc": "^1.0.3", + "https-proxy-agent": "^5.0.0", + "make-dir": "^3.1.0", + "node-fetch": "^2.6.5", + "nopt": "^5.0.0", + "npmlog": "^5.0.1", + "rimraf": "^3.0.2", + "semver": "^7.3.5", + "tar": "^6.1.11" + } + }, + "@phc/format": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@phc/format/-/format-1.0.0.tgz", + "integrity": "sha512-m7X9U6BG2+J+R1lSOdCiITLLrxm+cWlNI3HUFA92oLO77ObGNzaKdh8pMLqdZcshtkKuV84olNNXDfMc4FezBQ==" + }, "@prisma/client": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/@prisma/client/-/client-3.3.0.tgz", @@ -2155,6 +2754,14 @@ "@types/range-parser": "*" } }, + "@types/jsonwebtoken": { + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz", + "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==", + "requires": { + "@types/node": "*" + } + }, "@types/mime": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz", @@ -2192,6 +2799,14 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==", "dev": true }, + "@types/redis": { + "version": "2.8.32", + "resolved": "https://registry.npmjs.org/@types/redis/-/redis-2.8.32.tgz", + "integrity": "sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==", + "requires": { + "@types/node": "*" + } + }, "@types/serve-static": { "version": "1.13.10", "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz", @@ -2218,6 +2833,11 @@ "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==", "dev": true }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", @@ -2239,6 +2859,29 @@ "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, + "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==" + } + } + }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -2248,8 +2891,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": "4.3.0", @@ -2270,12 +2912,48 @@ "picomatch": "^2.0.4" } }, + "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==" + }, + "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" + } + } + } + }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, + "argon2": { + "version": "0.28.5", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.5.tgz", + "integrity": "sha512-kGFCctzc3VWmR1aCOYjNgvoTmVF5uVBUtWlXCKKO54d1K+31zRz45KAcDIqMo2746ozv/52d25nfEekitaXP0w==", + "requires": { + "@mapbox/node-pre-gyp": "^1.0.8", + "@phc/format": "^1.0.0", + "node-addon-api": "^4.3.0" + } + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -2302,8 +2980,7 @@ "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==" }, "binary-extensions": { "version": "2.2.0", @@ -2332,7 +3009,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" @@ -2353,6 +3029,11 @@ "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, + "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": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", @@ -2445,6 +3126,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==" + }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -2471,6 +3157,11 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "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", @@ -2489,8 +3180,12 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "content-disposition": { "version": "0.5.3", @@ -2562,6 +3257,16 @@ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "denque": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz", + "integrity": "sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw==" + }, "depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", @@ -2572,6 +3277,11 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" + }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -2583,6 +3293,14 @@ "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==" }, + "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", @@ -2591,8 +3309,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==" }, "encodeurl": { "version": "1.0.2", @@ -2730,11 +3447,18 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "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.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "2.3.2", @@ -2743,6 +3467,22 @@ "dev": true, "optional": 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" + } + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -2759,7 +3499,6 @@ "version": "7.1.7", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2790,6 +3529,11 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", @@ -2808,6 +3552,30 @@ "toidentifier": "1.0.0" } }, + "https-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", + "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", + "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", @@ -2820,7 +3588,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -2860,8 +3627,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", @@ -2920,6 +3686,54 @@ "argparse": "^2.0.1" } }, + "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==" + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + } + } + }, + "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" + } + }, "locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -2929,6 +3743,41 @@ "p-locate": "^5.0.0" } }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha1-YLuYqHy5I8aMoeUTJUgzFISfVT8=" + }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=" + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=" + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha1-POdoEMWSjQM1IwGsKHMX8RwLH/w=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=" + }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=" + }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -2939,6 +3788,29 @@ "is-unicode-supported": "^0.1.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "requires": { + "yallist": "^4.0.0" + } + }, + "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==" + } + } + }, "make-error": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", @@ -2982,11 +3854,32 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } }, + "minipass": { + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", + "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", + "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": "9.1.3", "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.1.3.tgz", @@ -3066,17 +3959,54 @@ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, + "node-addon-api": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==" + }, + "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" + } + }, "nodemailer": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.7.0.tgz", "integrity": "sha512-AtiTVUFHLiiDnMQ43zi0YgkzHOEWUkhDgPlBXrsDzJiJvB29Alo4OKxHQ0ugF3gRqRQIneCLtZU3yiUo7pItZw==" }, + "nopt": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", + "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", + "requires": { + "abbrev": "1" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "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" + } + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -3089,7 +4019,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -3126,8 +4055,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-to-regexp": { "version": "0.1.7", @@ -3224,12 +4152,49 @@ "picomatch": "^2.2.1" } }, + "redis": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz", + "integrity": "sha512-grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw==", + "requires": { + "denque": "^1.5.0", + "redis-commands": "^1.7.0", + "redis-errors": "^1.2.0", + "redis-parser": "^3.0.0" + } + }, + "redis-commands": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.7.0.tgz", + "integrity": "sha512-nJWqw3bTFy21hX/CPKHth6sfhZbdiHP6bTawSgQBlKOVRG7EZkfHbbHwQJnrE4vsQf0CMNE+3gJ4Fmm16vdVlQ==" + }, + "redis-errors": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz", + "integrity": "sha1-62LSrbFeTq9GEMBK/hUpOEJQq60=" + }, + "redis-parser": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz", + "integrity": "sha1-tm2CjNyv5rS4pCin3vTGvKwxyLQ=", + "requires": { + "redis-errors": "^1.0.0" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -3240,6 +4205,14 @@ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "semver": { + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", + "requires": { + "lru-cache": "^6.0.0" + } + }, "send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -3287,11 +4260,21 @@ "send": "0.17.1" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, + "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==" + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -3301,7 +4284,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" } @@ -3310,7 +4292,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", @@ -3321,7 +4302,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" } @@ -3376,6 +4356,19 @@ "has-flag": "^4.0.0" } }, + "tar": { + "version": "6.1.11", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", + "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", + "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" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -3390,6 +4383,11 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=" + }, "ts-node": { "version": "10.2.1", "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.2.1.tgz", @@ -3439,8 +4437,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "utils-merge": { "version": "1.0.1", @@ -3452,6 +4449,20 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=" + }, + "whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", + "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", @@ -3461,6 +4472,14 @@ "isexe": "^2.0.0" } }, + "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" + } + }, "workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -3481,8 +4500,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "y18n": { "version": "5.0.8", @@ -3490,6 +4508,11 @@ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index df5a8a4..465b8bf 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -20,10 +20,10 @@ export const getAllEvents = async (req: Request, res: Response) => { export const getEvent = async (req: Request, res: Response) => { const eventId = req.params.eventId; - if (eventId === undefined || null) { + if (typeof eventId !== "string") { res.status(400).json( generateInvalidBodyError({ - eventId: DataType.STRING, + eventId: DataType.UUID, }) ); return; @@ -58,7 +58,7 @@ export const getEvent = async (req: Request, res: Response) => { type: "error", payload: { message: "Unknown error occurred with your request. Check if your parameters are correct", - shema: { + schema: { eventId: DataType.UUID, }, }, From d7e7694249b910f4f3b8d3af8bb3775af9c31bdd Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 14:01:45 +0200 Subject: [PATCH 066/128] Fix: The server should always return 403 on failed login --- src/Controllers/admin_auth.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 33ce37b..760e85d 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -50,7 +50,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody // with only the username if (!user) { - return res.status(404).json({ + return res.status(403).json({ type: "error", payload: { message: `The provided credentials are not valid`, From d2de4e9208829496917ce35b1dfa54244d760b26 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 14:52:23 +0200 Subject: [PATCH 067/128] HOTFIX: Name of uuid function The prisma schema didn't compile with the previous schema --- prisma/schema.prisma | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index a4103a3..8025cd4 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -107,7 +107,7 @@ model Participant { model Role { id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random")) + pid String @unique @default(dbgenerated("gen_random_uuid()")) score String participant Participant? @relation(fields: [participantId], references: [id], onDelete: SetNull) From 62a5daa432046e52bcfe1bd190afc8fa283c2d9d Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Mon, 25 Apr 2022 08:56:45 +0200 Subject: [PATCH 068/128] Add Endpoint to verify email codes --- package-lock.json | 33 +++++++++++---- package.json | 1 + prisma/schema.prisma | 2 + src/Controllers/user_auth.controller.ts | 56 +++++++++++++++++++++++++ src/lib/mail.ts | 5 +-- src/lib/redis.ts | 10 +++++ 6 files changed, 95 insertions(+), 12 deletions(-) create mode 100644 src/Controllers/user_auth.controller.ts diff --git a/package-lock.json b/package-lock.json index 59872b4..bdbdc74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,7 @@ "handlebars": "^4.7.7", "jsonwebtoken": "^8.5.1", "mjml": "^4.11.0", + "nanoid": "^3.3.3", "nodemailer": "^6.7.0", "redis": "^3.1.2" }, @@ -2503,16 +2504,27 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, + "node_modules/mocha/node_modules/nanoid": { + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", + "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "dev": true, + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, "node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "node_modules/nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", - "dev": true, + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -5520,6 +5532,12 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true + }, + "nanoid": { + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", + "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "dev": true } } }, @@ -5529,10 +5547,9 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", - "dev": true + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", + "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==" }, "negotiator": { "version": "0.6.2", diff --git a/package.json b/package.json index 9b40eca..dc7fbad 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "handlebars": "^4.7.7", "jsonwebtoken": "^8.5.1", "mjml": "^4.11.0", + "nanoid": "^3.3.3", "nodemailer": "^6.7.0", "redis": "^3.1.2" }, diff --git a/prisma/schema.prisma b/prisma/schema.prisma index cabd3e2..f06c9b0 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -101,6 +101,8 @@ model Participant { email String gender Gender + verified Boolean @default(false) + group Group @relation(fields: [groupId], references: [id]) groupId Int team Team @relation(name: "participants", fields: [teamId], references: [id]) diff --git a/src/Controllers/user_auth.controller.ts b/src/Controllers/user_auth.controller.ts new file mode 100644 index 0000000..cd8c94a --- /dev/null +++ b/src/Controllers/user_auth.controller.ts @@ -0,0 +1,56 @@ +import { Request, Response } from "express"; +import prisma from "../lib/prisma"; +import { mailClient } from "../lib/redis"; +import { nanoid } from "nanoid"; +import { verificationMail } from "../lib/mail"; + +export const register = async (req: Request, res: Response) => { + //TODO: Implemnt user endpoint and use following code to send verification mail + + const user = { + //Supposed to come from database + id: "10", + email: "test@test.com", + }; + + const usid = nanoid(); + + (await mailClient).set(usid, user.id); + + verificationMail(user.email, "eventname", usid); + + //Send status code +}; + +export const verifyEmail = async (req: Request, res: Response) => { + const { code } = req.body || {}; + + if (!(typeof code === "string")) { + return res.status(400).json({ + type: "error", + payload: { + message: "Invalid Request parameter", + }, + }); + } + + const acc = await mailClient.get(code); + + if (!acc) { + return res.status(404).json({ + type: "error", + payload: { + message: "Invalid token. It might be expired", + }, + }); + } + + prisma.participant.update({ + where: { + id: parseInt(acc), + }, + data: { + verified: true, + }, + }); +}; diff --git a/src/lib/mail.ts b/src/lib/mail.ts index a6f9d4b..4572b1e 100644 --- a/src/lib/mail.ts +++ b/src/lib/mail.ts @@ -1,6 +1,6 @@ import { writeFile } from "fs"; import Handlebars, { template } from "handlebars"; -import { emailClient } from "./redis"; +import { mailClient } from "./redis"; import nodemailer from "nodemailer"; import SMTPTransport from "nodemailer/lib/smtp-transport"; @@ -64,9 +64,6 @@ export const verificationMail = async (to: string, eventName: string, verificati const compiled = message(data); sendMail(mailAccount.user, to, "Verify Email", undefined, compiled); - - //TODO: Implement verification codes - //TODO: Write endpoints to verify codes }; export default { sendMail }; diff --git a/src/lib/redis.ts b/src/lib/redis.ts index afe01f5..b685446 100644 --- a/src/lib/redis.ts +++ b/src/lib/redis.ts @@ -3,6 +3,7 @@ import { promisify } from "util"; const REDIS_INDICES = { auth: 0, + mail: 1, }; const REDIS_HOST = process.env.REDIS_HOST || "redis"; @@ -24,4 +25,13 @@ const auth = redis.createClient({ host: REDIS_HOST, port: REDIS_PORT }); auth.select(REDIS_INDICES.auth); +// ----------------- // +// Redis mail client // +// ----------------- // + +const mail = redis.createClient({ host: REDIS_HOST, port: REDIS_PORT }); + +mail.select(REDIS_INDICES.mail); + export const authClient = createAsyncClient(auth); +export const mailClient = createAsyncClient(mail); From dce75d1a9779e8540e22bf7f3a6ae73a695b2d6f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 26 Apr 2022 11:22:45 +0200 Subject: [PATCH 069/128] Port yens dev script to detleph + Provides more config options + Allows deleting and resetting the database --- dev.sh | 59 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/dev.sh b/dev.sh index d6b8e5a..b669776 100755 --- a/dev.sh +++ b/dev.sh @@ -1,26 +1,59 @@ #!/bin/bash -DATABASE_PASSWORD=server COMPOSE_PROJECT_NAME=detleph_server docker-compose up -d mail postgres redis +D_SERVICES="mail postgres redis" + +DATABASE_PASSWORD=server COMPOSE_PROJECT_NAME=detleph_server docker-compose up -d $D_SERVICES + +# Flag: Should the container be deleted and created again? +RECREATE=true +D_PORT="${PORT:-3000}" + +if [ "$(docker ps -a | grep detleph_server_dev)" ]; then + echo "The dev server is already on the system!" + + RECREATE=false + + # Use -s flag to skip any prompts + if [ "$1" != "-s" ]; then + echo "Do you want to recreate it? [y/n]" + read input + + if [ "$input" = "y" ]; then + RECREATE=true + fi + fi + + if [ "$RECREATE" = true ]; then + echo "Removing container" + docker rm detleph_server_dev + rm -f INITIALIZED # Flag has to be reset + + echo "Do you also want to reset the other services? [y/n]" + read input + + if [ "$input" = "y" ]; then + COMPOSE_PROJECT_NAME=detleph_server docker-compose down + DATABASE_PASSWORD=server COMPOSE_PROJECT_NAME=detleph_server docker-compose up -d $D_SERVICES + fi + + else + echo "Starting existing container" + docker start -ia detleph_server_dev + fi +fi + +if [ "$RECREATE" = true ]; then + echo "Creating the dev container" -if [ ! "$(docker ps -a | grep detleph_server_dev)" ]; then - echo "Creating the server container" - docker run -it \ --name detleph_server_dev \ --mount type=bind,source="$(pwd)",target=/app \ --network detleph_server_default \ - -p 3000:3000 -e PORT=3000 \ - -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \ - -e DATABASE_USER=server \ + -p $D_PORT:$D_PORT -e PORT=$D_PORT \ -e DATABASE_PASSWORD=server \ + -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \ --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \ node -else - echo "The server container already exists; Starting..." - - docker start -ia detleph_server_dev fi -# After container termination - COMPOSE_PROJECT_NAME=detleph_server docker-compose stop From 37437152da955afe53a2ccba3e1ae6ea1ee0028e Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 14:57:18 +0200 Subject: [PATCH 070/128] Add the organisation controller + Add function to get all organisation + Add function to get a specific organisation --- src/Controllers/organisation.controller.ts | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/Controllers/organisation.controller.ts diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts new file mode 100644 index 0000000..48c9cd9 --- /dev/null +++ b/src/Controllers/organisation.controller.ts @@ -0,0 +1,51 @@ +import { Request, Response } from "express"; +import prisma from "../lib/prisma"; +import { DataType, generateInvalidBodyError } from "./common"; + +export const getAllOrganisations = async (req: Request, res: Response) => { + const organisations = await prisma.organisation.findMany({ + select: { pid: true, name: true, event: { select: { pid: true, name: true } } }, + }); + + res.status(200).json({ + type: "success", + payload: { + organisations, + }, + }); +}; + +interface GetOrganisationQueryParams { + pid: string; +} + +export const getOrganisation = async (req: Request, res: Response) => { + const { pid } = req.params; + + const organisation = await prisma.organisation.findUnique({ + where: { pid }, + select: { pid: true, name: true, event: { select: { pid: true, date: true, name: true, description: true } } }, + }); + + if (!organisation) { + return res.status(404).json({ + type: "error", + payload: { + message: `The organisation with ID '${pid} could not be found'`, + }, + }); + } + + return res.status(200).json({ + type: "success", + payload: { + organisation: { + ...organisation, + event: { + ...organisation.event, + _links: [{ rel: "self", type: "GET", href: `/api/event/${organisation.event.pid}` }], + }, + }, + }, + }); +}; From ab62e39d8edcc1d3635e814d9628292a7180b19d Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:47:24 +0200 Subject: [PATCH 071/128] Add function to create new organisations + Extract common functions from the admin controller --- src/Controllers/admin.controller.ts | 24 +-------- src/Controllers/common.ts | 24 +++++++++ src/Controllers/organisation.controller.ts | 62 +++++++++++++++++++++- 3 files changed, 86 insertions(+), 24 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 714d98c..cdbc2ed 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -2,7 +2,7 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; import argon2 from "argon2"; -import { DataType, generateInvalidBodyError } from "./common"; +import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInvalidBodyError } from "./common"; import { authClient } from "../lib/redis"; export const regenerateRevision = async (pid: string) => { @@ -16,28 +16,6 @@ export const regenerateRevision = async (pid: string) => { await authClient.set(pid, revision.toISOString()); }; -const AUTH_ERROR = { - type: "failure", - payload: { - message: "The server was not able to validate your credentials; Please try again later", - }, -}; - -const createInsufficientPermissionsError = (required: AdminLevel = "ELEVATED") => ({ - type: "error", - payload: { - message: "You do not have sufficient permissions to use this feature", - required_level: required, - }, - _links: [ - { - rel: "authentication", - href: "/api/authentication", - type: "POST", - }, - ], -}); - // requires: auth(elevated) export const getAllAdmins = async (req: Request, res: Response) => { if (!req.auth?.isAuthenticated) { diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index f568c75..2e6bb5e 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -1,3 +1,5 @@ +import { AdminLevel } from "@prisma/client"; + export enum DataType { STRING = "string", NUMBER = "number", @@ -20,3 +22,25 @@ export function generateInvalidBodyError(body: Body) { }, }; } + +export const AUTH_ERROR = { + type: "failure", + payload: { + message: "The server was not able to validate your credentials; Please try again later", + }, +}; + +export const createInsufficientPermissionsError = (required: AdminLevel = "ELEVATED") => ({ + type: "error", + payload: { + message: "You do not have sufficient permissions to use this feature", + required_level: required, + }, + _links: [ + { + rel: "authentication", + href: "/api/authentication", + type: "POST", + }, + ], +}); diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index 48c9cd9..c5ec5df 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -1,6 +1,7 @@ +import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { DataType, generateInvalidBodyError } from "./common"; +import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInvalidBodyError } from "./common"; export const getAllOrganisations = async (req: Request, res: Response) => { const organisations = await prisma.organisation.findMany({ @@ -49,3 +50,62 @@ export const getOrganisation = async (req: Request, }, }); }; + +interface CreateOrganisationQueryParams { + eventPid: string; +} + +interface CreateOrganisationBody { + name?: string; +} + +// at: POST /api/events/:eventPid/organisations +// requires: auth(ELEVATED) +export const createOrganisation = async ( + req: Request, + res: Response +) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { name } = req.body || {}; + const { eventPid } = req.params; + + if (typeof name !== "string") { + return res.status(400).json(generateInvalidBodyError({ name: DataType.STRING, eventId: DataType.UUID })); + } + + // Check if event exists + + try { + const event = await prisma.event.findUnique({ where: { pid: eventPid } }); + + if (!event) { + return res.status(404).json({ + type: "error", + payload: { + message: `The event with the ID ${eventPid} could not be found`, + }, + }); + } + } catch (e) { + // REVIEW: Check for valid UUID + if (e instanceof PrismaClientUnknownRequestError) { + return res.status(400).send({ + type: "error", + payload: { + message: "Unknown error occured. This could be to malformed IDs", + }, + }); + } + } + + const organisation = await prisma.organisation.create({ data: { name, event: { connect: { pid: eventPid } } } }); + + res.status(201).json({ type: "success", payload: { organisation } }); +}; From 08e18db3c3b5c22899ca7141dd7f1ccc59b4bc8f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 15:56:55 +0200 Subject: [PATCH 072/128] Extract common function to handle selecting organisations --- src/Controllers/organisation.controller.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index c5ec5df..559cc8d 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -3,12 +3,13 @@ import { Request, Response } from "express"; import prisma from "../lib/prisma"; import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInvalidBodyError } from "./common"; -export const getAllOrganisations = async (req: Request, res: Response) => { +export const _getAllOrganisations = async (res: Response, eventId: number | undefined = undefined) => { const organisations = await prisma.organisation.findMany({ + where: { eventId }, select: { pid: true, name: true, event: { select: { pid: true, name: true } } }, }); - res.status(200).json({ + return res.status(200).json({ type: "success", payload: { organisations, @@ -16,6 +17,16 @@ export const getAllOrganisations = async (req: Request, res: Response) => { }); }; +interface GetAllOrganisationsSearchParams { + eventId?: string; +} + +export const getAllOrganisations = async (req: Request<{}, {}, {}, GetAllOrganisationsSearchParams>, res: Response) => { + const eventId = parseInt(req.query.eventId || ""); + + return _getAllOrganisations(res, isNaN(eventId) ? undefined : eventId); +}; + interface GetOrganisationQueryParams { pid: string; } From 831017e7c23fbd4b47af133e9f784f6a0af30c7b Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 16:13:32 +0200 Subject: [PATCH 073/128] Add routes for organisations + FIX: Change eventId type --- src/Controllers/organisation.controller.ts | 18 +++++++++++++---- src/Routes/organisation.routes.ts | 23 ++++++++++++++++++++++ src/app.ts | 3 +++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 src/Routes/organisation.routes.ts diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index 559cc8d..1987ee9 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -3,9 +3,9 @@ import { Request, Response } from "express"; import prisma from "../lib/prisma"; import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInvalidBodyError } from "./common"; -export const _getAllOrganisations = async (res: Response, eventId: number | undefined = undefined) => { +export const _getAllOrganisations = async (res: Response, eventId: string | undefined = undefined) => { const organisations = await prisma.organisation.findMany({ - where: { eventId }, + where: { event: { pid: eventId } }, select: { pid: true, name: true, event: { select: { pid: true, name: true } } }, }); @@ -22,9 +22,19 @@ interface GetAllOrganisationsSearchParams { } export const getAllOrganisations = async (req: Request<{}, {}, {}, GetAllOrganisationsSearchParams>, res: Response) => { - const eventId = parseInt(req.query.eventId || ""); + // TODO: Maybe rename to eventPid + return _getAllOrganisations(res, req.query.eventId); +}; - return _getAllOrganisations(res, isNaN(eventId) ? undefined : eventId); +interface GetAllOrganisationsWithParamQueryParams { + eventPid: string; +} + +export const getAllOrganisationsWithParam = async ( + req: Request, + res: Response +) => { + return _getAllOrganisations(res, req.params.eventPid); }; interface GetOrganisationQueryParams { diff --git a/src/Routes/organisation.routes.ts b/src/Routes/organisation.routes.ts new file mode 100644 index 0000000..19a25a7 --- /dev/null +++ b/src/Routes/organisation.routes.ts @@ -0,0 +1,23 @@ +import express from "express"; +import eventRouter from "./event.routes"; +import { + createOrganisation, + getAllOrganisations, + getAllOrganisationsWithParam, + getOrganisation, +} from "../Controllers/organisation.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; + +const router = express.Router(); + +router.get("/", getAllOrganisations); +router.get("/:pid", getOrganisation); + +eventRouter.get("/:eventPid/organisations", getAllOrganisationsWithParam); +eventRouter.post<"/:eventPid/organisations", { eventPid: string }>( + "/:eventPid/organisations", + requireAuthentication, + createOrganisation +); + +export default router; diff --git a/src/app.ts b/src/app.ts index 6af2048..0c5c408 100644 --- a/src/app.ts +++ b/src/app.ts @@ -4,6 +4,7 @@ import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; import argon2 from "argon2"; import adminRouter from "./Routes/admin.routes"; +import organisationRouter from "./Routes/organisation.routes"; require("dotenv").config(); // Load dotenv config @@ -46,6 +47,8 @@ async function main() { app.use("/api/admins", adminRouter); + app.use("/api/organisations", organisationRouter); + app.listen(process.env.PORT, () => { console.log(`Listening on Port: ${process.env.PORT}`); }); From 12034fa32ab61185c9073cd90b408ef43f3746be Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:10:23 +0200 Subject: [PATCH 074/128] Add function to update an organisation + Extract basicOrganisation and detailedOrganiation select types --- src/Controllers/organisation.controller.ts | 83 ++++++++++++++++++++-- src/Routes/organisation.routes.ts | 2 + 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index 1987ee9..3f5d9ba 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -2,11 +2,37 @@ import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInvalidBodyError } from "./common"; +import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; +import { Prisma } from "@prisma/client"; + +const detailedOrganisation = { + pid: true, + name: true, + event: { + select: { + pid: true, + name: true, + date: true, + description: true, + }, + }, +} as const; + +const basicOrganisation = { + pid: true, + name: true, + event: { + select: { + pid: true, + name: true, + }, + }, +} as const; export const _getAllOrganisations = async (res: Response, eventId: string | undefined = undefined) => { const organisations = await prisma.organisation.findMany({ where: { event: { pid: eventId } }, - select: { pid: true, name: true, event: { select: { pid: true, name: true } } }, + select: basicOrganisation, }); return res.status(200).json({ @@ -46,7 +72,7 @@ export const getOrganisation = async (req: Request, const organisation = await prisma.organisation.findUnique({ where: { pid }, - select: { pid: true, name: true, event: { select: { pid: true, date: true, name: true, description: true } } }, + select: detailedOrganisation, }); if (!organisation) { @@ -104,7 +130,7 @@ export const createOrganisation = async ( // Check if event exists try { - const event = await prisma.event.findUnique({ where: { pid: eventPid } }); + const event = await prisma.event.findUnique({ where: { pid: eventPid }, select: { id: true } }); if (!event) { return res.status(404).json({ @@ -126,7 +152,56 @@ export const createOrganisation = async ( } } - const organisation = await prisma.organisation.create({ data: { name, event: { connect: { pid: eventPid } } } }); + const organisation = await prisma.organisation.create({ + data: { name, event: { connect: { pid: eventPid } } }, + select: detailedOrganisation, + }); res.status(201).json({ type: "success", payload: { organisation } }); }; + +interface UpdateOrganisationQueryParams { + pid: string; +} + +interface UpdateOrganisationBody { + name?: string; +} + +// requires: auth(ELEVATED) +export const updateOrganisation = async ( + req: Request, + res: Response +) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { pid } = req.params; + const { name } = req.body; + + if (name && typeof name !== "string") { + return res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + }) + ); + } + + const organisation = await prisma.organisation.update({ + where: { pid }, + data: { name }, + select: detailedOrganisation, + }); + + return res.status(200).json({ + type: "success", + payload: { + organisation, + }, + }); +}; diff --git a/src/Routes/organisation.routes.ts b/src/Routes/organisation.routes.ts index 19a25a7..7cff08d 100644 --- a/src/Routes/organisation.routes.ts +++ b/src/Routes/organisation.routes.ts @@ -5,6 +5,7 @@ import { getAllOrganisations, getAllOrganisationsWithParam, getOrganisation, + updateOrganisation, } from "../Controllers/organisation.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; @@ -12,6 +13,7 @@ const router = express.Router(); router.get("/", getAllOrganisations); router.get("/:pid", getOrganisation); +router.put<"/:pid", { pid: string }>("/:pid", requireAuthentication, updateOrganisation); eventRouter.get("/:eventPid/organisations", getAllOrganisationsWithParam); eventRouter.post<"/:eventPid/organisations", { eventPid: string }>( From ca11eba3d4fb0eb0dd8c0e67d8ffd95d3248b0ea Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:21:14 +0200 Subject: [PATCH 075/128] Add better error handling --- src/Controllers/organisation.controller.ts | 59 +++++++++++++++++----- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index 3f5d9ba..cab0c0d 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -5,6 +5,10 @@ import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInval import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Prisma } from "@prisma/client"; +function validateOranisationName(name: string) { + return name.length > 0; +} + const detailedOrganisation = { pid: true, name: true, @@ -127,6 +131,15 @@ export const createOrganisation = async ( return res.status(400).json(generateInvalidBodyError({ name: DataType.STRING, eventId: DataType.UUID })); } + if (!validateOranisationName(name)) { + return res.status(400).json({ + type: "error", + payload: { + message: "The name has to be at least 1 character long", + }, + }); + } + // Check if event exists try { @@ -184,7 +197,7 @@ export const updateOrganisation = async ( const { pid } = req.params; const { name } = req.body; - if (name && typeof name !== "string") { + if (name !== undefined && typeof name !== "string") { return res.status(400).json( generateInvalidBodyError({ name: DataType.STRING, @@ -192,16 +205,38 @@ export const updateOrganisation = async ( ); } - const organisation = await prisma.organisation.update({ - where: { pid }, - data: { name }, - select: detailedOrganisation, - }); + if (name !== undefined && !validateOranisationName(name)) { + return res.status(400).json({ + type: "error", + payload: { + message: "The name has to be at least 1 character long", + }, + }); + } - return res.status(200).json({ - type: "success", - payload: { - organisation, - }, - }); + try { + const organisation = await prisma.organisation.update({ + where: { pid }, + data: { name }, + select: detailedOrganisation, + }); + + return res.status(200).json({ + type: "success", + payload: { + organisation, + }, + }); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError) { + if (e.code === "P2025") { + return res.status(404).json({ + type: "error", + payload: { + message: `The organiation with the ID '${pid}' could not be found!`, + }, + }); + } + } + } }; From 8aa4e5ef1609a346f4e671bf71c746661e3ffb2f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 20:42:01 +0200 Subject: [PATCH 076/128] Improve error handling and simplify code --- src/Controllers/common.ts | 16 +++++++ src/Controllers/organisation.controller.ts | 53 +++++++++++++++++++--- 2 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index 2e6bb5e..994ae79 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -44,3 +44,19 @@ export const createInsufficientPermissionsError = (required: AdminLevel = "ELEVA }, ], }); + +export const generateError = (message: string) => { + return { + type: "error", + payload: { + message, + }, + }; +}; + +export const genericError = { + type: "error", + payload: { + message: "There was an error processing your request, please try again later", + }, +}; diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index cab0c0d..d18cf56 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -1,7 +1,14 @@ import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { AUTH_ERROR, createInsufficientPermissionsError, DataType, generateInvalidBodyError } from "./common"; +import { + AUTH_ERROR, + createInsufficientPermissionsError, + DataType, + generateError, + generateInvalidBodyError, + genericError, +} from "./common"; import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Prisma } from "@prisma/client"; @@ -230,13 +237,45 @@ export const updateOrganisation = async ( } catch (e) { if (e instanceof PrismaClientKnownRequestError) { if (e.code === "P2025") { - return res.status(404).json({ - type: "error", - payload: { - message: `The organiation with the ID '${pid}' could not be found!`, - }, - }); + return res.status(404).json(generateError(`The organisation with the ID ${pid} could not be found`)); } + } else if (e instanceof PrismaClientUnknownRequestError) { + return res.status(400).send(generateError("Unkonwn error occured. This could be due to malformed IDs")); } } + + return res.status(500).json(genericError); +}; + +interface DeleteOrganisationQueryParams { + pid: string; +} + +// requires: auth(ELEVATED) +export const deleteOrganisation = async (req: Request, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { pid } = req.params; + + try { + prisma.organisation.delete({ where: { pid } }); + + res.status(204).end(); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError) { + if ((e.code = "P2025")) { + return res.status(404).json(generateError(`The organisation with the ID ${pid} could not be found`)); + } + } else if (e instanceof PrismaClientUnknownRequestError) { + return res.status(400).send(generateError("Unkonwn error occured. This could be due to malformed IDs")); + } + } + + return res.status(500).json(genericError); }; From 0c65aec96cea81e19a800650655da4af46e9d19c Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 21:28:47 +0200 Subject: [PATCH 077/128] Add controller and routes for groups --- src/Controllers/group.controllers.ts | 92 ++++++++++++++++++++++++++++ src/Routes/group.routes.ts | 12 ++++ src/app.ts | 3 + 3 files changed, 107 insertions(+) create mode 100644 src/Controllers/group.controllers.ts create mode 100644 src/Routes/group.routes.ts diff --git a/src/Controllers/group.controllers.ts b/src/Controllers/group.controllers.ts new file mode 100644 index 0000000..b9ba189 --- /dev/null +++ b/src/Controllers/group.controllers.ts @@ -0,0 +1,92 @@ +import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; +import { Request, Response } from "express"; +import prisma from "../lib/prisma"; +import { generateError, genericError } from "./common"; + +const basicGroup = { + pid: true, + name: true, + oragnisation: { select: { pid: true, name: true } }, +} as const; + +export const _getAllGroups = async (res: Response, organisationId: string | undefined) => { + const groups = await prisma.group.findMany({ + where: { oragnisation: { pid: organisationId } }, + select: basicGroup, + }); + + return res.status(200).json({ + type: "success", + payload: { + groups, + }, + }); +}; + +interface GetAllGroupsSearchParams { + organisationPid?: string; +} + +export const getAllGroups = async (req: Request<{}, {}, {}, GetAllGroupsSearchParams>, res: Response) => { + return _getAllGroups(res, req.query.organisationPid); +}; + +interface getAllGroupsWithParamQueryParams { + organisationPid: string; +} + +export const getAllGroupsWithParam = async (req: Request, res: Response) => { + return _getAllGroups(res, req.params.organisationPid); +}; + +interface GetGroupQueryParams { + pid: string; +} + +export const getGroup = async (req: Request, res: Response) => { + const { pid } = req.params; + + try { + const group = await prisma.group.findUnique({ + where: { pid }, + select: { + pid: true, + name: true, + oragnisation: { select: { pid: true, name: true } }, + admins: { select: { pid: true, name: true } }, + participants: { select: { pid: true } }, + }, + }); + + if (!group) { + return res.status(404).json(generateError(`The group with ID '${pid}' could not be found`)); + } + + return res.status(200).json({ + type: "success", + payload: { + group: { + ...group, + organisation: { + ...group.oragnisation, + _links: [{ rel: "self", type: "GET", href: `/api/organisation/${group.oragnisation.pid}` }], + }, + admins: group.admins.map((admin) => ({ + ...admin, + _links: [{ rel: "self", type: "GET", href: `/api/admins/${admin.pid}` }], + })), + participants: group.participants.map((participant) => ({ + ...participant, + _links: [{ rel: "self", type: "GET", href: `/api/participant/${participant.pid}` }], + })), + }, + }, + }); + } catch (e) { + if (e instanceof PrismaClientUnknownRequestError) { + return res.status(400).json(generateError("Unknown error occured. This could be due to malformed IDs")); + } + } + + return res.status(500).json(genericError); +}; diff --git a/src/Routes/group.routes.ts b/src/Routes/group.routes.ts new file mode 100644 index 0000000..54e43a0 --- /dev/null +++ b/src/Routes/group.routes.ts @@ -0,0 +1,12 @@ +import express from "express"; +import { getAllGroups, getAllGroupsWithParam, getGroup } from "../Controllers/group.controllers"; +import organisationRouter from "./organisation.routes"; + +const router = express.Router(); + +router.get("/", getAllGroups); +router.get("/:pid", getGroup); + +organisationRouter.get("/:organisationPid/groups", getAllGroupsWithParam); + +export default router; diff --git a/src/app.ts b/src/app.ts index 0c5c408..bb3b56b 100644 --- a/src/app.ts +++ b/src/app.ts @@ -5,6 +5,7 @@ import adminAuthRouter from "./Routes/admin_auth.routes"; import argon2 from "argon2"; import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; +import groupRouter from "./Routes/group.routes"; require("dotenv").config(); // Load dotenv config @@ -49,6 +50,8 @@ async function main() { app.use("/api/organisations", organisationRouter); + app.use("/api/groups", groupRouter); + app.listen(process.env.PORT, () => { console.log(`Listening on Port: ${process.env.PORT}`); }); From fe6879ea56671129fd6dd7ae948a3cb2a765f79f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 21:50:52 +0200 Subject: [PATCH 078/128] Only show details when authenticated --- src/Controllers/group.controllers.ts | 45 ++++++++++++++++++---------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/src/Controllers/group.controllers.ts b/src/Controllers/group.controllers.ts index b9ba189..ec95ada 100644 --- a/src/Controllers/group.controllers.ts +++ b/src/Controllers/group.controllers.ts @@ -1,3 +1,4 @@ +import { Admin } from "@prisma/client"; import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; @@ -47,15 +48,23 @@ export const getGroup = async (req: Request, res: Response) const { pid } = req.params; try { - const group = await prisma.group.findUnique({ + const group: { + pid: string; + name: string; + oragnisation: { pid: string; name: string }; + admins?: { pid: string; name: string }[]; + participants?: { pid: string }[]; + } | null = await prisma.group.findUnique({ where: { pid }, - select: { - pid: true, - name: true, - oragnisation: { select: { pid: true, name: true } }, - admins: { select: { pid: true, name: true } }, - participants: { select: { pid: true } }, - }, + select: req.auth?.isAuthenticated + ? { + pid: true, + name: true, + oragnisation: { select: { pid: true, name: true } }, + admins: { select: { pid: true, name: true } }, + participants: { select: { pid: true } }, + } + : basicGroup, }); if (!group) { @@ -71,14 +80,18 @@ export const getGroup = async (req: Request, res: Response) ...group.oragnisation, _links: [{ rel: "self", type: "GET", href: `/api/organisation/${group.oragnisation.pid}` }], }, - admins: group.admins.map((admin) => ({ - ...admin, - _links: [{ rel: "self", type: "GET", href: `/api/admins/${admin.pid}` }], - })), - participants: group.participants.map((participant) => ({ - ...participant, - _links: [{ rel: "self", type: "GET", href: `/api/participant/${participant.pid}` }], - })), + ...(req.auth?.isAuthenticated + ? { + admins: group.admins?.map((admin) => ({ + ...admin, + _links: [{ rel: "self", type: "GET", href: `/api/admins/${admin.pid}` }], + })), + participants: group.participants?.map((participant) => ({ + ...participant, + _links: [{ rel: "self", type: "GET", href: `/api/participant/${participant.pid}` }], + })), + } + : {}), }, }, }); From bff9dcc5f890c5bd070b088a9c13704b70418acf Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 26 Apr 2022 14:46:23 +0200 Subject: [PATCH 079/128] Extract function to create an object by name + Add route to create groups --- src/Controllers/common.ts | 90 +++++++++++++++++++++- src/Controllers/group.controllers.ts | 13 +++- src/Controllers/organisation.controller.ts | 62 ++------------- src/Routes/group.routes.ts | 4 +- 4 files changed, 111 insertions(+), 58 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index 994ae79..1658ef5 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -1,4 +1,7 @@ -import { AdminLevel } from "@prisma/client"; +import { AdminLevel, Prisma } from "@prisma/client"; +import { PrismaClientKnownRequestError, PrismaClientUnknownRequestError } from "@prisma/client/runtime"; +import { Request, Response } from "express"; +import prisma from "../lib/prisma"; export enum DataType { STRING = "string", @@ -60,3 +63,88 @@ export const genericError = { message: "There was an error processing your request, please try again later", }, }; + +export function validateName(name: string) { + return name.length > 0; +} + +type Organisation = Partial; +type Group = Partial; + +export async function handleCreateByName( + create: { type: "oragnisation"; data: Organisation }, + link: { type: "event"; id: string }, + req: Request, + res: Response +): Promise; +export async function handleCreateByName( + create: { type: "group"; data: Group }, + link: { type: "oragnisation"; id: string }, + req: Request, + res: Response +): Promise; +export async function handleCreateByName( + create: { type: "oragnisation" | "group"; data: Organisation | Group }, + link: { type: "event" | "oragnisation"; id: string }, + req: Request, + res: Response +) { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { name } = create.data; + + if (typeof name !== "string") { + return res + .status(400) + .json(generateInvalidBodyError({ name: DataType.STRING, [link.type + "Pid"]: DataType.STRING })); + } + + if (!validateName(name)) { + return res.status(400).json({ + type: "error", + payload: { + message: "The name has to be at least 1 character long", + }, + }); + } + + // Check if link object exsits + + try { + // @ts-ignore + const linked = await prisma[link.type].findUnique({ where: { pid: link.id }, select: { id: true } }); + + if (!linked) { + return res.status(404).json({ + type: "error", + payload: { + message: `Could not link to ${link.type} with ID '${link.id}'`, + }, + }); + } + } catch (e) { + // REVIEW: Check for valid UUID + if (e instanceof PrismaClientUnknownRequestError) { + return res.status(400).json({ + type: "error", + payload: { + message: "Unknown error occured. This could be due to malformed IDs", + }, + }); + } + } + + // @ts-ignore + const object = await prisma[create.type].create({ + data: { ...create.data, [link.type]: { connect: { pid: link.id } } }, + select: { pid: true, name: true }, + }); + + res.status(201).json({ type: "success", payload: { [create.type]: object } }); +} diff --git a/src/Controllers/group.controllers.ts b/src/Controllers/group.controllers.ts index ec95ada..54ab975 100644 --- a/src/Controllers/group.controllers.ts +++ b/src/Controllers/group.controllers.ts @@ -2,7 +2,7 @@ import { Admin } from "@prisma/client"; import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { generateError, genericError } from "./common"; +import { generateError, genericError, handleCreateByName } from "./common"; const basicGroup = { pid: true, @@ -103,3 +103,14 @@ export const getGroup = async (req: Request, res: Response) return res.status(500).json(genericError); }; + +// at: POST /api/organisations/:eventPid/groups +// requires: auth(ELEVATED) +export const createGroup = async (req: Request<{ organisationPid: string }, {}, { name?: string }>, res: Response) => { + return handleCreateByName( + { type: "group", data: { name: req.body.name, level: 1 } }, + { type: "oragnisation", id: req.params.organisationPid }, + req, + res + ); +}; diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index d18cf56..8a22d64 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -8,6 +8,7 @@ import { generateError, generateInvalidBodyError, genericError, + handleCreateByName, } from "./common"; import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Prisma } from "@prisma/client"; @@ -123,61 +124,12 @@ export const createOrganisation = async ( req: Request, res: Response ) => { - if (!req.auth?.isAuthenticated) { - return res.status(500).json(AUTH_ERROR); - } - - if (req.auth.permission_level !== "ELEVATED") { - return res.status(403).json(createInsufficientPermissionsError()); - } - - const { name } = req.body || {}; - const { eventPid } = req.params; - - if (typeof name !== "string") { - return res.status(400).json(generateInvalidBodyError({ name: DataType.STRING, eventId: DataType.UUID })); - } - - if (!validateOranisationName(name)) { - return res.status(400).json({ - type: "error", - payload: { - message: "The name has to be at least 1 character long", - }, - }); - } - - // Check if event exists - - try { - const event = await prisma.event.findUnique({ where: { pid: eventPid }, select: { id: true } }); - - if (!event) { - return res.status(404).json({ - type: "error", - payload: { - message: `The event with the ID ${eventPid} could not be found`, - }, - }); - } - } catch (e) { - // REVIEW: Check for valid UUID - if (e instanceof PrismaClientUnknownRequestError) { - return res.status(400).send({ - type: "error", - payload: { - message: "Unknown error occured. This could be to malformed IDs", - }, - }); - } - } - - const organisation = await prisma.organisation.create({ - data: { name, event: { connect: { pid: eventPid } } }, - select: detailedOrganisation, - }); - - res.status(201).json({ type: "success", payload: { organisation } }); + return handleCreateByName( + { type: "oragnisation", data: { name: req.body.name } }, + { type: "event", id: req.params.eventPid }, + req, + res + ); }; interface UpdateOrganisationQueryParams { diff --git a/src/Routes/group.routes.ts b/src/Routes/group.routes.ts index 54e43a0..12ae59d 100644 --- a/src/Routes/group.routes.ts +++ b/src/Routes/group.routes.ts @@ -1,5 +1,6 @@ import express from "express"; -import { getAllGroups, getAllGroupsWithParam, getGroup } from "../Controllers/group.controllers"; +import { createGroup, getAllGroups, getAllGroupsWithParam, getGroup } from "../Controllers/group.controllers"; +import { requireAuthentication } from "../Middleware/auth/auth"; import organisationRouter from "./organisation.routes"; const router = express.Router(); @@ -8,5 +9,6 @@ router.get("/", getAllGroups); router.get("/:pid", getGroup); organisationRouter.get("/:organisationPid/groups", getAllGroupsWithParam); +organisationRouter.post("/:organisationPid/groups", requireAuthentication, createGroup); export default router; From 01077dab22b5e82639bcd44df89e222ffee3f299 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 27 Apr 2022 08:24:34 +0200 Subject: [PATCH 080/128] Change name from oragnisation to organisation --- src/Controllers/common.ts | 8 ++++---- src/Controllers/group.controllers.ts | 14 +++++++------- src/Controllers/organisation.controller.ts | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index 1658ef5..a9a0caf 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -72,20 +72,20 @@ type Organisation = Partial; type Group = Partial; export async function handleCreateByName( - create: { type: "oragnisation"; data: Organisation }, + create: { type: "organisation"; data: Organisation }, link: { type: "event"; id: string }, req: Request, res: Response ): Promise; export async function handleCreateByName( create: { type: "group"; data: Group }, - link: { type: "oragnisation"; id: string }, + link: { type: "organisation"; id: string }, req: Request, res: Response ): Promise; export async function handleCreateByName( - create: { type: "oragnisation" | "group"; data: Organisation | Group }, - link: { type: "event" | "oragnisation"; id: string }, + create: { type: "organisation" | "group"; data: Organisation | Group }, + link: { type: "event" | "organisation"; id: string }, req: Request, res: Response ) { diff --git a/src/Controllers/group.controllers.ts b/src/Controllers/group.controllers.ts index 54ab975..10f42c7 100644 --- a/src/Controllers/group.controllers.ts +++ b/src/Controllers/group.controllers.ts @@ -7,12 +7,12 @@ import { generateError, genericError, handleCreateByName } from "./common"; const basicGroup = { pid: true, name: true, - oragnisation: { select: { pid: true, name: true } }, + organisation: { select: { pid: true, name: true } }, } as const; export const _getAllGroups = async (res: Response, organisationId: string | undefined) => { const groups = await prisma.group.findMany({ - where: { oragnisation: { pid: organisationId } }, + where: { organisation: { pid: organisationId } }, select: basicGroup, }); @@ -51,7 +51,7 @@ export const getGroup = async (req: Request, res: Response) const group: { pid: string; name: string; - oragnisation: { pid: string; name: string }; + organisation: { pid: string; name: string }; admins?: { pid: string; name: string }[]; participants?: { pid: string }[]; } | null = await prisma.group.findUnique({ @@ -60,7 +60,7 @@ export const getGroup = async (req: Request, res: Response) ? { pid: true, name: true, - oragnisation: { select: { pid: true, name: true } }, + organisation: { select: { pid: true, name: true } }, admins: { select: { pid: true, name: true } }, participants: { select: { pid: true } }, } @@ -77,8 +77,8 @@ export const getGroup = async (req: Request, res: Response) group: { ...group, organisation: { - ...group.oragnisation, - _links: [{ rel: "self", type: "GET", href: `/api/organisation/${group.oragnisation.pid}` }], + ...group.organisation, + _links: [{ rel: "self", type: "GET", href: `/api/organisation/${group.organisation.pid}` }], }, ...(req.auth?.isAuthenticated ? { @@ -109,7 +109,7 @@ export const getGroup = async (req: Request, res: Response) export const createGroup = async (req: Request<{ organisationPid: string }, {}, { name?: string }>, res: Response) => { return handleCreateByName( { type: "group", data: { name: req.body.name, level: 1 } }, - { type: "oragnisation", id: req.params.organisationPid }, + { type: "organisation", id: req.params.organisationPid }, req, res ); diff --git a/src/Controllers/organisation.controller.ts b/src/Controllers/organisation.controller.ts index 8a22d64..146594e 100644 --- a/src/Controllers/organisation.controller.ts +++ b/src/Controllers/organisation.controller.ts @@ -125,7 +125,7 @@ export const createOrganisation = async ( res: Response ) => { return handleCreateByName( - { type: "oragnisation", data: { name: req.body.name } }, + { type: "organisation", data: { name: req.body.name } }, { type: "event", id: req.params.eventPid }, req, res From 9965acee40814cbffdc3f534b9483ced5fa4778d Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 27 Apr 2022 08:26:51 +0200 Subject: [PATCH 081/128] Update name to organisation --- prisma/schema.prisma | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 8025cd4..c316eca 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -135,8 +135,8 @@ model Group { user_limit Int @default(40) level Int - oragnisation Organisation @relation(fields: [oragnisationId], references: [id], onDelete: Cascade) - oragnisationId Int + organisation Organisation @relation(fields: [organisationId], references: [id], onDelete: Cascade) + organisationId Int participants Participant[] link Link? admins Admin[] From 2936aa77f19cd387eb75451ea38f3e4326edd90b Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:36:02 +0200 Subject: [PATCH 082/128] FIX: Event endpoints are now using the correct format --- src/Controllers/event.controller.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 465b8bf..db5efcf 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -13,8 +13,13 @@ export const getAllEvents = async (req: Request, res: Response) => { id: false, }, }); - if (events.length > 0) res.status(200).json(events); - else res.status(200).json([]); + if (events.length > 0) + res.status(200).json({ + type: "success", + payload: { + events, + }, + }); }; export const getEvent = async (req: Request, res: Response) => { @@ -42,7 +47,12 @@ export const getEvent = async (req: Request, res: Response) => { }, }); - res.status(200).json(event); + res.status(200).json({ + type: "success", + payload: { + event, + }, + }); } catch (e) { if (e instanceof Prisma.PrismaClientKnownRequestError) { res.status(500).json({ @@ -102,7 +112,7 @@ export const addEvent = async (req: Request, res: Response) => { }); res.status(201).json({ - type: "succes", + type: "success", payload: { event, }, From 6d471eced2d8f546f15c684ed61983fafec2bfb0 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:42:33 +0200 Subject: [PATCH 083/128] Add function for deleting events --- src/Controllers/event.controller.ts | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index db5efcf..31a799f 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -1,7 +1,8 @@ import { Prisma } from "@prisma/client"; +import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { DataType, generateInvalidBodyError } from "./common"; +import { createInsufficientPermissionsError, DataType, generateError, generateInvalidBodyError } from "./common"; export const getAllEvents = async (req: Request, res: Response) => { const events = await prisma.event.findMany({ @@ -118,3 +119,28 @@ export const addEvent = async (req: Request, res: Response) => { }, }); }; + +interface DeleteEventQueryParams { + pid: string; +} + +// requires: auth(ELEVATED) +export const deleteEvent = (req: Request, res: Response) => { + if (req.auth?.permission_level !== "ELEVATED") { + res.status(403).json(createInsufficientPermissionsError()); + } + + const { pid } = req.params; + + try { + prisma.event.delete({ where: { pid } }); + + return res.status(204).end(); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { + return res.status(404).json(generateError(`The organisation with the ID ${pid} could not be found`)); + } + + throw e; + } +}; From 4a65dd4665db23ab151cd423388c6800cfb6b241 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:46:26 +0200 Subject: [PATCH 084/128] Add authorization --- src/Controllers/event.controller.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 31a799f..4789a1f 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -79,20 +79,24 @@ export const getEvent = async (req: Request, res: Response) => { } }; +// requires: auth(ELEVATED) export const addEvent = async (req: Request, res: Response) => { + if (req.auth?.permission_level !== "ELEVATED") { + res.status(403).json(createInsufficientPermissionsError()); + } + if ( typeof req.body.name !== "string" || typeof req.body.date !== "string" || typeof req.body.description !== "string" ) { - res.status(400).json( + return res.status(400).json( generateInvalidBodyError({ name: DataType.STRING, date: DataType.DATETIME, description: DataType.STRING, }) ); - return; } //TODO: Check if date is valid From 22a959bcea211bd038d8dcd6f7db5bbeea76f5b5 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 29 Dec 2021 15:08:40 +0100 Subject: [PATCH 085/128] FIX: The dev script can now run in any directory Initially, the directory was required to be called 'server'; This is not the case anymore --- dev.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev.sh b/dev.sh index 0b96319..d6b8e5a 100755 --- a/dev.sh +++ b/dev.sh @@ -1,14 +1,14 @@ #!/bin/bash -DATABASE_PASSWORD=server docker-compose up -d mail postgres redis +DATABASE_PASSWORD=server COMPOSE_PROJECT_NAME=detleph_server docker-compose up -d mail postgres redis -if [ ! "$(docker ps -a | grep server_dev)" ]; then - echo "Creating \"server_dev\" container" +if [ ! "$(docker ps -a | grep detleph_server_dev)" ]; then + echo "Creating the server container" docker run -it \ - --name server_dev \ + --name detleph_server_dev \ --mount type=bind,source="$(pwd)",target=/app \ - --network server_default \ + --network detleph_server_default \ -p 3000:3000 -e PORT=3000 \ -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \ -e DATABASE_USER=server \ @@ -16,11 +16,11 @@ if [ ! "$(docker ps -a | grep server_dev)" ]; then --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \ node else - echo "Container \"server_dev\" already exists; Starting container" + echo "The server container already exists; Starting..." - docker start -ia server_dev + docker start -ia detleph_server_dev fi # After container termination -docker-compose stop +COMPOSE_PROJECT_NAME=detleph_server docker-compose stop From 5e5b6bb60c73fc6acf47e2183bb54c86e0e8cbe5 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 30 Nov 2021 11:12:43 +0100 Subject: [PATCH 086/128] Add routes for admin authentication endpoints + Add router to the app --- src/Routes/admin_auth.routes.ts | 8 ++++++++ src/app.ts | 4 ++++ 2 files changed, 12 insertions(+) create mode 100644 src/Routes/admin_auth.routes.ts diff --git a/src/Routes/admin_auth.routes.ts b/src/Routes/admin_auth.routes.ts new file mode 100644 index 0000000..e9408d3 --- /dev/null +++ b/src/Routes/admin_auth.routes.ts @@ -0,0 +1,8 @@ +import express from "express"; +import { authenticateUser } from "../Controllers/admin_auth.controller"; + +const router = express.Router(); + +router.post("/", authenticateUser); + +export default router; diff --git a/src/app.ts b/src/app.ts index 84e6cee..7507b63 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,6 +1,7 @@ import express from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; +import adminAuthRouter from "./Routes/admin_auth.routes"; require("dotenv").config(); // Load dotenv config @@ -13,6 +14,9 @@ async function main() { app.use(express.urlencoded({ extended: true })); app.use(express.json()); + // Admin authentication endpoints + app.use("/api/authentication", adminAuthRouter); + // All API endpoints are behind /api/... app.use("/api/events", eventRouter); From fdfbd22dafd36f9b2305488a1a25cfb2c48cd629 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 1 Dec 2021 16:37:28 +0100 Subject: [PATCH 087/128] Add a controller for getting all admin user details + Requires Authentication --- src/Controllers/admin.controller.ts | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/Controllers/admin.controller.ts diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts new file mode 100644 index 0000000..bdd64d0 --- /dev/null +++ b/src/Controllers/admin.controller.ts @@ -0,0 +1,40 @@ +import prisma from "../lib/prisma"; +import { Request, Response } from "express"; + +// requires: auth(elevated) +export const getAllAdmins = async (req: Request, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json({ + type: "failure", + payload: { + message: "The server was not able to validate your credentials; Please try again later", + }, + }); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json({ + type: "error", + payload: { + message: "You do not have sufficient permissions to use this feature", + }, + _links: [ + { + rel: "authentication", + href: "/api/authentication", + type: "POST", + }, + ], + }); + } + + // TODO: Add exception handling + const users = await prisma.admin.findMany({ select: { pid: true, name: true, permission_level: true } }); + + res.status(200).json({ + type: "success", + payload: { + users, + }, + }); +}; From 579dc68d823d899abe92be0852c6829015932c1b Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 3 Dec 2021 13:15:50 +0100 Subject: [PATCH 088/128] Remove event <-> admin association and introduce a default value for revision --- prisma/schema.prisma | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index f06c9b0..27e0516 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -17,7 +17,6 @@ model Event { description String disciplines Discipline[] - admins Admin[] organisations Organisation[] campaign Campaign[] } @@ -47,14 +46,11 @@ model Link { model Admin { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String + name String // TODO: This should maybe be unique password String // TODO: Probably specify hash size (VarChar or some other type) permission_level AdminLevel @default(STANDARD) - revision String + revision String @default(dbgenerated("gen_random_uuid()")) @db.Uuid groups Group[] - - event Event @relation(fields: [eventId], references: [id]) - eventId Int } model Discipline { @@ -145,4 +141,4 @@ enum Gender { MALE FEMALE OTHER -} \ No newline at end of file +} From 79c5c3752cbed93b264f3366a26f6d773283aa6c Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 08:48:04 +0100 Subject: [PATCH 089/128] Extract code for error messages for better reusability + Create function for generating permission errors --- src/Controllers/admin.controller.ts | 44 ++++++++++++++++------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index bdd64d0..083d3c9 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -1,31 +1,37 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; +import { AdminLevel } from "@prisma/client"; + +const AUTH_ERROR = { + type: "failure", + payload: { + message: "The server was not able to validate your credentials; Please try again later", + }, +}; + +const createInsufficientPermissionsError = (required: AdminLevel = "ELEVATED") => ({ + type: "error", + payload: { + message: "You do not have sufficient permissions to use this feature", + required_level: required, + }, + _links: [ + { + rel: "authentication", + href: "/api/authentication", + type: "POST", + }, + ], +}); // requires: auth(elevated) export const getAllAdmins = async (req: Request, res: Response) => { if (!req.auth?.isAuthenticated) { - return res.status(500).json({ - type: "failure", - payload: { - message: "The server was not able to validate your credentials; Please try again later", - }, - }); + return res.status(500).json(AUTH_ERROR); } if (req.auth.permission_level !== "ELEVATED") { - return res.status(403).json({ - type: "error", - payload: { - message: "You do not have sufficient permissions to use this feature", - }, - _links: [ - { - rel: "authentication", - href: "/api/authentication", - type: "POST", - }, - ], - }); + return res.status(403).json(createInsufficientPermissionsError()); } // TODO: Add exception handling From 84db24fdb470abdd9d20dbeed0bec3b1af66188a Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 09:06:05 +0100 Subject: [PATCH 090/128] Add controller for adding a user + Add function to narrow type of string to AdminLevel --- src/Controllers/admin.controller.ts | 56 +++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 083d3c9..526d80f 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -1,6 +1,7 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; +import argon2 from "argon2"; const AUTH_ERROR = { type: "failure", @@ -44,3 +45,58 @@ export const getAllAdmins = async (req: Request, res: Response) => { }, }); }; + +interface CreateAdminBody { + name?: string; + password: string; + permission_level: string; + // TODO: Add groups or events +} + +const PERMISSION_LEVELS: readonly AdminLevel[] = ["ELEVATED", "STANDARD"]; // TODO: Enforce completeness + +const isPermissionLevel = (level: string): level is AdminLevel => PERMISSION_LEVELS.includes(level as any); + +// requires: auth(elevated) +export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + if (req.auth.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { name, password, permission_level } = req.body || {}; + + if (!(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level))) { + return res.status(400).json({ + type: "error", + payload: { + message: "The body of your request did not conform to the requirements", + schema: { + body: { + name: "string", + password_level: "string", + permission_level: "'STANDARD' | 'ELEVATED'", + }, + }, + }, + }); + } + + const password_hash = await argon2.hash(password, { type: argon2.argon2id }); + + // TODO: Check for uniqueness of the name + const user = await prisma.admin.create({ + data: { name, password: password_hash, permission_level }, + select: { pid: true, name: true, permission_level: true }, + }); + + res.status(201).json({ + type: "success", + payload: { + user, + }, + }); +}; From dd3133c3f33b38a855c5fb970df5c84e69e1af9c Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 09:11:46 +0100 Subject: [PATCH 091/128] Add router for the /admin endpoint --- src/Routes/admin.routes.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/Routes/admin.routes.ts diff --git a/src/Routes/admin.routes.ts b/src/Routes/admin.routes.ts new file mode 100644 index 0000000..49fe551 --- /dev/null +++ b/src/Routes/admin.routes.ts @@ -0,0 +1,11 @@ +import express from "express"; +import { getAllAdmins, createAdmin } from "../Controllers/admin.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; + +const router = express.Router(); + +router.get("/", requireAuthentication, getAllAdmins); + +router.post("/", requireAuthentication, createAdmin); + +export default router; From c0878d56144980fe14157a33157748624797c497 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 20 Dec 2021 10:12:06 +0100 Subject: [PATCH 092/128] Add code that ensures that an (admin) user is always present --- src/app.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app.ts b/src/app.ts index 7507b63..ce9c33f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -2,12 +2,20 @@ import express from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; +import argon2 from "argon2"; require("dotenv").config(); // Load dotenv config const app = express(); async function main() { + // Dev + await prisma.admin.upsert({ + where: { id: 1 }, + create: { name: "admin", password: await argon2.hash("test", { type: argon2.argon2id }) }, + update: {}, + }); + // Todo: Everything // Bodyparser and urlencoded to parse post request bodies From ed90f1e6ae2d5e89f76b85162642739a91933ae3 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 21 Dec 2021 12:19:17 +0100 Subject: [PATCH 093/128] Allow for groups to be specified when POSTing /api/admins + Add the admin router to the global app --- src/Controllers/admin.controller.ts | 29 +++++++++++++++++++++++++---- src/app.ts | 3 +++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 526d80f..d15d720 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -50,7 +50,7 @@ interface CreateAdminBody { name?: string; password: string; permission_level: string; - // TODO: Add groups or events + groups?: string[]; } const PERMISSION_LEVELS: readonly AdminLevel[] = ["ELEVATED", "STANDARD"]; // TODO: Enforce completeness @@ -67,9 +67,13 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re return res.status(403).json(createInsufficientPermissionsError()); } - const { name, password, permission_level } = req.body || {}; + const { name, password, permission_level, groups } = req.body || {}; - if (!(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level))) { + const groupsIsValid = groups ? groups.filter((e) => typeof e !== "string").length === 0 : true; + + if ( + !(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level) && groupsIsValid) + ) { return res.status(400).json({ type: "error", payload: { @@ -87,9 +91,26 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re const password_hash = await argon2.hash(password, { type: argon2.argon2id }); + // Check if all gropus exist + for (const groupId of groups || []) { + if (!(await prisma.group.findUnique({ where: { pid: groupId } }))) { + return res.status(404).json({ + type: "error", + payload: { + message: `The group with ID '${groupId}' could not be found!`, + }, + }); + } + } + // TODO: Check for uniqueness of the name const user = await prisma.admin.create({ - data: { name, password: password_hash, permission_level }, + data: { + name, + password: password_hash, + permission_level, + groups: { connect: groups?.map((group) => ({ pid: group })) }, + }, select: { pid: true, name: true, permission_level: true }, }); diff --git a/src/app.ts b/src/app.ts index ce9c33f..75f3c95 100644 --- a/src/app.ts +++ b/src/app.ts @@ -3,6 +3,7 @@ import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; import argon2 from "argon2"; +import adminRouter from "./Routes/admin.routes"; require("dotenv").config(); // Load dotenv config @@ -28,6 +29,8 @@ async function main() { // All API endpoints are behind /api/... app.use("/api/events", eventRouter); + app.use("/api/admins", adminRouter); + app.listen(process.env.PORT, () => { console.log(`Listening on Port: ${process.env.PORT}`); }); From a2e314f0368690ce29909cdb82131f4b90c13916 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 21 Dec 2021 16:16:29 +0100 Subject: [PATCH 094/128] Add the permission_level 'ELEVATED' to the default user --- src/app.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app.ts b/src/app.ts index 75f3c95..deffe8a 100644 --- a/src/app.ts +++ b/src/app.ts @@ -13,7 +13,11 @@ async function main() { // Dev await prisma.admin.upsert({ where: { id: 1 }, - create: { name: "admin", password: await argon2.hash("test", { type: argon2.argon2id }) }, + create: { + name: "admin", + password: await argon2.hash("test", { type: argon2.argon2id }), + permission_level: "ELEVATED", + }, update: {}, }); From 94ce50aaf120514adca3541bba210efb974ebbf5 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 31 Dec 2021 00:11:04 +0100 Subject: [PATCH 095/128] Add a controller and router to update a user's password + Add a function to update the password internally + The current interface could be improved (made more RESTful) --- src/Controllers/admin.controller.ts | 92 +++++++++++++++++++++++++++++ src/Routes/admin.routes.ts | 5 +- 2 files changed, 96 insertions(+), 1 deletion(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index d15d720..46ee403 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -121,3 +121,95 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re }, }); }; + +interface UpdatePasswordBody { + name?: string; + password?: string; + new_password: string; +} + +// Expects a valid username (Should be tested beforehand) +const updatePasswordField = async (name: string, new_password: string) => { + const new_password_hash = await argon2.hash(new_password, { type: argon2.argon2id }); + + await prisma.admin.updateMany({ where: { name }, data: { password: new_password_hash } }); +}; + +// requires: auth +export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + const name = req.body.name || req.auth.name; + + if (typeof req.body.new_password !== "string") { + return res.status(400).json({ + type: "error", + payload: { + message: "The body of your request did not conform to the requirements", + schema: { + body: { + new_password: "string", + }, + }, + }, + }); + } + + const user_to_upate = await prisma.admin.findFirst({ where: { name } }); + + if (!user_to_upate) { + // REVIEW: This allows potential attackers (which are authorized with some account) + // to test account names + return res.status(404).json({ + type: "error", + payload: { + message: "The requested user was not found", + }, + }); + } + + if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { + updatePasswordField(name, req.body.new_password); + + res.status(200).json({ + type: "success", + }); + } else if (req.auth.name === name) { + if (typeof req.body.password !== "string") { + return res.status(400).json({ + type: "error", + payload: "The body of your request did not conform to the requirements", + schema: { + body: { + password: "string", + new_password: "string", + }, + }, + }); + } + + if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { + updatePasswordField(name, req.body.new_password); + + return res.status(200).json({ + type: "success", + }); + } + + return res.status(401).json({ + type: "error", + payload: { + message: "The provided password is not valid", + }, + }); + } else { + res.status(403).json({ + type: "error", + payload: { + message: "Operation not permitted; Try logging in as another user", + }, + }); + } +}; diff --git a/src/Routes/admin.routes.ts b/src/Routes/admin.routes.ts index 49fe551..20d5df7 100644 --- a/src/Routes/admin.routes.ts +++ b/src/Routes/admin.routes.ts @@ -1,5 +1,5 @@ import express from "express"; -import { getAllAdmins, createAdmin } from "../Controllers/admin.controller"; +import { getAllAdmins, createAdmin, updatePassword } from "../Controllers/admin.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; const router = express.Router(); @@ -8,4 +8,7 @@ router.get("/", requireAuthentication, getAllAdmins); router.post("/", requireAuthentication, createAdmin); +// TODO: Use URL parameters to specify the user to update +router.put("/password", requireAuthentication, updatePassword); + export default router; From ff9d5b7912ae3197a2ad08f3f233d78f28a29b6d Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 15:46:47 +0100 Subject: [PATCH 096/128] Change the controller for changing passwords to use PIDs and not usernames --- src/Controllers/admin.controller.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 46ee403..9cf735c 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -123,16 +123,16 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re }; interface UpdatePasswordBody { - name?: string; + pid?: string; password?: string; new_password: string; } // Expects a valid username (Should be tested beforehand) -const updatePasswordField = async (name: string, new_password: string) => { +const updatePasswordField = async (pid: string, new_password: string) => { const new_password_hash = await argon2.hash(new_password, { type: argon2.argon2id }); - await prisma.admin.updateMany({ where: { name }, data: { password: new_password_hash } }); + await prisma.admin.update({ where: { pid }, data: { password: new_password_hash } }); }; // requires: auth @@ -141,7 +141,7 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r return res.status(500).json(AUTH_ERROR); } - const name = req.body.name || req.auth.name; + const pid = req.body.pid || req.auth.pid; if (typeof req.body.new_password !== "string") { return res.status(400).json({ @@ -157,7 +157,7 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r }); } - const user_to_upate = await prisma.admin.findFirst({ where: { name } }); + const user_to_upate = await prisma.admin.findUnique({ where: { pid } }); if (!user_to_upate) { // REVIEW: This allows potential attackers (which are authorized with some account) @@ -171,12 +171,12 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r } if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { - updatePasswordField(name, req.body.new_password); + updatePasswordField(pid, req.body.new_password); res.status(200).json({ type: "success", }); - } else if (req.auth.name === name) { + } else if (req.auth.pid === pid) { if (typeof req.body.password !== "string") { return res.status(400).json({ type: "error", @@ -191,7 +191,7 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r } if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { - updatePasswordField(name, req.body.new_password); + updatePasswordField(pid, req.body.new_password); return res.status(200).json({ type: "success", From f3c165bbd723d54e39d4b20799f166d4a09661a8 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 16:49:01 +0100 Subject: [PATCH 097/128] Restructure the process of changing a password + Requests are now dispatched to the according user ressource, not the collection + The current user can be referenced by setting the pid to 'current' + Refactored the error logic --- src/Controllers/admin.controller.ts | 119 +++++++++++++++------------- src/Controllers/common.ts | 20 +++++ src/Routes/admin.routes.ts | 6 +- 3 files changed, 88 insertions(+), 57 deletions(-) create mode 100644 src/Controllers/common.ts diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 9cf735c..1cd66a1 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -2,6 +2,7 @@ import prisma from "../lib/prisma"; import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; import argon2 from "argon2"; +import { DataType, generateInvalidBodyError } from "./common"; const AUTH_ERROR = { type: "failure", @@ -122,12 +123,6 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re }); }; -interface UpdatePasswordBody { - pid?: string; - password?: string; - new_password: string; -} - // Expects a valid username (Should be tested beforehand) const updatePasswordField = async (pid: string, new_password: string) => { const new_password_hash = await argon2.hash(new_password, { type: argon2.argon2id }); @@ -135,28 +130,72 @@ const updatePasswordField = async (pid: string, new_password: string) => { await prisma.admin.update({ where: { pid }, data: { password: new_password_hash } }); }; -// requires: auth -export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, res: Response) => { +interface UpdateForeignPasswordBody { + new_password?: string; +} + +interface UpdateForeignPasswordQueryParams { + pid: string; +} + +export const updateForeignPassword = async ( + req: Request, + res: Response +) => { if (!req.auth?.isAuthenticated) { return res.status(500).json(AUTH_ERROR); } - const pid = req.body.pid || req.auth.pid; - if (typeof req.body.new_password !== "string") { - return res.status(400).json({ + return res.status(400).json(generateInvalidBodyError({ new_password: DataType.STRING })); + } + + const user_to_upate = await prisma.admin.findUnique({ where: { pid: req.params.pid } }); + + if (!user_to_upate) { + // REVIEW: This allows potential attackers (which are authorized with some account) + // to test account names + return res.status(404).json({ type: "error", payload: { - message: "The body of your request did not conform to the requirements", - schema: { - body: { - new_password: "string", - }, - }, + message: "The requested user was not found", }, }); } + if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { + updatePasswordField(req.params.pid, req.body.new_password); + + res.status(200).json({ + type: "success", + }); + } else { + res.status(403).json({ + type: "error", + payload: { + message: "Operation not permitted; Try logging in as another user", + }, + }); + } +}; + +interface UpdatePasswordBody { + password?: string; + new_password?: string; +} + +// requires: auth +export const updateOwnPassword = async (req: Request<{}, {}, UpdatePasswordBody>, res: Response) => { + if (!req.auth?.isAuthenticated) { + return res.status(500).json(AUTH_ERROR); + } + + const pid = req.auth.pid; + + if (typeof req.body.password !== "string" || typeof req.body.new_password !== "string") { + return res.status(400).json(generateInvalidBodyError({ password: DataType.STRING, new_password: DataType.STRING })); + } + const user_to_upate = await prisma.admin.findUnique({ where: { pid } }); if (!user_to_upate) { @@ -170,46 +209,18 @@ export const updatePassword = async (req: Request<{}, {}, UpdatePasswordBody>, r }); } - if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { + if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { updatePasswordField(pid, req.body.new_password); - res.status(200).json({ + return res.status(200).json({ type: "success", }); - } else if (req.auth.pid === pid) { - if (typeof req.body.password !== "string") { - return res.status(400).json({ - type: "error", - payload: "The body of your request did not conform to the requirements", - schema: { - body: { - password: "string", - new_password: "string", - }, - }, - }); - } - - if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { - updatePasswordField(pid, req.body.new_password); - - return res.status(200).json({ - type: "success", - }); - } - - return res.status(401).json({ - type: "error", - payload: { - message: "The provided password is not valid", - }, - }); - } else { - res.status(403).json({ - type: "error", - payload: { - message: "Operation not permitted; Try logging in as another user", - }, - }); } + + return res.status(401).json({ + type: "error", + payload: { + message: "The provided password is not valid", + }, + }); }; diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts new file mode 100644 index 0000000..2adc291 --- /dev/null +++ b/src/Controllers/common.ts @@ -0,0 +1,20 @@ +export enum DataType { + STRING = "string", + NUMBER = "number", + INTEGER = "integer", + PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", +} + +interface Body { + [k: string]: DataType; +} + +export function generateInvalidBodyError(body: Body) { + return { + type: "error", + payload: { + message: "The body of your request did not conform to the requirements", + schema: { body }, + }, + }; +} diff --git a/src/Routes/admin.routes.ts b/src/Routes/admin.routes.ts index 20d5df7..b4be6ce 100644 --- a/src/Routes/admin.routes.ts +++ b/src/Routes/admin.routes.ts @@ -1,5 +1,5 @@ import express from "express"; -import { getAllAdmins, createAdmin, updatePassword } from "../Controllers/admin.controller"; +import { getAllAdmins, createAdmin, updateOwnPassword, updateForeignPassword } from "../Controllers/admin.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; const router = express.Router(); @@ -8,7 +8,7 @@ router.get("/", requireAuthentication, getAllAdmins); router.post("/", requireAuthentication, createAdmin); -// TODO: Use URL parameters to specify the user to update -router.put("/password", requireAuthentication, updatePassword); +router.put("/current/password", requireAuthentication, updateOwnPassword); +router.put<"/:pid/password", { pid: string }>("/:pid/password", requireAuthentication, updateForeignPassword); export default router; From 0fb8a9ca73552e185c60572da007772488d4177f Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 17:26:20 +0100 Subject: [PATCH 098/128] Update the admin revision on password change + Update type of revision to DateTime --- prisma/schema.prisma | 2 +- src/Controllers/admin.controller.ts | 18 ++++++++++++++++-- src/Controllers/admin_auth.controller.ts | 4 ++-- src/Middleware/auth/auth.ts | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 27e0516..a9c4d0f 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -49,7 +49,7 @@ model Admin { name String // TODO: This should maybe be unique password String // TODO: Probably specify hash size (VarChar or some other type) permission_level AdminLevel @default(STANDARD) - revision String @default(dbgenerated("gen_random_uuid()")) @db.Uuid + revision DateTime @default(now()) groups Group[] } diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 1cd66a1..69dd28f 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -3,6 +3,18 @@ import { Request, Response } from "express"; import { AdminLevel } from "@prisma/client"; import argon2 from "argon2"; import { DataType, generateInvalidBodyError } from "./common"; +import { authClient } from "../lib/redis"; + +export const regenerateRevision = async (pid: string) => { + // TOOO: Add error handling + const { revision } = await prisma.admin.update({ + where: { pid }, + data: { revision: new Date() }, + select: { revision: true }, + }); + + await authClient.set(pid, revision.toISOString()); +}; const AUTH_ERROR = { type: "failure", @@ -164,7 +176,8 @@ export const updateForeignPassword = async ( } if (req.auth.permission_level == "ELEVATED" && user_to_upate.permission_level == "STANDARD") { - updatePasswordField(req.params.pid, req.body.new_password); + await updatePasswordField(req.params.pid, req.body.new_password); // REVIEW: Should this be awaited? + await regenerateRevision(req.params.pid); res.status(200).json({ type: "success", @@ -210,7 +223,8 @@ export const updateOwnPassword = async (req: Request<{}, {}, UpdatePasswordBody> } if (await argon2.verify(user_to_upate.password, req.body.password, { type: argon2.argon2id })) { - updatePasswordField(pid, req.body.new_password); + await updatePasswordField(pid, req.body.new_password); + await regenerateRevision(pid); return res.status(200).json({ type: "success", diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 97161d9..8d1ec0e 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -21,7 +21,7 @@ function createAdminJWT(admin: Admin & { groups: Group[] }) { pid: admin.pid, name: admin.name, permission_level: admin.permission_level, - revision: admin.revision, + revision: admin.revision.toISOString(), groups: admin.groups.map((group) => group.pid), }; @@ -64,7 +64,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody if (await argon2.verify(user.password, password, { type: argon2.argon2id })) { // Set password revision ID in redis - await authClient.set(user.pid, user.revision); + await authClient.set(user.pid, user.revision.toISOString()); return res.status(200).json({ type: "success", diff --git a/src/Middleware/auth/auth.ts b/src/Middleware/auth/auth.ts index 37853b5..0b66952 100644 --- a/src/Middleware/auth/auth.ts +++ b/src/Middleware/auth/auth.ts @@ -62,7 +62,7 @@ export const requireAuthentication = async (req: Request, res: Response, next: N const user = await prisma.admin.findUnique({ where: { pid }, select: { revision: true } }); if (user) { - db_revision = user.revision; + db_revision = user.revision.toISOString(); await authClient.set(pid, db_revision); } From 5418d7b790c76723962a075a836abdb8fac700fa Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 2 Jan 2022 17:36:21 +0100 Subject: [PATCH 099/128] Refactor the endpoints to share common code --- src/Controllers/admin.controller.ts | 20 +++++++------------- src/Controllers/admin_auth.controller.ts | 8 ++------ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/Controllers/admin.controller.ts b/src/Controllers/admin.controller.ts index 69dd28f..714d98c 100644 --- a/src/Controllers/admin.controller.ts +++ b/src/Controllers/admin.controller.ts @@ -87,19 +87,13 @@ export const createAdmin = async (req: Request<{}, {}, CreateAdminBody>, res: Re if ( !(typeof name === "string" && typeof password == "string" && isPermissionLevel(permission_level) && groupsIsValid) ) { - return res.status(400).json({ - type: "error", - payload: { - message: "The body of your request did not conform to the requirements", - schema: { - body: { - name: "string", - password_level: "string", - permission_level: "'STANDARD' | 'ELEVATED'", - }, - }, - }, - }); + return res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + password: DataType.STRING, + permission_level: DataType.PERMISSION_LEVEL, + }) + ); } const password_hash = await argon2.hash(password, { type: argon2.argon2id }); diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 8d1ec0e..33ce37b 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -4,6 +4,7 @@ import { authClient } from "../lib/redis"; import prisma from "../lib/prisma"; import argon2 from "argon2"; import jwt from "jsonwebtoken"; +import { DataType, generateInvalidBodyError } from "./common"; const JWT_SECRET = process.env.JWT_SECRET || "secret"; const TOKEN_EXPIRY = "4 days"; @@ -39,12 +40,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody const { name, password } = req.body || {}; if (name == null || password == null) { - return res.status(400).json({ - type: "error", - payload: { - message: "The body must contain 'name' and 'password' attributes of type string", - }, - }); + return res.status(400).json(generateInvalidBodyError({ name: DataType.STRING, password: DataType.STRING })); } const user = await prisma.admin.findFirst({ where: { name }, include: { groups: true } }); From 035eb8771c81714b4ff558c7fe161d998358064b Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 15:31:20 +0100 Subject: [PATCH 100/128] Fix json parser return stack trace see Issue #24; --- src/app.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/app.ts b/src/app.ts index deffe8a..6ef80fa 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,4 +1,4 @@ -import express from "express"; +import express, { ErrorRequestHandler, NextFunction, Request, Response } from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; @@ -27,6 +27,17 @@ async function main() { app.use(express.urlencoded({ extended: true })); app.use(express.json()); + app.use((err: any, req: Request, res: Response, next: NextFunction) => { + if (err) { + res.status(400).send({ + type: "error", + payload: "The body of your request did not contain valid data" + }) + } else { + next() + } + }); + // Admin authentication endpoints app.use("/api/authentication", adminAuthRouter); From 4a57f759976c91219707aab02a453192a9749702 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:37:51 +0100 Subject: [PATCH 101/128] [create-pull-request] push formatted files (#27) Co-authored-by: Stefan-5422 --- src/app.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.ts b/src/app.ts index 6ef80fa..6af2048 100644 --- a/src/app.ts +++ b/src/app.ts @@ -31,10 +31,10 @@ async function main() { if (err) { res.status(400).send({ type: "error", - payload: "The body of your request did not contain valid data" - }) + payload: "The body of your request did not contain valid data", + }); } else { - next() + next(); } }); From 79e40e836956033b816d4da6615301f0fdff5079 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Sun, 13 Mar 2022 02:34:20 +0100 Subject: [PATCH 102/128] updating Role model (v.2.0) --- prisma/schema.prisma | 47 +++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index a9c4d0f..d06a3d4 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -46,8 +46,9 @@ model Link { model Admin { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String // TODO: This should maybe be unique + name String @unique password String // TODO: Probably specify hash size (VarChar or some other type) + permission_level AdminLevel @default(STANDARD) revision DateTime @default(now()) groups Group[] @@ -59,34 +60,33 @@ model Discipline { name String minTeamSize Int maxTeamSize Int - roles Role[] + roles RoleSchema[] teams Team[] event Event @relation(fields: [eventId], references: [id]) eventId Int } -model Role { +model RoleSchema { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid name String schema Json - participant Participant[] - discipline Discipline @relation(fields: [disciplineId], references: [id]) + roles Role[] + discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int } model Team { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + leaderEmail String - participants Participant[] @relation(name: "participants") - discipline Discipline @relation(fields: [disciplineId], references: [id]) + roles Role[] @relation(name: "participants") + discipline Discipline @relation(fields: [disciplineId], references: [id]) disciplineId Int - leader Participant? @relation(name: "leader", fields: [leaderId], references: [id]) - leaderId Int @unique } model Participant { @@ -94,18 +94,28 @@ model Participant { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid firstName String lastName String - email String gender Gender verified Boolean @default(false) group Group @relation(fields: [groupId], references: [id]) groupId Int - team Team @relation(name: "participants", fields: [teamId], references: [id]) - teamId Int - leaderOf Team? @relation(name: "leader") roles Role[] +} +model Role { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random")) + name String //e.g. runner, swimmer,... + importance Job + score String + + participant Participant? @relation(fields: [participantId], references: [id]) + participantId Int? + team Team @relation(name: "participants", fields: [teamId], references: [id]) + teamId Int + schema RoleSchema @relation(fields: [schemaId], references: [id]) + schemaId Int } model Organisation { @@ -142,3 +152,8 @@ enum Gender { FEMALE OTHER } + +enum Job { + TEAMLEADER + MEMBER +} \ No newline at end of file From 293d2753eb67f6027f12dedb67a34f5659d34df4 Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Sun, 20 Mar 2022 14:34:49 +0100 Subject: [PATCH 103/128] Adding VisualElement (v.2.1) --- prisma/schema.prisma | 1 - 1 file changed, 1 deletion(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index d06a3d4..e65ae5b 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -156,4 +156,3 @@ enum Gender { enum Job { TEAMLEADER MEMBER -} \ No newline at end of file From 269cc33a33101c97f2e7955559fee88e38c16907 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:29:25 +0100 Subject: [PATCH 104/128] Update Event Endpoints to give better errors; --- src/Controllers/common.ts | 2 + src/Controllers/event.controller.ts | 93 +++++++++++++++++++++++++---- src/Routes/event.routes.ts | 7 ++- 3 files changed, 90 insertions(+), 12 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index 2adc291..f327a5d 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -3,6 +3,8 @@ export enum DataType { NUMBER = "number", INTEGER = "integer", PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", + DATETIME = "ISOstring (8601)", + UUID = "UUID string", } interface Body { diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 814766e..00256c9 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -1,7 +1,9 @@ +import { Prisma } from "@prisma/client"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; +import { DataType, generateInvalidBodyError } from "./common"; -const getAllEvents = async (req: Request, res: Response) => { +export const getAllEvents = async (req: Request, res: Response) => { const events = await prisma.event.findMany({ select: { name: true, @@ -11,17 +13,84 @@ const getAllEvents = async (req: Request, res: Response) => { id: false, }, }); - if (events.length > 0) res.status(200).send(events); - else res.status(204).send(); + if (events.length > 0) res.status(200).json(events); + else res.status(200).json([]); }; -const addEvent = async (req: Request, res: Response) => { - // TODO: Add checks if user has admin permissions +export const getEvent = async (req: Request, res: Response) => { + const eventId = req.params.eventId; - if (req.body.name == null || undefined || req.body.date == null || undefined) { - res.status(400).send("Malformed request"); + if (eventId === undefined || null) { + res.status(400).json( + generateInvalidBodyError({ + eventId: DataType.STRING, + }) + ); return; } + try { + const event = await prisma.event.findUnique({ + where: { + pid: eventId, + }, + select: { + name: true, + description: true, + date: true, + pid: true, + id: false, + }, + }); + + res.status(200).json(event); + } catch (e) { + if (e instanceof Prisma.PrismaClientKnownRequestError) { + res.status(500).json({ + type: "error", + payload: { + message: `Internal Server error occured. Try again later`, + }, + }); + return; + } + if (e instanceof Prisma.PrismaClientUnknownRequestError) { + res.status(500).json({ + type: "error", + payload: { + message: "Unknown error occured with your request. Check if your parameters are correct", + shema: { + eventId: DataType.UUID, + }, + }, + }); + return; + } + } +}; + +export const addEvent = async (req: Request, res: Response) => { + if ( + req.body.name == null || + undefined || + typeof req.body.name !== "string" || + req.body.date == null || + undefined || + typeof req.body.date !== "string" || + req.body.description == null || + undefined || + typeof req.body.description !== "string" + ) { + res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + date: DataType.DATETIME, + description: DataType.STRING, + }) + ); + return; + } + + //TODO: Check if date is valid const event = await prisma.event.create({ data: { @@ -36,7 +105,11 @@ const addEvent = async (req: Request, res: Response) => { id: false, }, }); - res.status(201).send(event); -}; -export { getAllEvents, addEvent }; + res.status(201).json({ + type: "succes", + payload: { + event, + }, + }); +}; diff --git a/src/Routes/event.routes.ts b/src/Routes/event.routes.ts index de0cfde..2ce9e38 100644 --- a/src/Routes/event.routes.ts +++ b/src/Routes/event.routes.ts @@ -1,9 +1,12 @@ import Express from "express"; -import { addEvent, getAllEvents } from "../Controllers/event.controller"; +import { addEvent, getAllEvents, getEvent } from "../Controllers/event.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; const router = Express.Router(); router.get("/", getAllEvents); -router.post("/", addEvent); +router.get("/:eventId", getEvent); + +router.post("/", requireAuthentication, addEvent); export default router; From f94f89e99ea27130b40c6deccd6430c44fe03aca Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:50:11 +0100 Subject: [PATCH 105/128] Update common.ts types because nagging. --- src/Controllers/common.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index f327a5d..f568c75 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -3,8 +3,8 @@ export enum DataType { NUMBER = "number", INTEGER = "integer", PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", - DATETIME = "ISOstring (8601)", - UUID = "UUID string", + DATETIME = "ISOstring", + UUID = "string", } interface Body { From dd956476d7f089430a8cce53b53b4b2553f70fc0 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Tue, 22 Mar 2022 07:37:21 +0100 Subject: [PATCH 106/128] Minor changes Fixed complaints for PR #30 --- src/Controllers/event.controller.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 00256c9..df5a8a4 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -57,7 +57,7 @@ export const getEvent = async (req: Request, res: Response) => { res.status(500).json({ type: "error", payload: { - message: "Unknown error occured with your request. Check if your parameters are correct", + message: "Unknown error occurred with your request. Check if your parameters are correct", shema: { eventId: DataType.UUID, }, @@ -70,14 +70,8 @@ export const getEvent = async (req: Request, res: Response) => { export const addEvent = async (req: Request, res: Response) => { if ( - req.body.name == null || - undefined || typeof req.body.name !== "string" || - req.body.date == null || - undefined || typeof req.body.date !== "string" || - req.body.description == null || - undefined || typeof req.body.description !== "string" ) { res.status(400).json( @@ -103,6 +97,7 @@ export const addEvent = async (req: Request, res: Response) => { date: true, pid: true, id: false, + description: true, }, }); From 32d4bdf3e0a171acce898969ec1a1f01e845da93 Mon Sep 17 00:00:00 2001 From: Stefan-5422 <32109571+Stefan-5422@users.noreply.github.com> Date: Mon, 28 Mar 2022 11:52:25 +0200 Subject: [PATCH 107/128] Minor changes --- package-lock.json | 2119 +++------------------------ src/Controllers/event.controller.ts | 6 +- 2 files changed, 187 insertions(+), 1938 deletions(-) diff --git a/package-lock.json b/package-lock.json index bdbdc74..9948b4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,19 +10,14 @@ "license": "ISC", "dependencies": { "@prisma/client": "^3.3.0", - "@types/handlebars": "^4.1.0", "@types/jsonwebtoken": "^8.5.5", - "@types/mjml": "^4.7.0", "@types/node": "^16.10.3", "@types/nodemailer": "^6.4.4", "@types/redis": "^2.8.32", "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", - "handlebars": "^4.7.7", "jsonwebtoken": "^8.5.1", - "mjml": "^4.11.0", - "nanoid": "^3.3.3", "nodemailer": "^6.7.0", "redis": "^3.1.2" }, @@ -41,17 +36,6 @@ "typescript": "^4.4.3" } }, - "node_modules/@babel/runtime": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz", - "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", - "dependencies": { - "regenerator-runtime": "^0.13.4" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@cspotcode/source-map-consumer": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", @@ -74,16 +58,16 @@ } }, "node_modules/@mapbox/node-pre-gyp": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.7.tgz", - "integrity": "sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz", + "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==", "dependencies": { "detect-libc": "^1.0.3", "https-proxy-agent": "^5.0.0", "make-dir": "^3.1.0", "node-fetch": "^2.6.5", "nopt": "^5.0.0", - "npmlog": "^6.0.0", + "npmlog": "^5.0.1", "rimraf": "^3.0.2", "semver": "^7.3.5", "tar": "^6.1.11" @@ -229,19 +213,10 @@ "@types/range-parser": "*" } }, - "node_modules/@types/handlebars": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.1.0.tgz", - "integrity": "sha512-gq9YweFKNNB1uFK71eRqsd4niVkXrxHugqWFQkeLRJvGjnxsLr16bYtcsG4tOFwmYi0Bax+wCkbf1reUfdl4kA==", - "deprecated": "This is a stub types definition. handlebars provides its own type definitions, so you do not need this installed.", - "dependencies": { - "handlebars": "*" - } - }, "node_modules/@types/jsonwebtoken": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz", - "integrity": "sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==", + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz", + "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==", "dependencies": { "@types/node": "*" } @@ -252,19 +227,6 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, - "node_modules/@types/mjml": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@types/mjml/-/mjml-4.7.0.tgz", - "integrity": "sha512-aWWu8Lxq2SexXGs+lBPRUpN3kFf0sDRo3Y4jz7BQ15cQvMfyZOadgFJsNlHmDqI6D2Qjx0PIK+1f9IMXgq9vTA==", - "dependencies": { - "@types/mjml-core": "*" - } - }, - "node_modules/@types/mjml-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/@types/mjml-core/-/mjml-core-4.7.1.tgz", - "integrity": "sha512-k5IRafi93tyZBGF+0BTrcBDvG47OueI+Q7TC4V4UjGQn0AMVvL3Y+S26QF/UHMmMJW5r1hxLyv3StX2/+FatFg==" - }, "node_modules/@types/mocha": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz", @@ -380,9 +342,9 @@ } }, "node_modules/agent-base/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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" }, @@ -404,6 +366,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true, "engines": { "node": ">=6" } @@ -420,6 +383,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -434,6 +398,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -479,15 +444,14 @@ "dev": true }, "node_modules/argon2": { - "version": "0.28.3", - "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.3.tgz", - "integrity": "sha512-NkEJOImg+T7nnkx6/Fy8EbjZsF20hbBBKdVP/YUxujuLTAjIODmrFeY4vVpekKwGAGDm6roXxluFQ+CIaoVrbg==", + "version": "0.28.5", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.5.tgz", + "integrity": "sha512-kGFCctzc3VWmR1aCOYjNgvoTmVF5uVBUtWlXCKKO54d1K+31zRz45KAcDIqMo2746ozv/52d25nfEekitaXP0w==", "hasInstallScript": true, "dependencies": { - "@mapbox/node-pre-gyp": "^1.0.7", + "@mapbox/node-pre-gyp": "^1.0.8", "@phc/format": "^1.0.0", - "node-addon-api": "^4.2.0", - "opencollective-postinstall": "^2.0.3" + "node-addon-api": "^4.3.0" }, "engines": { "node": ">=12.0.0" @@ -528,6 +492,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true, "engines": { "node": ">=8" } @@ -552,11 +517,6 @@ "node": ">= 0.8" } }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" - }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -570,6 +530,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "dependencies": { "fill-range": "^7.0.1" }, @@ -596,15 +557,6 @@ "node": ">= 0.8" } }, - "node_modules/camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dependencies": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "node_modules/camelcase": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", @@ -701,45 +653,11 @@ "node": "*" } }, - "node_modules/cheerio": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", - "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", - "dependencies": { - "cheerio-select": "^1.5.0", - "dom-serializer": "^1.3.2", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "tslib": "^2.2.0" - }, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/cheeriojs/cheerio?sponsor=1" - } - }, - "node_modules/cheerio-select": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz", - "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==", - "dependencies": { - "css-select": "^4.1.3", - "css-what": "^5.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0", - "domutils": "^2.7.0" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/chokidar": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "dev": true, "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -764,21 +682,11 @@ "node": ">=10" } }, - "node_modules/clean-css": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", - "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 4.0" - } - }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -789,6 +697,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -799,7 +708,8 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/color-support": { "version": "1.1.3", @@ -821,11 +731,6 @@ "node": ">= 0.8" } }, - "node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, "node_modules/component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -837,15 +742,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "node_modules/config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -901,32 +797,6 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, - "node_modules/css-select": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", - "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^5.0.0", - "domhandler": "^4.2.0", - "domutils": "^2.6.0", - "nth-check": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-what": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", - "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==", - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -1005,11 +875,6 @@ "node": ">=0.10" } }, - "node_modules/detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" - }, "node_modules/diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", @@ -1019,57 +884,6 @@ "node": ">=0.3.1" } }, - "node_modules/dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] - }, - "node_modules/domhandler": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", - "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", - "dependencies": { - "domelementtype": "^2.2.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, "node_modules/dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -1086,28 +900,6 @@ "safe-buffer": "^5.0.1" } }, - "node_modules/editorconfig": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", - "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", - "dependencies": { - "commander": "^2.19.0", - "lru-cache": "^4.1.5", - "semver": "^5.6.0", - "sigmund": "^1.0.1" - }, - "bin": { - "editorconfig": "bin/editorconfig" - } - }, - "node_modules/editorconfig/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/ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -1126,33 +918,15 @@ "node": ">= 0.8" } }, - "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, "engines": { "node": ">=6" } }, - "node_modules/escape-goat": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz", - "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -1228,6 +1002,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -1336,6 +1111,7 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "optional": true, "os": [ @@ -1346,28 +1122,29 @@ } }, "node_modules/gauge": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", - "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", "dependencies": { - "ansi-regex": "^5.0.1", "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": "^12.13.0 || ^14.15.0 || >=16" + "node": ">=10" } }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -1404,6 +1181,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -1420,26 +1198,6 @@ "node": ">=4.x" } }, - "node_modules/handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "dependencies": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "wordwrap": "^1.0.0" - }, - "bin": { - "handlebars": "bin/handlebars" - }, - "engines": { - "node": ">=0.4.7" - }, - "optionalDependencies": { - "uglify-js": "^3.1.4" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1458,48 +1216,11 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true, "bin": { "he": "bin/he" } }, - "node_modules/html-minifier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", - "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", - "dependencies": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", - "he": "^1.2.0", - "param-case": "^2.1.1", - "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" - }, - "bin": { - "html-minifier": "cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, "node_modules/http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", @@ -1528,9 +1249,9 @@ } }, "node_modules/https-proxy-agent/node_modules/debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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" }, @@ -1573,11 +1294,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, - "node_modules/ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, "node_modules/ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", @@ -1599,6 +1315,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "dependencies": { "binary-extensions": "^2.0.0" }, @@ -1610,6 +1327,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -1626,6 +1344,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -1649,6 +1368,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "engines": { "node": ">=0.12.0" } @@ -1686,25 +1406,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "node_modules/js-beautify": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz", - "integrity": "sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==", - "dependencies": { - "config-chain": "^1.1.12", - "editorconfig": "^0.15.3", - "glob": "^7.1.3", - "nopt": "^5.0.0" - }, - "bin": { - "css-beautify": "js/bin/css-beautify.js", - "html-beautify": "js/bin/html-beautify.js", - "js-beautify": "js/bin/js-beautify.js" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -1751,32 +1452,6 @@ "semver": "bin/semver" } }, - "node_modules/juice": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/juice/-/juice-7.0.0.tgz", - "integrity": "sha512-AjKQX31KKN+uJs+zaf+GW8mBO/f/0NqSh2moTMyvwBY+4/lXIYTU8D8I2h6BAV3Xnz6GGsbalUyFqbYMe+Vh+Q==", - "dependencies": { - "cheerio": "^1.0.0-rc.3", - "commander": "^5.1.0", - "mensch": "^0.3.4", - "slick": "^1.12.2", - "web-resource-inliner": "^5.0.0" - }, - "bin": { - "juice": "bin/juice" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/juice/node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "engines": { - "node": ">= 6" - } - }, "node_modules/jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -1811,11 +1486,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "node_modules/lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -1867,18 +1537,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, "node_modules/lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dependencies": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, "node_modules/make-dir": { @@ -1917,11 +1584,6 @@ "node": ">= 0.6" } }, - "node_modules/mensch": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz", - "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==" - }, "node_modules/merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -1976,11 +1638,6 @@ "node": "*" } }, - "node_modules/minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, "node_modules/minipass": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", @@ -1992,11 +1649,6 @@ "node": ">=8" } }, - "node_modules/minipass/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/minizlib": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", @@ -2009,409 +1661,6 @@ "node": ">= 8" } }, - "node_modules/minizlib/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/mjml": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.11.0.tgz", - "integrity": "sha512-kYuCAds/8F7m7xNEs3TFkrc0jxnNYIkexQIUNByPLQJFoFRltpgXLSdoyreGAniQtDGITPE+p8FIocLUBKsOHg==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "mjml-cli": "4.11.0", - "mjml-core": "4.11.0", - "mjml-migrate": "4.11.0", - "mjml-preset-core": "4.11.0", - "mjml-validator": "4.11.0" - }, - "bin": { - "mjml": "bin/mjml" - } - }, - "node_modules/mjml-accordion": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.11.0.tgz", - "integrity": "sha512-u6cPMl4z8JeRIq0sGHWfzwE5SqwBhSPHJ8wElhfU7CK6gAoUTz4BIL/03da2whXk0S34n5CSU453JpuWV+3bQQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-body": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.11.0.tgz", - "integrity": "sha512-+SQXOjKOr9IMblmslrUbv+ahF/SkqT7mAuix1P/F9ev3aS+WN7Gy/lyJLaq1zhSQCmzrBDovHez3bJ7NGToU0g==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-button": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.11.0.tgz", - "integrity": "sha512-v/MwA2Kq2MlHJwrajdAqUihjAQivD8FpkpOAcqdgqI1ffaEDzd6FGFt5qOtVD9BncChQ4a51haOnPd+kbBLlCA==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-carousel": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.11.0.tgz", - "integrity": "sha512-/owKKSg3DNes1rauPPhlGCFdZ4zzoxdztPLGOm9TSjkbL5q2cN9NMfzNdTYLnnVG5G5XWX0THjDeeq+bGnHw8w==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-cli": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.11.0.tgz", - "integrity": "sha512-jgkxNY+sY+CwiUlO6VX8cwVjlLBXIzE7X4fXkQ2RjXpbAvsN8uDafST8oL8PDlxNIjOwK6YJySzZSLXSKTF5Zg==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "chokidar": "^3.0.0", - "glob": "^7.1.1", - "html-minifier": "^4.0.0", - "js-beautify": "^1.6.14", - "lodash": "^4.17.21", - "mjml-core": "4.11.0", - "mjml-migrate": "4.11.0", - "mjml-parser-xml": "4.11.0", - "mjml-validator": "4.11.0", - "yargs": "^16.1.0" - }, - "bin": { - "mjml-cli": "bin/mjml" - } - }, - "node_modules/mjml-column": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.11.0.tgz", - "integrity": "sha512-yuupexywYXuXTvxxGLPZw6S/D6fz4b41ZarOkEPW8Pbj7FkfnBTO3QokAS5KapJ9x6sIAVs+cCgUul87dwOBzg==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-core": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.11.0.tgz", - "integrity": "sha512-UTI1exu9/0lOF40aacAzC9A7RrJPcay7WYurYsb+X2LbDyfBlSx5ZCtuUTHwLfIz3PL6rSg8yrZ3KtlmhQJ/kQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "cheerio": "1.0.0-rc.10", - "detect-node": "2.0.4", - "html-minifier": "^4.0.0", - "js-beautify": "^1.6.14", - "juice": "^7.0.0", - "lodash": "^4.17.21", - "mjml-migrate": "4.11.0", - "mjml-parser-xml": "4.11.0", - "mjml-validator": "4.11.0" - } - }, - "node_modules/mjml-divider": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.11.0.tgz", - "integrity": "sha512-jS8Sa7uuFTmThtrcV3FICtbqmA0yJplldaNJwW5upiq7MEXuSwLNzjNeodaTpsVWevf/stE3C4lBA3+V4ascMg==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-group": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.11.0.tgz", - "integrity": "sha512-Yv1ZcPNk4bxOK/eol6bjJvRJBaOCzVY88QO8IfCQifAZuiXhatxwsuwaRKNcTi4cB+IHwl4JguZHgsFRi/Gf/g==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.11.0.tgz", - "integrity": "sha512-KNaSsOlf5FNwHyZQD6YNZN2Eo/o7n+mZISFLyp9MvNFaT3NKIRJDaInD1WjN+w2aHdXAw4sDV3+/9/EET2bh1A==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-attributes": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.11.0.tgz", - "integrity": "sha512-azeDRLGH7cU6PoXLd08E/H3UDHFsblBTcme++OWrj5B21vaFguOBySO2eWFTyWLthy+xst8FftWV46f8BWvciw==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-breakpoint": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.11.0.tgz", - "integrity": "sha512-OQ/WpXHagGoiUmBjoMHuxdigyLQrHNL6+Op0LHO87vN1GH2ap4YLcSSegIsThQLi/I7V4/JFZbzS5jV4xd4SMg==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-font": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.11.0.tgz", - "integrity": "sha512-AJQ9lhNzNr0hwPjUID76LNna3U8ycmFH1lyipZOWHTivOVGkSYs8PaboxORfU/QAEDKo/p8LafBAoDPEdSigxA==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-html-attributes": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.11.0.tgz", - "integrity": "sha512-Gew9EAuqFu9QR3g+8FyE9WHNMszx1ejzo8dRDIuTaBCDEpaIaPVO7G5rGhT7ADqZufeYtRhBXfXjcShPD/a30g==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-preview": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.11.0.tgz", - "integrity": "sha512-f79+OtwC8CYcQpglGNfm3s74qVecdwLlDm9DD/LJvZwIdaALeIfZF36nz6+rtCLMhND+wxgqxqkmbbuS6AbO+A==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-style": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.11.0.tgz", - "integrity": "sha512-jw0r9Ld56SkJmDUBx+27xOH+oY2O06FBcKSJIkZLJ/sefbjgJa2/ti2eso/LeGgrmTw8zge7g1pp0Fl+kPjsGA==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-head-title": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.11.0.tgz", - "integrity": "sha512-mjYsKoE9+5LI8V0mK9SAKVKspF19TVius2q5I1FXLRdBmt4Ei87CdrSui+iixGrug0Lwt4P2W3+mK8kVGNnJAQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-hero": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.11.0.tgz", - "integrity": "sha512-tZDCGjQrDICwbsDnLvfVEsQ5+GdrIozB3oO3NxC6m2Eq04VKNBkIqq+QvJyouOxzJ3CZgO2B4rylzxc6YXuHsw==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-image": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.11.0.tgz", - "integrity": "sha512-qjvKS/x2arDNgKppPecmg69VyXdQbb1CNVqPwowJLyfjioTw4hxQ93suWoBKJJojRjkwauj9IRMC8TR9ffn0HQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-migrate": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.11.0.tgz", - "integrity": "sha512-Y+9U4w9LwlTkfTkHX9GdalIQDO4JQxboG4PM8g7vRKNhKSZDZH8QSr0SNhX0+fMQmjb9b0nztWbMVVvNZfMoPQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "js-beautify": "^1.6.14", - "lodash": "^4.17.21", - "mjml-core": "4.11.0", - "mjml-parser-xml": "4.11.0", - "yargs": "^16.1.0" - }, - "bin": { - "migrate": "lib/cli.js" - } - }, - "node_modules/mjml-navbar": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.11.0.tgz", - "integrity": "sha512-FEd+8RD6ra8652jXdMbhfhzT1YY8TA30c34qjJ+ULlFgvLH4GNnYRIOHp/Mgd/L38Qf3bhK/rK9ELBidJ36dLQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-parser-xml": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.11.0.tgz", - "integrity": "sha512-3toQ9UKyfzXWXJ7PlTExBjzGXAzJNORv39sorPv5sG2KJsvPC6NE+e+/1GyqYFhk4JffHoDfd4mQ6w050qYATQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "detect-node": "2.0.4", - "htmlparser2": "^4.1.0", - "lodash": "^4.17.15" - } - }, - "node_modules/mjml-parser-xml/node_modules/domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "dependencies": { - "domelementtype": "^2.0.1" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/mjml-parser-xml/node_modules/htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - }, - "node_modules/mjml-preset-core": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.11.0.tgz", - "integrity": "sha512-HU9ZFzS+A7Dx0B/EbnqYjdcIQQuxpOVRfFReQBlllZYwjWaRUjDIeIjF+cdnCb9QveuSNo4msIG00h/MKPYiGQ==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "mjml-accordion": "4.11.0", - "mjml-body": "4.11.0", - "mjml-button": "4.11.0", - "mjml-carousel": "4.11.0", - "mjml-column": "4.11.0", - "mjml-divider": "4.11.0", - "mjml-group": "4.11.0", - "mjml-head": "4.11.0", - "mjml-head-attributes": "4.11.0", - "mjml-head-breakpoint": "4.11.0", - "mjml-head-font": "4.11.0", - "mjml-head-html-attributes": "4.11.0", - "mjml-head-preview": "4.11.0", - "mjml-head-style": "4.11.0", - "mjml-head-title": "4.11.0", - "mjml-hero": "4.11.0", - "mjml-image": "4.11.0", - "mjml-navbar": "4.11.0", - "mjml-raw": "4.11.0", - "mjml-section": "4.11.0", - "mjml-social": "4.11.0", - "mjml-spacer": "4.11.0", - "mjml-table": "4.11.0", - "mjml-text": "4.11.0", - "mjml-wrapper": "4.11.0" - } - }, - "node_modules/mjml-raw": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.11.0.tgz", - "integrity": "sha512-DyUwC/JrE8tF7v9XaKQpQ/yAg5tT2uAWSDI6J5x3t3TNFJmRPd3iorSu8v6t1s3OiekuxfagsDDPLFuzpGwZSw==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-section": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.11.0.tgz", - "integrity": "sha512-OpinxE019Z1symrEFku3UddsvSql2aolcAiOThFuAAXz3+tUuooofGMy/XyyMOuOnktOx/5PMcVFsV84/Jye/g==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-social": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.11.0.tgz", - "integrity": "sha512-tM5njGtang0VRWt+XCuMTnZP2IJehUd+kdsC7CnMKQhYI2X4vzEaOBLgXRWvhcT4pSBzEJkXB9sQ+y7JmLO10g==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-spacer": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.11.0.tgz", - "integrity": "sha512-9s6PjFgznKEFgFZCSa4vTYVDQ6kRH5ucMHGraoHS4VMZLA8QIaVakHd4Sl0n+SGWCqair4xZ3vYYMhOBKIXmMw==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-table": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.11.0.tgz", - "integrity": "sha512-ccniRz1MoDqKS6zoNM59xi81M7zy/tkvd/6weyH9XAZiU7ATgOxoBuIMy+d0uSTlKPWNwoi2FqR5YSedxT2YPw==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-text": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.11.0.tgz", - "integrity": "sha512-xrY5+uepxUg+q5KKuKX2s9KQnnlsMN5aoCt0JSbjt4H9ZwBpqXPD4Z2uJ8eZS33FvnXzUYPNVdKralvXnrsXKA==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "node_modules/mjml-validator": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-validator/-/mjml-validator-4.11.0.tgz", - "integrity": "sha512-oDL9tHcL4PaCZMwH6T/lLpS7LV9cm9lIwnzJy+y5/S81MGMV6kPr6xXHgS0A01G7sseg6+rHgqBnUgzUob4Ilg==", - "dependencies": { - "@babel/runtime": "^7.14.6" - } - }, - "node_modules/mjml-wrapper": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.11.0.tgz", - "integrity": "sha512-WXGKxS+DlYalx5ofwq3bttj26BLEcaueeQ+0BcffXIELojUzd0+xTyX09v0QemUCBmKpHB2QaKMGhzYuSkupyg==", - "dependencies": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0", - "mjml-section": "4.11.0" - } - }, "node_modules/mkdirp": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -2504,27 +1753,16 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true }, - "node_modules/mocha/node_modules/nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", - "dev": true, - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, "node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "node_modules/nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==", + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", + "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "dev": true, "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -2540,33 +1778,28 @@ "node": ">= 0.6" } }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" - }, - "node_modules/no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dependencies": { - "lower-case": "^1.1.1" - } - }, "node_modules/node-addon-api": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz", - "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==" }, "node_modules/node-fetch": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", - "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "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/nodemailer": { @@ -2595,33 +1828,28 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true, "engines": { "node": ">=0.10.0" } }, "node_modules/npmlog": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", - "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", + "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": "^4.0.0", + "gauge": "^3.0.0", "set-blocking": "^2.0.0" - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16" } }, - "node_modules/nth-check": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", - "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" } }, "node_modules/on-finished": { @@ -2643,14 +1871,6 @@ "wrappy": "1" } }, - "node_modules/opencollective-postinstall": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", - "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==", - "bin": { - "opencollective-postinstall": "index.js" - } - }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -2681,27 +1901,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dependencies": { - "no-case": "^2.2.0" - } - }, - "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - }, - "node_modules/parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "dependencies": { - "parse5": "^6.0.1" - } - }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -2745,6 +1944,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true, "engines": { "node": ">=8.6" }, @@ -2775,11 +1975,6 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, - "node_modules/proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" - }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -2792,11 +1987,6 @@ "node": ">= 0.10" } }, - "node_modules/pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, "node_modules/qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", @@ -2855,6 +2045,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "dependencies": { "picomatch": "^2.2.1" }, @@ -2904,23 +2095,11 @@ "node": ">=4" } }, - "node_modules/regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" - }, - "node_modules/relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "engines": { - "node": ">= 0.10" - } - }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -2963,22 +2142,6 @@ "node": ">=10" } }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/send": { "version": "0.17.1", "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", @@ -3040,31 +2203,10 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "node_modules/sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" - }, "node_modules/signal-exit": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", - "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" - }, - "node_modules/slick": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz", - "integrity": "sha1-vQSN23TefRymkV+qSldXCzVQwtc=", - "engines": { - "node": "*" - } - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "engines": { - "node": ">=0.10.0" - } + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/statuses": { "version": "1.5.0", @@ -3185,15 +2327,11 @@ "node": ">= 10" } }, - "node_modules/tar/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "dependencies": { "is-number": "^7.0.0" }, @@ -3258,11 +2396,6 @@ } } }, - "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - }, "node_modules/type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -3297,17 +2430,6 @@ "node": ">=4.2.0" } }, - "node_modules/uglify-js": { - "version": "3.14.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.4.tgz", - "integrity": "sha512-AbiSR44J0GoCeV81+oxcy/jDOElO2Bx3d0MfQCUShq7JRXaM4KtQopZsq2vFv8bCq2yMaGrw1FgygUd03RyRDA==", - "bin": { - "uglifyjs": "bin/uglifyjs" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -3316,11 +2438,6 @@ "node": ">= 0.8" } }, - "node_modules/upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -3334,14 +2451,6 @@ "node": ">= 0.4.0" } }, - "node_modules/valid-data-url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", - "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==", - "engines": { - "node": ">=10" - } - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -3350,58 +2459,6 @@ "node": ">= 0.8" } }, - "node_modules/web-resource-inliner": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-5.0.0.tgz", - "integrity": "sha512-AIihwH+ZmdHfkJm7BjSXiEClVt4zUFqX4YlFAzjL13wLtDuUneSaFvDBTbdYRecs35SiU7iNKbMnN+++wVfb6A==", - "dependencies": { - "ansi-colors": "^4.1.1", - "escape-goat": "^3.0.0", - "htmlparser2": "^4.0.0", - "mime": "^2.4.6", - "node-fetch": "^2.6.0", - "valid-data-url": "^3.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/web-resource-inliner/node_modules/domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "dependencies": { - "domelementtype": "^2.0.1" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/web-resource-inliner/node_modules/htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - }, - "node_modules/web-resource-inliner/node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, "node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -3439,11 +2496,6 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, - "node_modules/wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, "node_modules/workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -3454,6 +2506,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -3475,19 +2528,21 @@ "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, "engines": { "node": ">=10" } }, "node_modules/yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -3505,6 +2560,7 @@ "version": "20.2.4", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true, "engines": { "node": ">=10" } @@ -3547,14 +2603,6 @@ } }, "dependencies": { - "@babel/runtime": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.3.tgz", - "integrity": "sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==", - "requires": { - "regenerator-runtime": "^0.13.4" - } - }, "@cspotcode/source-map-consumer": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz", @@ -3571,16 +2619,16 @@ } }, "@mapbox/node-pre-gyp": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.7.tgz", - "integrity": "sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.8.tgz", + "integrity": "sha512-CMGKi28CF+qlbXh26hDe6NxCd7amqeAzEqnS6IHeO6LoaKyM/n+Xw3HT1COdq8cuioOdlKdqn/hCmqPUOMOywg==", "requires": { "detect-libc": "^1.0.3", "https-proxy-agent": "^5.0.0", "make-dir": "^3.1.0", "node-fetch": "^2.6.5", "nopt": "^5.0.0", - "npmlog": "^6.0.0", + "npmlog": "^5.0.1", "rimraf": "^3.0.2", "semver": "^7.3.5", "tar": "^6.1.11" @@ -3706,18 +2754,10 @@ "@types/range-parser": "*" } }, - "@types/handlebars": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@types/handlebars/-/handlebars-4.1.0.tgz", - "integrity": "sha512-gq9YweFKNNB1uFK71eRqsd4niVkXrxHugqWFQkeLRJvGjnxsLr16bYtcsG4tOFwmYi0Bax+wCkbf1reUfdl4kA==", - "requires": { - "handlebars": "*" - } - }, "@types/jsonwebtoken": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.6.tgz", - "integrity": "sha512-+P3O/xC7nzVizIi5VbF34YtqSonFsdnbXBnWUCYRiKOi1f9gA4sEFvXkrGr/QVV23IbMYvcoerI7nnhDUiWXRQ==", + "version": "8.5.8", + "resolved": "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-8.5.8.tgz", + "integrity": "sha512-zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==", "requires": { "@types/node": "*" } @@ -3728,19 +2768,6 @@ "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==", "dev": true }, - "@types/mjml": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@types/mjml/-/mjml-4.7.0.tgz", - "integrity": "sha512-aWWu8Lxq2SexXGs+lBPRUpN3kFf0sDRo3Y4jz7BQ15cQvMfyZOadgFJsNlHmDqI6D2Qjx0PIK+1f9IMXgq9vTA==", - "requires": { - "@types/mjml-core": "*" - } - }, - "@types/mjml-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/@types/mjml-core/-/mjml-core-4.7.1.tgz", - "integrity": "sha512-k5IRafi93tyZBGF+0BTrcBDvG47OueI+Q7TC4V4UjGQn0AMVvL3Y+S26QF/UHMmMJW5r1hxLyv3StX2/+FatFg==" - }, "@types/mocha": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.0.0.tgz", @@ -3841,9 +2868,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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" } @@ -3858,7 +2885,8 @@ "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", - "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==" + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true }, "ansi-regex": { "version": "5.0.1", @@ -3869,6 +2897,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "requires": { "color-convert": "^2.0.1" } @@ -3877,6 +2906,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==", + "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -3915,14 +2945,13 @@ "dev": true }, "argon2": { - "version": "0.28.3", - "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.3.tgz", - "integrity": "sha512-NkEJOImg+T7nnkx6/Fy8EbjZsF20hbBBKdVP/YUxujuLTAjIODmrFeY4vVpekKwGAGDm6roXxluFQ+CIaoVrbg==", + "version": "0.28.5", + "resolved": "https://registry.npmjs.org/argon2/-/argon2-0.28.5.tgz", + "integrity": "sha512-kGFCctzc3VWmR1aCOYjNgvoTmVF5uVBUtWlXCKKO54d1K+31zRz45KAcDIqMo2746ozv/52d25nfEekitaXP0w==", "requires": { - "@mapbox/node-pre-gyp": "^1.0.7", + "@mapbox/node-pre-gyp": "^1.0.8", "@phc/format": "^1.0.0", - "node-addon-api": "^4.2.0", - "opencollective-postinstall": "^2.0.3" + "node-addon-api": "^4.3.0" } }, "argparse": { @@ -3956,7 +2985,8 @@ "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", - "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==" + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "dev": true }, "body-parser": { "version": "1.19.0", @@ -3975,11 +3005,6 @@ "type-is": "~1.6.17" } }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -3993,6 +3018,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "requires": { "fill-range": "^7.0.1" } @@ -4013,15 +3039,6 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "requires": { - "no-case": "^2.2.0", - "upper-case": "^1.1.1" - } - }, "camelcase": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", @@ -4093,36 +3110,11 @@ "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "dev": true }, - "cheerio": { - "version": "1.0.0-rc.10", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz", - "integrity": "sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==", - "requires": { - "cheerio-select": "^1.5.0", - "dom-serializer": "^1.3.2", - "domhandler": "^4.2.0", - "htmlparser2": "^6.1.0", - "parse5": "^6.0.1", - "parse5-htmlparser2-tree-adapter": "^6.0.1", - "tslib": "^2.2.0" - } - }, - "cheerio-select": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz", - "integrity": "sha512-qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==", - "requires": { - "css-select": "^4.1.3", - "css-what": "^5.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0", - "domutils": "^2.7.0" - } - }, "chokidar": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz", "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==", + "dev": true, "requires": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -4139,18 +3131,11 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" }, - "clean-css": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", - "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", - "requires": { - "source-map": "~0.6.0" - } - }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, "requires": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -4161,6 +3146,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "requires": { "color-name": "~1.1.4" } @@ -4168,7 +3154,8 @@ "color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "color-support": { "version": "1.1.3", @@ -4184,11 +3171,6 @@ "delayed-stream": "~1.0.0" } }, - "commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - }, "component-emitter": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", @@ -4200,15 +3182,6 @@ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "config-chain": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", - "requires": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" - } - }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", @@ -4255,23 +3228,6 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", "dev": true }, - "css-select": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.1.3.tgz", - "integrity": "sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==", - "requires": { - "boolbase": "^1.0.0", - "css-what": "^5.0.0", - "domhandler": "^4.2.0", - "domutils": "^2.6.0", - "nth-check": "^2.0.0" - } - }, - "css-what": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz", - "integrity": "sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==" - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -4326,50 +3282,12 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=" }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==" - }, "diff": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true }, - "dom-serializer": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz", - "integrity": "sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", - "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" - }, - "domhandler": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", - "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, "dotenv": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", @@ -4383,24 +3301,6 @@ "safe-buffer": "^5.0.1" } }, - "editorconfig": { - "version": "0.15.3", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz", - "integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==", - "requires": { - "commander": "^2.19.0", - "lru-cache": "^4.1.5", - "semver": "^5.6.0", - "sigmund": "^1.0.1" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" - } - } - }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", @@ -4416,20 +3316,11 @@ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" - }, "escalade": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" - }, - "escape-goat": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz", - "integrity": "sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==" + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true }, "escape-html": { "version": "1.0.3", @@ -4494,6 +3385,7 @@ "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, "requires": { "to-regex-range": "^5.0.1" } @@ -4572,18 +3464,19 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "optional": true }, "gauge": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", - "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz", + "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==", "requires": { - "ansi-regex": "^5.0.1", "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", @@ -4593,7 +3486,8 @@ "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true }, "get-func-name": { "version": "2.0.0", @@ -4618,6 +3512,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "requires": { "is-glob": "^4.0.1" } @@ -4628,18 +3523,6 @@ "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, - "handlebars": { - "version": "4.7.7", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz", - "integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==", - "requires": { - "minimist": "^1.2.5", - "neo-async": "^2.6.0", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4", - "wordwrap": "^1.0.0" - } - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -4654,32 +3537,8 @@ "he": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" - }, - "html-minifier": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz", - "integrity": "sha512-aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==", - "requires": { - "camel-case": "^3.0.0", - "clean-css": "^4.2.1", - "commander": "^2.19.0", - "he": "^1.2.0", - "param-case": "^2.1.1", - "relateurl": "^0.2.7", - "uglify-js": "^3.5.1" - } - }, - "htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true }, "http-errors": { "version": "1.7.2", @@ -4703,9 +3562,9 @@ }, "dependencies": { "debug": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", - "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", + "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" } @@ -4739,11 +3598,6 @@ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" - }, "ip-regex": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", @@ -4759,6 +3613,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, "requires": { "binary-extensions": "^2.0.0" } @@ -4766,7 +3621,8 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true }, "is-fullwidth-code-point": { "version": "3.0.0", @@ -4777,6 +3633,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "requires": { "is-extglob": "^2.1.1" } @@ -4793,7 +3650,8 @@ "is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "is-plain-obj": { "version": "2.1.0", @@ -4819,17 +3677,6 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, - "js-beautify": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.0.tgz", - "integrity": "sha512-yuck9KirNSCAwyNJbqW+BxJqJ0NLJ4PwBUzQQACl5O3qHMBXVkXb/rD0ilh/Lat/tn88zSZ+CAHOlk0DsY7GuQ==", - "requires": { - "config-chain": "^1.1.12", - "editorconfig": "^0.15.3", - "glob": "^7.1.3", - "nopt": "^5.0.0" - } - }, "js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -4868,25 +3715,6 @@ } } }, - "juice": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/juice/-/juice-7.0.0.tgz", - "integrity": "sha512-AjKQX31KKN+uJs+zaf+GW8mBO/f/0NqSh2moTMyvwBY+4/lXIYTU8D8I2h6BAV3Xnz6GGsbalUyFqbYMe+Vh+Q==", - "requires": { - "cheerio": "^1.0.0-rc.3", - "commander": "^5.1.0", - "mensch": "^0.3.4", - "slick": "^1.12.2", - "web-resource-inliner": "^5.0.0" - }, - "dependencies": { - "commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==" - } - } - }, "jwa": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", @@ -4915,11 +3743,6 @@ "p-locate": "^5.0.0" } }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", @@ -4965,18 +3788,12 @@ "is-unicode-supported": "^0.1.0" } }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=" - }, "lru-cache": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", - "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "requires": { - "pseudomap": "^1.0.2", - "yallist": "^2.1.2" + "yallist": "^4.0.0" } }, "make-dir": { @@ -5005,11 +3822,6 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=" }, - "mensch": { - "version": "0.3.4", - "resolved": "https://registry.npmjs.org/mensch/-/mensch-0.3.4.tgz", - "integrity": "sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==" - }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", @@ -5046,24 +3858,12 @@ "brace-expansion": "^1.1.7" } }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - }, "minipass": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", "requires": { "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } } }, "minizlib": { @@ -5073,398 +3873,6 @@ "requires": { "minipass": "^3.0.0", "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } - } - }, - "mjml": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml/-/mjml-4.11.0.tgz", - "integrity": "sha512-kYuCAds/8F7m7xNEs3TFkrc0jxnNYIkexQIUNByPLQJFoFRltpgXLSdoyreGAniQtDGITPE+p8FIocLUBKsOHg==", - "requires": { - "@babel/runtime": "^7.14.6", - "mjml-cli": "4.11.0", - "mjml-core": "4.11.0", - "mjml-migrate": "4.11.0", - "mjml-preset-core": "4.11.0", - "mjml-validator": "4.11.0" - } - }, - "mjml-accordion": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-accordion/-/mjml-accordion-4.11.0.tgz", - "integrity": "sha512-u6cPMl4z8JeRIq0sGHWfzwE5SqwBhSPHJ8wElhfU7CK6gAoUTz4BIL/03da2whXk0S34n5CSU453JpuWV+3bQQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-body": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-body/-/mjml-body-4.11.0.tgz", - "integrity": "sha512-+SQXOjKOr9IMblmslrUbv+ahF/SkqT7mAuix1P/F9ev3aS+WN7Gy/lyJLaq1zhSQCmzrBDovHez3bJ7NGToU0g==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-button": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-button/-/mjml-button-4.11.0.tgz", - "integrity": "sha512-v/MwA2Kq2MlHJwrajdAqUihjAQivD8FpkpOAcqdgqI1ffaEDzd6FGFt5qOtVD9BncChQ4a51haOnPd+kbBLlCA==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-carousel": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-carousel/-/mjml-carousel-4.11.0.tgz", - "integrity": "sha512-/owKKSg3DNes1rauPPhlGCFdZ4zzoxdztPLGOm9TSjkbL5q2cN9NMfzNdTYLnnVG5G5XWX0THjDeeq+bGnHw8w==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-cli": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-cli/-/mjml-cli-4.11.0.tgz", - "integrity": "sha512-jgkxNY+sY+CwiUlO6VX8cwVjlLBXIzE7X4fXkQ2RjXpbAvsN8uDafST8oL8PDlxNIjOwK6YJySzZSLXSKTF5Zg==", - "requires": { - "@babel/runtime": "^7.14.6", - "chokidar": "^3.0.0", - "glob": "^7.1.1", - "html-minifier": "^4.0.0", - "js-beautify": "^1.6.14", - "lodash": "^4.17.21", - "mjml-core": "4.11.0", - "mjml-migrate": "4.11.0", - "mjml-parser-xml": "4.11.0", - "mjml-validator": "4.11.0", - "yargs": "^16.1.0" - } - }, - "mjml-column": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-column/-/mjml-column-4.11.0.tgz", - "integrity": "sha512-yuupexywYXuXTvxxGLPZw6S/D6fz4b41ZarOkEPW8Pbj7FkfnBTO3QokAS5KapJ9x6sIAVs+cCgUul87dwOBzg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-core": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-core/-/mjml-core-4.11.0.tgz", - "integrity": "sha512-UTI1exu9/0lOF40aacAzC9A7RrJPcay7WYurYsb+X2LbDyfBlSx5ZCtuUTHwLfIz3PL6rSg8yrZ3KtlmhQJ/kQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "cheerio": "1.0.0-rc.10", - "detect-node": "2.0.4", - "html-minifier": "^4.0.0", - "js-beautify": "^1.6.14", - "juice": "^7.0.0", - "lodash": "^4.17.21", - "mjml-migrate": "4.11.0", - "mjml-parser-xml": "4.11.0", - "mjml-validator": "4.11.0" - } - }, - "mjml-divider": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-divider/-/mjml-divider-4.11.0.tgz", - "integrity": "sha512-jS8Sa7uuFTmThtrcV3FICtbqmA0yJplldaNJwW5upiq7MEXuSwLNzjNeodaTpsVWevf/stE3C4lBA3+V4ascMg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-group": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-group/-/mjml-group-4.11.0.tgz", - "integrity": "sha512-Yv1ZcPNk4bxOK/eol6bjJvRJBaOCzVY88QO8IfCQifAZuiXhatxwsuwaRKNcTi4cB+IHwl4JguZHgsFRi/Gf/g==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head/-/mjml-head-4.11.0.tgz", - "integrity": "sha512-KNaSsOlf5FNwHyZQD6YNZN2Eo/o7n+mZISFLyp9MvNFaT3NKIRJDaInD1WjN+w2aHdXAw4sDV3+/9/EET2bh1A==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-attributes": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-attributes/-/mjml-head-attributes-4.11.0.tgz", - "integrity": "sha512-azeDRLGH7cU6PoXLd08E/H3UDHFsblBTcme++OWrj5B21vaFguOBySO2eWFTyWLthy+xst8FftWV46f8BWvciw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-breakpoint": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-breakpoint/-/mjml-head-breakpoint-4.11.0.tgz", - "integrity": "sha512-OQ/WpXHagGoiUmBjoMHuxdigyLQrHNL6+Op0LHO87vN1GH2ap4YLcSSegIsThQLi/I7V4/JFZbzS5jV4xd4SMg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-font": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-font/-/mjml-head-font-4.11.0.tgz", - "integrity": "sha512-AJQ9lhNzNr0hwPjUID76LNna3U8ycmFH1lyipZOWHTivOVGkSYs8PaboxORfU/QAEDKo/p8LafBAoDPEdSigxA==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-html-attributes": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-html-attributes/-/mjml-head-html-attributes-4.11.0.tgz", - "integrity": "sha512-Gew9EAuqFu9QR3g+8FyE9WHNMszx1ejzo8dRDIuTaBCDEpaIaPVO7G5rGhT7ADqZufeYtRhBXfXjcShPD/a30g==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-preview": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-preview/-/mjml-head-preview-4.11.0.tgz", - "integrity": "sha512-f79+OtwC8CYcQpglGNfm3s74qVecdwLlDm9DD/LJvZwIdaALeIfZF36nz6+rtCLMhND+wxgqxqkmbbuS6AbO+A==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-style": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-style/-/mjml-head-style-4.11.0.tgz", - "integrity": "sha512-jw0r9Ld56SkJmDUBx+27xOH+oY2O06FBcKSJIkZLJ/sefbjgJa2/ti2eso/LeGgrmTw8zge7g1pp0Fl+kPjsGA==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-head-title": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-head-title/-/mjml-head-title-4.11.0.tgz", - "integrity": "sha512-mjYsKoE9+5LI8V0mK9SAKVKspF19TVius2q5I1FXLRdBmt4Ei87CdrSui+iixGrug0Lwt4P2W3+mK8kVGNnJAQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-hero": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-hero/-/mjml-hero-4.11.0.tgz", - "integrity": "sha512-tZDCGjQrDICwbsDnLvfVEsQ5+GdrIozB3oO3NxC6m2Eq04VKNBkIqq+QvJyouOxzJ3CZgO2B4rylzxc6YXuHsw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-image": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-image/-/mjml-image-4.11.0.tgz", - "integrity": "sha512-qjvKS/x2arDNgKppPecmg69VyXdQbb1CNVqPwowJLyfjioTw4hxQ93suWoBKJJojRjkwauj9IRMC8TR9ffn0HQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-migrate": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-migrate/-/mjml-migrate-4.11.0.tgz", - "integrity": "sha512-Y+9U4w9LwlTkfTkHX9GdalIQDO4JQxboG4PM8g7vRKNhKSZDZH8QSr0SNhX0+fMQmjb9b0nztWbMVVvNZfMoPQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "js-beautify": "^1.6.14", - "lodash": "^4.17.21", - "mjml-core": "4.11.0", - "mjml-parser-xml": "4.11.0", - "yargs": "^16.1.0" - } - }, - "mjml-navbar": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-navbar/-/mjml-navbar-4.11.0.tgz", - "integrity": "sha512-FEd+8RD6ra8652jXdMbhfhzT1YY8TA30c34qjJ+ULlFgvLH4GNnYRIOHp/Mgd/L38Qf3bhK/rK9ELBidJ36dLQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-parser-xml": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-parser-xml/-/mjml-parser-xml-4.11.0.tgz", - "integrity": "sha512-3toQ9UKyfzXWXJ7PlTExBjzGXAzJNORv39sorPv5sG2KJsvPC6NE+e+/1GyqYFhk4JffHoDfd4mQ6w050qYATQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "detect-node": "2.0.4", - "htmlparser2": "^4.1.0", - "lodash": "^4.17.15" - }, - "dependencies": { - "domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "requires": { - "domelementtype": "^2.0.1" - } - }, - "htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - } - } - }, - "mjml-preset-core": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-preset-core/-/mjml-preset-core-4.11.0.tgz", - "integrity": "sha512-HU9ZFzS+A7Dx0B/EbnqYjdcIQQuxpOVRfFReQBlllZYwjWaRUjDIeIjF+cdnCb9QveuSNo4msIG00h/MKPYiGQ==", - "requires": { - "@babel/runtime": "^7.14.6", - "mjml-accordion": "4.11.0", - "mjml-body": "4.11.0", - "mjml-button": "4.11.0", - "mjml-carousel": "4.11.0", - "mjml-column": "4.11.0", - "mjml-divider": "4.11.0", - "mjml-group": "4.11.0", - "mjml-head": "4.11.0", - "mjml-head-attributes": "4.11.0", - "mjml-head-breakpoint": "4.11.0", - "mjml-head-font": "4.11.0", - "mjml-head-html-attributes": "4.11.0", - "mjml-head-preview": "4.11.0", - "mjml-head-style": "4.11.0", - "mjml-head-title": "4.11.0", - "mjml-hero": "4.11.0", - "mjml-image": "4.11.0", - "mjml-navbar": "4.11.0", - "mjml-raw": "4.11.0", - "mjml-section": "4.11.0", - "mjml-social": "4.11.0", - "mjml-spacer": "4.11.0", - "mjml-table": "4.11.0", - "mjml-text": "4.11.0", - "mjml-wrapper": "4.11.0" - } - }, - "mjml-raw": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-raw/-/mjml-raw-4.11.0.tgz", - "integrity": "sha512-DyUwC/JrE8tF7v9XaKQpQ/yAg5tT2uAWSDI6J5x3t3TNFJmRPd3iorSu8v6t1s3OiekuxfagsDDPLFuzpGwZSw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-section": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-section/-/mjml-section-4.11.0.tgz", - "integrity": "sha512-OpinxE019Z1symrEFku3UddsvSql2aolcAiOThFuAAXz3+tUuooofGMy/XyyMOuOnktOx/5PMcVFsV84/Jye/g==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-social": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-social/-/mjml-social-4.11.0.tgz", - "integrity": "sha512-tM5njGtang0VRWt+XCuMTnZP2IJehUd+kdsC7CnMKQhYI2X4vzEaOBLgXRWvhcT4pSBzEJkXB9sQ+y7JmLO10g==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-spacer": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-spacer/-/mjml-spacer-4.11.0.tgz", - "integrity": "sha512-9s6PjFgznKEFgFZCSa4vTYVDQ6kRH5ucMHGraoHS4VMZLA8QIaVakHd4Sl0n+SGWCqair4xZ3vYYMhOBKIXmMw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-table": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-table/-/mjml-table-4.11.0.tgz", - "integrity": "sha512-ccniRz1MoDqKS6zoNM59xi81M7zy/tkvd/6weyH9XAZiU7ATgOxoBuIMy+d0uSTlKPWNwoi2FqR5YSedxT2YPw==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-text": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-text/-/mjml-text-4.11.0.tgz", - "integrity": "sha512-xrY5+uepxUg+q5KKuKX2s9KQnnlsMN5aoCt0JSbjt4H9ZwBpqXPD4Z2uJ8eZS33FvnXzUYPNVdKralvXnrsXKA==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0" - } - }, - "mjml-validator": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-validator/-/mjml-validator-4.11.0.tgz", - "integrity": "sha512-oDL9tHcL4PaCZMwH6T/lLpS7LV9cm9lIwnzJy+y5/S81MGMV6kPr6xXHgS0A01G7sseg6+rHgqBnUgzUob4Ilg==", - "requires": { - "@babel/runtime": "^7.14.6" - } - }, - "mjml-wrapper": { - "version": "4.11.0", - "resolved": "https://registry.npmjs.org/mjml-wrapper/-/mjml-wrapper-4.11.0.tgz", - "integrity": "sha512-WXGKxS+DlYalx5ofwq3bttj26BLEcaueeQ+0BcffXIELojUzd0+xTyX09v0QemUCBmKpHB2QaKMGhzYuSkupyg==", - "requires": { - "@babel/runtime": "^7.14.6", - "lodash": "^4.17.21", - "mjml-core": "4.11.0", - "mjml-section": "4.11.0" } }, "mkdirp": { @@ -5532,12 +3940,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true - }, - "nanoid": { - "version": "3.1.25", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", - "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", - "dev": true } } }, @@ -5547,37 +3949,25 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "nanoid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz", - "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==" + "version": "3.1.25", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", + "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q==", + "dev": true }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==" }, - "neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==" - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "requires": { - "lower-case": "^1.1.1" - } - }, "node-addon-api": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.2.0.tgz", - "integrity": "sha512-eazsqzwG2lskuzBqCGPi7Ac2UgOoMz8JVOXVhTvvPDYhthvNpefx8jWD8Np7Gv+2Sz0FlPWZk0nJV0z598Wn8Q==" + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-4.3.0.tgz", + "integrity": "sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==" }, "node-fetch": { - "version": "2.6.6", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.6.tgz", - "integrity": "sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==", + "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" } @@ -5598,26 +3988,24 @@ "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "npmlog": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", - "integrity": "sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==", + "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": "^4.0.0", + "gauge": "^3.0.0", "set-blocking": "^2.0.0" } }, - "nth-check": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", - "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", - "requires": { - "boolbase": "^1.0.0" - } + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "on-finished": { "version": "2.3.0", @@ -5635,11 +4023,6 @@ "wrappy": "1" } }, - "opencollective-postinstall": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz", - "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==" - }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -5658,27 +4041,6 @@ "p-limit": "^3.0.2" } }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "requires": { - "no-case": "^2.2.0" - } - }, - "parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==" - }, - "parse5-htmlparser2-tree-adapter": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz", - "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==", - "requires": { - "parse5": "^6.0.1" - } - }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", @@ -5709,7 +4071,8 @@ "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", - "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==" + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true }, "prisma": { "version": "3.3.0", @@ -5726,11 +4089,6 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, - "proto-list": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=" - }, "proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -5740,11 +4098,6 @@ "ipaddr.js": "1.9.1" } }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" - }, "qs": { "version": "6.7.0", "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", @@ -5794,6 +4147,7 @@ "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, "requires": { "picomatch": "^2.2.1" } @@ -5827,20 +4181,11 @@ "redis-errors": "^1.0.0" } }, - "regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" - }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=" - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true }, "rimraf": { "version": "3.0.2", @@ -5866,21 +4211,6 @@ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "requires": { "lru-cache": "^6.0.0" - }, - "dependencies": { - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "requires": { - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } } }, "send": { @@ -5940,25 +4270,10 @@ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "sigmund": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", - "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=" - }, "signal-exit": { - "version": "3.0.6", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", - "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" - }, - "slick": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz", - "integrity": "sha1-vQSN23TefRymkV+qSldXCzVQwtc=" - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "statuses": { "version": "1.5.0", @@ -6052,19 +4367,13 @@ "minizlib": "^2.1.1", "mkdirp": "^1.0.3", "yallist": "^4.0.0" - }, - "dependencies": { - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - } } }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "requires": { "is-number": "^7.0.0" } @@ -6099,11 +4408,6 @@ "yn": "3.1.1" } }, - "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" - }, "type-detect": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", @@ -6125,21 +4429,11 @@ "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "dev": true }, - "uglify-js": { - "version": "3.14.4", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.4.tgz", - "integrity": "sha512-AbiSR44J0GoCeV81+oxcy/jDOElO2Bx3d0MfQCUShq7JRXaM4KtQopZsq2vFv8bCq2yMaGrw1FgygUd03RyRDA==" - }, "unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=" - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -6150,55 +4444,11 @@ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=" }, - "valid-data-url": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz", - "integrity": "sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==" - }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "web-resource-inliner": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-5.0.0.tgz", - "integrity": "sha512-AIihwH+ZmdHfkJm7BjSXiEClVt4zUFqX4YlFAzjL13wLtDuUneSaFvDBTbdYRecs35SiU7iNKbMnN+++wVfb6A==", - "requires": { - "ansi-colors": "^4.1.1", - "escape-goat": "^3.0.0", - "htmlparser2": "^4.0.0", - "mime": "^2.4.6", - "node-fetch": "^2.6.0", - "valid-data-url": "^3.0.0" - }, - "dependencies": { - "domhandler": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz", - "integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==", - "requires": { - "domelementtype": "^2.0.1" - } - }, - "htmlparser2": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz", - "integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==", - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^3.0.0", - "domutils": "^2.0.0", - "entities": "^2.0.0" - } - }, - "mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==" - } - } - }, "webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", @@ -6230,11 +4480,6 @@ "string-width": "^1.0.2 || 2 || 3 || 4" } }, - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - }, "workerpool": { "version": "6.1.5", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.1.5.tgz", @@ -6245,6 +4490,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, "requires": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -6259,17 +4505,19 @@ "y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true }, "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "yargs": { "version": "16.2.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, "requires": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -6283,7 +4531,8 @@ "yargs-parser": { "version": "20.2.4", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz", - "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==" + "integrity": "sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==", + "dev": true }, "yargs-unparser": { "version": "2.0.0", diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index df5a8a4..465b8bf 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -20,10 +20,10 @@ export const getAllEvents = async (req: Request, res: Response) => { export const getEvent = async (req: Request, res: Response) => { const eventId = req.params.eventId; - if (eventId === undefined || null) { + if (typeof eventId !== "string") { res.status(400).json( generateInvalidBodyError({ - eventId: DataType.STRING, + eventId: DataType.UUID, }) ); return; @@ -58,7 +58,7 @@ export const getEvent = async (req: Request, res: Response) => { type: "error", payload: { message: "Unknown error occurred with your request. Check if your parameters are correct", - shema: { + schema: { eventId: DataType.UUID, }, }, From f6d194f0c97f48d45c4ddcef579be54ad0fb47cb Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 14:01:45 +0200 Subject: [PATCH 108/128] Fix: The server should always return 403 on failed login --- src/Controllers/admin_auth.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controllers/admin_auth.controller.ts b/src/Controllers/admin_auth.controller.ts index 33ce37b..760e85d 100644 --- a/src/Controllers/admin_auth.controller.ts +++ b/src/Controllers/admin_auth.controller.ts @@ -50,7 +50,7 @@ export const authenticateUser = async (req: Request<{}, {}, AuthenticateUserBody // with only the username if (!user) { - return res.status(404).json({ + return res.status(403).json({ type: "error", payload: { message: `The provided credentials are not valid`, From d688a7db9cec0f0d2932bd551b4dcd404f059e56 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sat, 23 Apr 2022 14:52:23 +0200 Subject: [PATCH 109/128] HOTFIX: Name of uuid function The prisma schema didn't compile with the previous schema --- prisma/schema.prisma | 328 ++++++++++++++++++++++--------------------- 1 file changed, 170 insertions(+), 158 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index e65ae5b..8025cd4 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -1,158 +1,170 @@ -// Schema for the main database - -datasource db { - provider = "postgresql" - url = env("DATABASE_URL") -} - -generator client { - provider = "prisma-client-js" -} - -model Event { - id Int @id @default(autoincrement()) // Primary key - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key - date DateTime - name String - description String - - disciplines Discipline[] - organisations Organisation[] - campaign Campaign[] -} - -model Campaign { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - start DateTime - expiresAt DateTime - - links Link[] - event Event @relation(fields: [eventId], references: [id]) - eventId Int @unique -} - -model Link { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - link String - - campaign Campaign @relation(fields: [campaignId], references: [id]) - campaignId Int - group Group? @relation(fields: [groupId], references: [id]) - groupId Int @unique -} - -model Admin { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String @unique - password String // TODO: Probably specify hash size (VarChar or some other type) - - permission_level AdminLevel @default(STANDARD) - revision DateTime @default(now()) - groups Group[] -} - -model Discipline { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - minTeamSize Int - maxTeamSize Int - roles RoleSchema[] - - teams Team[] - event Event @relation(fields: [eventId], references: [id]) - eventId Int -} - -model RoleSchema { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - schema Json - - roles Role[] - discipline Discipline @relation(fields: [disciplineId], references: [id]) - disciplineId Int -} - -model Team { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - leaderEmail String - - roles Role[] @relation(name: "participants") - discipline Discipline @relation(fields: [disciplineId], references: [id]) - disciplineId Int -} - -model Participant { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - firstName String - lastName String - gender Gender - - verified Boolean @default(false) - - group Group @relation(fields: [groupId], references: [id]) - groupId Int - roles Role[] -} - -model Role { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random")) - name String //e.g. runner, swimmer,... - importance Job - score String - - participant Participant? @relation(fields: [participantId], references: [id]) - participantId Int? - team Team @relation(name: "participants", fields: [teamId], references: [id]) - teamId Int - schema RoleSchema @relation(fields: [schemaId], references: [id]) - schemaId Int -} - -model Organisation { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - - groups Group[] - event Event @relation(fields: [eventId], references: [id]) - eventId Int -} - -model Group { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - name String - user_limit Int @default(40) - level Int - - oragnisation Organisation @relation(fields: [oragnisationId], references: [id]) - oragnisationId Int - participants Participant[] - link Link? - admins Admin[] -} - -enum AdminLevel { - STANDARD - ELEVATED -} - -enum Gender { - MALE - FEMALE - OTHER -} - -enum Job { - TEAMLEADER - MEMBER +// Schema for the main database + +datasource db { + provider = "postgresql" + url = env("DATABASE_URL") +} + +generator client { + provider = "prisma-client-js" +} + +model Event { + id Int @id @default(autoincrement()) // Primary key + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid // Public key + date DateTime + name String + description String + + disciplines Discipline[] + organisations Organisation[] + campaign Campaign[] + visual Media[] +} + +model Campaign { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + start DateTime + expiresAt DateTime + + links Link[] + event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) + eventId Int @unique +} + +model Link { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + link String + + campaign Campaign @relation(fields: [campaignId], references: [id], onDelete: Cascade) + campaignId Int + group Group @relation(fields: [groupId], references: [id], onDelete: Cascade) + groupId Int @unique +} + +model Admin { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String @unique + password String // TODO: Probably specify hash size (VarChar or some other type) + + permission_level AdminLevel @default(STANDARD) + revision DateTime @default(now()) + groups Group[] +} + +model Discipline { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + minTeamSize Int + maxTeamSize Int + + roles RoleSchema[] + teams Team[] + event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) + eventId Int + visual Media[] +} + +model RoleSchema { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + schema Json + + roles Role[] + discipline Discipline @relation(fields: [disciplineId], references: [id], onDelete: Cascade) + disciplineId Int + visual Media[] +} + +model Team { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + leaderEmail String + + roles Role[] @relation(name: "participants") + discipline Discipline @relation(fields: [disciplineId], references: [id], onDelete: Cascade) + disciplineId Int +} + +model Participant { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + firstName String + lastName String + gender Gender + relevance Job + + group Group @relation(fields: [groupId], references: [id], onDelete: Cascade) + groupId Int + roles Role[] +} + +model Role { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) + score String + + participant Participant? @relation(fields: [participantId], references: [id], onDelete: SetNull) + participantId Int? + team Team @relation(name: "participants", fields: [teamId], references: [id], onDelete: Cascade) + teamId Int + schema RoleSchema @relation(fields: [schemaId], references: [id], onDelete: Cascade) + schemaId Int +} + +model Organisation { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + + groups Group[] + event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) + eventId Int +} + +model Group { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + name String + user_limit Int @default(40) + level Int + + oragnisation Organisation @relation(fields: [oragnisationId], references: [id], onDelete: Cascade) + oragnisationId Int + participants Participant[] + link Link? + admins Admin[] +} + +model Media { + id Int @id @default(autoincrement()) + pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid + description String + location String @unique + + event Event[] + discipline Discipline[] + role RoleSchema[] +} + +enum AdminLevel { + STANDARD + ELEVATED +} + +enum Gender { + MALE + FEMALE + OTHER +} + +enum Job { + TEAMLEADER + MEMBER +} From 382a42d4393a1b457620eb5fb50fc7805e007624 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 27 Apr 2022 15:30:55 +0200 Subject: [PATCH 110/128] Add basic error handling + Add express-async-errors package to handle async errors + Add ForwaradableError class (Base class for all project-specific errors) + Add defaultErrorHandler middleware which handles errors and sends info to the client --- package.json | 1 + src/Middleware/error/ForwardableError.ts | 16 +++++++++++ src/Middleware/error/handler.ts | 36 ++++++++++++++++++++++++ src/app.ts | 7 +++++ 4 files changed, 60 insertions(+) create mode 100644 src/Middleware/error/ForwardableError.ts create mode 100644 src/Middleware/error/handler.ts diff --git a/package.json b/package.json index 4166d94..9bbdaf3 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "argon2": "^0.28.2", "dotenv": "^10.0.0", "express": "^4.17.1", + "express-async-errors": "^3.1.1", "jsonwebtoken": "^8.5.1", "nodemailer": "^6.7.0", "redis": "^3.1.2" diff --git a/src/Middleware/error/ForwardableError.ts b/src/Middleware/error/ForwardableError.ts new file mode 100644 index 0000000..04bc5e1 --- /dev/null +++ b/src/Middleware/error/ForwardableError.ts @@ -0,0 +1,16 @@ +export default class ForwardableError extends Error { + // If in different context + private readonly __id = "CUSTOM_ERROR"; + + public readonly status: number; + + constructor(status: number, message: string) { + super(message); + + this.status = status; + } + + static isForwardableError(error: any): error is ForwardableError { + return error.__id === "CUSTOM_ERROR"; + } +} diff --git a/src/Middleware/error/handler.ts b/src/Middleware/error/handler.ts new file mode 100644 index 0000000..d182f19 --- /dev/null +++ b/src/Middleware/error/handler.ts @@ -0,0 +1,36 @@ +import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; +import { NextFunction, Request, Response } from "express"; +import ForwardableError from "./ForwardableError"; + +const env = process.env.NODE_ENV || "production"; + +export default function defaultErrorHandler(err: any, req: Request, res: Response, next: NextFunction) { + if (ForwardableError.isForwardableError(err)) { + return res.status(err.status).json({ + type: "error", + payload: { + message: err.message, + ...(env === "development" + ? { + stack: err.stack, + } + : {}), + }, + }); + } + + if (err instanceof PrismaClientUnknownRequestError) { + return res.status(404).json({ + type: "error", + payload: { + message: "An unknown error occured. This could be due to malformed IDs", + ...(env === "development" + ? { + prisma: err.message, + stack: err.stack, + } + : {}), + }, + }); + } +} diff --git a/src/app.ts b/src/app.ts index bb3b56b..83e28d1 100644 --- a/src/app.ts +++ b/src/app.ts @@ -6,6 +6,10 @@ import argon2 from "argon2"; import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; +import defaultErrorHandler from "./Middleware/error/handler"; + +// Set up async error handling +require("express-async-errors"); require("dotenv").config(); // Load dotenv config @@ -52,6 +56,9 @@ async function main() { app.use("/api/groups", groupRouter); + // Error handling + app.use(defaultErrorHandler); + app.listen(process.env.PORT, () => { console.log(`Listening on Port: ${process.env.PORT}`); }); From 9516b60d93e45b4985b79229de186f8324374f3d Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 27 Apr 2022 17:00:36 +0200 Subject: [PATCH 111/128] Add logger using winston + Add formats + Add debug and error log files --- src/Middleware/error/handler.ts | 3 +++ src/Middleware/error/logger.ts | 39 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 src/Middleware/error/logger.ts diff --git a/src/Middleware/error/handler.ts b/src/Middleware/error/handler.ts index d182f19..33f3448 100644 --- a/src/Middleware/error/handler.ts +++ b/src/Middleware/error/handler.ts @@ -1,6 +1,7 @@ import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { NextFunction, Request, Response } from "express"; import ForwardableError from "./ForwardableError"; +import logger from "./logger"; const env = process.env.NODE_ENV || "production"; @@ -20,6 +21,8 @@ export default function defaultErrorHandler(err: any, req: Request, res: Respons } if (err instanceof PrismaClientUnknownRequestError) { + logger.warning(err); + return res.status(404).json({ type: "error", payload: { diff --git a/src/Middleware/error/logger.ts b/src/Middleware/error/logger.ts new file mode 100644 index 0000000..184f5f7 --- /dev/null +++ b/src/Middleware/error/logger.ts @@ -0,0 +1,39 @@ +import winston, { createLogger } from "winston"; + +const { + format: { printf, colorize, combine, timestamp, json, errors, prettyPrint }, +} = winston; + +const defaultJsonFormat = combine(errors({ stack: true }), timestamp(), json({ space: 2 })); + +const customCLIFormat = printf(({ level, message, label, timestamp, stack }) => { + let output = `${level}${stack ? `(1/2:message)` : ""} at ${timestamp}${label ? ` (#${label})` : ""}: ${message}\n`; + + if (stack) { + output += `\n${level}(2/2:stack)${label ? ` (#${label})` : ""}: ${stack}\n\n`; + } + + return output; +}); + +export default createLogger({ + levels: winston.config.syslog.levels, + format: combine(errors({ stack: true }), timestamp()), + transports: [ + new winston.transports.Console({ + level: "debug", + format: combine(timestamp(), colorize(), customCLIFormat), + }), + new winston.transports.File({ + filename: "/app/error.log", + level: "error", + format: defaultJsonFormat, + }), + new winston.transports.File({ + level: "debug", + filename: "/app/debug.log", + format: defaultJsonFormat, + silent: !(process.env.NODE_ENV === "development"), // Silent when not in development + }), + ], +}); From 9ac4fb8efdaf8c299e5520998fe8dd894893d8a9 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Wed, 27 Apr 2022 17:14:16 +0200 Subject: [PATCH 112/128] Add logger to main + Remove whitespace --- src/Middleware/error/logger.ts | 4 +++- src/app.ts | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Middleware/error/logger.ts b/src/Middleware/error/logger.ts index 184f5f7..9674d1f 100644 --- a/src/Middleware/error/logger.ts +++ b/src/Middleware/error/logger.ts @@ -7,7 +7,9 @@ const { const defaultJsonFormat = combine(errors({ stack: true }), timestamp(), json({ space: 2 })); const customCLIFormat = printf(({ level, message, label, timestamp, stack }) => { - let output = `${level}${stack ? `(1/2:message)` : ""} at ${timestamp}${label ? ` (#${label})` : ""}: ${message}\n`; + let output = `${level}${stack ? `(1/2:message)` : ""} at ${timestamp}${label ? ` (#${label})` : ""}: ${message}${ + stack ? "\n" : "" + }`; if (stack) { output += `\n${level}(2/2:stack)${label ? ` (#${label})` : ""}: ${stack}\n\n`; diff --git a/src/app.ts b/src/app.ts index 83e28d1..d821084 100644 --- a/src/app.ts +++ b/src/app.ts @@ -7,6 +7,7 @@ import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; import defaultErrorHandler from "./Middleware/error/handler"; +import logger from "./Middleware/error/logger"; // Set up async error handling require("express-async-errors"); @@ -60,8 +61,10 @@ async function main() { app.use(defaultErrorHandler); app.listen(process.env.PORT, () => { - console.log(`Listening on Port: ${process.env.PORT}`); + logger.info(`Listening on port ${process.env.PORT}`); }); + + logger.info("Server started"); } main() From 8bf18267d1d203f78f972331a50c0c3deaa0f9e8 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:04:36 +0200 Subject: [PATCH 113/128] Fix: Add winston; And: Add custom error handlers + addCustomHandler() + removeCustomHandler() --- package.json | 3 ++- src/Middleware/error/handler.ts | 43 +++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9bbdaf3..e51d789 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "express-async-errors": "^3.1.1", "jsonwebtoken": "^8.5.1", "nodemailer": "^6.7.0", - "redis": "^3.1.2" + "redis": "^3.1.2", + "winston": "^3.7.2" }, "devDependencies": { "@types/chai": "^4.2.22", diff --git a/src/Middleware/error/handler.ts b/src/Middleware/error/handler.ts index 33f3448..fbfe846 100644 --- a/src/Middleware/error/handler.ts +++ b/src/Middleware/error/handler.ts @@ -5,7 +5,34 @@ import logger from "./logger"; const env = process.env.NODE_ENV || "production"; +type ErrorHandler = (err: any, req: Request, res: Response) => boolean; + +const customHandlers: ErrorHandler[] = []; + +export function addCustomHandler(handler: ErrorHandler) { + customHandlers.push(handler); +} + +export function removeCustomHandler(handler: ErrorHandler): Boolean { + const index = customHandlers.findIndex((h) => h === handler); + + if (index < 0) { + return false; + } + + customHandlers.splice(index); + + return true; +} + export default function defaultErrorHandler(err: any, req: Request, res: Response, next: NextFunction) { + for (const handler of customHandlers) { + // Run custom handler + if (handler(err, req, res)) { + return; + } + } + if (ForwardableError.isForwardableError(err)) { return res.status(err.status).json({ type: "error", @@ -36,4 +63,20 @@ export default function defaultErrorHandler(err: any, req: Request, res: Respons }, }); } + + logger.error("--- Unhandled error ---"); + logger.error(err); + + return res.status(err.status).json({ + type: "error", + payload: { + message: err.message, + ...(env === "development" + ? { + notice: "This error was not caught by any handler, please add handling!", + stack: err.stack, + } + : {}), + }, + }); } From 09931c78da5f2412188839da8d17a697073fb224 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 13:51:10 +0200 Subject: [PATCH 114/128] Add logger and remove unused code --- src/app.ts | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/app.ts b/src/app.ts index d821084..bda5053 100644 --- a/src/app.ts +++ b/src/app.ts @@ -34,17 +34,6 @@ async function main() { app.use(express.urlencoded({ extended: true })); app.use(express.json()); - app.use((err: any, req: Request, res: Response, next: NextFunction) => { - if (err) { - res.status(400).send({ - type: "error", - payload: "The body of your request did not contain valid data", - }); - } else { - next(); - } - }); - // Admin authentication endpoints app.use("/api/authentication", adminAuthRouter); @@ -65,10 +54,15 @@ async function main() { }); logger.info("Server started"); + + process.on("exit", () => { + logger.info("Server stopping..."); + }); } main() .catch((e) => { + logger.crit(e); throw e; }) .finally(async () => { From 51c744de26a6604a970f1770dad39a7adfa03d49 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 14:35:15 +0200 Subject: [PATCH 115/128] Add debugging code + Small fix in the event controller + Add development flag to the dev container --- dev.sh | 1 + src/Controllers/event.controller.ts | 14 +++++++------- src/Middleware/debug/logger.ts | 10 ++++++++++ src/app.ts | 7 +++++++ 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 src/Middleware/debug/logger.ts diff --git a/dev.sh b/dev.sh index b669776..258ad38 100755 --- a/dev.sh +++ b/dev.sh @@ -52,6 +52,7 @@ if [ "$RECREATE" = true ]; then -p $D_PORT:$D_PORT -e PORT=$D_PORT \ -e DATABASE_PASSWORD=server \ -e DATABASE_URL="postgresql://server:server@postgres:5432/management?schema=public" \ + -e NODE_ENV="development" \ --entrypoint "/app/scripts/docker-entrypoint.dev.sh" \ node fi diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 4789a1f..6667aa6 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -14,13 +14,13 @@ export const getAllEvents = async (req: Request, res: Response) => { id: false, }, }); - if (events.length > 0) - res.status(200).json({ - type: "success", - payload: { - events, - }, - }); + + res.status(200).json({ + type: "success", + payload: { + events, + }, + }); }; export const getEvent = async (req: Request, res: Response) => { diff --git a/src/Middleware/debug/logger.ts b/src/Middleware/debug/logger.ts new file mode 100644 index 0000000..11711a2 --- /dev/null +++ b/src/Middleware/debug/logger.ts @@ -0,0 +1,10 @@ +import { NextFunction, Request, Response } from "express"; +import logger from "../error/logger"; + +export default function debugLogger(req: Request, res: Response, next: NextFunction) { + // Only log when in development mode + if (process.env.NODE_ENV === "development") { + logger.debug(`Request to: ${req.url}`); + next(); + } +} diff --git a/src/app.ts b/src/app.ts index bda5053..da3df2c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -8,6 +8,7 @@ import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; import defaultErrorHandler from "./Middleware/error/handler"; import logger from "./Middleware/error/logger"; +import debugLogger from "./Middleware/debug/logger"; // Set up async error handling require("express-async-errors"); @@ -16,6 +17,10 @@ require("dotenv").config(); // Load dotenv config const app = express(); +if (process.env.NODE_ENV === "development") { + logger.info("Using development mode"); +} + async function main() { // Dev await prisma.admin.upsert({ @@ -34,6 +39,8 @@ async function main() { app.use(express.urlencoded({ extended: true })); app.use(express.json()); + app.use(debugLogger); + // Admin authentication endpoints app.use("/api/authentication", adminAuthRouter); From 6fb09b9f3198ff9b4e850cf8833f13fbf88e1e6c Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 29 Apr 2022 10:25:13 +0200 Subject: [PATCH 116/128] HOTFIX: next() only called when in development mode + Push fix, now the server should be working again --- src/Middleware/debug/logger.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Middleware/debug/logger.ts b/src/Middleware/debug/logger.ts index 11711a2..64310c1 100644 --- a/src/Middleware/debug/logger.ts +++ b/src/Middleware/debug/logger.ts @@ -5,6 +5,7 @@ export default function debugLogger(req: Request, res: Response, next: NextFunct // Only log when in development mode if (process.env.NODE_ENV === "development") { logger.debug(`Request to: ${req.url}`); - next(); } + + next(); } From df9b47dbfda5d33159648264976b5602e1a006a0 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 15:04:39 +0200 Subject: [PATCH 117/128] Add router to delete groups + Add route to delete organisations --- src/Controllers/group.controllers.ts | 28 ++++++++++++++++++++++++++-- src/Routes/group.routes.ts | 9 ++++++++- src/Routes/organisation.routes.ts | 2 ++ 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/Controllers/group.controllers.ts b/src/Controllers/group.controllers.ts index 10f42c7..ee7fb5e 100644 --- a/src/Controllers/group.controllers.ts +++ b/src/Controllers/group.controllers.ts @@ -1,8 +1,8 @@ import { Admin } from "@prisma/client"; -import { PrismaClientUnknownRequestError } from "@prisma/client/runtime"; +import { PrismaClientKnownRequestError, PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { generateError, genericError, handleCreateByName } from "./common"; +import { createInsufficientPermissionsError, generateError, genericError, handleCreateByName } from "./common"; const basicGroup = { pid: true, @@ -114,3 +114,27 @@ export const createGroup = async (req: Request<{ organisationPid: string }, {}, res ); }; + +interface DeleteGroupQueryParams { + pid: string; +} + +export const deleteGroup = async (req: Request, res: Response) => { + if (req.auth?.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { pid } = req.params; + + try { + prisma.group.delete({ where: { pid } }); + + return res.status(204).end(); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { + return res.status(404).json(generateError(`The group with the ID ${pid} could not be found`)); + } + + throw e; + } +}; diff --git a/src/Routes/group.routes.ts b/src/Routes/group.routes.ts index 12ae59d..4ab9387 100644 --- a/src/Routes/group.routes.ts +++ b/src/Routes/group.routes.ts @@ -1,5 +1,11 @@ import express from "express"; -import { createGroup, getAllGroups, getAllGroupsWithParam, getGroup } from "../Controllers/group.controllers"; +import { + createGroup, + deleteGroup, + getAllGroups, + getAllGroupsWithParam, + getGroup, +} from "../Controllers/group.controllers"; import { requireAuthentication } from "../Middleware/auth/auth"; import organisationRouter from "./organisation.routes"; @@ -7,6 +13,7 @@ const router = express.Router(); router.get("/", getAllGroups); router.get("/:pid", getGroup); +router.delete<"/:pid", { pid: string }>("/:pid", requireAuthentication, deleteGroup); organisationRouter.get("/:organisationPid/groups", getAllGroupsWithParam); organisationRouter.post("/:organisationPid/groups", requireAuthentication, createGroup); diff --git a/src/Routes/organisation.routes.ts b/src/Routes/organisation.routes.ts index 7cff08d..9cda611 100644 --- a/src/Routes/organisation.routes.ts +++ b/src/Routes/organisation.routes.ts @@ -2,6 +2,7 @@ import express from "express"; import eventRouter from "./event.routes"; import { createOrganisation, + deleteOrganisation, getAllOrganisations, getAllOrganisationsWithParam, getOrganisation, @@ -14,6 +15,7 @@ const router = express.Router(); router.get("/", getAllOrganisations); router.get("/:pid", getOrganisation); router.put<"/:pid", { pid: string }>("/:pid", requireAuthentication, updateOrganisation); +router.delete<"/:pid", { pid: string }>("/:pid", requireAuthentication, deleteOrganisation); eventRouter.get("/:eventPid/organisations", getAllOrganisationsWithParam); eventRouter.post<"/:eventPid/organisations", { eventPid: string }>( From 3c8cea8c7145b627432592ee87fd49ea2d7129e8 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Thu, 28 Apr 2022 16:14:48 +0200 Subject: [PATCH 118/128] Add routes for getting disciplines + Throwing an error still crashes the server --- src/Controllers/discipline.controller.ts | 102 +++++++++++++++++++++++ src/Routes/discipline.routes.ts | 9 ++ src/app.ts | 5 +- 3 files changed, 115 insertions(+), 1 deletion(-) create mode 100644 src/Controllers/discipline.controller.ts create mode 100644 src/Routes/discipline.routes.ts diff --git a/src/Controllers/discipline.controller.ts b/src/Controllers/discipline.controller.ts new file mode 100644 index 0000000..8a927a1 --- /dev/null +++ b/src/Controllers/discipline.controller.ts @@ -0,0 +1,102 @@ +import { Prisma, Organisation, Admin, AdminLevel, Team } from "@prisma/client"; +import { Request, Response } from "express"; +import prisma from "../lib/prisma"; +import ForwardableError from "../Middleware/error/ForwardableError"; + +const basicDiscipline = { + pid: true, + name: true, + visual: { select: { pid: true, location: true } }, + maxTeamSize: true, + minTeamSize: true, + event: { select: { pid: true, name: true } }, + roles: { select: { pid: true, name: true } }, +} as const; + +const authenticatedDiscipline = { + ...basicDiscipline, + teams: { select: { pid: true, name: true } }, +} as const; + +const elevatedDiscipline: Prisma.DisciplineFindManyArgs["select"] = { + ...authenticatedDiscipline, + teams: { select: { pid: true, name: true, leaderEmail: true } }, +}; + +export const _getAllDisciplines = async ( + res: Response, + authenticated: boolean | undefined, + eventId: string | undefined +) => { + const disciplines = await prisma.discipline.findMany({ + where: { event: { pid: eventId } }, + select: !authenticated ? basicDiscipline : authenticatedDiscipline, + }); + + return res.status(200).json({ + type: "success", + payload: { + disciplines, + }, + }); +}; + +interface GetAllDisciplinesSearchParams { + eventPid?: string; +} + +export const getAllDisciplines = async (req: Request<{}, {}, {}, GetAllDisciplinesSearchParams>, res: Response) => { + return _getAllDisciplines(res, req.auth?.isAuthenticated, req.query.eventPid); +}; + +interface GetAllDisciplinesQueryParams { + eventPid: string; +} + +export const GetAllDisciplinesWithParam = async (req: Request, res: Response) => { + return _getAllDisciplines(res, req.auth?.isAuthenticated, req.params.eventPid); +}; + +interface GetDisciplineQueryParams { + pid: string; +} + +export const getDiscipline = async (req: Request, res: Response) => { + const { pid } = req.params; + + const discipline = await prisma.discipline.findUnique({ + where: { pid }, + select: !req.auth?.isAuthenticated + ? basicDiscipline + : req.auth.permission_level !== "ELEVATED" + ? authenticatedDiscipline + : elevatedDiscipline, + }); + + if (!discipline) { + throw new ForwardableError(404, `The discipline with ID ${pid} could not be found`); + } + + return res.status(200).json({ + type: "success", + payload: { + discipline: { + ...discipline, + event: { + ...discipline.event, + _links: [{ rel: "self", type: "GET", href: `/api/events/${discipline.event.pid}` }], + }, + roles: discipline.roles.map((role) => ({ + ...role, + _links: [{ rel: "self", type: "GET", href: `/api/role/${role.pid}` }], + })), + ...((discipline as any).teams + ? (discipline as any).teams.map((team: Team) => ({ + ...team, + _links: [{ rel: "self", type: "GET", href: `/api/teams/${team.pid}` }], + })) + : {}), + }, + }, + }); +}; diff --git a/src/Routes/discipline.routes.ts b/src/Routes/discipline.routes.ts new file mode 100644 index 0000000..ef158cd --- /dev/null +++ b/src/Routes/discipline.routes.ts @@ -0,0 +1,9 @@ +import express from "express"; +import { getAllDisciplines, getDiscipline } from "../Controllers/discipline.controller"; + +const router = express.Router(); + +router.get("/", getAllDisciplines); // TODO: Optional auth +router.get("/:pid", getDiscipline); + +export default router; diff --git a/src/app.ts b/src/app.ts index da3df2c..64e9789 100644 --- a/src/app.ts +++ b/src/app.ts @@ -6,6 +6,7 @@ import argon2 from "argon2"; import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; +import disciplineRouter from "./Routes/discipline.routes"; import defaultErrorHandler from "./Middleware/error/handler"; import logger from "./Middleware/error/logger"; import debugLogger from "./Middleware/debug/logger"; @@ -53,8 +54,10 @@ async function main() { app.use("/api/groups", groupRouter); + app.use("/api/disciplines", disciplineRouter); + // Error handling - app.use(defaultErrorHandler); + app.use(defaultErrorHandler); // Not working app.listen(process.env.PORT, () => { logger.info(`Listening on port ${process.env.PORT}`); From 9bafdebd31474d410adf9f3bba8a07d9103f4e09 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Fri, 29 Apr 2022 10:08:50 +0200 Subject: [PATCH 119/128] Add function to create disciplines + Fix async errors + Extract name error --- src/Controllers/common.ts | 14 +++--- src/Controllers/discipline.controller.ts | 64 +++++++++++++++++++++++- src/Middleware/error/ForwardableError.ts | 1 + src/Middleware/error/NotFoundError.ts | 13 +++++ src/Routes/discipline.routes.ts | 6 ++- 5 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 src/Middleware/error/NotFoundError.ts diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index a9a0caf..88fc839 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -64,6 +64,13 @@ export const genericError = { }, }; +export const NAME_ERROR = { + type: "error", + payload: { + message: "The name has to be at least 1 character long", + }, +}; + export function validateName(name: string) { return name.length > 0; } @@ -106,12 +113,7 @@ export async function handleCreateByName( } if (!validateName(name)) { - return res.status(400).json({ - type: "error", - payload: { - message: "The name has to be at least 1 character long", - }, - }); + return res.status(400).json(NAME_ERROR); } // Check if link object exsits diff --git a/src/Controllers/discipline.controller.ts b/src/Controllers/discipline.controller.ts index 8a927a1..fbe4a72 100644 --- a/src/Controllers/discipline.controller.ts +++ b/src/Controllers/discipline.controller.ts @@ -1,7 +1,19 @@ import { Prisma, Organisation, Admin, AdminLevel, Team } from "@prisma/client"; +import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; import ForwardableError from "../Middleware/error/ForwardableError"; +import NotFoundError from "../Middleware/error/NotFoundError"; +import { + createInsufficientPermissionsError, + DataType, + generateError, + generateInvalidBodyError, + NAME_ERROR, + validateName, +} from "./common"; + +require("express-async-errors"); const basicDiscipline = { pid: true, @@ -74,7 +86,7 @@ export const getDiscipline = async (req: Request, res: }); if (!discipline) { - throw new ForwardableError(404, `The discipline with ID ${pid} could not be found`); + throw new NotFoundError("discipline", pid); } return res.status(200).json({ @@ -100,3 +112,53 @@ export const getDiscipline = async (req: Request, res: }, }); }; + +interface CreateDisciplineBody { + name?: string; + minTeamSize?: number; + maxTeamSize?: number; +} + +// require: auth(ELEVATED) +// at: POST /event/:eventPid/discipliens +export const createDiscipline = async (req: Request<{ eventPid: string }, {}, CreateDisciplineBody>, res: Response) => { + if (req.auth?.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { name, minTeamSize, maxTeamSize } = req.body; + + if (typeof name !== "string" || typeof minTeamSize !== "number" || typeof maxTeamSize !== "number") { + return res.status(400).json( + generateInvalidBodyError({ + name: DataType.STRING, + minTeamSize: DataType.NUMBER, + maxTeamSize: DataType.NUMBER, + }) + ); + } + + if (!validateName(name)) { + return res.status(400).json(NAME_ERROR); + } + + try { + const discipline = await prisma.discipline.create({ + data: { name, minTeamSize, maxTeamSize, event: { connect: { pid: req.params.eventPid } } }, + select: { + pid: true, + name: true, + minTeamSize: true, + maxTeamSize: true, + event: { select: { pid: true, name: true } }, + }, + }); + + return res.status(201).json({ type: "success", payload: { discipline } }); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { + return res.status(404).json(generateError(`Could not link to event with ID '${req.params.eventPid}'`)); + } + throw e; + } +}; diff --git a/src/Middleware/error/ForwardableError.ts b/src/Middleware/error/ForwardableError.ts index 04bc5e1..bbae485 100644 --- a/src/Middleware/error/ForwardableError.ts +++ b/src/Middleware/error/ForwardableError.ts @@ -1,6 +1,7 @@ export default class ForwardableError extends Error { // If in different context private readonly __id = "CUSTOM_ERROR"; + protected readonly __oid?: string; public readonly status: number; diff --git a/src/Middleware/error/NotFoundError.ts b/src/Middleware/error/NotFoundError.ts new file mode 100644 index 0000000..382441f --- /dev/null +++ b/src/Middleware/error/NotFoundError.ts @@ -0,0 +1,13 @@ +import ForwardableError from "./ForwardableError"; + +export default class NotFoundError extends ForwardableError { + protected __oid = "NOT_FOUND_ERROR"; + + constructor(resource?: string, pid?: string) { + super(404, `The requested ${resource ?? "resource"}${pid ? ` with PID '${pid}'` : ""} could not be found!`); + } + + static isNotFoundError(err: any): err is NotFoundError { + return err.__oid === "NOT_FOUND_ERROR"; + } +} diff --git a/src/Routes/discipline.routes.ts b/src/Routes/discipline.routes.ts index ef158cd..3ae7ad1 100644 --- a/src/Routes/discipline.routes.ts +++ b/src/Routes/discipline.routes.ts @@ -1,9 +1,13 @@ import express from "express"; -import { getAllDisciplines, getDiscipline } from "../Controllers/discipline.controller"; +import eventRouter from "./event.routes"; +import { createDiscipline, getAllDisciplines, getDiscipline } from "../Controllers/discipline.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; const router = express.Router(); router.get("/", getAllDisciplines); // TODO: Optional auth router.get("/:pid", getDiscipline); +eventRouter.post("/:eventPid/disciplines", requireAuthentication, createDiscipline); + export default router; From 48ac07a52b2fd9a11662035501833015d31254d2 Mon Sep 17 00:00:00 2001 From: Stefan <32109571+Stefan-5422@users.noreply.github.com> Date: Fri, 29 Apr 2022 11:38:45 +0200 Subject: [PATCH 120/128] FIX: Formatting & Syntax error --- src/Controllers/event.controller.ts | 37 +++++++++++++++++++---------- src/app.ts | 8 +++++-- src/lib/mjml.ts | 2 +- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 9f5afbf..ba88f68 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -1,8 +1,13 @@ -import { Prisma } from "@prisma/client" +import { Prisma } from "@prisma/client"; import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { createInsufficientPermissionsError, DataType, generateError, generateInvalidBodyError } from "./common"; +import { + createInsufficientPermissionsError, + DataType, + generateError, + generateInvalidBodyError, +} from "./common"; export const getAllEvents = async (req: Request, res: Response) => { const events = await prisma.event.findMany({ @@ -68,7 +73,8 @@ export const getEvent = async (req: Request, res: Response) => { res.status(500).json({ type: "error", payload: { - message: "Unknown error occurred with your request. Check if your parameters are correct", + message: + "Unknown error occurred with your request. Check if your parameters are correct", schema: { eventId: DataType.UUID, }, @@ -79,7 +85,6 @@ export const getEvent = async (req: Request, res: Response) => { } }; - // requires: auth(ELEVATED) export const addEvent = async (req: Request, res: Response) => { if (req.auth?.permission_level !== "ELEVATED") { @@ -90,12 +95,11 @@ export const addEvent = async (req: Request, res: Response) => { typeof req.body.date !== "string" || typeof req.body.description !== "string" ) { - generateInvalidBodyError({ - name: DataType.STRING, - date: DataType.DATETIME, - description: DataType.STRING, - }) - ); + generateInvalidBodyError({ + name: DataType.STRING, + date: DataType.DATETIME, + description: DataType.STRING, + }); } //TODO: Check if date is valid @@ -128,7 +132,10 @@ interface DeleteEventQueryParams { } // requires: auth(ELEVATED) -export const deleteEvent = (req: Request, res: Response) => { +export const deleteEvent = ( + req: Request, + res: Response +) => { if (req.auth?.permission_level !== "ELEVATED") { res.status(403).json(createInsufficientPermissionsError()); } @@ -141,7 +148,13 @@ export const deleteEvent = (req: Request, res: Response) return res.status(204).end(); } catch (e) { if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { - return res.status(404).json(generateError(`The organisation with the ID ${pid} could not be found`)); + return res + .status(404) + .json( + generateError( + `The organisation with the ID ${pid} could not be found` + ) + ); } throw e; diff --git a/src/app.ts b/src/app.ts index 5bbc7b7..7cf06b8 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,4 +1,9 @@ -import express, { ErrorRequestHandler, NextFunction, Request, Response } from "express"; +import express, { + ErrorRequestHandler, + NextFunction, + Request, + Response, +} from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; @@ -7,7 +12,6 @@ import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; - require("dotenv").config(); // Load dotenv config const app = express(); diff --git a/src/lib/mjml.ts b/src/lib/mjml.ts index 012d516..e148cf2 100644 --- a/src/lib/mjml.ts +++ b/src/lib/mjml.ts @@ -5,7 +5,7 @@ import mjml from "mjml"; const template_folder = "/app/resources/email/templates/"; const compileTemplates = () => { - console.log("Compiling templates: ") + console.log("Compiling templates: "); fs.readdir(template_folder, (err, files) => { if (err) console.log(err); From 4ef5989c9a34a5069a1be4bdd02d48c019536584 Mon Sep 17 00:00:00 2001 From: Stefan-5422 Date: Fri, 29 Apr 2022 10:23:02 +0000 Subject: [PATCH 121/128] [create-pull-request] push formatted files --- src/Controllers/event.controller.ts | 23 ++++------------------- src/Middleware/debug/logger.ts | 2 +- src/app.ts | 7 +------ 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/Controllers/event.controller.ts b/src/Controllers/event.controller.ts index 0038a2b..99378fa 100644 --- a/src/Controllers/event.controller.ts +++ b/src/Controllers/event.controller.ts @@ -2,12 +2,7 @@ import { Prisma } from "@prisma/client"; import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; -import { - createInsufficientPermissionsError, - DataType, - generateError, - generateInvalidBodyError, -} from "./common"; +import { createInsufficientPermissionsError, DataType, generateError, generateInvalidBodyError } from "./common"; export const getAllEvents = async (req: Request, res: Response) => { const events = await prisma.event.findMany({ @@ -73,8 +68,7 @@ export const getEvent = async (req: Request, res: Response) => { res.status(500).json({ type: "error", payload: { - message: - "Unknown error occurred with your request. Check if your parameters are correct", + message: "Unknown error occurred with your request. Check if your parameters are correct", schema: { eventId: DataType.UUID, }, @@ -132,10 +126,7 @@ interface DeleteEventQueryParams { } // requires: auth(ELEVATED) -export const deleteEvent = ( - req: Request, - res: Response -) => { +export const deleteEvent = (req: Request, res: Response) => { if (req.auth?.permission_level !== "ELEVATED") { res.status(403).json(createInsufficientPermissionsError()); } @@ -148,13 +139,7 @@ export const deleteEvent = ( return res.status(204).end(); } catch (e) { if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { - return res - .status(404) - .json( - generateError( - `The organisation with the ID ${pid} could not be found` - ) - ); + return res.status(404).json(generateError(`The organisation with the ID ${pid} could not be found`)); } throw e; diff --git a/src/Middleware/debug/logger.ts b/src/Middleware/debug/logger.ts index 64310c1..a1c63bd 100644 --- a/src/Middleware/debug/logger.ts +++ b/src/Middleware/debug/logger.ts @@ -6,6 +6,6 @@ export default function debugLogger(req: Request, res: Response, next: NextFunct if (process.env.NODE_ENV === "development") { logger.debug(`Request to: ${req.url}`); } - + next(); } diff --git a/src/app.ts b/src/app.ts index d1864ed..da3df2c 100644 --- a/src/app.ts +++ b/src/app.ts @@ -1,9 +1,4 @@ -import express, { - ErrorRequestHandler, - NextFunction, - Request, - Response, -} from "express"; +import express, { ErrorRequestHandler, NextFunction, Request, Response } from "express"; import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; From 2034faa4483d59f5c27979f25f19ff11371deba2 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 1 May 2022 16:09:10 +0200 Subject: [PATCH 122/128] Add endpoint to delete disciplines --- src/Controllers/discipline.controller.ts | 27 +++++++++++++++++++++++- src/Routes/discipline.routes.ts | 8 ++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/Controllers/discipline.controller.ts b/src/Controllers/discipline.controller.ts index fbe4a72..93431ae 100644 --- a/src/Controllers/discipline.controller.ts +++ b/src/Controllers/discipline.controller.ts @@ -1,5 +1,5 @@ import { Prisma, Organisation, Admin, AdminLevel, Team } from "@prisma/client"; -import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; +import { PrismaClientKnownRequestError, PrismaClientUnknownRequestError } from "@prisma/client/runtime"; import { Request, Response } from "express"; import prisma from "../lib/prisma"; import ForwardableError from "../Middleware/error/ForwardableError"; @@ -162,3 +162,28 @@ export const createDiscipline = async (req: Request<{ eventPid: string }, {}, Cr throw e; } }; + +interface DeleteDisciplineQueryParams { + pid: string; +} + +// requires: auth(ELEVATED) +export const deleteDiscipline = async (req: Request, res: Response) => { + if (req.auth?.permission_level !== "ELEVATED") { + res.status(403).json(createInsufficientPermissionsError()); + } + + const { pid } = req.params; + + try { + await prisma.discipline.delete({ where: { pid } }); + + return res.status(204).end(); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { + throw new NotFoundError("discipline", pid); + } + + throw e; + } +}; diff --git a/src/Routes/discipline.routes.ts b/src/Routes/discipline.routes.ts index 3ae7ad1..08aec30 100644 --- a/src/Routes/discipline.routes.ts +++ b/src/Routes/discipline.routes.ts @@ -1,12 +1,18 @@ import express from "express"; import eventRouter from "./event.routes"; -import { createDiscipline, getAllDisciplines, getDiscipline } from "../Controllers/discipline.controller"; +import { + createDiscipline, + deleteDiscipline, + getAllDisciplines, + getDiscipline, +} from "../Controllers/discipline.controller"; import { requireAuthentication } from "../Middleware/auth/auth"; const router = express.Router(); router.get("/", getAllDisciplines); // TODO: Optional auth router.get("/:pid", getDiscipline); +router.delete<"/:pid", { pid: string }>("/:pid", requireAuthentication, deleteDiscipline); eventRouter.post("/:eventPid/disciplines", requireAuthentication, createDiscipline); From 72ee918f00b9cad1dad2e2ef5f34593121974b53 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 1 May 2022 17:18:55 +0200 Subject: [PATCH 123/128] Add schema valiation + Using zod for validation + Add SchemaError --- package.json | 3 +- src/Middleware/error/SchemaError.ts | 9 ++++ src/lib/result_schema.ts | 65 +++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/Middleware/error/SchemaError.ts create mode 100644 src/lib/result_schema.ts diff --git a/package.json b/package.json index e51d789..850d786 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,8 @@ "jsonwebtoken": "^8.5.1", "nodemailer": "^6.7.0", "redis": "^3.1.2", - "winston": "^3.7.2" + "winston": "^3.7.2", + "zod": "^3.14.4" }, "devDependencies": { "@types/chai": "^4.2.22", diff --git a/src/Middleware/error/SchemaError.ts b/src/Middleware/error/SchemaError.ts new file mode 100644 index 0000000..6d4026d --- /dev/null +++ b/src/Middleware/error/SchemaError.ts @@ -0,0 +1,9 @@ +import ForwardableError from "./ForwardableError"; + +export default class SchemaError extends ForwardableError { + protected __oid = "SCHEMA_ERROR"; + + constructor(message: string) { + super(400, message); + } +} diff --git a/src/lib/result_schema.ts b/src/lib/result_schema.ts new file mode 100644 index 0000000..53bcc38 --- /dev/null +++ b/src/lib/result_schema.ts @@ -0,0 +1,65 @@ +import { Schema, z, ZodError } from "zod"; +import SchemaError from "../Middleware/error/SchemaError"; + +// -- Schema definitions -- + +const SchemaVersion = z.enum(["1.0"]); + +const TimeUnit = z.enum(["days", "hours", "minutes", "seconds", "milliseconds"]); + +const DurationSchema = z + .object({ + type: z.literal("duration"), + min: z.number().int({ message: "min must be an integer (relative to smallestUnit)" }), + max: z.number().int({ message: "max must be an integer (relative to smallestUnit)" }), + smallestUnit: TimeUnit, + higherIsBetter: z.boolean(), + }) + .refine(({ min, max }) => min < max, { message: "min must be smaller than max" }); + +const PointSchema = z + .object({ + type: z.literal("points"), + min: z.number(), + max: z.number(), + step: z.number(), + start: z.number(), + + unit: z.string(), + unitSign: z.string(), + + higherIsBetter: z.boolean(), + }) + .refine(({ min, max }) => min < max, { message: "min must be smaller than max" }) + .refine(({ min, max, start }) => min <= start && max >= start, { + message: "start must be larger than or equal to min and smaller than or equal to max", + }); + +export type DurationSchemaT = z.infer; +export type PointSchemaT = z.infer; + +// -- Parser -- + +export function parseSchema(schema: any): DurationSchemaT | PointSchemaT { + try { + if (schema.type === "duration") { + return DurationSchema.parse(schema); + } else if (schema.type === "points") { + return PointSchema.parse(schema); + } + } catch (e) { + if (e instanceof ZodError) { + const issue = e.issues.at(0); + + if (issue) { + throw new SchemaError(`${issue.path}: ${issue.message}`); + } + + throw new SchemaError("Unknown error occured while validating the schema"); + } + + throw e; + } + + throw new SchemaError("type must be either 'duration' or 'points'"); +} From 8384a3eebbd0df0bc55fb4ce4b155f67ac51b1cc Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Sun, 1 May 2022 18:18:48 +0200 Subject: [PATCH 124/128] Add controller for roleSchemas (unfinished) + Refine error messages for role schemas + Add role schema routes + Add RESULT_SCHEMA DataType + Add SchemaError.isSchemaError() type guard --- src/Controllers/common.ts | 1 + src/Controllers/role_schema.controller.ts | 125 ++++++++++++++++++++++ src/Middleware/error/SchemaError.ts | 4 + src/Routes/role_schema.routes.ts | 19 ++++ src/app.ts | 3 + src/lib/result_schema.ts | 4 +- 6 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 src/Controllers/role_schema.controller.ts create mode 100644 src/Routes/role_schema.routes.ts diff --git a/src/Controllers/common.ts b/src/Controllers/common.ts index 88fc839..ad2dc49 100644 --- a/src/Controllers/common.ts +++ b/src/Controllers/common.ts @@ -10,6 +10,7 @@ export enum DataType { PERMISSION_LEVEL = "'ELEVATED' | 'STANDARD'", DATETIME = "ISOstring", UUID = "string", + RESULT_SCHEMA = "result_schema", } interface Body { diff --git a/src/Controllers/role_schema.controller.ts b/src/Controllers/role_schema.controller.ts new file mode 100644 index 0000000..ca73554 --- /dev/null +++ b/src/Controllers/role_schema.controller.ts @@ -0,0 +1,125 @@ +import { Prisma } from "@prisma/client"; +import { PrismaClientKnownRequestError } from "@prisma/client/runtime"; +import { Request, Response } from "express"; +import prisma from "../lib/prisma"; +import { DurationSchemaT, parseSchema, PointSchemaT } from "../lib/result_schema"; +import NotFoundError from "../Middleware/error/NotFoundError"; +import SchemaError from "../Middleware/error/SchemaError"; +import { + createInsufficientPermissionsError, + DataType, + generateInvalidBodyError, + NAME_ERROR, + validateName, +} from "./common"; + +const roleSchema = { + name: true, + schema: true, + discipline: { select: { pid: true, name: true } }, + visual: { select: { pid: true, location: true } }, +} as const; + +export const _getAllRoleSchemas = async (res: Response, disciplinePid: string | undefined) => { + const schemas = await prisma.roleSchema.findMany({ + where: { discipline: { pid: disciplinePid } }, + select: roleSchema, + }); + + return res.status(200).json({ + type: "success", + payload: { + roleSchemas: schemas, + }, + }); +}; + +interface GetAllRoleSchemasSearchParams { + disciplinePid?: string; +} + +export const getAllRoleSchemas = async (req: Request<{}, {}, {}, GetAllRoleSchemasSearchParams>, res: Response) => { + return _getAllRoleSchemas(res, req.query.disciplinePid); +}; + +interface GetAllRoleSchemasWithParamQueryParams { + organisationPid: string; +} + +export const getAllRoleSchemasWithParam = async ( + req: Request, + res: Response +) => { + return _getAllRoleSchemas(res, req.params.organisationPid); +}; + +interface GetRoleSchemaQueryParams { + pid: string; +} + +export const getRoleSchema = async (req: Request, res: Response) => { + const { pid } = req.params; + + const schema = await prisma.roleSchema.findUnique({ where: { pid }, select: roleSchema }); + + if (!schema) { + throw new NotFoundError("roleSchema", pid); + } + + return res.status(200).json({ + type: "success", + payload: { + roleSchema: { + ...schema, + discipline: { + ...schema.discipline, + _links: [{ rel: "self", type: "GET", href: `/api/disciplines/${schema.discipline.pid}` }], + }, + }, + }, + }); +}; + +interface CreateRoleSchemaBody { + name?: string; + schema?: any; +} + +// at: POST /discipline/:disciplinePid/role-schemas +// requires: auth(ELEVATED) +export const createRoleSchema = async ( + req: Request<{ disciplinePid: string }, {}, CreateRoleSchemaBody>, + res: Response +) => { + if (req.auth?.permission_level !== "ELEVATED") { + return res.status(403).json(createInsufficientPermissionsError()); + } + + const { name, schema: resultSchema } = req.body; + + if (typeof name !== "string") { + return res.status(400).json(generateInvalidBodyError({ name: DataType.STRING, schema: DataType.RESULT_SCHEMA })); + } + + if (!validateName(name)) { + return res.status(400).json(NAME_ERROR); + } + + // Validate the result schema (Errors should be handled by the default error handler) + const validatedSchema = parseSchema(resultSchema); + + try { + const schema = await prisma.roleSchema.create({ + data: { name, schema: validatedSchema, discipline: { connect: { pid: req.params.disciplinePid } } }, + select: roleSchema, + }); + + return res.status(201).json({ type: "success", payload: { roleSchema: schema } }); + } catch (e) { + if (e instanceof PrismaClientKnownRequestError && e.code === "P2025") { + throw new NotFoundError("discipline", req.params.disciplinePid); + } + + throw e; + } +}; diff --git a/src/Middleware/error/SchemaError.ts b/src/Middleware/error/SchemaError.ts index 6d4026d..b880480 100644 --- a/src/Middleware/error/SchemaError.ts +++ b/src/Middleware/error/SchemaError.ts @@ -6,4 +6,8 @@ export default class SchemaError extends ForwardableError { constructor(message: string) { super(400, message); } + + public static isSchemaError(err: any): err is SchemaError { + return err.__oid === "SCHEMA_ERROR"; + } } diff --git a/src/Routes/role_schema.routes.ts b/src/Routes/role_schema.routes.ts new file mode 100644 index 0000000..ea3c938 --- /dev/null +++ b/src/Routes/role_schema.routes.ts @@ -0,0 +1,19 @@ +import express from "express"; +import disciplineRouter from "./discipline.routes"; +import { + createRoleSchema, + getAllRoleSchemas, + getAllRoleSchemasWithParam, + getRoleSchema, +} from "../Controllers/role_schema.controller"; +import { requireAuthentication } from "../Middleware/auth/auth"; + +const router = express.Router(); + +router.get("/", getAllRoleSchemas); +router.get("/:pid", getRoleSchema); + +disciplineRouter.get("/:disciplinePid/role-schemas", getAllRoleSchemasWithParam); +disciplineRouter.post("/:disciplinePid/role-schemas", requireAuthentication, createRoleSchema); + +export default router; diff --git a/src/app.ts b/src/app.ts index 64e9789..39dcc0f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -7,6 +7,7 @@ import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; import disciplineRouter from "./Routes/discipline.routes"; +import roleSchemaRouter from "./Routes/role_schema.routes"; import defaultErrorHandler from "./Middleware/error/handler"; import logger from "./Middleware/error/logger"; import debugLogger from "./Middleware/debug/logger"; @@ -56,6 +57,8 @@ async function main() { app.use("/api/disciplines", disciplineRouter); + app.use("/api/role-schemas", roleSchemaRouter); + // Error handling app.use(defaultErrorHandler); // Not working diff --git a/src/lib/result_schema.ts b/src/lib/result_schema.ts index 53bcc38..7da23c9 100644 --- a/src/lib/result_schema.ts +++ b/src/lib/result_schema.ts @@ -52,7 +52,7 @@ export function parseSchema(schema: any): DurationSchemaT | PointSchemaT { const issue = e.issues.at(0); if (issue) { - throw new SchemaError(`${issue.path}: ${issue.message}`); + throw new SchemaError(`Error with the schema: ${issue.path ? `${issue.path}:` : ""} ${issue.message}`); } throw new SchemaError("Unknown error occured while validating the schema"); @@ -61,5 +61,5 @@ export function parseSchema(schema: any): DurationSchemaT | PointSchemaT { throw e; } - throw new SchemaError("type must be either 'duration' or 'points'"); + throw new SchemaError("Error with the schema: type must be either 'duration' or 'points'"); } From 510624cbc67b66bcbafd7c39f0005de2b4055e8a Mon Sep 17 00:00:00 2001 From: Laurin <60652077+Flexla54@users.noreply.github.com> Date: Sun, 8 May 2022 22:49:49 +0200 Subject: [PATCH 125/128] Removed Campaign, Link, Gender --- prisma/schema.prisma | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 67e12ad..e5bb5f0 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -18,32 +18,9 @@ model Event { disciplines Discipline[] organisations Organisation[] - campaign Campaign[] visual Media[] } -model Campaign { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - start DateTime - expiresAt DateTime - - links Link[] - event Event @relation(fields: [eventId], references: [id], onDelete: Cascade) - eventId Int @unique -} - -model Link { - id Int @id @default(autoincrement()) - pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid - link String - - campaign Campaign @relation(fields: [campaignId], references: [id], onDelete: Cascade) - campaignId Int - group Group @relation(fields: [groupId], references: [id], onDelete: Cascade) - groupId Int @unique -} - model Admin { id Int @id @default(autoincrement()) pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid @@ -97,7 +74,6 @@ model Participant { pid String @unique @default(dbgenerated("gen_random_uuid()")) @db.Uuid firstName String lastName String - gender Gender relevance Job group Group @relation(fields: [groupId], references: [id], onDelete: Cascade) @@ -134,11 +110,10 @@ model Group { name String user_limit Int @default(40) level Int + organisation Organisation @relation(fields: [organisationId], references: [id], onDelete: Cascade) organisationId Int - participants Participant[] - link Link? admins Admin[] } @@ -158,12 +133,6 @@ enum AdminLevel { ELEVATED } -enum Gender { - MALE - FEMALE - OTHER -} - enum Job { TEAMLEADER MEMBER From 2eb9edee696918ee83c9a57af186b4e6417ab566 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Mon, 16 May 2022 15:38:22 +0200 Subject: [PATCH 126/128] Only create default admin when in development mode --- src/app.ts | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/app.ts b/src/app.ts index 39dcc0f..83da103 100644 --- a/src/app.ts +++ b/src/app.ts @@ -19,21 +19,26 @@ require("dotenv").config(); // Load dotenv config const app = express(); -if (process.env.NODE_ENV === "development") { - logger.info("Using development mode"); -} - async function main() { - // Dev - await prisma.admin.upsert({ - where: { id: 1 }, - create: { - name: "admin", - password: await argon2.hash("test", { type: argon2.argon2id }), - permission_level: "ELEVATED", - }, - update: {}, - }); + if (process.env.NODE_ENV === "development") { + logger.info("Using development mode"); + logger.warning( + "This mode should not be used in any production-near environment as it is significantly less secure than the production mode" + ); + + // TODO: How should you login to the prod server by default? Maybe random password? + await prisma.admin.upsert({ + where: { id: 1 }, + create: { + name: "admin", + password: await argon2.hash("test", { type: argon2.argon2id }), + permission_level: "ELEVATED", + }, + update: {}, + }); + } else { + logger.info("Using production mode"); + } // Todo: Everything From 645baf1f8aa06dffb0cfbe9473b04c0b5b4a0bfe Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 17 May 2022 15:42:50 +0200 Subject: [PATCH 127/128] Add cors --- README.md | 1 + package.json | 4 +++- src/app.ts | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 24171fb..b4b469e 100644 --- a/README.md +++ b/README.md @@ -14,4 +14,5 @@ Before Runningthis on you local machine some things have to be setup DOMAIN: THE DOMAIN NAME OF THE SERVER MAILPASSWORD: THE PASSWORD FOR THE MAIL ACCOUNT DEV: SWITCH FOR DEV MODE AFFECTS EMAIL SERVER + ALLOW_ORIGIN: ORIGIN OF THE PRODUCTION CLIENT (FOR CORS) ``` diff --git a/package.json b/package.json index d247c39..b21172b 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "homepage": "https://github.com/detleph/server#readme", "dependencies": { "@prisma/client": "^3.3.0", + "@types/cors": "^2.8.12", "@types/handlebars": "^4.1.0", "@types/jsonwebtoken": "^8.5.5", "@types/mjml": "^4.7.0", @@ -27,10 +28,11 @@ "@types/nodemailer": "^6.4.4", "@types/redis": "^2.8.32", "argon2": "^0.28.2", + "cors": "^2.8.5", "dotenv": "^10.0.0", "express": "^4.17.1", - "handlebars": "^4.7.7", "express-async-errors": "^3.1.1", + "handlebars": "^4.7.7", "jsonwebtoken": "^8.5.1", "mjml": "^4.11.0", "nanoid": "^3.3.3", diff --git a/src/app.ts b/src/app.ts index 83da103..58762fe 100644 --- a/src/app.ts +++ b/src/app.ts @@ -3,6 +3,7 @@ import prisma from "./lib/prisma"; import eventRouter from "./Routes/event.routes"; import adminAuthRouter from "./Routes/admin_auth.routes"; import argon2 from "argon2"; +import cors from "cors"; import adminRouter from "./Routes/admin.routes"; import organisationRouter from "./Routes/organisation.routes"; import groupRouter from "./Routes/group.routes"; @@ -36,8 +37,22 @@ async function main() { }, update: {}, }); + + // Allow all CORS requests + app.use(cors()); } else { logger.info("Using production mode"); + + // Configure cors + app.use( + cors({ + origin: process.env.ALLOW_ORIGIN, + allowedHeaders: ["Content-Type", "Authorization"], + preflightContinue: false, + methods: ["GET", "PUT", "PATCH", "POST", "DELETE"], + optionsSuccessStatus: 204, + }) + ); } // Todo: Everything From 3ec5f924296fc36778da4b66454f5fe3b3580072 Mon Sep 17 00:00:00 2001 From: Stephan <57194608+stephan418@users.noreply.github.com> Date: Tue, 17 May 2022 16:16:26 +0200 Subject: [PATCH 128/128] Add controllers for 404 and the root endpoint --- src/Middleware/error/defaultRoutes.ts | 27 +++++++++++++++++++++++++++ src/app.ts | 5 +++++ 2 files changed, 32 insertions(+) create mode 100644 src/Middleware/error/defaultRoutes.ts diff --git a/src/Middleware/error/defaultRoutes.ts b/src/Middleware/error/defaultRoutes.ts new file mode 100644 index 0000000..4a15997 --- /dev/null +++ b/src/Middleware/error/defaultRoutes.ts @@ -0,0 +1,27 @@ +import { Request, Response } from "express"; + +// Only called when no other route matches +export function notFoundHandler(req: Request, res: Response) { + return res.status(404).json({ + type: "error", + payload: { + message: `The ${req.method} HTTP method is implemented for '${req.path}'`, + _links: [ + { + rel: "root", + href: "/api", + }, + ], + }, + }); +} + +export function rootHandler(req: Request, res: Response) { + return res.status(200).json({ + type: "success", + payload: { + message: "Detleph event API", + detail: "This is the API for the Detleph event system", + }, + }); +} diff --git a/src/app.ts b/src/app.ts index 58762fe..749116d 100644 --- a/src/app.ts +++ b/src/app.ts @@ -12,6 +12,7 @@ import roleSchemaRouter from "./Routes/role_schema.routes"; import defaultErrorHandler from "./Middleware/error/handler"; import logger from "./Middleware/error/logger"; import debugLogger from "./Middleware/debug/logger"; +import { notFoundHandler, rootHandler } from "./Middleware/error/defaultRoutes"; // Set up async error handling require("express-async-errors"); @@ -79,9 +80,13 @@ async function main() { app.use("/api/role-schemas", roleSchemaRouter); + app.get("/", rootHandler); + // Error handling app.use(defaultErrorHandler); // Not working + app.use(notFoundHandler); + app.listen(process.env.PORT, () => { logger.info(`Listening on port ${process.env.PORT}`); });