btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

feat: hoppscotch-backend dependency update (#4426) (HSB-489)

Browse Source
This commit is contained in:
Mir Arif Hasan
2024-10-17 03:46:54 +06:00
committed by GitHub
parent 28727cd6c2
commit 2a95ee8d19
7 changed files with 6304 additions and 4887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@@ -34,12 +34,11 @@
}, },
"pnpm": { "pnpm": {
"overrides": { "overrides": {
"cookie": "0.7.2",
"vue": "3.3.9", "vue": "3.3.9",
"@nestjs-modules/mailer>mjml": "5.0.0-alpha.4", "@nestjs-modules/mailer>mjml": "5.0.0-alpha.4",
"subscriptions-transport-ws>ws": "7.5.10", "subscriptions-transport-ws>ws": "7.5.10",
"@nestjs/graphql>ws": "8.17.1",
"braces": "3.0.3", "braces": "3.0.3",
"express": "4.20.0",
"send": "0.19.0", "send": "0.19.0",
"pug": "3.0.3", "pug": "3.0.3",
"body-parser": "1.20.3", "body-parser": "1.20.3",

133
packages/hoppscotch-backend/package.json
View File

@@ -28,87 +28,86 @@
"do-test": "pnpm run test" "do-test": "pnpm run test"
}, },
"dependencies": { "dependencies": {
"@apollo/server": "4.9.5", "@apollo/server": "4.11.0",
"@nestjs-modules/mailer": "1.9.1", "@nestjs-modules/mailer": "2.0.2",
"@nestjs/apollo": "12.0.9", "@nestjs/apollo": "12.2.0",
"@nestjs/common": "10.2.7", "@nestjs/common": "10.4.4",
"@nestjs/config": "3.1.1", "@nestjs/config": "3.2.3",
"@nestjs/core": "10.2.7", "@nestjs/core": "10.4.4",
"@nestjs/graphql": "12.0.9", "@nestjs/graphql": "12.2.0",
"@nestjs/jwt": "10.1.1", "@nestjs/jwt": "10.2.0",
"@nestjs/passport": "10.0.2", "@nestjs/passport": "10.0.3",
"@nestjs/platform-express": "10.2.7", "@nestjs/platform-express": "10.4.4",
"@nestjs/schedule": "4.0.1", "@nestjs/schedule": "4.1.1",
"@nestjs/swagger": "7.4.0", "@nestjs/swagger": "7.4.2",
"@nestjs/terminus": "10.2.3", "@nestjs/terminus": "10.2.3",
"@nestjs/throttler": "5.0.1", "@nestjs/throttler": "6.2.1",
"@prisma/client": "5.8.1", "@prisma/client": "5.20.0",
"argon2": "0.30.3", "argon2": "0.41.1",
"bcrypt": "5.1.0", "bcrypt": "5.1.1",
"class-transformer": "0.5.1", "class-transformer": "0.5.1",
"class-validator": "0.14.1", "class-validator": "0.14.1",
"cookie": "0.5.0", "cookie": "1.0.0",
"cookie-parser": "1.4.6", "cookie-parser": "1.4.7",
"cron": "3.1.6", "cron": "3.1.7",
"express": "4.20.0", "express": "4.21.1",
"express-session": "1.17.3", "express-session": "1.18.1",
"fp-ts": "2.13.1", "fp-ts": "2.16.9",
"graphql": "16.8.1", "graphql": "16.9.0",
"graphql-query-complexity": "0.12.0", "graphql-query-complexity": "1.0.0",
"graphql-redis-subscriptions": "2.6.0", "graphql-redis-subscriptions": "2.6.1",
"graphql-subscriptions": "2.0.0", "graphql-subscriptions": "2.0.0",
"handlebars": "4.7.7", "handlebars": "4.7.8",
"io-ts": "2.2.16", "io-ts": "2.2.21",
"luxon": "3.2.1", "luxon": "3.5.0",
"nodemailer": "6.9.14", "nodemailer": "6.9.15",
"passport": "0.6.0", "passport": "0.7.0",
"passport-github2": "0.1.12", "passport-github2": "0.1.12",
"passport-google-oauth20": "2.0.0", "passport-google-oauth20": "2.0.0",
"passport-jwt": "4.0.1", "passport-jwt": "4.0.1",
"passport-local": "1.0.0", "passport-local": "1.0.0",
"passport-microsoft": "1.0.0", "passport-microsoft": "2.1.0",
"posthog-node": "4.2.0", "posthog-node": "4.2.0",
"prisma": "5.8.1", "prisma": "5.20.0",
"reflect-metadata": "0.1.13", "reflect-metadata": "0.2.2",
"rimraf": "3.0.2", "rimraf": "6.0.1",
"rxjs": "7.6.0" "rxjs": "7.8.1"
}, },
"devDependencies": { "devDependencies": {
"@nestjs/cli": "10.2.1", "@nestjs/cli": "10.4.5",
"@nestjs/schematics": "10.0.3", "@nestjs/schematics": "10.1.4",
"@nestjs/testing": "10.2.7", "@nestjs/testing": "10.4.4",
"@relmify/jest-fp-ts": "2.0.2", "@relmify/jest-fp-ts": "2.1.1",
"@types/argon2": "0.15.0", "@types/bcrypt": "5.0.2",
"@types/bcrypt": "5.0.0", "@types/cookie": "0.6.0",
"@types/cookie": "0.5.1", "@types/cookie-parser": "1.4.7",
"@types/cookie-parser": "1.4.3", "@types/express": "5.0.0",
"@types/express": "4.17.14", "@types/jest": "29.5.13",
"@types/jest": "29.4.0", "@types/luxon": "3.4.2",
"@types/luxon": "3.2.0", "@types/node": "22.7.5",
"@types/node": "18.11.10", "@types/nodemailer": "6.4.16",
"@types/nodemailer": "6.4.7", "@types/passport-github2": "1.2.9",
"@types/passport-github2": "1.2.5", "@types/passport-google-oauth20": "2.0.16",
"@types/passport-google-oauth20": "2.0.11", "@types/passport-jwt": "4.0.1",
"@types/passport-jwt": "3.0.8", "@types/passport-microsoft": "1.0.3",
"@types/passport-microsoft": "0.0.0", "@types/supertest": "6.0.2",
"@types/supertest": "2.0.12", "@typescript-eslint/eslint-plugin": "8.8.1",
"@typescript-eslint/eslint-plugin": "5.45.0", "@typescript-eslint/parser": "8.8.1",
"@typescript-eslint/parser": "5.45.0",
"cross-env": "7.0.3", "cross-env": "7.0.3",
"eslint": "8.29.0", "eslint": "9.12.0",
"eslint-config-prettier": "8.5.0", "eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "4.2.1", "eslint-plugin-prettier": "5.2.1",
"jest": "29.4.1", "jest": "29.7.0",
"jest-mock-extended": "3.0.1", "jest-mock-extended": "4.0.0-beta1",
"jwt": "link:@types/nestjs/jwt", "jwt": "link:@types/nestjs/jwt",
"prettier": "2.8.4", "prettier": "3.3.3",
"source-map-support": "0.5.21", "source-map-support": "0.5.21",
"supertest": "6.3.2", "supertest": "7.0.0",
"ts-jest": "29.0.5", "ts-jest": "29.2.5",
"ts-loader": "9.4.2", "ts-loader": "9.5.1",
"ts-node": "10.9.1", "ts-node": "10.9.2",
"tsconfig-paths": "4.1.1", "tsconfig-paths": "4.2.0",
"typescript": "4.9.3" "typescript": "5.6.3"
}, },
"jest": { "jest": {
"moduleFileExtensions": [ "moduleFileExtensions": [

3
packages/hoppscotch-backend/src/auth/auth.service.spec.ts
View File

@@ -9,7 +9,6 @@ import {
MAGIC_LINK_EXPIRED, MAGIC_LINK_EXPIRED,
VERIFICATION_TOKEN_DATA_NOT_FOUND, VERIFICATION_TOKEN_DATA_NOT_FOUND,
USER_NOT_FOUND, USER_NOT_FOUND,
USERS_NOT_FOUND,
} from 'src/errors'; } from 'src/errors';
import { MailerService } from 'src/mailer/mailer.service'; import { MailerService } from 'src/mailer/mailer.service';
import { PrismaService } from 'src/prisma/prisma.service'; import { PrismaService } from 'src/prisma/prisma.service';
@@ -18,8 +17,6 @@ import { UserService } from 'src/user/user.service';
import { AuthService } from './auth.service'; import { AuthService } from './auth.service';
import * as O from 'fp-ts/Option'; import * as O from 'fp-ts/Option';
import { VerifyMagicDto } from './dto/verify-magic.dto'; import { VerifyMagicDto } from './dto/verify-magic.dto';
import { DateTime } from 'luxon';
import * as argon2 from 'argon2';
import * as E from 'fp-ts/Either'; import * as E from 'fp-ts/Either';
import { ConfigService } from '@nestjs/config'; import { ConfigService } from '@nestjs/config';
import { InfraConfigService } from 'src/infra-config/infra-config.service'; import { InfraConfigService } from 'src/infra-config/infra-config.service';

2
packages/hoppscotch-backend/src/mailer/helper.ts
View File

@@ -35,7 +35,7 @@ export function getTransportOption(env, config): TransportType {
console.log('Using advanced mailer configuration'); console.log('Using advanced mailer configuration');
return { return {
host: env.INFRA.MAILER_SMTP_HOST ?? config.get('MAILER_SMTP_HOST'), host: env.INFRA.MAILER_SMTP_HOST ?? config.get('MAILER_SMTP_HOST'),
port: +env.INFRA.MAILER_SMTP_PORT ?? +config.get('MAILER_SMTP_PORT'), port: +(env.INFRA.MAILER_SMTP_PORT ?? config.get('MAILER_SMTP_PORT')),
secure: secure:
(env.INFRA.MAILER_SMTP_SECURE ?? config.get('MAILER_SMTP_SECURE')) === (env.INFRA.MAILER_SMTP_SECURE ?? config.get('MAILER_SMTP_SECURE')) ===
'true', 'true',

2
packages/hoppscotch-backend/src/team-collection/input-type.args.ts
View File

@@ -47,14 +47,12 @@ export class RenameTeamCollectionArgs {
@Field(() => ID, { @Field(() => ID, {
name: 'collectionID', name: 'collectionID',
description: 'ID of the collection', description: 'ID of the collection',
deprecationReason: 'Switch to updateTeamCollection mutation instead',
}) })
collectionID: string; collectionID: string;
@Field({ @Field({
name: 'newTitle', name: 'newTitle',
description: 'The updated title of the collection', description: 'The updated title of the collection',
deprecationReason: 'Switch to updateTeamCollection mutation instead',
}) })
newTitle: string; newTitle: string;
} }

8
packages/hoppscotch-backend/src/user/user.service.spec.ts
View File

@@ -153,6 +153,14 @@ const exampleSSOProfileData = {
photos: 'https://en.wikipedia.org/wiki/Dwight_Schrute', photos: 'https://en.wikipedia.org/wiki/Dwight_Schrute',
}; };
beforeAll(() => {
process.env.DATA_ENCRYPTION_KEY = '12345678901234567890123456789012';
});
afterAll(() => {
delete process.env.DATA_ENCRYPTION_KEY; // Clean up after tests
});
beforeEach(() => { beforeEach(() => {
mockReset(mockPrisma); mockReset(mockPrisma);
mockPubSub.publish.mockClear(); mockPubSub.publish.mockClear();

11040
pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff