[pull] main from hoppscotch:main

docker-compose.deploy.yml

@@ -13,7 +13,7 @@ services:
       test:
         [
           "CMD-SHELL",
-          "sh -c 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'"
+          "sh -c 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'",
         ]
       interval: 5s
       timeout: 5s
@@ -28,21 +28,32 @@ services:
     environment:
       # DATABASE_URL is read from the .env file to allow the backend to connect with an external database.
       # This allows the backend to retain existing data and prevents database resets during deployments.
-      # DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch
+      # - DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch
       - ENABLE_SUBPATH_BASED_ACCESS=true
     env_file:
       - ./.env
     depends_on:
       hoppscotch-db:
         condition: service_healthy
-    command: ["sh", "-c", "pnpm exec prisma migrate deploy && node /usr/src/app/aio_run.mjs"]
+    command:
+      [
+        "sh",
+        "-c",
+        "pnpm exec prisma migrate deploy && node /usr/src/app/aio_run.mjs",
+      ]
     healthcheck:
       test:
-        - CMD
-        - curl
-        - '-f'
-        - 'http://localhost:80'
+        [
+          "CMD",
+          "curl",
+          "-f",
+          "-s",
+          "-o",
+          "/dev/null",
+          "-w",
+          "%{http_code}",
+          "http://localhost:80",
+        ]
       interval: 2s
       timeout: 10s
       retries: 30
-

docker-compose.yml

@@ -135,7 +135,16 @@ services:
   # you are using an external postgres instance
   # This will be exposed at port 5432
   hoppscotch-db:
-    profiles: ["default", "database", "just-backend", "backend", "app", "admin", "deprecated"]
+    profiles:
+      [
+        "default",
+        "database",
+        "just-backend",
+        "backend",
+        "app",
+        "admin",
+        "deprecated",
+      ]
     image: postgres:15
     ports:
       - "5432:5432"

package.json

@@ -52,7 +52,8 @@
       "execa@0.10.0": "2.0.0",
       "@babel/runtime@<7.26.10": "7.26.10",
       "apiconnect-wsdl": "2.0.36",
-      "@xmldom/xmldom": "0.8.10"
+      "@xmldom/xmldom": "0.8.10",
+      "multer@1.4.5-lts.2": "2.0.0"
     },
     "packageExtensions": {
       "@hoppscotch/httpsnippet": {

packages/hoppscotch-backend/eslint.config.js

@@ -0,0 +1,50 @@
+const { defineConfig, globalIgnores } = require('eslint/config');
+const tsParser = require('@typescript-eslint/parser');
+const typescriptEslintEslintPlugin = require('@typescript-eslint/eslint-plugin');
+const globals = require('globals');
+const js = require('@eslint/js');
+
+const { FlatCompat } = require('@eslint/eslintrc');
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+module.exports = defineConfig([
+  {
+    languageOptions: {
+      parser: tsParser,
+      sourceType: 'module',
+
+      parserOptions: {
+        project: 'tsconfig.json',
+        tsconfigRootDir: __dirname,
+      },
+
+      globals: {
+        ...globals.node,
+        ...globals.jest,
+      },
+    },
+
+    plugins: {
+      '@typescript-eslint': typescriptEslintEslintPlugin,
+    },
+
+    extends: compat.extends(
+      'plugin:@typescript-eslint/recommended',
+      'plugin:prettier/recommended',
+    ),
+
+    rules: {
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      'no-empty-function': 'off',
+      '@typescript-eslint/no-empty-function': 'error',
+    },
+  },
+  globalIgnores(['**/.eslintrc.js']),
+]);

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2025.4.2",
+  "version": "2025.5.0",
   "description": "",
   "author": "",
   "private": true,
@@ -30,86 +30,87 @@
     "do-test": "pnpm run test"
   },
   "dependencies": {
-    "@apollo/server": "4.11.0",
+    "@apollo/server": "4.12.1",
     "@nestjs-modules/mailer": "2.0.2",
-    "@nestjs/apollo": "12.2.0",
-    "@nestjs/common": "10.4.16",
-    "@nestjs/config": "3.2.3",
-    "@nestjs/core": "10.4.4",
-    "@nestjs/graphql": "12.2.0",
-    "@nestjs/jwt": "10.2.0",
-    "@nestjs/passport": "10.0.3",
-    "@nestjs/platform-express": "10.4.4",
-    "@nestjs/schedule": "4.1.1",
-    "@nestjs/swagger": "7.4.2",
-    "@nestjs/terminus": "10.2.3",
-    "@nestjs/throttler": "6.2.1",
-    "@prisma/client": "5.20.0",
-    "argon2": "0.41.1",
-    "bcrypt": "5.1.1",
+    "@nestjs/apollo": "13.1.0",
+    "@nestjs/common": "11.1.1",
+    "@nestjs/config": "4.0.2",
+    "@nestjs/core": "11.1.1",
+    "@nestjs/graphql": "13.1.0",
+    "@nestjs/jwt": "11.0.0",
+    "@nestjs/passport": "11.0.0",
+    "@nestjs/platform-express": "11.1.1",
+    "@nestjs/schedule": "6.0.0",
+    "@nestjs/swagger": "11.2.0",
+    "@nestjs/terminus": "11.0.0",
+    "@nestjs/throttler": "6.4.0",
+    "@prisma/client": "6.8.2",
+    "argon2": "0.43.0",
+    "bcrypt": "6.0.0",
     "class-transformer": "0.5.1",
-    "class-validator": "0.14.1",
-    "cookie": "1.0.0",
+    "class-validator": "0.14.2",
+    "cookie": "1.0.2",
     "cookie-parser": "1.4.7",
-    "cron": "3.1.7",
-    "express": "4.21.1",
+    "cron": "4.3.0",
+    "express": "5.1.0",
     "express-session": "1.18.1",
-    "fp-ts": "2.16.9",
-    "graphql": "16.9.0",
-    "graphql-query-complexity": "1.0.0",
-    "graphql-redis-subscriptions": "2.6.1",
-    "graphql-subscriptions": "2.0.0",
+    "fp-ts": "2.16.10",
+    "graphql": "16.11.0",
+    "graphql-query-complexity": "1.1.0",
+    "graphql-redis-subscriptions": "2.7.0",
+    "graphql-subscriptions": "3.0.0",
     "handlebars": "4.7.8",
-    "io-ts": "2.2.21",
-    "luxon": "3.5.0",
-    "nodemailer": "6.9.15",
+    "io-ts": "2.2.22",
+    "luxon": "3.6.1",
+    "nodemailer": "7.0.3",
     "passport": "0.7.0",
     "passport-github2": "0.1.12",
     "passport-google-oauth20": "2.0.0",
     "passport-jwt": "4.0.1",
     "passport-local": "1.0.0",
     "passport-microsoft": "2.1.0",
-    "posthog-node": "4.2.0",
-    "prisma": "5.20.0",
+    "posthog-node": "4.17.1",
+    "prisma": "6.8.2",
     "reflect-metadata": "0.2.2",
     "rimraf": "6.0.1",
-    "rxjs": "7.8.1"
+    "rxjs": "7.8.2"
   },
   "devDependencies": {
-    "@nestjs/cli": "10.4.5",
-    "@nestjs/schematics": "10.1.4",
-    "@nestjs/testing": "10.4.4",
+    "@eslint/eslintrc": "3.3.1",
+    "@eslint/js": "9.27.0",
+    "@nestjs/cli": "11.0.7",
+    "@nestjs/schematics": "11.0.5",
+    "@nestjs/testing": "11.1.1",
     "@relmify/jest-fp-ts": "2.1.1",
     "@types/bcrypt": "5.0.2",
-    "@types/cookie": "0.6.0",
-    "@types/cookie-parser": "1.4.7",
-    "@types/express": "5.0.0",
-    "@types/jest": "29.5.13",
-    "@types/luxon": "3.4.2",
-    "@types/node": "22.7.5",
-    "@types/nodemailer": "6.4.16",
+    "@types/cookie-parser": "1.4.8",
+    "@types/express": "5.0.2",
+    "@types/jest": "29.5.14",
+    "@types/luxon": "3.6.2",
+    "@types/node": "22.15.19",
+    "@types/nodemailer": "6.4.17",
     "@types/passport-github2": "1.2.9",
     "@types/passport-google-oauth20": "2.0.16",
     "@types/passport-jwt": "4.0.1",
     "@types/passport-microsoft": "1.0.3",
-    "@types/supertest": "6.0.2",
-    "@typescript-eslint/eslint-plugin": "8.8.1",
-    "@typescript-eslint/parser": "8.8.1",
+    "@types/supertest": "6.0.3",
+    "@typescript-eslint/eslint-plugin": "8.32.1",
+    "@typescript-eslint/parser": "8.32.1",
     "cross-env": "7.0.3",
-    "eslint": "8.57.0",
-    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-prettier": "5.2.1",
+    "eslint": "9.27.0",
+    "eslint-config-prettier": "10.1.5",
+    "eslint-plugin-prettier": "5.4.0",
+    "globals": "16.1.0",
     "jest": "29.7.0",
     "jest-mock-extended": "4.0.0-beta1",
-    "jwt": "link:@types/nestjs/jwt",
-    "prettier": "3.3.3",
+    "prettier": "3.5.3",
     "source-map-support": "0.5.21",
-    "supertest": "7.0.0",
-    "ts-jest": "29.2.5",
-    "ts-loader": "9.5.1",
+    "supertest": "7.1.1",
+    "ts-jest": "29.3.4",
+    "ts-loader": "9.5.2",
     "ts-node": "10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.5.4"
+    "typescript": "5.8.3"
   },
   "jest": {
     "moduleFileExtensions": [

packages/hoppscotch-backend/prisma/migrations/20250306054346_team_access_role_enum/migration.sql

@@ -0,0 +1,2 @@
+-- Alter the enum type "TeamMemberRole" to "TeamAccessRole"
+ALTER TYPE "TeamMemberRole" RENAME TO "TeamAccessRole";

packages/hoppscotch-backend/prisma/schema.prisma

@@ -20,7 +20,7 @@ model Team {
 
 model TeamMember {
   id      String         @id @default(uuid()) // Membership ID
-  role    TeamMemberRole
+  role    TeamAccessRole
   userUid String
   teamID  String
   team    Team           @relation(fields: [teamID], references: [id], onDelete: Cascade)
@@ -34,7 +34,7 @@ model TeamInvitation {
   team         Team           @relation(fields: [teamID], references: [id], onDelete: Cascade)
   creatorUid   String
   inviteeEmail String
-  inviteeRole  TeamMemberRole
+  inviteeRole  TeamAccessRole
 
   @@unique([teamID, inviteeEmail])
   @@index([teamID])
@@ -207,7 +207,7 @@ model UserCollection {
   updatedOn  DateTime         @updatedAt @db.Timestamp(3)
 }
 
-enum TeamMemberRole {
+enum TeamAccessRole {
   OWNER
   VIEWER
   EDITOR

packages/hoppscotch-backend/src/access-token/access-token.controller.ts

@@ -4,7 +4,6 @@ import {
   Controller,
   Delete,
   Get,
-  HttpStatus,
   Param,
   ParseIntPipe,
   Post,

packages/hoppscotch-backend/src/access-token/access-token.module.ts

@@ -1,18 +1,12 @@
 import { Module } from '@nestjs/common';
 import { AccessTokenController } from './access-token.controller';
-import { PrismaModule } from 'src/prisma/prisma.module';
 import { AccessTokenService } from './access-token.service';
 import { TeamCollectionModule } from 'src/team-collection/team-collection.module';
 import { TeamEnvironmentsModule } from 'src/team-environments/team-environments.module';
 import { TeamModule } from 'src/team/team.module';
 
 @Module({
-  imports: [
-    PrismaModule,
-    TeamCollectionModule,
-    TeamEnvironmentsModule,
-    TeamModule,
-  ],
+  imports: [TeamCollectionModule, TeamEnvironmentsModule, TeamModule],
   controllers: [AccessTokenController],
   providers: [AccessTokenService],
   exports: [AccessTokenService],

packages/hoppscotch-backend/src/access-token/access-token.service.ts

@@ -12,6 +12,7 @@ import {
 import { CreateAccessTokenResponse } from './helper';
 import { PersonalAccessToken } from '@prisma/client';
 import { AccessToken } from 'src/types/AccessToken';
+
 @Injectable()
 export class AccessTokenService {
   constructor(private readonly prisma: PrismaService) {}

packages/hoppscotch-backend/src/admin/admin.module.ts

@@ -1,8 +1,6 @@
 import { Module } from '@nestjs/common';
 import { AdminResolver } from './admin.resolver';
 import { AdminService } from './admin.service';
-import { PrismaModule } from '../prisma/prisma.module';
-import { PubSubModule } from '../pubsub/pubsub.module';
 import { UserModule } from '../user/user.module';
 import { TeamModule } from '../team/team.module';
 import { TeamInvitationModule } from '../team-invitation/team-invitation.module';
@@ -16,8 +14,6 @@ import { UserHistoryModule } from 'src/user-history/user-history.module';
 
 @Module({
   imports: [
-    PrismaModule,
-    PubSubModule,
     UserModule,
     TeamModule,
     TeamInvitationModule,