fix: feedback resolve

This reverts commit 852353f24d170726b400fb729ac4caef7acfeb19.

.env.example

@@ -35,20 +35,9 @@ MICROSOFT_SCOPE="user.read"
 MICROSOFT_TENANT="common"
 
 # Mailer config
-MAILER_SMTP_ENABLE="true"
-MAILER_USE_ADVANCE_CONFIGS="false"
+MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com"
 MAILER_ADDRESS_FROM='"From Name Here" <from@example.com>'
 
-MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com" # used if custom mailer configs is false
-
-# The following are used if custom mailer configs is true
-MAILER_SMTP_HOST="smtp.domain.com"
-MAILER_SMTP_PORT="587"
-MAILER_SMTP_SECURE="true"
-MAILER_SMTP_USER="user@domain.com"
-MAILER_SMTP_PASSWORD="pass"
-MAILER_TLS_REJECT_UNAUTHORIZED="true"
-
 # Rate Limit Config
 RATE_LIMIT_TTL=60 # In seconds
 RATE_LIMIT_MAX=100 # Max requests per IP

.github/workflows/tests.yml

@@ -17,21 +17,22 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Setup environment
         run: mv .env.example .env
 
-      - name: Setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: ${{ matrix.node-version }}
-
       - name: Setup pnpm
-        uses: pnpm/action-setup@v3
+        uses: pnpm/action-setup@v2.2.4
         with:
           version: 8
           run_install: true
 
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: pnpm
+
       - name: Run tests
         run: pnpm test

.npmrc

@@ -1,2 +1 @@
 shamefully-hoist=false
-save-prefix=''

docker-compose.deploy.yml

@@ -1,48 +0,0 @@
-# THIS IS NOT TO BE USED FOR PERSONAL DEPLOYMENTS!
-# Internal Docker Compose Image used for internal testing deployments
-
-version: "3.7"
-
-services:
-  hoppscotch-db:
-    image: postgres:15
-    user: postgres
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: testpass
-      POSTGRES_DB: hoppscotch
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "sh -c 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'"
-        ]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-  hoppscotch-aio:
-    container_name: hoppscotch-aio
-    build:
-      dockerfile: prod.Dockerfile
-      context: .
-      target: aio
-    environment:
-      - 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"]
-    healthcheck:
-      test:
-        - CMD
-        - curl
-        - '-f'
-        - 'http://localhost:80'
-      interval: 2s
-      timeout: 10s
-      retries: 30
-

docker-compose.yml

@@ -118,7 +118,7 @@ services:
     restart: always
     environment:
       # Edit the below line to match your PostgresDB URL if you have an outside DB (make sure to update the .env file as well)
-      - DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch?connect_timeout=300
+      # - DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch?connect_timeout=300
       - PORT=3000
     volumes:
       # Uncomment the line below when modifying code. Only applicable when using the "dev" target.

healthcheck.sh

@@ -9,10 +9,6 @@ curlCheck() {
   fi
 }
 
-if [ "$ENABLE_SUBPATH_BASED_ACCESS" = "true" ]; then
-  curlCheck "http://localhost:80/backend/ping"
-else
-  curlCheck "http://localhost:3000"
-  curlCheck "http://localhost:3100"
-  curlCheck "http://localhost:3170/ping"
-fi
+curlCheck "http://localhost:3000"
+curlCheck "http://localhost:3100"
+curlCheck "http://localhost:3170/ping"

package.json

@@ -23,13 +23,13 @@
     "./packages/*"
   ],
   "devDependencies": {
-    "@commitlint/cli": "16.3.0",
-    "@commitlint/config-conventional": "16.2.4",
-    "@hoppscotch/ui": "0.1.0",
+    "@commitlint/cli": "^16.2.3",
+    "@commitlint/config-conventional": "^16.2.1",
+    "@hoppscotch/ui": "^0.1.0",
     "@types/node": "17.0.27",
-    "cross-env": "7.0.3",
-    "http-server": "14.1.1",
-    "husky": "7.0.4",
+    "cross-env": "^7.0.3",
+    "http-server": "^14.1.1",
+    "husky": "^7.0.4",
     "lint-staged": "12.4.0"
   },
   "pnpm": {
@@ -37,8 +37,8 @@
       "vue": "3.3.9"
     },
     "packageExtensions": {
-      "httpsnippet@3.0.1": {
-        "dependencies": {
+      "httpsnippet@^3.0.1": {
+        "peerDependencies": {
           "ajv": "6.12.3"
         }
       }

packages/codemirror-lang-graphql/package.json

@@ -17,16 +17,16 @@
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@codemirror/language": "6.10.1",
+    "@codemirror/language": "6.9.3",
     "@lezer/highlight": "1.2.0",
-    "@lezer/lr": "1.3.14"
+    "@lezer/lr": "^1.3.14"
   },
   "devDependencies": {
-    "@lezer/generator": "1.5.1",
-    "mocha": "9.2.2",
-    "rollup": "3.29.4",
-    "rollup-plugin-dts": "6.0.2",
-    "rollup-plugin-ts": "3.4.5",
-    "typescript": "5.2.2"
+    "@lezer/generator": "^1.5.1",
+    "mocha": "^9.2.2",
+    "rollup": "^3.29.3",
+    "rollup-plugin-dts": "^6.0.2",
+    "rollup-plugin-ts": "^3.4.5",
+    "typescript": "^5.2.2"
   }
-}
+}

packages/hoppscotch-backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.12.2 AS builder
+FROM node:18.8.0 AS builder
 
 WORKDIR /usr/src/app
 

packages/hoppscotch-backend/nest-cli.json

@@ -3,7 +3,9 @@
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
   "compilerOptions": {
-    "assets": [{ "include": "mailer/templates/**/*", "outDir": "dist" }],
+    "assets": [
+      "**/*.hbs"
+    ],
     "watchAssets": true
   }
 }

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2024.3.3",
+  "version": "2023.12.3",
   "description": "",
   "author": "",
   "private": true,
@@ -24,85 +24,80 @@
     "do-test": "pnpm run test"
   },
   "dependencies": {
-    "@apollo/server": "4.9.5",
-    "@nestjs-modules/mailer": "1.9.1",
-    "@nestjs/apollo": "12.0.9",
-    "@nestjs/common": "10.2.7",
-    "@nestjs/config": "3.1.1",
-    "@nestjs/core": "10.2.7",
-    "@nestjs/event-emitter": "2.0.4",
-    "@nestjs/graphql": "12.0.9",
-    "@nestjs/jwt": "10.1.1",
-    "@nestjs/passport": "10.0.2",
-    "@nestjs/platform-express": "10.2.7",
-    "@nestjs/schedule": "4.0.1",
-    "@nestjs/terminus": "10.2.3",
-    "@nestjs/throttler": "5.0.1",
-    "@prisma/client": "5.8.1",
-    "argon2": "0.30.3",
-    "bcrypt": "5.1.0",
-    "cookie": "0.5.0",
-    "cookie-parser": "1.4.6",
-    "cron": "3.1.6",
-    "express": "4.18.2",
-    "express-session": "1.17.3",
-    "fp-ts": "2.13.1",
-    "graphql": "16.8.1",
-    "graphql-query-complexity": "0.12.0",
-    "graphql-redis-subscriptions": "2.6.0",
-    "graphql-subscriptions": "2.0.0",
-    "handlebars": "4.7.7",
-    "io-ts": "2.2.16",
-    "luxon": "3.2.1",
-    "nodemailer": "6.9.1",
-    "passport": "0.6.0",
-    "passport-github2": "0.1.12",
-    "passport-google-oauth20": "2.0.0",
-    "passport-jwt": "4.0.1",
-    "passport-local": "1.0.0",
-    "passport-microsoft": "1.0.0",
-    "posthog-node": "3.6.3",
-    "prisma": "5.8.1",
-    "reflect-metadata": "0.1.13",
-    "rimraf": "3.0.2",
-    "rxjs": "7.6.0"
+    "@apollo/server": "^4.9.4",
+    "@nestjs-modules/mailer": "^1.9.1",
+    "@nestjs/apollo": "^12.0.9",
+    "@nestjs/common": "^10.2.6",
+    "@nestjs/config": "^3.1.1",
+    "@nestjs/core": "^10.2.6",
+    "@nestjs/graphql": "^12.0.9",
+    "@nestjs/jwt": "^10.1.1",
+    "@nestjs/passport": "^10.0.2",
+    "@nestjs/platform-express": "^10.2.6",
+    "@nestjs/throttler": "^5.0.0",
+    "@prisma/client": "^5.8.0",
+    "argon2": "^0.30.3",
+    "bcrypt": "^5.1.0",
+    "cookie": "^0.5.0",
+    "cookie-parser": "^1.4.6",
+    "express": "^4.17.1",
+    "express-session": "^1.17.3",
+    "fp-ts": "^2.13.1",
+    "graphql": "^16.8.1",
+    "graphql-query-complexity": "^0.12.0",
+    "graphql-redis-subscriptions": "^2.6.0",
+    "graphql-subscriptions": "^2.0.0",
+    "handlebars": "^4.7.7",
+    "io-ts": "^2.2.16",
+    "luxon": "^3.2.1",
+    "nodemailer": "^6.9.1",
+    "passport": "^0.6.0",
+    "passport-github2": "^0.1.12",
+    "passport-google-oauth20": "^2.0.0",
+    "passport-jwt": "^4.0.1",
+    "passport-local": "^1.0.0",
+    "passport-microsoft": "^1.0.0",
+    "prisma": "^5.8.0",
+    "reflect-metadata": "^0.1.13",
+    "rimraf": "^3.0.2",
+    "rxjs": "^7.6.0"
   },
   "devDependencies": {
-    "@nestjs/cli": "10.2.1",
-    "@nestjs/schematics": "10.0.3",
-    "@nestjs/testing": "10.2.7",
-    "@relmify/jest-fp-ts": "2.0.2",
-    "@types/argon2": "0.15.0",
-    "@types/bcrypt": "5.0.0",
-    "@types/cookie": "0.5.1",
-    "@types/cookie-parser": "1.4.3",
-    "@types/express": "4.17.14",
-    "@types/jest": "29.4.0",
-    "@types/luxon": "3.2.0",
-    "@types/node": "18.11.10",
-    "@types/nodemailer": "6.4.7",
-    "@types/passport-github2": "1.2.5",
-    "@types/passport-google-oauth20": "2.0.11",
-    "@types/passport-jwt": "3.0.8",
-    "@types/passport-microsoft": "0.0.0",
-    "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.45.0",
-    "@typescript-eslint/parser": "5.45.0",
-    "cross-env": "7.0.3",
-    "eslint": "8.29.0",
-    "eslint-config-prettier": "8.5.0",
-    "eslint-plugin-prettier": "4.2.1",
-    "jest": "29.4.1",
-    "jest-mock-extended": "3.0.1",
+    "@nestjs/cli": "^10.1.18",
+    "@nestjs/schematics": "^10.0.2",
+    "@nestjs/testing": "^10.2.6",
+    "@relmify/jest-fp-ts": "^2.0.2",
+    "@types/argon2": "^0.15.0",
+    "@types/bcrypt": "^5.0.0",
+    "@types/cookie": "^0.5.1",
+    "@types/cookie-parser": "^1.4.3",
+    "@types/express": "^4.17.14",
+    "@types/jest": "^29.4.0",
+    "@types/luxon": "^3.2.0",
+    "@types/node": "^18.11.10",
+    "@types/nodemailer": "^6.4.7",
+    "@types/passport-github2": "^1.2.5",
+    "@types/passport-google-oauth20": "^2.0.11",
+    "@types/passport-jwt": "^3.0.8",
+    "@types/passport-microsoft": "^0.0.0",
+    "@types/supertest": "^2.0.12",
+    "@typescript-eslint/eslint-plugin": "^5.45.0",
+    "@typescript-eslint/parser": "^5.45.0",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.29.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "jest": "^29.4.1",
+    "jest-mock-extended": "^3.0.1",
     "jwt": "link:@types/nestjs/jwt",
-    "prettier": "2.8.4",
-    "source-map-support": "0.5.21",
-    "supertest": "6.3.2",
+    "prettier": "^2.8.4",
+    "source-map-support": "^0.5.21",
+    "supertest": "^6.3.2",
     "ts-jest": "29.0.5",
-    "ts-loader": "9.4.2",
-    "ts-node": "10.9.1",
+    "ts-loader": "^9.4.2",
+    "ts-node": "^10.9.1",
     "tsconfig-paths": "4.1.1",
-    "typescript": "4.9.3"
+    "typescript": "^4.9.3"
   },
   "jest": {
     "moduleFileExtensions": [

packages/hoppscotch-backend/prisma/migrations/20240226053141_full_text_search_additions/migration.sql

@@ -1,22 +0,0 @@
--- This is a custom migration file which is not generated by Prisma.
--- The aim of this migration is to add text search indices to the TeamCollection and TeamRequest tables.
-
--- Create Extension
-CREATE EXTENSION IF NOT EXISTS pg_trgm;
-
--- Create GIN Trigram Index for Team Collection title
-CREATE INDEX
-  "TeamCollection_title_trgm_idx"
-ON
-  "TeamCollection"
-USING
-  GIN (title gin_trgm_ops);
-
--- Create GIN Trigram Index for Team Collection title
-CREATE INDEX
-  "TeamRequest_title_trgm_idx"
-ON
-  "TeamRequest"
-USING
-  GIN (title gin_trgm_ops);
-

packages/hoppscotch-backend/prisma/schema.prisma

@@ -41,31 +41,31 @@ model TeamInvitation {
 }
 
 model TeamCollection {
-  id         String                   @id @default(cuid())
+  id         String           @id @default(cuid())
   parentID   String?
   data       Json?
-  parent     TeamCollection?          @relation("TeamCollectionChildParent", fields: [parentID], references: [id])
-  children   TeamCollection[]         @relation("TeamCollectionChildParent")
+  parent     TeamCollection?  @relation("TeamCollectionChildParent", fields: [parentID], references: [id])
+  children   TeamCollection[] @relation("TeamCollectionChildParent")
   requests   TeamRequest[]
   teamID     String
-  team       Team                     @relation(fields: [teamID], references: [id], onDelete: Cascade)
+  team       Team             @relation(fields: [teamID], references: [id], onDelete: Cascade)
   title      String
   orderIndex Int
-  createdOn  DateTime                 @default(now()) @db.Timestamp(3)
-  updatedOn  DateTime                 @updatedAt @db.Timestamp(3)
+  createdOn  DateTime         @default(now()) @db.Timestamp(3)
+  updatedOn  DateTime         @updatedAt @db.Timestamp(3)
 }
 
 model TeamRequest {
-  id           String                   @id @default(cuid())
+  id           String         @id @default(cuid())
   collectionID String
-  collection   TeamCollection           @relation(fields: [collectionID], references: [id], onDelete: Cascade)
+  collection   TeamCollection @relation(fields: [collectionID], references: [id], onDelete: Cascade)
   teamID       String
-  team         Team                     @relation(fields: [teamID], references: [id], onDelete: Cascade)
+  team         Team           @relation(fields: [teamID], references: [id], onDelete: Cascade)
   title        String
   request      Json
   orderIndex   Int
-  createdOn    DateTime                 @default(now()) @db.Timestamp(3)
-  updatedOn    DateTime                 @updatedAt @db.Timestamp(3)
+  createdOn    DateTime       @default(now()) @db.Timestamp(3)
+  updatedOn    DateTime       @updatedAt @db.Timestamp(3)
 }
 
 model Shortcode {

packages/hoppscotch-backend/src/admin/admin.service.spec.ts

@@ -22,7 +22,6 @@ import { ShortcodeService } from 'src/shortcode/shortcode.service';
 import { ConfigService } from '@nestjs/config';
 import { OffsetPaginationArgs } from 'src/types/input-types.args';
 import * as E from 'fp-ts/Either';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 
 const mockPrisma = mockDeep<PrismaService>();
 const mockPubSub = mockDeep<PubSubService>();
@@ -35,7 +34,6 @@ const mockTeamCollectionService = mockDeep<TeamCollectionService>();
 const mockMailerService = mockDeep<MailerService>();
 const mockShortcodeService = mockDeep<ShortcodeService>();
 const mockConfigService = mockDeep<ConfigService>();
-const mockEventEmitter = mockDeep<EventEmitter2>();
 
 const adminService = new AdminService(
   mockUserService,
@@ -46,9 +44,9 @@ const adminService = new AdminService(
   mockTeamInvitationService,
   mockPubSub as any,
   mockPrisma as any,
+  mockMailerService,
   mockShortcodeService,
   mockConfigService,
-  mockEventEmitter,
 );
 
 const invitedUsers: InvitedUsers[] = [

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

@@ -19,6 +19,7 @@ import {
   USER_IS_ADMIN,
   USER_NOT_FOUND,
 } from '../errors';
+import { MailerService } from '../mailer/mailer.service';
 import { InvitedUser } from './invited-user.model';
 import { TeamService } from '../team/team.service';
 import { TeamCollectionService } from '../team-collection/team-collection.service';
@@ -30,8 +31,6 @@ import { ShortcodeService } from 'src/shortcode/shortcode.service';
 import { ConfigService } from '@nestjs/config';
 import { OffsetPaginationArgs } from 'src/types/input-types.args';
 import { UserDeletionResult } from 'src/user/user.model';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Events } from 'src/types/EventEmitter';
 
 @Injectable()
 export class AdminService {
@@ -44,9 +43,9 @@ export class AdminService {
     private readonly teamInvitationService: TeamInvitationService,
     private readonly pubsub: PubSubService,
     private readonly prisma: PrismaService,
+    private readonly mailerService: MailerService,
     private readonly shortcodeService: ShortcodeService,
     private readonly configService: ConfigService,
-    private readonly eventEmitter: EventEmitter2,
   ) {}
 
   /**
@@ -100,16 +99,17 @@ export class AdminService {
     });
     if (alreadyInvitedUser != null) return E.left(USER_ALREADY_INVITED);
 
-    this.eventEmitter.emit(Events.MAILER_SEND_USER_INVITATION_EMAIL, {
-      to: inviteeEmail,
-      mailDesc: {
+    try {
+      await this.mailerService.sendUserInvitationEmail(inviteeEmail, {
         template: 'user-invitation',
         variables: {
           inviteeEmail: inviteeEmail,
           magicLink: `${this.configService.get('VITE_BASE_URL')}`,
         },
-      },
-    });
+      });
+    } catch (e) {
+      return E.left(EMAIL_FAILED);
+    }
 
     // Add invitee email to the list of invited users by admin
     const dbInvitedUser = await this.prisma.invitedUsers.create({

packages/hoppscotch-backend/src/admin/infra.resolver.ts

@@ -32,8 +32,7 @@ import {
   EnableAndDisableSSOArgs,
   InfraConfigArgs,
 } from 'src/infra-config/input-args';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
-import { ServiceStatus } from 'src/infra-config/helper';
+import { InfraConfigEnumForClient } from 'src/types/InfraConfig';
 
 @UseGuards(GqlThrottlerGuard)
 @Resolver(() => Infra)
@@ -274,10 +273,10 @@ export class InfraResolver {
   async infraConfigs(
     @Args({
       name: 'configNames',
-      type: () => [InfraConfigEnum],
+      type: () => [InfraConfigEnumForClient],
       description: 'Configs to fetch',
     })
-    names: InfraConfigEnum[],
+    names: InfraConfigEnumForClient[],
   ) {
     const infraConfigs = await this.infraConfigService.getMany(names);
     if (E.isLeft(infraConfigs)) throwErr(infraConfigs.left);
@@ -292,14 +291,6 @@ export class InfraResolver {
     return this.infraConfigService.getAllowedAuthProviders();
   }
 
-  @Query(() => Boolean, {
-    description: 'Check if the SMTP is enabled or not',
-  })
-  @UseGuards(GqlAuthGuard)
-  isSMTPEnabled() {
-    return this.infraConfigService.isSMTPEnabled();
-  }
-
   /* Mutations */
 
   @Mutation(() => [InfraConfig], {
@@ -319,25 +310,6 @@ export class InfraResolver {
     return updatedRes.right;
   }
 
-  @Mutation(() => Boolean, {
-    description: 'Enable or disable analytics collection',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async toggleAnalyticsCollection(
-    @Args({
-      name: 'status',
-      type: () => ServiceStatus,
-      description: 'Toggle analytics collection',
-    })
-    analyticsCollectionStatus: ServiceStatus,
-  ) {
-    const res = await this.infraConfigService.toggleAnalyticsCollection(
-      analyticsCollectionStatus,
-    );
-    if (E.isLeft(res)) throwErr(res.left);
-    return res.right;
-  }
-
   @Mutation(() => Boolean, {
     description: 'Reset Infra Configs with default values (.env)',
   })
@@ -367,23 +339,4 @@ export class InfraResolver {
 
     return true;
   }
-
-  @Mutation(() => Boolean, {
-    description: 'Enable or Disable SMTP for sending emails',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async toggleSMTP(
-    @Args({
-      name: 'status',
-      type: () => ServiceStatus,
-      description: 'Toggle SMTP',
-    })
-    status: ServiceStatus,
-  ) {
-    const isUpdated = await this.infraConfigService.enableAndDisableSMTP(
-      status,
-    );
-    if (E.isLeft(isUpdated)) throwErr(isUpdated.left);
-    return true;
-  }
 }

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

@@ -24,14 +24,9 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
 import { InfraConfigModule } from './infra-config/infra-config.module';
 import { loadInfraConfiguration } from './infra-config/helper';
 import { MailerModule } from './mailer/mailer.module';
-import { PosthogModule } from './posthog/posthog.module';
-import { ScheduleModule } from '@nestjs/schedule';
-import { HealthModule } from './health/health.module';
-import { EventEmitterModule } from '@nestjs/event-emitter';
 
 @Module({
   imports: [
-    EventEmitterModule.forRoot(),
     ConfigModule.forRoot({
       isGlobal: true,
       load: [async () => loadInfraConfiguration()],
@@ -101,9 +96,6 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
     UserCollectionModule,
     ShortcodeModule,
     InfraConfigModule,
-    PosthogModule,
-    ScheduleModule.forRoot(),
-    HealthModule,
   ],
   providers: [GQLComplexityPlugin],
   controllers: [AppController],

packages/hoppscotch-backend/src/auth/auth.controller.ts

@@ -18,7 +18,12 @@ import { JwtAuthGuard } from './guards/jwt-auth.guard';
 import { GqlUser } from 'src/decorators/gql-user.decorator';
 import { AuthUser } from 'src/types/AuthUser';
 import { RTCookie } from 'src/decorators/rt-cookie.decorator';
-import { AuthProvider, authCookieHandler, authProviderCheck } from './helper';
+import {
+  AuthProvider,
+  authCookieHandler,
+  authProviderCheck,
+  throwHTTPErr,
+} from './helper';
 import { GoogleSSOGuard } from './guards/google-sso.guard';
 import { GithubSSOGuard } from './guards/github-sso.guard';
 import { MicrosoftSSOGuard } from './guards/microsoft-sso-.guard';
@@ -26,7 +31,6 @@ import { ThrottlerBehindProxyGuard } from 'src/guards/throttler-behind-proxy.gua
 import { SkipThrottle } from '@nestjs/throttler';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 import { ConfigService } from '@nestjs/config';
-import { throwHTTPErr } from 'src/utils';
 
 @UseGuards(ThrottlerBehindProxyGuard)
 @Controller({ path: 'auth', version: '1' })

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

@@ -12,10 +12,7 @@ import { GithubStrategy } from './strategies/github.strategy';
 import { MicrosoftStrategy } from './strategies/microsoft.strategy';
 import { AuthProvider, authProviderCheck } from './helper';
 import { ConfigModule, ConfigService } from '@nestjs/config';
-import {
-  isInfraConfigTablePopulated,
-  loadInfraConfiguration,
-} from 'src/infra-config/helper';
+import { loadInfraConfiguration } from 'src/infra-config/helper';
 import { InfraConfigModule } from 'src/infra-config/infra-config.module';
 
 @Module({
@@ -37,11 +34,6 @@ import { InfraConfigModule } from 'src/infra-config/infra-config.module';
 })
 export class AuthModule {
   static async register() {
-    const isInfraConfigPopulated = await isInfraConfigTablePopulated();
-    if (!isInfraConfigPopulated) {
-      return { module: AuthModule };
-    }
-
     const env = await loadInfraConfiguration();
     const allowedAuthProviders = env.INFRA.VITE_ALLOWED_AUTH_PROVIDERS;
 

packages/hoppscotch-backend/src/auth/auth.service.spec.ts

@@ -23,7 +23,6 @@ import * as argon2 from 'argon2';
 import * as E from 'fp-ts/Either';
 import { ConfigService } from '@nestjs/config';
 import { InfraConfigService } from 'src/infra-config/infra-config.service';
-import { EventEmitter2 } from '@nestjs/event-emitter';
 
 const mockPrisma = mockDeep<PrismaService>();
 const mockUser = mockDeep<UserService>();
@@ -31,7 +30,6 @@ const mockJWT = mockDeep<JwtService>();
 const mockMailer = mockDeep<MailerService>();
 const mockConfigService = mockDeep<ConfigService>();
 const mockInfraConfigService = mockDeep<InfraConfigService>();
-const mockEventEmitter = mockDeep<EventEmitter2>();
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -39,9 +37,9 @@ const authService = new AuthService(
   mockUser,
   mockPrisma,
   mockJWT,
+  mockMailer,
   mockConfigService,
   mockInfraConfigService,
-  mockEventEmitter,
 );
 
 const currentTime = new Date();

packages/hoppscotch-backend/src/auth/auth.service.ts

@@ -1,4 +1,5 @@
 import { HttpStatus, Injectable } from '@nestjs/common';
+import { MailerService } from 'src/mailer/mailer.service';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { UserService } from 'src/user/user.service';
 import { VerifyMagicDto } from './dto/verify-magic.dto';
@@ -23,14 +24,12 @@ import {
   RefreshTokenPayload,
 } from 'src/types/AuthTokens';
 import { JwtService } from '@nestjs/jwt';
-import { RESTError } from 'src/types/RESTError';
+import { AuthError } from 'src/types/AuthError';
 import { AuthUser, IsAdmin } from 'src/types/AuthUser';
 import { VerificationToken } from '@prisma/client';
 import { Origin } from './helper';
 import { ConfigService } from '@nestjs/config';
 import { InfraConfigService } from 'src/infra-config/infra-config.service';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Events } from 'src/types/EventEmitter';
 
 @Injectable()
 export class AuthService {
@@ -38,9 +37,9 @@ export class AuthService {
     private usersService: UserService,
     private prismaService: PrismaService,
     private jwtService: JwtService,
+    private readonly mailerService: MailerService,
     private readonly configService: ConfigService,
     private infraConfigService: InfraConfigService,
-    private eventEmitter: EventEmitter2,
   ) {}
 
   /**
@@ -118,7 +117,7 @@ export class AuthService {
       userUid,
     );
     if (E.isLeft(updatedUser))
-      return E.left(<RESTError>{
+      return E.left(<AuthError>{
         message: updatedUser.left,
         statusCode: HttpStatus.NOT_FOUND,
       });
@@ -235,14 +234,11 @@ export class AuthService {
         url = this.configService.get('VITE_BASE_URL');
     }
 
-    this.eventEmitter.emit(Events.MAILER_SEND_EMAIL, {
-      to: email,
-      mailDesc: {
-        template: 'user-invitation',
-        variables: {
-          inviteeEmail: email,
-          magicLink: `${url}/enter?token=${generatedTokens.token}`,
-        },
+    await this.mailerService.sendEmail(email, {
+      template: 'user-invitation',
+      variables: {
+        inviteeEmail: email,
+        magicLink: `${url}/enter?token=${generatedTokens.token}`,
       },
     });
 
@@ -259,7 +255,7 @@ export class AuthService {
    */
   async verifyMagicLinkTokens(
     magicLinkIDTokens: VerifyMagicDto,
-  ): Promise<E.Right<AuthTokens> | E.Left<RESTError>> {
+  ): Promise<E.Right<AuthTokens> | E.Left<AuthError>> {
     const passwordlessTokens = await this.validatePasswordlessTokens(
       magicLinkIDTokens,
     );
@@ -377,7 +373,7 @@ export class AuthService {
     if (usersCount === 1) {
       const elevatedUser = await this.usersService.makeAdmin(user.uid);
       if (E.isLeft(elevatedUser))
-        return E.left(<RESTError>{
+        return E.left(<AuthError>{
           message: elevatedUser.left,
           statusCode: HttpStatus.NOT_FOUND,
         });

packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts

@@ -1,10 +1,9 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthProvider, authProviderCheck } from '../helper';
+import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
 import { Observable } from 'rxjs';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 import { ConfigService } from '@nestjs/config';
-import { throwHTTPErr } from 'src/utils';
 
 @Injectable()
 export class GithubSSOGuard extends AuthGuard('github') implements CanActivate {

packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts

@@ -1,10 +1,9 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthProvider, authProviderCheck } from '../helper';
+import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
 import { Observable } from 'rxjs';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 import { ConfigService } from '@nestjs/config';
-import { throwHTTPErr } from 'src/utils';
 
 @Injectable()
 export class GoogleSSOGuard extends AuthGuard('google') implements CanActivate {

packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts

@@ -1,10 +1,9 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { AuthProvider, authProviderCheck } from '../helper';
+import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
 import { Observable } from 'rxjs';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
 import { ConfigService } from '@nestjs/config';
-import { throwHTTPErr } from 'src/utils';
 
 @Injectable()
 export class MicrosoftSSOGuard

packages/hoppscotch-backend/src/auth/helper.ts

@@ -1,5 +1,6 @@
 import { HttpException, HttpStatus } from '@nestjs/common';
 import { DateTime } from 'luxon';
+import { AuthError } from 'src/types/AuthError';
 import { AuthTokens } from 'src/types/AuthTokens';
 import { Response } from 'express';
 import * as cookie from 'cookie';
@@ -24,6 +25,15 @@ export enum AuthProvider {
   EMAIL = 'EMAIL',
 }
 
+/**
+ * This function allows throw to be used as an expression
+ * @param errMessage Message present in the error message
+ */
+export function throwHTTPErr(errorData: AuthError): never {
+  const { message, statusCode } = errorData;
+  throw new HttpException(message, statusCode);
+}
+
 /**
  * Sets and returns the cookies in the response object on successful authentication
  * @param res Express Response Object

packages/hoppscotch-backend/src/auth/strategies/github.strategy.ts

@@ -17,8 +17,8 @@ export class GithubStrategy extends PassportStrategy(Strategy) {
     super({
       clientID: configService.get('INFRA.GITHUB_CLIENT_ID'),
       clientSecret: configService.get('INFRA.GITHUB_CLIENT_SECRET'),
-      callbackURL: configService.get('INFRA.GITHUB_CALLBACK_URL'),
-      scope: [configService.get('INFRA.GITHUB_SCOPE')],
+      callbackURL: configService.get('GITHUB_CALLBACK_URL'),
+      scope: [configService.get('GITHUB_SCOPE')],
       store: true,
     });
   }

packages/hoppscotch-backend/src/auth/strategies/google.strategy.ts

@@ -17,8 +17,8 @@ export class GoogleStrategy extends PassportStrategy(Strategy) {
     super({
       clientID: configService.get('INFRA.GOOGLE_CLIENT_ID'),
       clientSecret: configService.get('INFRA.GOOGLE_CLIENT_SECRET'),
-      callbackURL: configService.get('INFRA.GOOGLE_CALLBACK_URL'),
-      scope: configService.get('INFRA.GOOGLE_SCOPE').split(','),
+      callbackURL: configService.get('GOOGLE_CALLBACK_URL'),
+      scope: configService.get('GOOGLE_SCOPE').split(','),
       passReqToCallback: true,
       store: true,
     });

packages/hoppscotch-backend/src/auth/strategies/microsoft.strategy.ts

@@ -17,9 +17,9 @@ export class MicrosoftStrategy extends PassportStrategy(Strategy) {
     super({
       clientID: configService.get('INFRA.MICROSOFT_CLIENT_ID'),
       clientSecret: configService.get('INFRA.MICROSOFT_CLIENT_SECRET'),
-      callbackURL: configService.get('INFRA.MICROSOFT_CALLBACK_URL'),
-      scope: [configService.get('INFRA.MICROSOFT_SCOPE')],
-      tenant: configService.get('INFRA.MICROSOFT_TENANT'),
+      callbackURL: configService.get('MICROSOFT_CALLBACK_URL'),
+      scope: [configService.get('MICROSOFT_SCOPE')],
+      tenant: configService.get('MICROSOFT_TENANT'),
       store: true,
     });
   }

packages/hoppscotch-backend/src/errors.ts

@@ -84,12 +84,6 @@ export const USER_ALREADY_INVITED = 'admin/user_already_invited' as const;
  */
 export const USER_UPDATE_FAILED = 'user/update_failed' as const;
 
-/**
- * User display name validation failure
- * (UserService)
- */
-export const USER_SHORT_DISPLAY_NAME = 'user/short_display_name' as const;
-
 /**
  * User deletion failure
  * (UserService)
@@ -234,12 +228,6 @@ export const TEAM_COL_NOT_SAME_PARENT =
 export const TEAM_COL_SAME_NEXT_COLL =
   'team_coll/collection_and_next_collection_are_same';
 
-/**
- * Team Collection search failed
- * (TeamCollectionService)
- */
-export const TEAM_COL_SEARCH_FAILED = 'team_coll/team_collection_search_failed';
-
 /**
  * Team Collection Re-Ordering Failed
  * (TeamCollectionService)
@@ -295,13 +283,6 @@ export const TEAM_NOT_OWNER = 'team_coll/team_not_owner' as const;
 export const TEAM_COLL_DATA_INVALID =
   'team_coll/team_coll_data_invalid' as const;
 
-/**
- * Team Collection parent tree generation failed
- * (TeamCollectionService)
- */
-export const TEAM_COLL_PARENT_TREE_GEN_FAILED =
-  'team_coll/team_coll_parent_tree_generation_failed';
-
 /**
  * Tried to perform an action on a request that doesn't accept their member role level
  * (GqlRequestTeamMemberGuard)
@@ -327,19 +308,6 @@ export const TEAM_REQ_INVALID_TARGET_COLL_ID =
  */
 export const TEAM_REQ_REORDERING_FAILED = 'team_req/reordering_failed' as const;
 
-/**
- * Team Request search failed
- * (TeamRequestService)
- */
-export const TEAM_REQ_SEARCH_FAILED = 'team_req/team_request_search_failed';
-
-/**
- * Team Request parent tree generation failed
- * (TeamRequestService)
- */
-export const TEAM_REQ_PARENT_TREE_GEN_FAILED =
-  'team_req/team_req_parent_tree_generation_failed';
-
 /**
  * No Postmark Sender Email defined
  * (AuthService)
@@ -678,19 +646,6 @@ export const MAILER_SMTP_URL_UNDEFINED = 'mailer/smtp_url_undefined' as const;
 export const MAILER_FROM_ADDRESS_UNDEFINED =
   'mailer/from_address_undefined' as const;
 
-/**
- * MAILER_SMTP_USER environment variable is not defined
- * (MailerModule)
- */
-export const MAILER_SMTP_USER_UNDEFINED = 'mailer/smtp_user_undefined' as const;
-
-/**
- * MAILER_SMTP_PASSWORD environment variable is not defined
- * (MailerModule)
- */
-export const MAILER_SMTP_PASSWORD_UNDEFINED =
-  'mailer/smtp_password_undefined' as const;
-
 /**
  * SharedRequest invalid request JSON format
  * (ShortcodeService)
@@ -750,27 +705,9 @@ export const INFRA_CONFIG_INVALID_INPUT = 'infra_config/invalid_input' as const;
 export const INFRA_CONFIG_SERVICE_NOT_CONFIGURED =
   'infra_config/service_not_configured' as const;
 
-/**
- * Infra Config update/fetch operation not allowed
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_OPERATION_NOT_ALLOWED =
-  'infra_config/operation_not_allowed';
-
 /**
  * Error message for when the database table does not exist
  * (InfraConfigService)
  */
 export const DATABASE_TABLE_NOT_EXIST =
   'Database migration not found. Please check the documentation for assistance: https://docs.hoppscotch.io/documentation/self-host/community-edition/install-and-build#running-migrations';
-
-/**
- * PostHog client is not initialized
- * (InfraConfigService)
- */
-export const POSTHOG_CLIENT_NOT_INITIALIZED = 'posthog/client_not_initialized';
-
-/**
- * Inputs supplied are invalid
- */
-export const INVALID_PARAMS = 'invalid_parameters' as const;

packages/hoppscotch-backend/src/health/health.controller.ts

@@ -1,24 +0,0 @@
-import { Controller, Get } from '@nestjs/common';
-import {
-  HealthCheck,
-  HealthCheckService,
-  PrismaHealthIndicator,
-} from '@nestjs/terminus';
-import { PrismaService } from 'src/prisma/prisma.service';
-
-@Controller('health')
-export class HealthController {
-  constructor(
-    private health: HealthCheckService,
-    private prismaHealth: PrismaHealthIndicator,
-    private prisma: PrismaService,
-  ) {}
-
-  @Get()
-  @HealthCheck()
-  check() {
-    return this.health.check([
-      async () => this.prismaHealth.pingCheck('database', this.prisma),
-    ]);
-  }
-}

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

@@ -1,10 +0,0 @@
-import { Module } from '@nestjs/common';
-import { HealthController } from './health.controller';
-import { PrismaModule } from 'src/prisma/prisma.module';
-import { TerminusModule } from '@nestjs/terminus';
-
-@Module({
-  imports: [PrismaModule, TerminusModule],
-  controllers: [HealthController],
-})
-export class HealthModule {}

packages/hoppscotch-backend/src/infra-config/helper.ts

@@ -1,12 +1,8 @@
 import { AuthProvider } from 'src/auth/helper';
-import {
-  AUTH_PROVIDER_NOT_CONFIGURED,
-  DATABASE_TABLE_NOT_EXIST,
-} from 'src/errors';
+import { AUTH_PROVIDER_NOT_CONFIGURED } from 'src/errors';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { InfraConfigEnum } from 'src/types/InfraConfig';
 import { throwErr } from 'src/utils';
-import { randomBytes } from 'crypto';
 
 export enum ServiceStatus {
   ENABLE = 'ENABLE',
@@ -17,33 +13,19 @@ const AuthProviderConfigurations = {
   [AuthProvider.GOOGLE]: [
     InfraConfigEnum.GOOGLE_CLIENT_ID,
     InfraConfigEnum.GOOGLE_CLIENT_SECRET,
-    InfraConfigEnum.GOOGLE_CALLBACK_URL,
-    InfraConfigEnum.GOOGLE_SCOPE,
   ],
   [AuthProvider.GITHUB]: [
     InfraConfigEnum.GITHUB_CLIENT_ID,
     InfraConfigEnum.GITHUB_CLIENT_SECRET,
-    InfraConfigEnum.GITHUB_CALLBACK_URL,
-    InfraConfigEnum.GITHUB_SCOPE,
   ],
   [AuthProvider.MICROSOFT]: [
     InfraConfigEnum.MICROSOFT_CLIENT_ID,
     InfraConfigEnum.MICROSOFT_CLIENT_SECRET,
-    InfraConfigEnum.MICROSOFT_CALLBACK_URL,
-    InfraConfigEnum.MICROSOFT_SCOPE,
-    InfraConfigEnum.MICROSOFT_TENANT,
   ],
-  [AuthProvider.EMAIL]: !!process.env.MAILER_USE_CUSTOM_CONFIGS
-    ? [
-        InfraConfigEnum.MAILER_SMTP_HOST,
-        InfraConfigEnum.MAILER_SMTP_PORT,
-        InfraConfigEnum.MAILER_SMTP_SECURE,
-        InfraConfigEnum.MAILER_SMTP_USER,
-        InfraConfigEnum.MAILER_SMTP_PASSWORD,
-        InfraConfigEnum.MAILER_TLS_REJECT_UNAUTHORIZED,
-        InfraConfigEnum.MAILER_ADDRESS_FROM,
-      ]
-    : [InfraConfigEnum.MAILER_SMTP_URL, InfraConfigEnum.MAILER_ADDRESS_FROM],
+  [AuthProvider.EMAIL]: [
+    InfraConfigEnum.MAILER_SMTP_URL,
+    InfraConfigEnum.MAILER_ADDRESS_FROM,
+  ],
 };
 
 /**
@@ -71,171 +53,6 @@ export async function loadInfraConfiguration() {
   }
 }
 
-/**
- * Read the default values from .env file and return them as an array
- * @returns Array of default infra configs
- */
-export async function getDefaultInfraConfigs(): Promise<
-  { name: InfraConfigEnum; value: string }[]
-> {
-  const prisma = new PrismaService();
-
-  // Prepare rows for 'infra_config' table with default values (from .env) for each 'name'
-  const infraConfigDefaultObjs: { name: InfraConfigEnum; value: string }[] = [
-    {
-      name: InfraConfigEnum.MAILER_SMTP_ENABLE,
-      value: process.env.MAILER_SMTP_ENABLE ?? 'true',
-    },
-    {
-      name: InfraConfigEnum.MAILER_USE_CUSTOM_CONFIGS,
-      value: process.env.MAILER_USE_CUSTOM_CONFIGS ?? 'false',
-    },
-    {
-      name: InfraConfigEnum.MAILER_SMTP_URL,
-      value: process.env.MAILER_SMTP_URL,
-    },
-    {
-      name: InfraConfigEnum.MAILER_ADDRESS_FROM,
-      value: process.env.MAILER_ADDRESS_FROM,
-    },
-    {
-      name: InfraConfigEnum.MAILER_SMTP_HOST,
-      value: process.env.MAILER_SMTP_HOST,
-    },
-    {
-      name: InfraConfigEnum.MAILER_SMTP_PORT,
-      value: process.env.MAILER_SMTP_PORT,
-    },
-    {
-      name: InfraConfigEnum.MAILER_SMTP_SECURE,
-      value: process.env.MAILER_SMTP_SECURE,
-    },
-    {
-      name: InfraConfigEnum.MAILER_SMTP_USER,
-      value: process.env.MAILER_SMTP_USER,
-    },
-    {
-      name: InfraConfigEnum.MAILER_SMTP_PASSWORD,
-      value: process.env.MAILER_SMTP_PASSWORD,
-    },
-    {
-      name: InfraConfigEnum.MAILER_TLS_REJECT_UNAUTHORIZED,
-      value: process.env.MAILER_TLS_REJECT_UNAUTHORIZED,
-    },
-    {
-      name: InfraConfigEnum.GOOGLE_CLIENT_ID,
-      value: process.env.GOOGLE_CLIENT_ID,
-    },
-    {
-      name: InfraConfigEnum.GOOGLE_CLIENT_SECRET,
-      value: process.env.GOOGLE_CLIENT_SECRET,
-    },
-    {
-      name: InfraConfigEnum.GOOGLE_CALLBACK_URL,
-      value: process.env.GOOGLE_CALLBACK_URL,
-    },
-    {
-      name: InfraConfigEnum.GOOGLE_SCOPE,
-      value: process.env.GOOGLE_SCOPE,
-    },
-    {
-      name: InfraConfigEnum.GITHUB_CLIENT_ID,
-      value: process.env.GITHUB_CLIENT_ID,
-    },
-    {
-      name: InfraConfigEnum.GITHUB_CLIENT_SECRET,
-      value: process.env.GITHUB_CLIENT_SECRET,
-    },
-    {
-      name: InfraConfigEnum.GITHUB_CALLBACK_URL,
-      value: process.env.GITHUB_CALLBACK_URL,
-    },
-    {
-      name: InfraConfigEnum.GITHUB_SCOPE,
-      value: process.env.GITHUB_SCOPE,
-    },
-    {
-      name: InfraConfigEnum.MICROSOFT_CLIENT_ID,
-      value: process.env.MICROSOFT_CLIENT_ID,
-    },
-    {
-      name: InfraConfigEnum.MICROSOFT_CLIENT_SECRET,
-      value: process.env.MICROSOFT_CLIENT_SECRET,
-    },
-    {
-      name: InfraConfigEnum.MICROSOFT_CALLBACK_URL,
-      value: process.env.MICROSOFT_CALLBACK_URL,
-    },
-    {
-      name: InfraConfigEnum.MICROSOFT_SCOPE,
-      value: process.env.MICROSOFT_SCOPE,
-    },
-    {
-      name: InfraConfigEnum.MICROSOFT_TENANT,
-      value: process.env.MICROSOFT_TENANT,
-    },
-    {
-      name: InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
-      value: getConfiguredSSOProviders(),
-    },
-    {
-      name: InfraConfigEnum.ALLOW_ANALYTICS_COLLECTION,
-      value: false.toString(),
-    },
-    {
-      name: InfraConfigEnum.ANALYTICS_USER_ID,
-      value: generateAnalyticsUserId(),
-    },
-    {
-      name: InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
-      value: (await prisma.infraConfig.count()) === 0 ? 'true' : 'false',
-    },
-  ];
-
-  return infraConfigDefaultObjs;
-}
-
-/**
- * Get the missing entries in the 'infra_config' table
- * @returns Array of InfraConfig
- */
-export async function getMissingInfraConfigEntries() {
-  const prisma = new PrismaService();
-  const [dbInfraConfigs, infraConfigDefaultObjs] = await Promise.all([
-    prisma.infraConfig.findMany(),
-    getDefaultInfraConfigs(),
-  ]);
-
-  const missingEntries = infraConfigDefaultObjs.filter(
-    (config) =>
-      !dbInfraConfigs.some((dbConfig) => dbConfig.name === config.name),
-  );
-
-  return missingEntries;
-}
-
-/**
- * Verify if 'infra_config' table is loaded with all entries
- * @returns boolean
- */
-export async function isInfraConfigTablePopulated(): Promise<boolean> {
-  const prisma = new PrismaService();
-  try {
-    const propsRemainingToInsert = await getMissingInfraConfigEntries();
-
-    if (propsRemainingToInsert.length > 0) {
-      console.log(
-        'Infra Config table is not populated with all entries. Populating now...',
-      );
-      return false;
-    }
-
-    return true;
-  } catch (error) {
-    return false;
-  }
-}
-
 /**
  * Stop the app after 5 seconds
  * (Docker will re-start the app)
@@ -287,12 +104,3 @@ export function getConfiguredSSOProviders() {
 
   return configuredAuthProviders.join(',');
 }
-
-/**
- * Generate a hashed valued for analytics
- * @returns Generated hashed value
- */
-export function generateAnalyticsUserId() {
-  const hashedUserID = randomBytes(20).toString('hex');
-  return hashedUserID;
-}

packages/hoppscotch-backend/src/infra-config/infra-config.controller.ts

@@ -4,9 +4,9 @@ import { InfraConfigService } from './infra-config.service';
 import * as E from 'fp-ts/Either';
 import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
 import { RESTAdminGuard } from 'src/admin/guards/rest-admin.guard';
-import { RESTError } from 'src/types/RESTError';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
-import { throwHTTPErr } from 'src/utils';
+import { throwHTTPErr } from 'src/auth/helper';
+import { AuthError } from 'src/types/AuthError';
+import { InfraConfigEnumForClient } from 'src/types/InfraConfig';
 
 @UseGuards(ThrottlerBehindProxyGuard)
 @Controller({ path: 'site', version: '1' })
@@ -17,11 +17,11 @@ export class SiteController {
   @UseGuards(JwtAuthGuard, RESTAdminGuard)
   async fetchSetupInfo() {
     const status = await this.infraConfigService.get(
-      InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
+      InfraConfigEnumForClient.IS_FIRST_TIME_INFRA_SETUP,
     );
 
     if (E.isLeft(status))
-      throwHTTPErr(<RESTError>{
+      throwHTTPErr(<AuthError>{
         message: status.left,
         statusCode: HttpStatus.NOT_FOUND,
       });
@@ -32,13 +32,13 @@ export class SiteController {
   @UseGuards(JwtAuthGuard, RESTAdminGuard)
   async setSetupAsComplete() {
     const res = await this.infraConfigService.update(
-      InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
+      InfraConfigEnumForClient.IS_FIRST_TIME_INFRA_SETUP,
       false.toString(),
       false,
     );
 
     if (E.isLeft(res))
-      throwHTTPErr(<RESTError>{
+      throwHTTPErr(<AuthError>{
         message: res.left,
         statusCode: HttpStatus.FORBIDDEN,
       });

packages/hoppscotch-backend/src/infra-config/infra-config.model.ts

@@ -1,6 +1,6 @@
 import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 import { AuthProvider } from 'src/auth/helper';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
+import { InfraConfigEnumForClient } from 'src/types/InfraConfig';
 import { ServiceStatus } from './helper';
 
 @ObjectType()
@@ -8,7 +8,7 @@ export class InfraConfig {
   @Field({
     description: 'Infra Config Name',
   })
-  name: InfraConfigEnum;
+  name: InfraConfigEnumForClient;
 
   @Field({
     description: 'Infra Config Value',
@@ -16,7 +16,7 @@ export class InfraConfig {
   value: string;
 }
 
-registerEnumType(InfraConfigEnum, {
+registerEnumType(InfraConfigEnumForClient, {
   name: 'InfraConfigEnum',
 });
 

packages/hoppscotch-backend/src/infra-config/infra-config.service.spec.ts

@@ -1,16 +1,13 @@
 import { mockDeep, mockReset } from 'jest-mock-extended';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { InfraConfigService } from './infra-config.service';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
 import {
-  INFRA_CONFIG_NOT_FOUND,
-  INFRA_CONFIG_OPERATION_NOT_ALLOWED,
-  INFRA_CONFIG_UPDATE_FAILED,
-} from 'src/errors';
+  InfraConfigEnum,
+  InfraConfigEnumForClient,
+} from 'src/types/InfraConfig';
+import { INFRA_CONFIG_NOT_FOUND, INFRA_CONFIG_UPDATE_FAILED } from 'src/errors';
 import { ConfigService } from '@nestjs/config';
 import * as helper from './helper';
-import { InfraConfig as dbInfraConfig } from '@prisma/client';
-import { InfraConfig } from './infra-config.model';
 
 const mockPrisma = mockDeep<PrismaService>();
 const mockConfigService = mockDeep<ConfigService>();
@@ -22,82 +19,12 @@ const infraConfigService = new InfraConfigService(
   mockConfigService,
 );
 
-const INITIALIZED_DATE_CONST = new Date();
-const dbInfraConfigs: dbInfraConfig[] = [
-  {
-    id: '3',
-    name: InfraConfigEnum.GOOGLE_CLIENT_ID,
-    value: 'abcdefghijkl',
-    active: true,
-    createdOn: INITIALIZED_DATE_CONST,
-    updatedOn: INITIALIZED_DATE_CONST,
-  },
-  {
-    id: '4',
-    name: InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
-    value: 'google',
-    active: true,
-    createdOn: INITIALIZED_DATE_CONST,
-    updatedOn: INITIALIZED_DATE_CONST,
-  },
-];
-const infraConfigs: InfraConfig[] = [
-  {
-    name: dbInfraConfigs[0].name as InfraConfigEnum,
-    value: dbInfraConfigs[0].value,
-  },
-  {
-    name: dbInfraConfigs[1].name as InfraConfigEnum,
-    value: dbInfraConfigs[1].value,
-  },
-];
-
 beforeEach(() => {
   mockReset(mockPrisma);
 });
 
 describe('InfraConfigService', () => {
   describe('update', () => {
-    it('should update the infra config without backend server restart', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
-      const value = 'true';
-
-      mockPrisma.infraConfig.update.mockResolvedValueOnce({
-        id: '',
-        name,
-        value,
-        active: true,
-        createdOn: new Date(),
-        updatedOn: new Date(),
-      });
-
-      jest.spyOn(helper, 'stopApp').mockReturnValueOnce();
-      const result = await infraConfigService.update(name, value);
-
-      expect(helper.stopApp).not.toHaveBeenCalled();
-      expect(result).toEqualRight({ name, value });
-    });
-
-    it('should update the infra config with backend server restart', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
-      const value = 'true';
-
-      mockPrisma.infraConfig.update.mockResolvedValueOnce({
-        id: '',
-        name,
-        value,
-        active: true,
-        createdOn: new Date(),
-        updatedOn: new Date(),
-      });
-      jest.spyOn(helper, 'stopApp').mockReturnValueOnce();
-
-      const result = await infraConfigService.update(name, value, true);
-
-      expect(helper.stopApp).toHaveBeenCalledTimes(1);
-      expect(result).toEqualRight({ name, value });
-    });
-
     it('should update the infra config', async () => {
       const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
       const value = 'true';
@@ -144,7 +71,7 @@ describe('InfraConfigService', () => {
 
   describe('get', () => {
     it('should get the infra config', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
+      const name = InfraConfigEnumForClient.GOOGLE_CLIENT_ID;
       const value = 'true';
 
       mockPrisma.infraConfig.findUniqueOrThrow.mockResolvedValueOnce({
@@ -160,7 +87,7 @@ describe('InfraConfigService', () => {
     });
 
     it('should pass correct params to prisma findUnique', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
+      const name = InfraConfigEnumForClient.GOOGLE_CLIENT_ID;
 
       await infraConfigService.get(name);
 
@@ -171,7 +98,7 @@ describe('InfraConfigService', () => {
     });
 
     it('should throw an error if the infra config does not exist', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
+      const name = InfraConfigEnumForClient.GOOGLE_CLIENT_ID;
 
       mockPrisma.infraConfig.findUniqueOrThrow.mockRejectedValueOnce('null');
 
@@ -179,45 +106,4 @@ describe('InfraConfigService', () => {
       expect(result).toEqualLeft(INFRA_CONFIG_NOT_FOUND);
     });
   });
-
-  describe('getMany', () => {
-    it('should throw error if any disallowed names are provided', async () => {
-      const disallowedNames = [InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS];
-      const result = await infraConfigService.getMany(disallowedNames);
-
-      expect(result).toEqualLeft(INFRA_CONFIG_OPERATION_NOT_ALLOWED);
-    });
-    it('should resolve right with disallowed names if `checkDisallowed` parameter passed', async () => {
-      const disallowedNames = [InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS];
-
-      const dbInfraConfigResponses = dbInfraConfigs.filter((dbConfig) =>
-        disallowedNames.includes(dbConfig.name as InfraConfigEnum),
-      );
-      mockPrisma.infraConfig.findMany.mockResolvedValueOnce(
-        dbInfraConfigResponses,
-      );
-
-      const result = await infraConfigService.getMany(disallowedNames, false);
-
-      expect(result).toEqualRight(
-        infraConfigs.filter((i) => disallowedNames.includes(i.name)),
-      );
-    });
-
-    it('should return right with infraConfigs if Prisma query succeeds', async () => {
-      const allowedNames = [InfraConfigEnum.GOOGLE_CLIENT_ID];
-
-      const dbInfraConfigResponses = dbInfraConfigs.filter((dbConfig) =>
-        allowedNames.includes(dbConfig.name as InfraConfigEnum),
-      );
-      mockPrisma.infraConfig.findMany.mockResolvedValueOnce(
-        dbInfraConfigResponses,
-      );
-
-      const result = await infraConfigService.getMany(allowedNames);
-      expect(result).toEqualRight(
-        infraConfigs.filter((i) => allowedNames.includes(i.name)),
-      );
-    });
-  });
 });

packages/hoppscotch-backend/src/infra-config/infra-config.service.ts

@@ -3,30 +3,23 @@ import { InfraConfig } from './infra-config.model';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { InfraConfig as DBInfraConfig } from '@prisma/client';
 import * as E from 'fp-ts/Either';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
+import {
+  InfraConfigEnum,
+  InfraConfigEnumForClient,
+} from 'src/types/InfraConfig';
 import {
   AUTH_PROVIDER_NOT_SPECIFIED,
   DATABASE_TABLE_NOT_EXIST,
   INFRA_CONFIG_INVALID_INPUT,
   INFRA_CONFIG_NOT_FOUND,
+  INFRA_CONFIG_NOT_LISTED,
   INFRA_CONFIG_RESET_FAILED,
   INFRA_CONFIG_UPDATE_FAILED,
   INFRA_CONFIG_SERVICE_NOT_CONFIGURED,
-  INFRA_CONFIG_OPERATION_NOT_ALLOWED,
 } from 'src/errors';
-import {
-  throwErr,
-  validateSMTPEmail,
-  validateSMTPUrl,
-  validateUrl,
-} from 'src/utils';
+import { throwErr, validateSMTPEmail, validateSMTPUrl } from 'src/utils';
 import { ConfigService } from '@nestjs/config';
-import {
-  ServiceStatus,
-  getDefaultInfraConfigs,
-  getMissingInfraConfigEntries,
-  stopApp,
-} from './helper';
+import { ServiceStatus, getConfiguredSSOProviders, stopApp } from './helper';
 import { EnableAndDisableSSOArgs, InfraConfigArgs } from './input-args';
 import { AuthProvider } from 'src/auth/helper';
 
@@ -37,32 +30,82 @@ export class InfraConfigService implements OnModuleInit {
     private readonly configService: ConfigService,
   ) {}
 
-  // Following fields are not updatable by `infraConfigs` Mutation. Use dedicated mutations for these fields instead.
-  EXCLUDE_FROM_UPDATE_CONFIGS = [
-    InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
-    InfraConfigEnum.ALLOW_ANALYTICS_COLLECTION,
-    InfraConfigEnum.ANALYTICS_USER_ID,
-    InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
-    InfraConfigEnum.MAILER_SMTP_ENABLE,
-  ];
-  // Following fields can not be fetched by `infraConfigs` Query. Use dedicated queries for these fields instead.
-  EXCLUDE_FROM_FETCH_CONFIGS = [
-    InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
-    InfraConfigEnum.ANALYTICS_USER_ID,
-    InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
-  ];
-
   async onModuleInit() {
     await this.initializeInfraConfigTable();
   }
 
+  async getDefaultInfraConfigs(): Promise<
+    { name: InfraConfigEnum; value: string }[]
+  > {
+    // Prepare rows for 'infra_config' table with default values (from .env) for each 'name'
+    const infraConfigDefaultObjs: { name: InfraConfigEnum; value: string }[] = [
+      {
+        name: InfraConfigEnum.MAILER_SMTP_URL,
+        value: process.env.MAILER_SMTP_URL,
+      },
+      {
+        name: InfraConfigEnum.MAILER_ADDRESS_FROM,
+        value: process.env.MAILER_ADDRESS_FROM,
+      },
+      {
+        name: InfraConfigEnum.GOOGLE_CLIENT_ID,
+        value: process.env.GOOGLE_CLIENT_ID,
+      },
+      {
+        name: InfraConfigEnum.GOOGLE_CLIENT_SECRET,
+        value: process.env.GOOGLE_CLIENT_SECRET,
+      },
+      {
+        name: InfraConfigEnum.GITHUB_CLIENT_ID,
+        value: process.env.GITHUB_CLIENT_ID,
+      },
+      {
+        name: InfraConfigEnum.GITHUB_CLIENT_SECRET,
+        value: process.env.GITHUB_CLIENT_SECRET,
+      },
+      {
+        name: InfraConfigEnum.MICROSOFT_CLIENT_ID,
+        value: process.env.MICROSOFT_CLIENT_ID,
+      },
+      {
+        name: InfraConfigEnum.MICROSOFT_CLIENT_SECRET,
+        value: process.env.MICROSOFT_CLIENT_SECRET,
+      },
+      {
+        name: InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
+        value: getConfiguredSSOProviders(),
+      },
+      {
+        name: InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
+        value: (await this.prisma.infraConfig.count()) === 0 ? 'true' : 'false',
+      },
+    ];
+
+    return infraConfigDefaultObjs;
+  }
+
   /**
    * Initialize the 'infra_config' table with values from .env
    * @description This function create rows 'infra_config' in very first time (only once)
    */
   async initializeInfraConfigTable() {
     try {
-      const propsToInsert = await getMissingInfraConfigEntries();
+      // Get all the 'names' of the properties to be saved in the 'infra_config' table
+      const enumValues = Object.values(InfraConfigEnum);
+
+      // Fetch the default values (value in .env) for configs to be saved in 'infra_config' table
+      const infraConfigDefaultObjs = await this.getDefaultInfraConfigs();
+
+      // Check if all the 'names' are listed in the default values
+      if (enumValues.length !== infraConfigDefaultObjs.length) {
+        throw new Error(INFRA_CONFIG_NOT_LISTED);
+      }
+
+      // Eliminate the rows (from 'infraConfigDefaultObjs') that are already present in the database table
+      const dbInfraConfigs = await this.prisma.infraConfig.findMany();
+      const propsToInsert = infraConfigDefaultObjs.filter(
+        (p) => !dbInfraConfigs.find((e) => e.name === p.name),
+      );
 
       if (propsToInsert.length > 0) {
         await this.prisma.infraConfig.createMany({ data: propsToInsert });
@@ -113,7 +156,11 @@ export class InfraConfigService implements OnModuleInit {
    * @param restartEnabled If true, restart the app after updating the InfraConfig
    * @returns InfraConfig model
    */
-  async update(name: InfraConfigEnum, value: string, restartEnabled = false) {
+  async update(
+    name: InfraConfigEnumForClient | InfraConfigEnum,
+    value: string,
+    restartEnabled = false,
+  ) {
     const isValidate = this.validateEnvValues([{ name, value }]);
     if (E.isLeft(isValidate)) return E.left(isValidate.left);
 
@@ -137,11 +184,6 @@ export class InfraConfigService implements OnModuleInit {
    * @returns InfraConfig model
    */
   async updateMany(infraConfigs: InfraConfigArgs[]) {
-    for (let i = 0; i < infraConfigs.length; i++) {
-      if (this.EXCLUDE_FROM_UPDATE_CONFIGS.includes(infraConfigs[i].name))
-        return E.left(INFRA_CONFIG_OPERATION_NOT_ALLOWED);
-    }
-
     const isValidate = this.validateEnvValues(infraConfigs);
     if (E.isLeft(isValidate)) return E.left(isValidate.left);
 
@@ -175,26 +217,12 @@ export class InfraConfigService implements OnModuleInit {
   ) {
     switch (service) {
       case AuthProvider.GOOGLE:
-        return (
-          configMap.GOOGLE_CLIENT_ID &&
-          configMap.GOOGLE_CLIENT_SECRET &&
-          configMap.GOOGLE_CALLBACK_URL &&
-          configMap.GOOGLE_SCOPE
-        );
+        return configMap.GOOGLE_CLIENT_ID && configMap.GOOGLE_CLIENT_SECRET;
       case AuthProvider.GITHUB:
-        return (
-          configMap.GITHUB_CLIENT_ID &&
-          configMap.GITHUB_CLIENT_SECRET &&
-          configMap.GITHUB_CALLBACK_URL &&
-          configMap.GITHUB_SCOPE
-        );
+        return configMap.GITHUB_CLIENT_ID && configMap.GITHUB_CLIENT_SECRET;
       case AuthProvider.MICROSOFT:
         return (
-          configMap.MICROSOFT_CLIENT_ID &&
-          configMap.MICROSOFT_CLIENT_SECRET &&
-          configMap.MICROSOFT_CALLBACK_URL &&
-          configMap.MICROSOFT_SCOPE &&
-          configMap.MICROSOFT_TENANT
+          configMap.MICROSOFT_CLIENT_ID && configMap.MICROSOFT_CLIENT_SECRET
         );
       case AuthProvider.EMAIL:
         return configMap.MAILER_SMTP_URL && configMap.MAILER_ADDRESS_FROM;
@@ -203,63 +231,6 @@ export class InfraConfigService implements OnModuleInit {
     }
   }
 
-  /**
-   * Enable or Disable Analytics Collection
-   *
-   * @param status Status to enable or disable
-   * @returns Boolean of status of analytics collection
-   */
-  async toggleAnalyticsCollection(status: ServiceStatus) {
-    const isUpdated = await this.update(
-      InfraConfigEnum.ALLOW_ANALYTICS_COLLECTION,
-      status === ServiceStatus.ENABLE ? 'true' : 'false',
-    );
-
-    if (E.isLeft(isUpdated)) return E.left(isUpdated.left);
-    return E.right(isUpdated.right.value === 'true');
-  }
-
-  /**
-   * Enable or Disable SMTP
-   * @param status Status to enable or disable
-   * @returns Either true or an error
-   */
-  async enableAndDisableSMTP(status: ServiceStatus) {
-    const isUpdated = await this.toggleServiceStatus(
-      InfraConfigEnum.MAILER_SMTP_ENABLE,
-      status,
-      true,
-    );
-    if (E.isLeft(isUpdated)) return E.left(isUpdated.left);
-
-    if (status === ServiceStatus.DISABLE) {
-      this.enableAndDisableSSO([{ provider: AuthProvider.EMAIL, status }]);
-    }
-    return E.right(true);
-  }
-
-  /**
-   * Enable or Disable Service (i.e. ALLOW_AUDIT_LOGS, ALLOW_ANALYTICS_COLLECTION, ALLOW_DOMAIN_WHITELISTING, SITE_PROTECTION)
-   * @param configName Name of the InfraConfigEnum
-   * @param status Status to enable or disable
-   * @param restartEnabled If true, restart the app after updating the InfraConfig
-   * @returns Either true or an error
-   */
-  async toggleServiceStatus(
-    configName: InfraConfigEnum,
-    status: ServiceStatus,
-    restartEnabled = false,
-  ) {
-    const isUpdated = await this.update(
-      configName,
-      status === ServiceStatus.ENABLE ? 'true' : 'false',
-      restartEnabled,
-    );
-    if (E.isLeft(isUpdated)) return E.left(isUpdated.left);
-
-    return E.right(true);
-  }
-
   /**
    * Enable or Disable SSO for login/signup
    * @param provider Auth Provider to enable or disable
@@ -310,7 +281,7 @@ export class InfraConfigService implements OnModuleInit {
    * @param name Name of the InfraConfig
    * @returns InfraConfig model
    */
-  async get(name: InfraConfigEnum) {
+  async get(name: InfraConfigEnumForClient) {
     try {
       const infraConfig = await this.prisma.infraConfig.findUniqueOrThrow({
         where: { name },
@@ -325,18 +296,9 @@ export class InfraConfigService implements OnModuleInit {
   /**
    * Get InfraConfigs by names
    * @param names Names of the InfraConfigs
-   * @param checkDisallowedKeys If true, check if the names are allowed to fetch by client
    * @returns InfraConfig model
    */
-  async getMany(names: InfraConfigEnum[], checkDisallowedKeys: boolean = true) {
-    if (checkDisallowedKeys) {
-      // Check if the names are allowed to fetch by client
-      for (let i = 0; i < names.length; i++) {
-        if (this.EXCLUDE_FROM_FETCH_CONFIGS.includes(names[i]))
-          return E.left(INFRA_CONFIG_OPERATION_NOT_ALLOWED);
-      }
-    }
-
+  async getMany(names: InfraConfigEnumForClient[]) {
     try {
       const infraConfigs = await this.prisma.infraConfig.findMany({
         where: { name: { in: names } },
@@ -358,42 +320,29 @@ export class InfraConfigService implements OnModuleInit {
       .split(',');
   }
 
-  /**
-   * Check if SMTP is enabled or not
-   * @returns boolean
-   */
-  isSMTPEnabled() {
-    return (
-      this.configService.get<string>('INFRA.MAILER_SMTP_ENABLE') === 'true'
-    );
-  }
-
   /**
    * Reset all the InfraConfigs to their default values (from .env)
    */
   async reset() {
-    // These are all the infra-configs that should not be reset
-    const RESET_EXCLUSION_LIST = [
-      InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
-      InfraConfigEnum.ANALYTICS_USER_ID,
-      InfraConfigEnum.ALLOW_ANALYTICS_COLLECTION,
-    ];
     try {
-      const infraConfigDefaultObjs = await getDefaultInfraConfigs();
-      const updatedInfraConfigDefaultObjs = infraConfigDefaultObjs.filter(
-        (p) => RESET_EXCLUSION_LIST.includes(p.name) === false,
-      );
+      const infraConfigDefaultObjs = await this.getDefaultInfraConfigs();
 
       await this.prisma.infraConfig.deleteMany({
-        where: {
-          name: {
-            in: updatedInfraConfigDefaultObjs.map((p) => p.name),
-          },
-        },
+        where: { name: { in: infraConfigDefaultObjs.map((p) => p.name) } },
       });
 
+      // Hardcode t
+      const updatedInfraConfigDefaultObjs = infraConfigDefaultObjs.filter(
+        (obj) => obj.name !== InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
+      );
       await this.prisma.infraConfig.createMany({
-        data: updatedInfraConfigDefaultObjs,
+        data: [
+          ...updatedInfraConfigDefaultObjs,
+          {
+            name: InfraConfigEnum.IS_FIRST_TIME_INFRA_SETUP,
+            value: 'true',
+          },
+        ],
       });
 
       stopApp();
@@ -409,100 +358,36 @@ export class InfraConfigService implements OnModuleInit {
    */
   validateEnvValues(
     infraConfigs: {
-      name: InfraConfigEnum;
+      name: InfraConfigEnumForClient | InfraConfigEnum;
       value: string;
     }[],
   ) {
     for (let i = 0; i < infraConfigs.length; i++) {
       switch (infraConfigs[i].name) {
-        case InfraConfigEnum.MAILER_SMTP_ENABLE:
-          if (
-            infraConfigs[i].value !== 'true' &&
-            infraConfigs[i].value !== 'false'
-          )
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MAILER_USE_CUSTOM_CONFIGS:
-          if (
-            infraConfigs[i].value !== 'true' &&
-            infraConfigs[i].value !== 'false'
-          )
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MAILER_SMTP_URL:
+        case InfraConfigEnumForClient.MAILER_SMTP_URL:
           const isValidUrl = validateSMTPUrl(infraConfigs[i].value);
           if (!isValidUrl) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.MAILER_ADDRESS_FROM:
+        case InfraConfigEnumForClient.MAILER_ADDRESS_FROM:
           const isValidEmail = validateSMTPEmail(infraConfigs[i].value);
           if (!isValidEmail) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.MAILER_SMTP_HOST:
+        case InfraConfigEnumForClient.GOOGLE_CLIENT_ID:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.MAILER_SMTP_PORT:
+        case InfraConfigEnumForClient.GOOGLE_CLIENT_SECRET:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.MAILER_SMTP_SECURE:
-          if (
-            infraConfigs[i].value !== 'true' &&
-            infraConfigs[i].value !== 'false'
-          )
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MAILER_SMTP_USER:
+        case InfraConfigEnumForClient.GITHUB_CLIENT_ID:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.MAILER_SMTP_PASSWORD:
+        case InfraConfigEnumForClient.GITHUB_CLIENT_SECRET:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.MAILER_TLS_REJECT_UNAUTHORIZED:
-          if (
-            infraConfigs[i].value !== 'true' &&
-            infraConfigs[i].value !== 'false'
-          )
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GOOGLE_CLIENT_ID:
+        case InfraConfigEnumForClient.MICROSOFT_CLIENT_ID:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.GOOGLE_CLIENT_SECRET:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GOOGLE_CALLBACK_URL:
-          if (!validateUrl(infraConfigs[i].value))
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GOOGLE_SCOPE:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GITHUB_CLIENT_ID:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GITHUB_CLIENT_SECRET:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GITHUB_CALLBACK_URL:
-          if (!validateUrl(infraConfigs[i].value))
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.GITHUB_SCOPE:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MICROSOFT_CLIENT_ID:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MICROSOFT_CLIENT_SECRET:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MICROSOFT_CALLBACK_URL:
-          if (!validateUrl(infraConfigs[i].value))
-            return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MICROSOFT_SCOPE:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnum.MICROSOFT_TENANT:
+        case InfraConfigEnumForClient.MICROSOFT_CLIENT_SECRET:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
         default:

packages/hoppscotch-backend/src/infra-config/input-args.ts

@@ -1,14 +1,14 @@
 import { Field, InputType } from '@nestjs/graphql';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
+import { InfraConfigEnumForClient } from 'src/types/InfraConfig';
 import { ServiceStatus } from './helper';
 import { AuthProvider } from 'src/auth/helper';
 
 @InputType()
 export class InfraConfigArgs {
-  @Field(() => InfraConfigEnum, {
+  @Field(() => InfraConfigEnumForClient, {
     description: 'Infra Config Name',
   })
-  name: InfraConfigEnum;
+  name: InfraConfigEnumForClient;
 
   @Field({
     description: 'Infra Config Value',

packages/hoppscotch-backend/src/mailer/mailer.listener.ts

@@ -1,30 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { OnEvent } from '@nestjs/event-emitter';
-import { Events } from 'src/types/EventEmitter';
-import {
-  AdminUserInvitationMailDescription,
-  MailDescription,
-  UserMagicLinkMailDescription,
-} from './MailDescriptions';
-import { MailerService } from './mailer.service';
-
-@Injectable()
-export class MailerEventListener {
-  constructor(private mailerService: MailerService) {}
-
-  @OnEvent(Events.MAILER_SEND_EMAIL, { async: true })
-  async handleSendEmailEvent(data: {
-    to: string;
-    mailDesc: MailDescription | UserMagicLinkMailDescription;
-  }) {
-    await this.mailerService.sendEmail(data.to, data.mailDesc);
-  }
-
-  @OnEvent(Events.MAILER_SEND_USER_INVITATION_EMAIL, { async: true })
-  async handleSendUserInvitationEmailEvent(data: {
-    to: string;
-    mailDesc: AdminUserInvitationMailDescription;
-  }) {
-    await this.mailerService.sendUserInvitationEmail(data.to, data.mailDesc);
-  }
-}

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

@@ -4,43 +4,38 @@ import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handleba
 import { MailerService } from './mailer.service';
 import { throwErr } from 'src/utils';
 import {
-  MAILER_SMTP_PASSWORD_UNDEFINED,
+  MAILER_FROM_ADDRESS_UNDEFINED,
   MAILER_SMTP_URL_UNDEFINED,
-  MAILER_SMTP_USER_UNDEFINED,
 } from 'src/errors';
 import { ConfigService } from '@nestjs/config';
 import { loadInfraConfiguration } from 'src/infra-config/helper';
-import { MailerEventListener } from './mailer.listener';
-import { TransportType } from '@nestjs-modules/mailer/dist/interfaces/mailer-options.interface';
 
 @Global()
-@Module({})
+@Module({
+  imports: [],
+  providers: [MailerService],
+  exports: [MailerService],
+})
 export class MailerModule {
   static async register() {
-    const config = new ConfigService();
     const env = await loadInfraConfiguration();
 
-    // If mailer SMTP is DISABLED, return the module without any configuration (service, listener, etc.)
-    if (env.INFRA.MAILER_SMTP_ENABLE !== 'true') {
-      console.log('Mailer SMTP is disabled');
-      return { module: MailerModule };
+    let mailerSmtpUrl = env.INFRA.MAILER_SMTP_URL;
+    let mailerAddressFrom = env.INFRA.MAILER_ADDRESS_FROM;
+
+    if (!env.INFRA.MAILER_SMTP_URL || !env.INFRA.MAILER_ADDRESS_FROM) {
+      const config = new ConfigService();
+      mailerSmtpUrl = config.get('MAILER_SMTP_URL');
+      mailerAddressFrom = config.get('MAILER_ADDRESS_FROM');
     }
 
-    // If mailer is ENABLED, return the module with configuration (service, listener, etc.)
-
-    // Determine transport configuration based on custom config flag
-    let transportOption = getTransportOption(env, config);
-    // Get mailer address from environment or config
-    const mailerAddressFrom = getMailerAddressFrom(env, config);
-
     return {
       module: MailerModule,
-      providers: [MailerService, MailerEventListener],
       imports: [
         NestMailerModule.forRoot({
-          transport: transportOption,
+          transport: mailerSmtpUrl ?? throwErr(MAILER_SMTP_URL_UNDEFINED),
           defaults: {
-            from: mailerAddressFrom,
+            from: mailerAddressFrom ?? throwErr(MAILER_FROM_ADDRESS_UNDEFINED),
           },
           template: {
             dir: __dirname + '/templates',
@@ -51,52 +46,3 @@ export class MailerModule {
     };
   }
 }
-
-function isEnabled(value) {
-  return value === 'true';
-}
-function getMailerAddressFrom(env, config): string {
-  return (
-    env.INFRA.MAILER_ADDRESS_FROM ??
-    config.get('MAILER_ADDRESS_FROM') ??
-    throwErr(MAILER_SMTP_URL_UNDEFINED)
-  );
-}
-function getTransportOption(env, config): TransportType {
-  const useCustomConfigs = isEnabled(
-    env.INFRA.MAILER_USE_CUSTOM_CONFIGS ??
-      config.get('MAILER_USE_CUSTOM_CONFIGS'),
-  );
-
-  if (!useCustomConfigs) {
-    console.log('Using simple mailer configuration');
-    return (
-      env.INFRA.MAILER_SMTP_URL ??
-      config.get('MAILER_SMTP_URL') ??
-      throwErr(MAILER_SMTP_URL_UNDEFINED)
-    );
-  } else {
-    console.log('Using advanced mailer configuration');
-    return {
-      host: env.INFRA.MAILER_SMTP_HOST ?? config.get('MAILER_SMTP_HOST'),
-      port: +env.INFRA.MAILER_SMTP_PORT ?? +config.get('MAILER_SMTP_PORT'),
-      secure:
-        !!env.INFRA.MAILER_SMTP_SECURE ?? !!config.get('MAILER_SMTP_SECURE'),
-      auth: {
-        user:
-          env.INFRA.MAILER_SMTP_USER ??
-          config.get('MAILER_SMTP_USER') ??
-          throwErr(MAILER_SMTP_USER_UNDEFINED),
-        pass:
-          env.INFRA.MAILER_SMTP_PASSWORD ??
-          config.get('MAILER_SMTP_PASSWORD') ??
-          throwErr(MAILER_SMTP_PASSWORD_UNDEFINED),
-      },
-      tls: {
-        rejectUnauthorized:
-          !!env.INFRA.MAILER_TLS_REJECT_UNAUTHORIZED ??
-          !!config.get('MAILER_TLS_REJECT_UNAUTHORIZED'),
-      },
-    };
-  }
-}

packages/hoppscotch-backend/src/mailer/mailer.service.ts

@@ -7,14 +7,10 @@ import {
 import { throwErr } from 'src/utils';
 import { EMAIL_FAILED } from 'src/errors';
 import { MailerService as NestMailerService } from '@nestjs-modules/mailer';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class MailerService {
-  constructor(
-    private readonly nestMailerService: NestMailerService,
-    private readonly configService: ConfigService,
-  ) {}
+  constructor(private readonly nestMailerService: NestMailerService) {}
 
   /**
    * Takes an input mail description and spits out the Email subject required for it
@@ -29,7 +25,7 @@ export class MailerService {
   ): string {
     switch (mailDesc.template) {
       case 'team-invitation':
-        return `A user has invited you to join a team workspace in Hoppscotch`;
+        return `${mailDesc.variables.invitee} invited you to join ${mailDesc.variables.invite_team_name} in Hoppscotch`;
 
       case 'user-invitation':
         return 'Sign in to Hoppscotch';
@@ -46,8 +42,6 @@ export class MailerService {
     to: string,
     mailDesc: MailDescription | UserMagicLinkMailDescription,
   ) {
-    if (this.configService.get('INFRA.MAILER_SMTP_ENABLE') !== 'true') return;
-
     try {
       await this.nestMailerService.sendMail({
         to,
@@ -70,8 +64,6 @@ export class MailerService {
     to: string,
     mailDesc: AdminUserInvitationMailDescription,
   ) {
-    if (this.configService.get('INFRA.MAILER_SMTP_ENABLE') !== 'true') return;
-
     try {
       const res = await this.nestMailerService.sendMail({
         to,

packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs

@@ -27,12 +27,6 @@
       color: #3869D4;
     }
 
-    a.nohighlight {
-      color: inherit !important;
-      text-decoration: none !important;
-      cursor: default !important;
-    }
-
     a img {
       border: none;
     }
@@ -464,7 +458,7 @@
                     <td class="content-cell">
                       <div class="f-fallback">
 <h1>Hi there,</h1>
-<p><a class="nohighlight" name="invitee" href="#">{{invitee}}</a> with <a class="nohighlight" name="invite_team_name" href="#">{{invite_team_name}}</a> has invited you to use Hoppscotch to collaborate with them. Click the button below to set up your account and get started:</p>
+<p>{{invitee}} with {{invite_team_name}} has invited you to use Hoppscotch to collaborate with them. Click the button below to set up your account and get started:</p>
 <!-- Action -->
 <table class="body-action" align="center" width="100%" cellpadding="0" cellspacing="0">
   <tr>
@@ -490,7 +484,7 @@
   Welcome aboard, <br />
   Your friends at Hoppscotch
 </p>
-<p><strong>P.S.</strong> If you don't associate with <a class="nohighlight" name="invitee" href="#">{{invitee}}</a> or <a class="nohighlight" name="invite_team_name" href="#">{{invite_team_name}}</a>, just ignore this email.</p>
+<p><strong>P.S.</strong> If you don't associate with {{invitee}} or {{invite_team_name}}, just ignore this email.</p>
 <!-- Sub copy -->
 <table class="body-sub">
   <tr>

packages/hoppscotch-backend/src/mailer/templates/user-invitation.hbs

@@ -14,7 +14,7 @@
   -->
     <style type="text/css" rel="stylesheet" media="all">
     /* Base ------------------------------ */
-
+    
     @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
     body {
       width: 100% !important;
@@ -22,25 +22,19 @@
       margin: 0;
       -webkit-text-size-adjust: none;
     }
-
+    
     a {
       color: #3869D4;
     }
-
-    a.nohighlight {
-      color: inherit !important;
-      text-decoration: none !important;
-      cursor: default !important;
-    }
-
+    
     a img {
       border: none;
     }
-
+    
     td {
       word-break: break-word;
     }
-
+    
     .preheader {
       display: none !important;
       visibility: hidden;
@@ -53,13 +47,13 @@
       overflow: hidden;
     }
     /* Type ------------------------------ */
-
+    
     body,
     td,
     th {
       font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
     }
-
+    
     h1 {
       margin-top: 0;
       color: #333333;
@@ -67,7 +61,7 @@
       font-weight: bold;
       text-align: left;
     }
-
+    
     h2 {
       margin-top: 0;
       color: #333333;
@@ -75,7 +69,7 @@
       font-weight: bold;
       text-align: left;
     }
-
+    
     h3 {
       margin-top: 0;
       color: #333333;
@@ -83,12 +77,12 @@
       font-weight: bold;
       text-align: left;
     }
-
+    
     td,
     th {
       font-size: 16px;
     }
-
+    
     p,
     ul,
     ol,
@@ -97,25 +91,25 @@
       font-size: 16px;
       line-height: 1.625;
     }
-
+    
     p.sub {
       font-size: 13px;
     }
     /* Utilities ------------------------------ */
-
+    
     .align-right {
       text-align: right;
     }
-
+    
     .align-left {
       text-align: left;
     }
-
+    
     .align-center {
       text-align: center;
     }
     /* Buttons ------------------------------ */
-
+    
     .button {
       background-color: #3869D4;
       border-top: 10px solid #3869D4;
@@ -130,7 +124,7 @@
       -webkit-text-size-adjust: none;
       box-sizing: border-box;
     }
-
+    
     .button--green {
       background-color: #22BC66;
       border-top: 10px solid #22BC66;
@@ -138,7 +132,7 @@
       border-bottom: 10px solid #22BC66;
       border-left: 18px solid #22BC66;
     }
-
+    
     .button--red {
       background-color: #FF6136;
       border-top: 10px solid #FF6136;
@@ -146,7 +140,7 @@
       border-bottom: 10px solid #FF6136;
       border-left: 18px solid #FF6136;
     }
-
+    
     @media only screen and (max-width: 500px) {
       .button {
         width: 100% !important;
@@ -154,21 +148,21 @@
       }
     }
     /* Attribute list ------------------------------ */
-
+    
     .attributes {
       margin: 0 0 21px;
     }
-
+    
     .attributes_content {
       background-color: #F4F4F7;
       padding: 16px;
     }
-
+    
     .attributes_item {
       padding: 0;
     }
     /* Related Items ------------------------------ */
-
+    
     .related {
       width: 100%;
       margin: 0;
@@ -177,31 +171,31 @@
       -premailer-cellpadding: 0;
       -premailer-cellspacing: 0;
     }
-
+    
     .related_item {
       padding: 10px 0;
       color: #CBCCCF;
       font-size: 15px;
       line-height: 18px;
     }
-
+    
     .related_item-title {
       display: block;
       margin: .5em 0 0;
     }
-
+    
     .related_item-thumb {
       display: block;
       padding-bottom: 10px;
     }
-
+    
     .related_heading {
       border-top: 1px solid #CBCCCF;
       text-align: center;
       padding: 25px 0 10px;
     }
     /* Discount Code ------------------------------ */
-
+    
     .discount {
       width: 100%;
       margin: 0;
@@ -212,33 +206,33 @@
       background-color: #F4F4F7;
       border: 2px dashed #CBCCCF;
     }
-
+    
     .discount_heading {
       text-align: center;
     }
-
+    
     .discount_body {
       text-align: center;
       font-size: 15px;
     }
     /* Social Icons ------------------------------ */
-
+    
     .social {
       width: auto;
     }
-
+    
     .social td {
       padding: 0;
       width: auto;
     }
-
+    
     .social_icon {
       height: 20px;
       margin: 0 8px 10px 8px;
       padding: 0;
     }
     /* Data table ------------------------------ */
-
+    
     .purchase {
       width: 100%;
       margin: 0;
@@ -247,7 +241,7 @@
       -premailer-cellpadding: 0;
       -premailer-cellspacing: 0;
     }
-
+    
     .purchase_content {
       width: 100%;
       margin: 0;
@@ -256,50 +250,50 @@
       -premailer-cellpadding: 0;
       -premailer-cellspacing: 0;
     }
-
+    
     .purchase_item {
       padding: 10px 0;
       color: #51545E;
       font-size: 15px;
       line-height: 18px;
     }
-
+    
     .purchase_heading {
       padding-bottom: 8px;
       border-bottom: 1px solid #EAEAEC;
     }
-
+    
     .purchase_heading p {
       margin: 0;
       color: #85878E;
       font-size: 12px;
     }
-
+    
     .purchase_footer {
       padding-top: 15px;
       border-top: 1px solid #EAEAEC;
     }
-
+    
     .purchase_total {
       margin: 0;
       text-align: right;
       font-weight: bold;
       color: #333333;
     }
-
+    
     .purchase_total--label {
       padding: 0 15px 0 0;
     }
-
+    
     body {
       background-color: #F2F4F6;
       color: #51545E;
     }
-
+    
     p {
       color: #51545E;
     }
-
+    
     .email-wrapper {
       width: 100%;
       margin: 0;
@@ -309,7 +303,7 @@
       -premailer-cellspacing: 0;
       background-color: #F2F4F6;
     }
-
+    
     .email-content {
       width: 100%;
       margin: 0;
@@ -319,16 +313,16 @@
       -premailer-cellspacing: 0;
     }
     /* Masthead ----------------------- */
-
+    
     .email-masthead {
       padding: 25px 0;
       text-align: center;
     }
-
+    
     .email-masthead_logo {
       width: 94px;
     }
-
+    
     .email-masthead_name {
       font-size: 16px;
       font-weight: bold;
@@ -337,7 +331,7 @@
       text-shadow: 0 1px 0 white;
     }
     /* Body ------------------------------ */
-
+    
     .email-body {
       width: 100%;
       margin: 0;
@@ -346,7 +340,7 @@
       -premailer-cellpadding: 0;
       -premailer-cellspacing: 0;
     }
-
+    
     .email-body_inner {
       width: 570px;
       margin: 0 auto;
@@ -356,7 +350,7 @@
       -premailer-cellspacing: 0;
       background-color: #FFFFFF;
     }
-
+    
     .email-footer {
       width: 570px;
       margin: 0 auto;
@@ -366,11 +360,11 @@
       -premailer-cellspacing: 0;
       text-align: center;
     }
-
+    
     .email-footer p {
       color: #A8AAAF;
     }
-
+    
     .body-action {
       width: 100%;
       margin: 30px auto;
@@ -380,25 +374,25 @@
       -premailer-cellspacing: 0;
       text-align: center;
     }
-
+    
     .body-sub {
       margin-top: 25px;
       padding-top: 25px;
       border-top: 1px solid #EAEAEC;
     }
-
+    
     .content-cell {
       padding: 45px;
     }
     /*Media Queries ------------------------------ */
-
+    
     @media only screen and (max-width: 600px) {
       .email-body_inner,
       .email-footer {
         width: 100% !important;
       }
     }
-
+    
     @media (prefers-color-scheme: dark) {
       body,
       .email-body,

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

@@ -1,9 +0,0 @@
-import { Module } from '@nestjs/common';
-import { PosthogService } from './posthog.service';
-import { PrismaModule } from 'src/prisma/prisma.module';
-
-@Module({
-  imports: [PrismaModule],
-  providers: [PosthogService],
-})
-export class PosthogModule {}

packages/hoppscotch-backend/src/posthog/posthog.service.ts

@@ -1,58 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { PostHog } from 'posthog-node';
-import { Cron, CronExpression, SchedulerRegistry } from '@nestjs/schedule';
-import { ConfigService } from '@nestjs/config';
-import { PrismaService } from 'src/prisma/prisma.service';
-import { CronJob } from 'cron';
-import { POSTHOG_CLIENT_NOT_INITIALIZED } from 'src/errors';
-import { throwErr } from 'src/utils';
-@Injectable()
-export class PosthogService {
-  private postHogClient: PostHog;
-  private POSTHOG_API_KEY = 'phc_9CipPajQC22mSkk2wxe2TXsUA0Ysyupe8dt5KQQELqx';
-
-  constructor(
-    private readonly configService: ConfigService,
-    private readonly prismaService: PrismaService,
-    private schedulerRegistry: SchedulerRegistry,
-  ) {}
-
-  async onModuleInit() {
-    if (this.configService.get('INFRA.ALLOW_ANALYTICS_COLLECTION') === 'true') {
-      console.log('Initializing PostHog');
-      this.postHogClient = new PostHog(this.POSTHOG_API_KEY, {
-        host: 'https://eu.posthog.com',
-      });
-
-      // Schedule the cron job only if analytics collection is allowed
-      this.scheduleCronJob();
-    }
-  }
-
-  private scheduleCronJob() {
-    const job = new CronJob(CronExpression.EVERY_WEEK, async () => {
-      await this.capture();
-    });
-
-    this.schedulerRegistry.addCronJob('captureAnalytics', job);
-    job.start();
-  }
-
-  async capture() {
-    if (!this.postHogClient) {
-      throwErr(POSTHOG_CLIENT_NOT_INITIALIZED);
-    }
-
-    this.postHogClient.capture({
-      distinctId: this.configService.get('INFRA.ANALYTICS_USER_ID'),
-      event: 'sh_instance',
-      properties: {
-        type: 'COMMUNITY',
-        total_user_count: await this.prismaService.user.count(),
-        total_workspace_count: await this.prismaService.team.count(),
-        version: this.configService.get('npm_package_version'),
-      },
-    });
-    console.log('Sent event to PostHog');
-  }
-}

packages/hoppscotch-backend/src/team-collection/helper.ts

@@ -1,14 +0,0 @@
-// Type of data returned from the query to obtain all search results
-export type SearchQueryReturnType = {
-  id: string;
-  title: string;
-  type: 'collection' | 'request';
-  method?: string;
-};
-
-// Type of data returned from the query to obtain all parents
-export type ParentTreeQueryReturnType = {
-  id: string;
-  parentID: string;
-  title: string;
-};

packages/hoppscotch-backend/src/team-collection/team-collection.controller.ts

@@ -1,54 +0,0 @@
-import {
-  Controller,
-  Get,
-  HttpStatus,
-  Param,
-  Query,
-  UseGuards,
-} from '@nestjs/common';
-import { TeamCollectionService } from './team-collection.service';
-import * as E from 'fp-ts/Either';
-import { ThrottlerBehindProxyGuard } from 'src/guards/throttler-behind-proxy.guard';
-import { JwtAuthGuard } from 'src/auth/guards/jwt-auth.guard';
-import { RequiresTeamRole } from 'src/team/decorators/requires-team-role.decorator';
-import { TeamMemberRole } from '@prisma/client';
-import { RESTTeamMemberGuard } from 'src/team/guards/rest-team-member.guard';
-import { throwHTTPErr } from 'src/utils';
-import { RESTError } from 'src/types/RESTError';
-import { INVALID_PARAMS } from 'src/errors';
-
-@UseGuards(ThrottlerBehindProxyGuard)
-@Controller({ path: 'team-collection', version: '1' })
-export class TeamCollectionController {
-  constructor(private readonly teamCollectionService: TeamCollectionService) {}
-
-  @Get('search/:teamID')
-  @RequiresTeamRole(
-    TeamMemberRole.VIEWER,
-    TeamMemberRole.EDITOR,
-    TeamMemberRole.OWNER,
-  )
-  @UseGuards(JwtAuthGuard, RESTTeamMemberGuard)
-  async searchByTitle(
-    @Query('searchQuery') searchQuery: string,
-    @Param('teamID') teamID: string,
-    @Query('take') take: string,
-    @Query('skip') skip: string,
-  ) {
-    if (!teamID || !searchQuery) {
-      return <RESTError>{
-        message: INVALID_PARAMS,
-        statusCode: HttpStatus.BAD_REQUEST,
-      };
-    }
-
-    const res = await this.teamCollectionService.searchByTitle(
-      searchQuery.trim(),
-      teamID,
-      parseInt(take),
-      parseInt(skip),
-    );
-    if (E.isLeft(res)) throwHTTPErr(res.left);
-    return res.right;
-  }
-}

packages/hoppscotch-backend/src/team-collection/team-collection.module.ts

@@ -6,7 +6,6 @@ import { GqlCollectionTeamMemberGuard } from './guards/gql-collection-team-membe
 import { TeamModule } from '../team/team.module';
 import { UserModule } from '../user/user.module';
 import { PubSubModule } from '../pubsub/pubsub.module';
-import { TeamCollectionController } from './team-collection.controller';
 
 @Module({
   imports: [PrismaModule, TeamModule, UserModule, PubSubModule],
@@ -16,6 +15,5 @@ import { TeamCollectionController } from './team-collection.controller';
     GqlCollectionTeamMemberGuard,
   ],
   exports: [TeamCollectionService, GqlCollectionTeamMemberGuard],
-  controllers: [TeamCollectionController],
 })
 export class TeamCollectionModule {}

packages/hoppscotch-backend/src/team-collection/team-collection.service.ts

@@ -1,4 +1,4 @@
-import { HttpStatus, Injectable } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
 import { TeamCollection } from './team-collection.model';
 import {
@@ -14,21 +14,14 @@ import {
   TEAM_COL_SAME_NEXT_COLL,
   TEAM_COL_REORDERING_FAILED,
   TEAM_COLL_DATA_INVALID,
-  TEAM_REQ_SEARCH_FAILED,
-  TEAM_COL_SEARCH_FAILED,
-  TEAM_REQ_PARENT_TREE_GEN_FAILED,
-  TEAM_COLL_PARENT_TREE_GEN_FAILED,
 } from '../errors';
 import { PubSubService } from '../pubsub/pubsub.service';
-import { escapeSqlLikeString, isValidLength } from 'src/utils';
+import { isValidLength } from 'src/utils';
 import * as E from 'fp-ts/Either';
 import * as O from 'fp-ts/Option';
 import { Prisma, TeamCollection as DBTeamCollection } from '@prisma/client';
 import { CollectionFolder } from 'src/types/CollectionFolder';
 import { stringToJson } from 'src/utils';
-import { CollectionSearchNode } from 'src/types/CollectionSearchNode';
-import { ParentTreeQueryReturnType, SearchQueryReturnType } from './helper';
-import { RESTError } from 'src/types/RESTError';
 
 @Injectable()
 export class TeamCollectionService {
@@ -1063,285 +1056,4 @@ export class TeamCollectionService {
       return E.left(TEAM_COLL_NOT_FOUND);
     }
   }
-
-  /**
-   * Search for TeamCollections and TeamRequests by title
-   *
-   * @param searchQuery The search query
-   * @param teamID The Team ID
-   * @param take Number of items we want returned
-   * @param skip Number of items we want to skip
-   * @returns An Either of the search results
-   */
-  async searchByTitle(
-    searchQuery: string,
-    teamID: string,
-    take = 10,
-    skip = 0,
-  ) {
-    // Fetch all collections and requests that match the search query
-    const searchResults: SearchQueryReturnType[] = [];
-
-    const matchedCollections = await this.searchCollections(
-      searchQuery,
-      teamID,
-      take,
-      skip,
-    );
-    if (E.isLeft(matchedCollections))
-      return E.left(<RESTError>{
-        message: matchedCollections.left,
-        statusCode: HttpStatus.NOT_FOUND,
-      });
-    searchResults.push(...matchedCollections.right);
-
-    const matchedRequests = await this.searchRequests(
-      searchQuery,
-      teamID,
-      take,
-      skip,
-    );
-    if (E.isLeft(matchedRequests))
-      return E.left(<RESTError>{
-        message: matchedRequests.left,
-        statusCode: HttpStatus.NOT_FOUND,
-      });
-    searchResults.push(...matchedRequests.right);
-
-    // Generate the parent tree for searchResults
-    const searchResultsWithTree: CollectionSearchNode[] = [];
-
-    for (let i = 0; i < searchResults.length; i++) {
-      const fetchedParentTree = await this.fetchParentTree(searchResults[i]);
-      if (E.isLeft(fetchedParentTree))
-        return E.left(<RESTError>{
-          message: fetchedParentTree.left,
-          statusCode: HttpStatus.NOT_FOUND,
-        });
-      searchResultsWithTree.push({
-        type: searchResults[i].type,
-        title: searchResults[i].title,
-        method: searchResults[i].method,
-        id: searchResults[i].id,
-        path: !fetchedParentTree
-          ? []
-          : (fetchedParentTree.right as CollectionSearchNode[]),
-      });
-    }
-
-    return E.right({ data: searchResultsWithTree });
-  }
-
-  /**
-   * Search for TeamCollections by title
-   *
-   * @param searchQuery The search query
-   * @param teamID The Team ID
-   * @param take Number of items we want returned
-   * @param skip Number of items we want to skip
-   * @returns An Either of the search results
-   */
-  private async searchCollections(
-    searchQuery: string,
-    teamID: string,
-    take: number,
-    skip: number,
-  ) {
-    const query = Prisma.sql`
-    SELECT
-      id,title,'collection' AS type
-    FROM
-      "TeamCollection"
-    WHERE
-      "TeamCollection"."teamID"=${teamID}
-      AND
-        title ILIKE ${`%${escapeSqlLikeString(searchQuery)}%`}
-    ORDER BY
-      similarity(title, ${searchQuery})
-    LIMIT ${take}
-    OFFSET ${skip === 0 ? 0 : (skip - 1) * take};
-  `;
-
-    try {
-      const res = await this.prisma.$queryRaw<SearchQueryReturnType[]>(query);
-      return E.right(res);
-    } catch (error) {
-      return E.left(TEAM_COL_SEARCH_FAILED);
-    }
-  }
-
-  /**
-   * Search for TeamRequests by title
-   *
-   * @param searchQuery The search query
-   * @param teamID The Team ID
-   * @param take Number of items we want returned
-   * @param skip Number of items we want to skip
-   * @returns An Either of the search results
-   */
-  private async searchRequests(
-    searchQuery: string,
-    teamID: string,
-    take: number,
-    skip: number,
-  ) {
-    const query = Prisma.sql`
-    SELECT
-      id,title,request->>'method' as method,'request' AS type
-    FROM
-      "TeamRequest"
-    WHERE
-      "TeamRequest"."teamID"=${teamID}
-      AND
-        title ILIKE ${`%${escapeSqlLikeString(searchQuery)}%`}
-    ORDER BY
-      similarity(title, ${searchQuery})
-    LIMIT ${take}
-    OFFSET ${skip === 0 ? 0 : (skip - 1) * take};
-  `;
-
-    try {
-      const res = await this.prisma.$queryRaw<SearchQueryReturnType[]>(query);
-      return E.right(res);
-    } catch (error) {
-      return E.left(TEAM_REQ_SEARCH_FAILED);
-    }
-  }
-
-  /**
-   * Generate the parent tree of a search result
-   *
-   * @param searchResult The search result for which we want to generate the parent tree
-   * @returns The parent tree of the search result
-   */
-  private async fetchParentTree(searchResult: SearchQueryReturnType) {
-    return searchResult.type === 'collection'
-      ? await this.fetchCollectionParentTree(searchResult.id)
-      : await this.fetchRequestParentTree(searchResult.id);
-  }
-
-  /**
-   * Generate the parent tree of a collection
-   *
-   * @param id The ID of the collection
-   * @returns The parent tree of the collection
-   */
-  private async fetchCollectionParentTree(id: string) {
-    try {
-      const query = Prisma.sql`
-      WITH RECURSIVE collection_tree AS (
-        SELECT tc.id, tc."parentID", tc.title
-        FROM "TeamCollection" AS tc
-        JOIN "TeamCollection" AS tr ON tc.id = tr."parentID"
-        WHERE tr.id = ${id}
-
-        UNION ALL
-
-        SELECT parent.id,  parent."parentID", parent.title
-        FROM "TeamCollection" AS parent
-        JOIN collection_tree AS ct ON parent.id = ct."parentID"
-      )
-      SELECT * FROM collection_tree;
-      `;
-      const res = await this.prisma.$queryRaw<ParentTreeQueryReturnType[]>(
-        query,
-      );
-
-      const collectionParentTree = this.generateParentTree(res);
-      return E.right(collectionParentTree);
-    } catch (error) {
-      E.left(TEAM_COLL_PARENT_TREE_GEN_FAILED);
-    }
-  }
-
-  /**
-   * Generate the parent tree from the collections
-   *
-   * @param parentCollections The parent collections
-   * @returns The parent tree of the parent collections
-   */
-  private generateParentTree(parentCollections: ParentTreeQueryReturnType[]) {
-    function findChildren(id: string): CollectionSearchNode[] {
-      const collection = parentCollections.filter((item) => item.id === id)[0];
-      if (collection.parentID == null) {
-        return <CollectionSearchNode[]>[
-          {
-            id: collection.id,
-            title: collection.title,
-            type: 'collection' as const,
-            path: [],
-          },
-        ];
-      }
-
-      const res = <CollectionSearchNode[]>[
-        {
-          id: collection.id,
-          title: collection.title,
-          type: 'collection' as const,
-          path: findChildren(collection.parentID),
-        },
-      ];
-      return res;
-    }
-
-    if (parentCollections.length > 0) {
-      if (parentCollections[0].parentID == null) {
-        return <CollectionSearchNode[]>[
-          {
-            id: parentCollections[0].id,
-            title: parentCollections[0].title,
-            type: 'collection',
-            path: [],
-          },
-        ];
-      }
-
-      return <CollectionSearchNode[]>[
-        {
-          id: parentCollections[0].id,
-          title: parentCollections[0].title,
-          type: 'collection',
-          path: findChildren(parentCollections[0].parentID),
-        },
-      ];
-    }
-
-    return <CollectionSearchNode[]>[];
-  }
-
-  /**
-   * Generate the parent tree of a request
-   *
-   * @param id The ID of the request
-   * @returns The parent tree of the request
-   */
-  private async fetchRequestParentTree(id: string) {
-    try {
-      const query = Prisma.sql`
-      WITH RECURSIVE request_collection_tree AS (
-        SELECT tc.id, tc."parentID", tc.title
-        FROM "TeamCollection" AS tc
-        JOIN "TeamRequest" AS tr ON tc.id = tr."collectionID"
-        WHERE tr.id = ${id}
-
-        UNION ALL
-
-        SELECT parent.id, parent."parentID", parent.title
-        FROM "TeamCollection" AS parent
-        JOIN request_collection_tree AS ct ON parent.id = ct."parentID"
-      )
-      SELECT * FROM request_collection_tree;
-
-      `;
-      const res = await this.prisma.$queryRaw<ParentTreeQueryReturnType[]>(
-        query,
-      );
-
-      const requestParentTree = this.generateParentTree(res);
-      return E.right(requestParentTree);
-    } catch (error) {
-      return E.left(TEAM_REQ_PARENT_TREE_GEN_FAILED);
-    }
-  }
 }

packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts

@@ -15,13 +15,12 @@ import {
   TEAM_MEMBER_NOT_FOUND,
 } from 'src/errors';
 import { TeamInvitation } from './team-invitation.model';
+import { MailerService } from 'src/mailer/mailer.service';
 import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { validateEmail } from '../utils';
 import { AuthUser } from 'src/types/AuthUser';
 import { ConfigService } from '@nestjs/config';
-import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Events } from 'src/types/EventEmitter';
 
 @Injectable()
 export class TeamInvitationService {
@@ -29,9 +28,9 @@ export class TeamInvitationService {
     private readonly prisma: PrismaService,
     private readonly userService: UserService,
     private readonly teamService: TeamService,
+    private readonly mailerService: MailerService,
     private readonly pubsub: PubSubService,
     private readonly configService: ConfigService,
-    private eventEmitter: EventEmitter2,
   ) {}
 
   /**
@@ -148,17 +147,14 @@ export class TeamInvitationService {
       },
     });
 
-    this.eventEmitter.emit(Events.MAILER_SEND_EMAIL, {
-      to: inviteeEmail,
-      mailDesc: {
-        template: 'team-invitation',
-        variables: {
-          invitee: creator.displayName ?? 'A Hoppscotch User',
-          action_url: `${this.configService.get(
-            'VITE_BASE_URL',
-          )}/join-team?id=${dbInvitation.id}`,
-          invite_team_name: team.name,
-        },
+    await this.mailerService.sendEmail(inviteeEmail, {
+      template: 'team-invitation',
+      variables: {
+        invitee: creator.displayName ?? 'A Hoppscotch User',
+        action_url: `${this.configService.get('VITE_BASE_URL')}/join-team?id=${
+          dbInvitation.id
+        }`,
+        invite_team_name: team.name,
       },
     });
 

packages/hoppscotch-backend/src/team/guards/rest-team-member.guard.ts

@@ -1,47 +0,0 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
-import { Reflector } from '@nestjs/core';
-import { TeamService } from '../../team/team.service';
-import { TeamMemberRole } from '../../team/team.model';
-import {
-  BUG_TEAM_NO_REQUIRE_TEAM_ROLE,
-  BUG_AUTH_NO_USER_CTX,
-  BUG_TEAM_NO_TEAM_ID,
-  TEAM_MEMBER_NOT_FOUND,
-  TEAM_NOT_REQUIRED_ROLE,
-} from 'src/errors';
-import { throwHTTPErr } from 'src/utils';
-
-@Injectable()
-export class RESTTeamMemberGuard implements CanActivate {
-  constructor(
-    private readonly reflector: Reflector,
-    private readonly teamService: TeamService,
-  ) {}
-
-  async canActivate(context: ExecutionContext): Promise<boolean> {
-    const requireRoles = this.reflector.get<TeamMemberRole[]>(
-      'requiresTeamRole',
-      context.getHandler(),
-    );
-    if (!requireRoles)
-      throwHTTPErr({ message: BUG_TEAM_NO_REQUIRE_TEAM_ROLE, statusCode: 400 });
-
-    const request = context.switchToHttp().getRequest();
-
-    const { user } = request;
-    if (user == undefined)
-      throwHTTPErr({ message: BUG_AUTH_NO_USER_CTX, statusCode: 400 });
-
-    const teamID = request.params.teamID;
-    if (!teamID)
-      throwHTTPErr({ message: BUG_TEAM_NO_TEAM_ID, statusCode: 400 });
-
-    const teamMember = await this.teamService.getTeamMember(teamID, user.uid);
-    if (!teamMember)
-      throwHTTPErr({ message: TEAM_MEMBER_NOT_FOUND, statusCode: 404 });
-
-    if (requireRoles.includes(teamMember.role)) return true;
-
-    throwHTTPErr({ message: TEAM_NOT_REQUIRED_ROLE, statusCode: 403 });
-  }
-}

packages/hoppscotch-backend/src/types/AuthError.ts

@@ -1,10 +1,10 @@
 import { HttpStatus } from '@nestjs/common';
 
 /**
- ** Custom interface to handle errors for REST modules such as Auth, Admin modules
+ ** Custom interface to handle errors specific to Auth module
  ** Since its REST we need to return the HTTP status code along with the error message
  */
-export type RESTError = {
+export type AuthError = {
   message: string;
   statusCode: HttpStatus;
 };

packages/hoppscotch-backend/src/types/CollectionSearchNode.ts

@@ -1,17 +0,0 @@
-// Response type of results from the search query
-export type CollectionSearchNode = {
-  /** Encodes the hierarchy of where the node is **/
-  path: CollectionSearchNode[];
-} & (
-  | {
-      type: 'request';
-      title: string;
-      method: string;
-      id: string;
-    }
-  | {
-      type: 'collection';
-      title: string;
-      id: string;
-    }
-);

packages/hoppscotch-backend/src/types/EventEmitter.ts

@@ -1,4 +0,0 @@
-export enum Events {
-  MAILER_SEND_EMAIL = 'mailer.sendEmail',
-  MAILER_SEND_USER_INVITATION_EMAIL = 'mailer.sendUserInvitationEmail',
-}

packages/hoppscotch-backend/src/types/InfraConfig.ts

@@ -1,35 +1,33 @@
 export enum InfraConfigEnum {
-  MAILER_SMTP_ENABLE = 'MAILER_SMTP_ENABLE',
-  MAILER_USE_CUSTOM_CONFIGS = 'MAILER_USE_CUSTOM_CONFIGS',
   MAILER_SMTP_URL = 'MAILER_SMTP_URL',
   MAILER_ADDRESS_FROM = 'MAILER_ADDRESS_FROM',
 
-  MAILER_SMTP_HOST = 'MAILER_SMTP_HOST',
-  MAILER_SMTP_PORT = 'MAILER_SMTP_PORT',
-  MAILER_SMTP_SECURE = 'MAILER_SMTP_SECURE',
-  MAILER_SMTP_USER = 'MAILER_SMTP_USER',
-  MAILER_SMTP_PASSWORD = 'MAILER_SMTP_PASSWORD',
-  MAILER_TLS_REJECT_UNAUTHORIZED = 'MAILER_TLS_REJECT_UNAUTHORIZED',
-
   GOOGLE_CLIENT_ID = 'GOOGLE_CLIENT_ID',
   GOOGLE_CLIENT_SECRET = 'GOOGLE_CLIENT_SECRET',
-  GOOGLE_CALLBACK_URL = 'GOOGLE_CALLBACK_URL',
-  GOOGLE_SCOPE = 'GOOGLE_SCOPE',
 
   GITHUB_CLIENT_ID = 'GITHUB_CLIENT_ID',
   GITHUB_CLIENT_SECRET = 'GITHUB_CLIENT_SECRET',
-  GITHUB_CALLBACK_URL = 'GITHUB_CALLBACK_URL',
-  GITHUB_SCOPE = 'GITHUB_SCOPE',
 
   MICROSOFT_CLIENT_ID = 'MICROSOFT_CLIENT_ID',
   MICROSOFT_CLIENT_SECRET = 'MICROSOFT_CLIENT_SECRET',
-  MICROSOFT_CALLBACK_URL = 'MICROSOFT_CALLBACK_URL',
-  MICROSOFT_SCOPE = 'MICROSOFT_SCOPE',
-  MICROSOFT_TENANT = 'MICROSOFT_TENANT',
 
   VITE_ALLOWED_AUTH_PROVIDERS = 'VITE_ALLOWED_AUTH_PROVIDERS',
 
-  ALLOW_ANALYTICS_COLLECTION = 'ALLOW_ANALYTICS_COLLECTION',
-  ANALYTICS_USER_ID = 'ANALYTICS_USER_ID',
+  IS_FIRST_TIME_INFRA_SETUP = 'IS_FIRST_TIME_INFRA_SETUP',
+}
+
+export enum InfraConfigEnumForClient {
+  MAILER_SMTP_URL = 'MAILER_SMTP_URL',
+  MAILER_ADDRESS_FROM = 'MAILER_ADDRESS_FROM',
+
+  GOOGLE_CLIENT_ID = 'GOOGLE_CLIENT_ID',
+  GOOGLE_CLIENT_SECRET = 'GOOGLE_CLIENT_SECRET',
+
+  GITHUB_CLIENT_ID = 'GITHUB_CLIENT_ID',
+  GITHUB_CLIENT_SECRET = 'GITHUB_CLIENT_SECRET',
+
+  MICROSOFT_CLIENT_ID = 'MICROSOFT_CLIENT_ID',
+  MICROSOFT_CLIENT_SECRET = 'MICROSOFT_CLIENT_SECRET',
+
   IS_FIRST_TIME_INFRA_SETUP = 'IS_FIRST_TIME_INFRA_SETUP',
 }

packages/hoppscotch-backend/src/user/user.resolver.ts

@@ -58,29 +58,6 @@ export class UserResolver {
     if (E.isLeft(updatedUser)) throwErr(updatedUser.left);
     return updatedUser.right;
   }
-
-  @Mutation(() => User, {
-    description: 'Update a users display name',
-  })
-  @UseGuards(GqlAuthGuard)
-  async updateDisplayName(
-    @GqlUser() user: AuthUser,
-    @Args({
-      name: 'updatedDisplayName',
-      description: 'New name of user',
-      type: () => String,
-    })
-    updatedDisplayName: string,
-  ) {
-    const updatedUser = await this.userService.updateUserDisplayName(
-      user.uid,
-      updatedDisplayName,
-    );
-
-    if (E.isLeft(updatedUser)) throwErr(updatedUser.left);
-    return updatedUser.right;
-  }
-
   @Mutation(() => Boolean, {
     description: 'Delete an user account',
   })

packages/hoppscotch-backend/src/user/user.service.spec.ts

@@ -1,9 +1,4 @@
-import {
-  JSON_INVALID,
-  USERS_NOT_FOUND,
-  USER_NOT_FOUND,
-  USER_SHORT_DISPLAY_NAME,
-} from 'src/errors';
+import { JSON_INVALID, USERS_NOT_FOUND, USER_NOT_FOUND } from 'src/errors';
 import { mockDeep, mockReset } from 'jest-mock-extended';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { AuthUser } from 'src/types/AuthUser';
@@ -485,14 +480,6 @@ describe('UserService', () => {
       );
       expect(result).toEqualLeft(USER_NOT_FOUND);
     });
-    test('should resolve left and error when short display name is passed', async () => {
-      const newDisplayName = '';
-      const result = await userService.updateUserDisplayName(
-        user.uid,
-        newDisplayName,
-      );
-      expect(result).toEqualLeft(USER_SHORT_DISPLAY_NAME);
-    });
   });
 
   describe('fetchAllUsers', () => {

packages/hoppscotch-backend/src/user/user.service.ts

@@ -8,11 +8,7 @@ import * as T from 'fp-ts/Task';
 import * as A from 'fp-ts/Array';
 import { pipe, constVoid } from 'fp-ts/function';
 import { AuthUser } from 'src/types/AuthUser';
-import {
-  USERS_NOT_FOUND,
-  USER_NOT_FOUND,
-  USER_SHORT_DISPLAY_NAME,
-} from 'src/errors';
+import { USERS_NOT_FOUND, USER_NOT_FOUND } from 'src/errors';
 import { SessionType, User } from './user.model';
 import { USER_UPDATE_FAILED } from 'src/errors';
 import { PubSubService } from 'src/pubsub/pubsub.service';
@@ -295,10 +291,6 @@ export class UserService {
    * @returns a Either of User or error
    */
   async updateUserDisplayName(userUID: string, displayName: string) {
-    if (!displayName || displayName.length === 0) {
-      return E.left(USER_SHORT_DISPLAY_NAME);
-    }
-
     try {
       const dbUpdatedUser = await this.prisma.user.update({
         where: { uid: userUID },

packages/hoppscotch-backend/src/utils.ts

@@ -1,4 +1,4 @@
-import { ExecutionContext, HttpException } from '@nestjs/common';
+import { ExecutionContext } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import { pipe } from 'fp-ts/lib/function';
@@ -16,7 +16,6 @@ import {
   JSON_INVALID,
 } from './errors';
 import { AuthProvider } from './auth/helper';
-import { RESTError } from './types/RESTError';
 
 /**
  * A workaround to throw an exception in an expression.
@@ -28,15 +27,6 @@ export function throwErr(errMessage: string): never {
   throw new Error(errMessage);
 }
 
-/**
- * This function allows throw to be used as an expression
- * @param errMessage Message present in the error message
- */
-export function throwHTTPErr(errorData: RESTError): never {
-  const { message, statusCode } = errorData;
-  throw new HttpException(message, statusCode);
-}
-
 /**
  * Prints the given value to log and returns the same value.
  * Used for debugging functional pipelines.
@@ -183,16 +173,6 @@ export const validateSMTPUrl = (url: string) => {
   return false;
 };
 
-/**
- * Checks to see if the URL is valid or not
- * @param url The URL to validate
- * @returns boolean
- */
-export const validateUrl = (url: string) => {
-  const urlRegex = /^(http|https):\/\/[^ "]+$/;
-  return urlRegex.test(url);
-};
-
 /**
  * String to JSON parser
  * @param {str} str The string to parse
@@ -250,39 +230,3 @@ export function checkEnvironmentAuthProvider(
     }
   }
 }
-
-/**
- * Adds escape backslashes to the input so that it can be used inside
- * SQL LIKE/ILIKE queries. Inspired by PHP's `mysql_real_escape_string`
- * function.
- *
- * Eg. "100%" -> "100\\%"
- *
- * Source: https://stackoverflow.com/a/32648526
- */
-export function escapeSqlLikeString(str: string) {
-  if (typeof str != 'string') return str;
-
-  return str.replace(/[\0\x08\x09\x1a\n\r"'\\\%]/g, function (char) {
-    switch (char) {
-      case '\0':
-        return '\\0';
-      case '\x08':
-        return '\\b';
-      case '\x09':
-        return '\\t';
-      case '\x1a':
-        return '\\z';
-      case '\n':
-        return '\\n';
-      case '\r':
-        return '\\r';
-      case '"':
-      case "'":
-      case '\\':
-      case '%':
-        return '\\' + char; // prepends a backslash to backslash, percent,
-      // and double/single quotes
-    }
-  });
-}

packages/hoppscotch-cli/README.md

@@ -52,34 +52,11 @@ hopp [options or commands] arguments
 		Taking the above example, `pw.env.get("ENV1")` will return `"value1"`
 
 ## Install
-- Before you install Hoppscotch CLI you need to make sure you have the dependencies it requires to run.
-  - **Windows & macOS**: You will need `node-gyp` installed. Find instructions here: https://github.com/nodejs/node-gyp
-  - **Debian/Ubuntu derivatives**:
-    ```sh
-    sudo apt-get install python g++ build-essential
-    ```
-  - **Alpine Linux**:
-    ```sh
-    sudo apk add python3 make g++
-    ```
-  - **Amazon Linux (AMI)**
-    ```sh
-    sudo yum install gcc72 gcc72-c++
-    ```
-  - **Arch Linux**
-    ```sh
-    sudo pacman -S make gcc python
-    ```
-  - **RHEL/Fedora derivatives**:
-    ```sh
-    sudo dnf install python3 make gcc gcc-c++ zlib-devel brotli-devel openssl-devel libuv-devel
-    ```
 
-
-- Once the dependencies are installed, install [@hoppscotch/cli](https://www.npmjs.com/package/@hoppscotch/cli) from npm by running:
-  ```
-  npm i -g @hoppscotch/cli
-  ```
+Install [@hoppscotch/cli](https://www.npmjs.com/package/@hoppscotch/cli) from npm by running:
+```
+npm i -g @hoppscotch/cli
+```
 
 ## **Developing:**
 

packages/hoppscotch-cli/bin/hopp.js

@@ -1,31 +1,6 @@
 #!/usr/bin/env node
 // * The entry point of the CLI
-// @ts-check
 
 import { cli } from "../dist/index.js";
 
-import { spawnSync } from "child_process";
-import { cloneDeep } from "lodash-es";
-
-const nodeVersion = parseInt(process.versions.node.split(".")[0]);
-
-// As per isolated-vm documentation, we need to supply `--no-node-snapshot` for node >= 20
-// src: https://github.com/laverdet/isolated-vm?tab=readme-ov-file#requirements
-if (nodeVersion >= 20 && !process.execArgv.includes("--no-node-snapshot")) {
-  const argCopy = cloneDeep(process.argv);
-
-  // Replace first argument with --no-node-snapshot
-  // We can get argv[0] from process.argv0
-  argCopy[0] = "--no-node-snapshot";
-
-  const result = spawnSync(
-    process.argv0,
-    argCopy,
-    { stdio: "inherit" }
-  );
-
-  // Exit with the same status code as the spawned process
-  process.exit(result.status ?? 0);
-} else {
-  cli(process.argv);
-}
+cli(process.argv);

packages/hoppscotch-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoppscotch/cli",
-  "version": "0.8.0",
+  "version": "0.6.0",
   "description": "A CLI to run Hoppscotch test scripts in CI environments.",
   "homepage": "https://hoppscotch.io",
   "type": "module",
@@ -41,29 +41,26 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "axios": "1.6.7",
-    "chalk": "5.3.0",
-    "commander": "11.1.0",
-    "isolated-vm": "4.7.2",
-    "lodash-es": "4.17.21",
-    "qs": "6.11.2",
-    "verzod": "0.2.2",
-    "zod": "3.22.4"
+    "axios": "^1.6.6",
+    "chalk": "^5.3.0",
+    "commander": "^11.1.0",
+    "lodash-es": "^4.17.21",
+    "qs": "^6.11.2",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
     "@hoppscotch/data": "workspace:^",
     "@hoppscotch/js-sandbox": "workspace:^",
-    "@relmify/jest-fp-ts": "2.1.1",
-    "@swc/core": "1.4.2",
-    "@types/jest": "29.5.12",
-    "@types/lodash-es": "4.17.12",
-    "@types/qs": "6.9.12",
-    "fp-ts": "2.16.2",
-    "jest": "29.7.0",
-    "prettier": "3.2.5",
-    "qs": "6.11.2",
-    "ts-jest": "29.1.2",
-    "tsup": "8.0.2",
-    "typescript": "5.3.3"
+    "@relmify/jest-fp-ts": "^2.1.1",
+    "@swc/core": "^1.3.105",
+    "@types/jest": "^29.5.11",
+    "@types/lodash-es": "^4.17.12",
+    "@types/qs": "^6.9.11",
+    "fp-ts": "^2.16.2",
+    "jest": "^29.7.0",
+    "prettier": "^3.2.4",
+    "ts-jest": "^29.1.2",
+    "tsup": "^8.0.1",
+    "typescript": "^5.3.3"
   }
 }

packages/hoppscotch-cli/src/__tests__/commands/test.spec.ts

@@ -3,317 +3,138 @@ import { ExecException } from "child_process";
 import { HoppErrorCode } from "../../types/errors";
 import { runCLI, getErrorCode, getTestJsonFilePath } from "../utils";
 
-describe("Test `hopp test <file>` command:", () => {
-  describe("Argument parsing", () => {
-    test("Errors with the code `INVALID_ARGUMENT` for not supplying enough arguments", async () => {
-      const args = "test";
-      const { stderr } = await runCLI(args);
+describe("Test 'hopp test <file>' command:", () => {
+  test("No collection file path provided.", async () => {
+    const args = "test";
+    const { stderr } = await runCLI(args);
 
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
-    });
-
-    test("Errors with the code `INVALID_ARGUMENT` for an invalid command", async () => {
-      const args = "invalid-arg";
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
-    });
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
-  describe("Supplied collection export file validations", () => {
-    test("Errors with the code `FILE_NOT_FOUND` if the supplied collection export file doesn't exist", async () => {
-      const args = "test notfound.json";
-      const { stderr } = await runCLI(args);
+  test("Collection file not found.", async () => {
+    const args = "test notfound.json";
+    const { stderr } = await runCLI(args);
 
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("FILE_NOT_FOUND");
-    });
-
-    test("Errors with the code UNKNOWN_ERROR if the supplied collection export file content isn't valid JSON", async () => {
-      const args = `test ${getTestJsonFilePath("malformed-coll.json", "collection")}`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("UNKNOWN_ERROR");
-    });
-
-    test("Errors with the code `MALFORMED_COLLECTION` if the supplied collection export file content is malformed", async () => {
-      const args = `test ${getTestJsonFilePath("malformed-coll-2.json", "collection")}`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("MALFORMED_COLLECTION");
-    });
-
-    test("Errors with the code `INVALID_FILE_TYPE` if the supplied collection export file doesn't end with the `.json` extension", async () => {
-      const args = `test ${getTestJsonFilePath("notjson-coll.txt", "collection")}`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("INVALID_FILE_TYPE");
-    });
-
-    test("Fails if the collection file includes scripts with incorrect API usage and failed assertions", async () => {
-      const args = `test ${getTestJsonFilePath("fails-coll.json", "collection")}`;
-      const { error } = await runCLI(args);
-
-      expect(error).not.toBeNull();
-      expect(error).toMatchObject(<ExecException>{
-        code: 1,
-      });
-    });
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("FILE_NOT_FOUND");
   });
 
-  describe("Versioned entities", () => {
-    describe("Collections & Requests", () => {
-      const testFixtures = [
-        { fileName: "coll-v1-req-v0.json", collVersion: 1, reqVersion: 0 },
-        { fileName: "coll-v1-req-v1.json", collVersion: 1, reqVersion: 1 },
-        { fileName: "coll-v2-req-v2.json", collVersion: 2, reqVersion: 2 },
-        { fileName: "coll-v2-req-v3.json", collVersion: 2, reqVersion: 3 },
-      ];
-
-      testFixtures.forEach(({ collVersion, fileName, reqVersion }) => {
-        test(`Successfully processes a supplied collection export file where the collection is based on the "v${collVersion}" schema and the request following the "v${reqVersion}" schema`, async () => {
-          const args = `test ${getTestJsonFilePath(fileName, "collection")}`;
-          const { error } = await runCLI(args);
-
-          expect(error).toBeNull();
-        });
-      });
-    });
-
-    describe("Environments", () => {
-      const testFixtures = [
-        { fileName: "env-v0.json", version: 0 },
-        { fileName: "env-v1.json", version: 1 },
-      ];
-
-      testFixtures.forEach(({ fileName, version }) => {
-        test(`Successfully processes the supplied collection and environment export files where the environment is based on the "v${version}" schema`, async () => {
-          const ENV_PATH = getTestJsonFilePath(fileName, "environment");
-          const args = `test ${getTestJsonFilePath("sample-coll.json", "collection")} --env ${ENV_PATH}`;
-          const { error } = await runCLI(args);
-
-          expect(error).toBeNull();
-        });
-      });
-    });
-  });
-
-  test("Successfully processes a supplied collection export file of the expected format", async () => {
-    const args = `test ${getTestJsonFilePath("passes-coll.json", "collection")}`;
-    const { error } = await runCLI(args);
-
-    expect(error).toBeNull();
-  });
-
-  test("Successfully inherits headers and authorization set at the root collection", async () => {
+  test("Collection file is invalid JSON.", async () => {
     const args = `test ${getTestJsonFilePath(
-      "collection-level-headers-auth-coll.json",
-      "collection"
+      "malformed-collection.json"
     )}`;
-    const { error } = await runCLI(args);
+    const { stderr } = await runCLI(args);
 
-    expect(error).toBeNull();
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("UNKNOWN_ERROR");
   });
 
-  test("Persists environment variables set in the pre-request script for consumption in the test script", async () => {
+  test("Malformed collection file.", async () => {
     const args = `test ${getTestJsonFilePath(
-      "pre-req-script-env-var-persistence-coll.json",
-      "collection"
+      "malformed-collection2.json"
     )}`;
+    const { stderr } = await runCLI(args);
+
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("MALFORMED_COLLECTION");
+  });
+
+  test("Invalid arguement.", async () => {
+    const args = "invalid-arg";
+    const { stderr } = await runCLI(args);
+
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
+  });
+
+  test("Collection file not JSON type.", async () => {
+    const args = `test ${getTestJsonFilePath("notjson.txt")}`;
+    const { stderr } = await runCLI(args);
+
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("INVALID_FILE_TYPE");
+  });
+
+  test("Some errors occured (exit code 1).", async () => {
+    const args = `test ${getTestJsonFilePath("fails.json")}`;
+    const { error } = await runCLI(args);
+
+    expect(error).not.toBeNull();
+    expect(error).toMatchObject(<ExecException>{
+      code: 1,
+    });
+  });
+
+  test("No errors occured (exit code 0).", async () => {
+    const args = `test ${getTestJsonFilePath("passes.json")}`;
     const { error } = await runCLI(args);
 
     expect(error).toBeNull();
   });
+
+  test("Supports inheriting headers and authorization set at the root collection", async () => {
+    const args = `test ${getTestJsonFilePath("collection-level-headers-auth.json")}`;
+    const { error } = await runCLI(args);
+
+    expect(error).toBeNull();
+  })
 });
 
-describe("Test `hopp test <file> --env <file>` command:", () => {
-  describe("Supplied environment export file validations", () => {
-    const VALID_TEST_ARGS = `test ${getTestJsonFilePath("passes-coll.json", "collection")}`;
+describe("Test 'hopp test <file> --env <file>' command:", () => {
+  const VALID_TEST_ARGS = `test ${getTestJsonFilePath(
+    "passes.json"
+  )}`;
 
-    test("Errors with the code `INVALID_ARGUMENT` if no file is supplied", async () => {
-      const args = `${VALID_TEST_ARGS} --env`;
-      const { stderr } = await runCLI(args);
+  test("No env file path provided.", async () => {
+    const args = `${VALID_TEST_ARGS} --env`;
+    const { stderr } = await runCLI(args);
 
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
-    });
-
-    test("Errors with the code `INVALID_FILE_TYPE` if the supplied environment export file doesn't end with the `.json` extension", async () => {
-      const args = `${VALID_TEST_ARGS} --env ${getTestJsonFilePath(
-        "notjson-coll.txt",
-        "collection"
-      )}`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("INVALID_FILE_TYPE");
-    });
-
-    test("Errors with the code `FILE_NOT_FOUND` if the supplied environment export file doesn't exist", async () => {
-      const args = `${VALID_TEST_ARGS} --env notfound.json`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("FILE_NOT_FOUND");
-    });
-
-    test("Errors with the code `MALFORMED_ENV_FILE` on supplying a malformed environment export file", async () => {
-      const ENV_PATH = getTestJsonFilePath(
-        "malformed-envs.json",
-        "environment"
-      );
-      const args = `${VALID_TEST_ARGS} --env ${ENV_PATH}`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("MALFORMED_ENV_FILE");
-    });
-
-    test("Errors with the code `BULK_ENV_FILE` on supplying an environment export file based on the bulk environment export format", async () => {
-      const ENV_PATH = getTestJsonFilePath("bulk-envs.json", "environment");
-      const args = `${VALID_TEST_ARGS} --env ${ENV_PATH}`;
-      const { stderr } = await runCLI(args);
-
-      const out = getErrorCode(stderr);
-      expect(out).toBe<HoppErrorCode>("BULK_ENV_FILE");
-    });
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
-  test("Successfully resolves values from the supplied environment export file", async () => {
-    const TESTS_PATH = getTestJsonFilePath(
-      "env-flag-tests-coll.json",
-      "collection"
-    );
-    const ENV_PATH = getTestJsonFilePath("env-flag-envs.json", "environment");
+  test("ENV file not JSON type.", async () => {
+    const args = `${VALID_TEST_ARGS} --env ${getTestJsonFilePath("notjson.txt")}`;
+    const { stderr } = await runCLI(args);
+
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("INVALID_FILE_TYPE");
+  });
+
+  test("ENV file not found.", async () => {
+    const args = `${VALID_TEST_ARGS} --env notfound.json`;
+    const { stderr } = await runCLI(args);
+
+    const out = getErrorCode(stderr);
+    expect(out).toBe<HoppErrorCode>("FILE_NOT_FOUND");
+  });
+
+  test("No errors occured (exit code 0).", async () => {
+    const TESTS_PATH = getTestJsonFilePath("env-flag-tests.json");
+    const ENV_PATH = getTestJsonFilePath("env-flag-envs.json");
     const args = `test ${TESTS_PATH} --env ${ENV_PATH}`;
 
     const { error } = await runCLI(args);
     expect(error).toBeNull();
   });
 
-  test("Successfully resolves environment variables referenced in the request body", async () => {
-    const COLL_PATH = getTestJsonFilePath(
-      "req-body-env-vars-coll.json",
-      "collection"
-    );
-    const ENVS_PATH = getTestJsonFilePath(
-      "req-body-env-vars-envs.json",
-      "environment"
-    );
+  test("Correctly resolves environment variables referenced in the request body", async () => {
+    const COLL_PATH = getTestJsonFilePath("req-body-env-vars-coll.json");
+    const ENVS_PATH = getTestJsonFilePath("req-body-env-vars-envs.json");
     const args = `test ${COLL_PATH} --env ${ENVS_PATH}`;
 
     const { error } = await runCLI(args);
     expect(error).toBeNull();
   });
-
-  test("Works with shorth `-e` flag", async () => {
-    const TESTS_PATH = getTestJsonFilePath(
-      "env-flag-tests-coll.json",
-      "collection"
-    );
-    const ENV_PATH = getTestJsonFilePath("env-flag-envs.json", "environment");
-    const args = `test ${TESTS_PATH} -e ${ENV_PATH}`;
-
-    const { error } = await runCLI(args);
-    expect(error).toBeNull();
-  });
-
-  describe("Secret environment variables", () => {
-    jest.setTimeout(100000);
-
-    // Reads secret environment values from system environment
-    test("Successfully picks the values for secret environment variables from `process.env` and persists the variables set from the pre-request script", async () => {
-      const env = {
-        ...process.env,
-        secretBearerToken: "test-token",
-        secretBasicAuthUsername: "test-user",
-        secretBasicAuthPassword: "test-pass",
-        secretQueryParamValue: "secret-query-param-value",
-        secretBodyValue: "secret-body-value",
-        secretHeaderValue: "secret-header-value",
-      };
-
-      const COLL_PATH = getTestJsonFilePath(
-        "secret-envs-coll.json",
-        "collection"
-      );
-      const ENVS_PATH = getTestJsonFilePath("secret-envs.json", "environment");
-      const args = `test ${COLL_PATH} --env ${ENVS_PATH}`;
-
-      const { error, stdout } = await runCLI(args, { env });
-
-      expect(stdout).toContain(
-        "https://httpbin.org/basic-auth/*********/*********"
-      );
-      expect(error).toBeNull();
-    });
-
-    // Prefers values specified in the environment export file over values set in the system environment
-    test("Successfully picks the values for secret environment variables set directly in the environment export file and persists the environment variables set from the pre-request script", async () => {
-      const COLL_PATH = getTestJsonFilePath(
-        "secret-envs-coll.json",
-        "collection"
-      );
-      const ENVS_PATH = getTestJsonFilePath(
-        "secret-supplied-values-envs.json",
-        "environment"
-      );
-      const args = `test ${COLL_PATH} --env ${ENVS_PATH}`;
-
-      const { error, stdout } = await runCLI(args);
-
-      expect(stdout).toContain(
-        "https://httpbin.org/basic-auth/*********/*********"
-      );
-      expect(error).toBeNull();
-    });
-
-    // Values set from the scripting context takes the highest precedence
-    test("Setting values for secret environment variables from the pre-request script overrides values set at the supplied environment export file", async () => {
-      const COLL_PATH = getTestJsonFilePath(
-        "secret-envs-persistence-coll.json",
-        "collection"
-      );
-      const ENVS_PATH = getTestJsonFilePath(
-        "secret-supplied-values-envs.json",
-        "environment"
-      );
-      const args = `test ${COLL_PATH} --env ${ENVS_PATH}`;
-
-      const { error, stdout } = await runCLI(args);
-
-      expect(stdout).toContain(
-        "https://httpbin.org/basic-auth/*********/*********"
-      );
-      expect(error).toBeNull();
-    });
-
-    test("Persists secret environment variable values set from the pre-request script for consumption in the request and post-request script context", async () => {
-      const COLL_PATH = getTestJsonFilePath(
-        "secret-envs-persistence-scripting-coll.json",
-        "collection"
-      );
-      const ENVS_PATH = getTestJsonFilePath(
-        "secret-envs-persistence-scripting-envs.json",
-        "environment"
-      );
-      const args = `test ${COLL_PATH} --env ${ENVS_PATH}`;
-
-      const { error } = await runCLI(args);
-      expect(error).toBeNull();
-    });
-  });
 });
 
-describe("Test `hopp test <file> --delay <delay_in_ms>` command:", () => {
-  const VALID_TEST_ARGS = `test ${getTestJsonFilePath("passes-coll.json", "collection")}`;
+describe("Test 'hopp test <file> --delay <delay_in_ms>' command:", () => {
+  const VALID_TEST_ARGS = `test ${getTestJsonFilePath(
+    "passes.json"
+  )}`;
 
-  test("Errors with the code `INVALID_ARGUMENT` on not supplying a delay value", async () => {
+  test("No value passed to delay flag.", async () => {
     const args = `${VALID_TEST_ARGS} --delay`;
     const { stderr } = await runCLI(args);
 
@@ -321,7 +142,7 @@ describe("Test `hopp test <file> --delay <delay_in_ms>` command:", () => {
     expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
-  test("Errors with the code `INVALID_ARGUMENT` on supplying an invalid delay value", async () => {
+  test("Invalid value passed to delay flag.", async () => {
     const args = `${VALID_TEST_ARGS} --delay 'NaN'`;
     const { stderr } = await runCLI(args);
 
@@ -329,17 +150,10 @@ describe("Test `hopp test <file> --delay <delay_in_ms>` command:", () => {
     expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
-  test("Successfully performs delayed request execution for a valid delay value", async () => {
+  test("Valid value passed to delay flag.", async () => {
     const args = `${VALID_TEST_ARGS} --delay 1`;
     const { error } = await runCLI(args);
 
     expect(error).toBeNull();
   });
-
-  test("Works with the short `-d` flag", async () => {
-    const args = `${VALID_TEST_ARGS} -d 1`;
-    const { error } = await runCLI(args);
-
-    expect(error).toBeNull();
-  });
 });

packages/hoppscotch-cli/src/__tests__/functions/checks/isRESTCollection.spec.ts

@@ -0,0 +1,84 @@
+import { isRESTCollection } from "../../../utils/checks";
+
+describe("isRESTCollection", () => {
+  test("Undefined collection value.", () => {
+    expect(isRESTCollection(undefined)).toBeFalsy();
+  });
+
+  test("Invalid id value.", () => {
+    expect(
+      isRESTCollection({
+        v: 1,
+        name: "test",
+        id: 1,
+      })
+    ).toBeFalsy();
+  });
+
+  test("Invalid requests value.", () => {
+    expect(
+      isRESTCollection({
+        v: 1,
+        name: "test",
+        id: "1",
+        requests: null,
+      })
+    ).toBeFalsy();
+  });
+
+  test("Invalid folders value.", () => {
+    expect(
+      isRESTCollection({
+        v: 1,
+        name: "test",
+        id: "1",
+        requests: [],
+        folders: undefined,
+      })
+    ).toBeFalsy();
+  });
+
+  test("Invalid RESTCollection(s) in folders.", () => {
+    expect(
+      isRESTCollection({
+        v: 1,
+        name: "test",
+        id: "1",
+        requests: [],
+        folders: [
+          {
+            v: 1,
+            name: "test1",
+            id: "2",
+            requests: undefined,
+            folders: [],
+          },
+        ],
+      })
+    ).toBeFalsy();
+  });
+
+  test("Invalid HoppRESTRequest(s) in requests.", () => {
+    expect(
+      isRESTCollection({
+        v: 1,
+        name: "test",
+        id: "1",
+        requests: [{}],
+        folders: [],
+      })
+    ).toBeFalsy();
+  });
+
+  test("Valid RESTCollection.", () => {
+    expect(
+      isRESTCollection({
+        v: 1,
+        name: "test",
+        id: "1",
+        requests: [],
+        folders: [],
+      })
+    ).toBeTruthy();
+  });
+});

packages/hoppscotch-cli/src/__tests__/samples/collection-level-headers-auth.json

@@ -1,23 +1,23 @@
 [
   {
-    "v": 2,
+    "v": 1,
     "name": "CollectionA",
     "folders": [
       {
-        "v": 2,
+        "v": 1,
         "name": "FolderA",
         "folders": [
           {
-            "v": 2,
+            "v": 1,
             "name": "FolderB",
             "folders": [
               {
-                "v": 2,
+                "v": 1,
                 "name": "FolderC",
                 "folders": [],
                 "requests": [
                   {
-                    "v": "3",
+                    "v": "1",
                     "endpoint": "https://echo.hoppscotch.io",
                     "name": "RequestD",
                     "params": [],
@@ -40,8 +40,7 @@
                     "body": {
                       "contentType": null,
                       "body": null
-                    },
-                    "requestVariables": []
+                    }
                   }
                 ],
                 "auth": {
@@ -53,7 +52,7 @@
             ],
             "requests": [
               {
-                "v": "3",
+                "v": "1",
                 "endpoint": "https://echo.hoppscotch.io",
                 "name": "RequestC",
                 "params": [],
@@ -68,14 +67,13 @@
                 "body": {
                   "contentType": null,
                   "body": null
-                },
-                "requestVariables": []
+                }
               }
             ],
             "auth": {
               "authType": "api-key",
               "authActive": true,
-              "addTo": "HEADERS",
+              "addTo": "Headers",
               "key": "key",
               "value": "test-key"
             },
@@ -90,7 +88,7 @@
         ],
         "requests": [
           {
-            "v": "3",
+            "v": "1",
             "endpoint": "https://echo.hoppscotch.io",
             "name": "RequestB",
             "params": [],
@@ -106,7 +104,6 @@
               "contentType": null,
               "body": null
             },
-            "requestVariables": [],
             "id": "clpttpdq00003qp16kut6doqv"
           }
         ],
@@ -119,7 +116,7 @@
     ],
     "requests": [
       {
-        "v": "3",
+        "v": "1",
         "endpoint": "https://echo.hoppscotch.io",
         "name": "RequestA",
         "params": [],
@@ -135,7 +132,6 @@
           "contentType": null,
           "body": null
         },
-        "requestVariables": [],
         "id": "clpttpdq00003qp16kut6doqv"
       }
     ],
@@ -153,16 +149,16 @@
     }
   },
   {
-    "v": 2,
+    "v": 1,
     "name": "CollectionB",
     "folders": [
       {
-        "v": 2,
+        "v": 1,
         "name": "FolderA",
         "folders": [],
         "requests": [
           {
-            "v": "3",
+            "v": "1",
             "endpoint": "https://echo.hoppscotch.io",
             "name": "RequestB",
             "params": [],
@@ -178,7 +174,6 @@
               "contentType": null,
               "body": null
             },
-            "requestVariables": [],
             "id": "clpttpdq00003qp16kut6doqv"
           }
         ],
@@ -191,7 +186,7 @@
     ],
     "requests": [
       {
-        "v": "3",
+        "v": "1",
         "endpoint": "https://echo.hoppscotch.io",
         "name": "RequestA",
         "params": [],
@@ -207,7 +202,6 @@
           "contentType": null,
           "body": null
         },
-        "requestVariables": [],
         "id": "clpttpdq00003qp16kut6doqv"
       }
     ],
@@ -224,4 +218,4 @@
       "token": "BearerToken"
     }
   }
-]
+]

packages/hoppscotch-cli/src/__tests__/samples/collections/coll-v1-req-v0.json

@@ -1,55 +0,0 @@
-{
-  "v": 1,
-  "name": "coll-v1",
-  "folders": [
-    {
-      "v": 1,
-      "name": "coll-v1-child",
-      "folders": [],
-      "requests": [
-        {
-          "url": "https://echo.hoppscotch.io",
-          "path": "/get",
-          "headers": [
-            { "key": "Inactive-Header", "value": "Inactive Header", "active": false },
-            { "key": "Authorization", "value": "Bearer token123", "active": true }
-          ],
-          "params": [
-            { "key": "key", "value": "value", "active": true },
-            { "key": "inactive-key", "value": "inactive-param", "active": false }
-          ],
-          "name": "req-v0-II",
-          "method": "GET",
-          "preRequestScript": "",
-          "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-          "contentType": "application/json",
-          "body": "",
-          "auth": "Bearer Token",
-          "bearerToken": "token123"
-        }
-      ]
-    }
-  ],
-  "requests": [
-    {
-      "url": "https://echo.hoppscotch.io",
-      "path": "/get",
-      "headers": [
-        { "key": "Inactive-Header", "value": "Inactive Header", "active": false },
-        { "key": "Authorization", "value": "Bearer token123", "active": true }
-      ],
-      "params": [
-        { "key": "key", "value": "value", "active": true },
-        { "key": "inactive-key", "value": "inactive-param", "active": false }
-      ],
-      "name": "req-v0",
-      "method": "GET",
-      "preRequestScript": "",
-      "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-      "contentType": "application/json",
-      "body": "",
-      "auth": "Bearer Token",
-      "bearerToken": "token123"
-    }
-  ]
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/coll-v1-req-v1.json

@@ -1,97 +0,0 @@
-{
-    "v": 1,
-    "name": "coll-v1",
-    "folders": [
-        {
-            "v": 1,
-            "name": "coll-v1-child",
-            "folders": [],
-            "requests": [
-                {
-                    "v": "1",
-                    "endpoint": "https://echo.hoppscotch.io",
-                    "headers": [
-                        {
-                            "key": "Inactive-Header",
-                            "value": "Inactive Header",
-                            "active": false
-                        },
-                        {
-                            "key": "Authorization",
-                            "value": "Bearer token123",
-                            "active": true
-                        }
-                    ],
-                    "params": [
-                        {
-                            "key": "key",
-                            "value": "value",
-                            "active": true
-                        },
-                        {
-                            "key": "inactive-key",
-                            "value": "inactive-param",
-                            "active": false
-                        }
-                    ],
-                    "name": "req-v1-II",
-                    "method": "GET",
-                    "preRequestScript": "",
-                    "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-                    "body": {
-                        "contentType": null,
-                        "body": null
-                    },
-                    "auth": {
-                        "authType": "bearer",
-                        "authActive": true,
-                        "token": "token123"
-                    }
-                }
-            ]
-        }
-    ],
-    "requests": [
-        {
-            "v": "1",
-            "endpoint": "https://echo.hoppscotch.io",
-            "headers": [
-                {
-                    "key": "Inactive-Header",
-                    "value": "Inactive Header",
-                    "active": false
-                },
-                {
-                    "key": "Authorization",
-                    "value": "Bearer token123",
-                    "active": true
-                }
-            ],
-            "params": [
-                {
-                    "key": "key",
-                    "value": "value",
-                    "active": true
-                },
-                {
-                    "key": "inactive-key",
-                    "value": "inactive-param",
-                    "active": false
-                }
-            ],
-            "name": "req-v1",
-            "method": "GET",
-            "preRequestScript": "",
-            "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-            "body": {
-                "contentType": null,
-                "body": null
-            },
-            "auth": {
-                "authType": "bearer",
-                "authActive": true,
-                "token": "token123"
-            }
-        }
-    ]
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/coll-v2-req-v2.json

@@ -1,109 +0,0 @@
-{
-    "v": 2,
-    "name": "coll-v2",
-    "folders": [
-        {
-            "v": 2,
-            "name": "coll-v2-child",
-            "folders": [],
-            "requests": [
-                {
-                    "v": "2",
-                    "endpoint": "https://echo.hoppscotch.io",
-                    "headers": [
-                        {
-                            "key": "Inactive-Header",
-                            "value": "Inactive Header",
-                            "active": false
-                        },
-                        {
-                            "key": "Authorization",
-                            "value": "Bearer token123",
-                            "active": true
-                        }
-                    ],
-                    "params": [
-                        {
-                            "key": "key",
-                            "value": "value",
-                            "active": true
-                        },
-                        {
-                            "key": "inactive-key",
-                            "value": "inactive-param",
-                            "active": false
-                        }
-                    ],
-                    "name": "req-v2-II",
-                    "method": "GET",
-                    "preRequestScript": "",
-                    "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-                    "body": {
-                        "contentType": null,
-                        "body": null
-                    },
-                    "auth": {
-                        "authType": "bearer",
-                        "authActive": true,
-                        "token": "token123"
-                    },
-                    "requestVariables": []
-                }
-            ],
-            "auth": {
-                "authType": "inherit",
-                "authActive": true
-            },
-            "headers": []
-        }
-    ],
-    "requests": [
-        {
-            "v": "2",
-            "endpoint": "https://echo.hoppscotch.io",
-            "headers": [
-                {
-                    "key": "Inactive-Header",
-                    "value": "Inactive Header",
-                    "active": false
-                },
-                {
-                    "key": "Authorization",
-                    "value": "Bearer token123",
-                    "active": true
-                }
-            ],
-            "params": [
-                {
-                    "key": "key",
-                    "value": "value",
-                    "active": true
-                },
-                {
-                    "key": "inactive-key",
-                    "value": "inactive-param",
-                    "active": false
-                }
-            ],
-            "name": "req-v2",
-            "method": "GET",
-            "preRequestScript": "",
-            "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-            "body": {
-                "contentType": null,
-                "body": null
-            },
-            "auth": {
-                "authType": "bearer",
-                "authActive": true,
-                "token": "token123"
-            },
-            "requestVariables": []
-        }
-    ],
-    "auth": {
-        "authType": "inherit",
-        "authActive": true
-    },
-    "headers": []
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/coll-v2-req-v3.json

@@ -1,109 +0,0 @@
-{
-    "v": 2,
-    "name": "coll-v2",
-    "folders": [
-        {
-            "v": 2,
-            "name": "coll-v2-child",
-            "folders": [],
-            "requests": [
-                {
-                    "v": "3",
-                    "endpoint": "https://echo.hoppscotch.io",
-                    "headers": [
-                        {
-                            "key": "Inactive-Header",
-                            "value": "Inactive Header",
-                            "active": false
-                        },
-                        {
-                            "key": "Authorization",
-                            "value": "Bearer token123",
-                            "active": true
-                        }
-                    ],
-                    "params": [
-                        {
-                            "key": "key",
-                            "value": "value",
-                            "active": true
-                        },
-                        {
-                            "key": "inactive-key",
-                            "value": "inactive-param",
-                            "active": false
-                        }
-                    ],
-                    "name": "req-v3-II",
-                    "method": "GET",
-                    "preRequestScript": "",
-                    "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-                    "body": {
-                        "contentType": null,
-                        "body": null
-                    },
-                    "auth": {
-                        "authType": "bearer",
-                        "authActive": true,
-                        "token": "token123"
-                    },
-                    "requestVariables": []
-                }
-            ],
-            "auth": {
-                "authType": "inherit",
-                "authActive": true
-            },
-            "headers": []
-        }
-    ],
-    "requests": [
-        {
-            "v": "3",
-            "endpoint": "https://echo.hoppscotch.io",
-            "headers": [
-                {
-                    "key": "Inactive-Header",
-                    "value": "Inactive Header",
-                    "active": false
-                },
-                {
-                    "key": "Authorization",
-                    "value": "Bearer token123",
-                    "active": true
-                }
-            ],
-            "params": [
-                {
-                    "key": "key",
-                    "value": "value",
-                    "active": true
-                },
-                {
-                    "key": "inactive-key",
-                    "value": "inactive-param",
-                    "active": false
-                }
-            ],
-            "name": "req-v3",
-            "method": "GET",
-            "preRequestScript": "",
-            "testScript": "pw.test(\"Asserts request params\", () => {\n  pw.expect(pw.response.body.args.key).toBe(\"value\")\n  pw.expect(pw.response.body.args[\"inactive-key\"]).toBe(undefined)\n})\n\npw.test(\"Asserts request headers\", () => {\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer token123\")\n  pw.expect(pw.response.body.headers[\"inactive-header\"]).toBe(undefined)\n})",
-            "body": {
-                "contentType": null,
-                "body": null
-            },
-            "auth": {
-                "authType": "bearer",
-                "authActive": true,
-                "token": "token123"
-            },
-            "requestVariables": []
-        }
-    ],
-    "auth": {
-        "authType": "inherit",
-        "authActive": true
-    },
-    "headers": []
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/pre-req-script-env-var-persistence-coll.json

@@ -1,22 +0,0 @@
-{
-  "v": 2,
-  "name": "pre-req-script-env-var-persistence-coll",
-  "folders": [],
-  "requests": [
-    {
-      "v": "3",
-      "auth": { "authType": "none", "authActive": true },
-      "body": { "body": null, "contentType": null },
-      "name": "sample-req",
-      "method": "GET",
-      "params": [],
-      "headers": [],
-      "endpoint": "https://echo.hoppscotch.io",
-      "testScript": "pw.expect(pw.env.get(\"variable\")).toBe(\"value\")",
-      "preRequestScript": "pw.env.set(\"variable\", \"value\");",
-      "requestVariables": []
-    }
-  ],
-  "auth": { "authType": "inherit", "authActive": true },
-  "headers": []
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/sample-coll.json

@@ -1,26 +0,0 @@
-{
-    "v": 1,
-    "name": "tests",
-    "folders": [],
-    "requests": [
-        {
-            "v": "2",
-            "endpoint": "<<baseURL>>",
-            "name": "",
-            "params": [],
-            "headers": [],
-            "method": "GET",
-            "auth": {
-                "authType": "none",
-                "authActive": true
-            },
-            "preRequestScript": "",
-            "testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n});",
-            "body": {
-                "contentType": null,
-                "body": null
-              },
-            "requestVariables": []
-        }
-    ]
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/secret-envs-coll.json

@@ -1,143 +0,0 @@
-{
-  "v": 2,
-  "name": "secret-envs-coll",
-  "folders": [],
-  "requests": [
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-headers",
-      "method": "GET",
-      "params": [],
-      "headers": [
-        {
-          "key": "Secret-Header-Key",
-          "value": "<<secretHeaderValue>>",
-          "active": true
-        }
-      ],
-      "requestVariables": [],
-      "endpoint": "<<echoHoppBaseURL>>/headers",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the header value\", () => {\n    const secretHeaderValue = pw.env.get(\"secretHeaderValue\")\n    pw.expect(secretHeaderValue).toBe(\"secret-header-value\")\n    \n    if (secretHeaderValue) {\n      pw.expect(pw.response.body.headers[\"secret-header-key\"]).toBe(secretHeaderValue)\n    }\n\n    pw.expect(pw.env.get(\"secretHeaderValueFromPreReqScript\")).toBe(\"secret-header-value\")\n})",
-      "preRequestScript": "const secretHeaderValueFromPreReqScript = pw.env.get(\"secretHeaderValue\")\npw.env.set(\"secretHeaderValueFromPreReqScript\", secretHeaderValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": "{\n  \"secretBodyKey\": \"<<secretBodyValue>>\"\n}",
-        "contentType": "application/json"
-      },
-      "name": "test-secret-body",
-      "method": "POST",
-      "params": [],
-      "headers": [],
-      "requestVariables": [],
-      "endpoint": "<<echoHoppBaseURL>>/post",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the request body value\", () => {\n    const secretBodyValue = pw.env.get(\"secretBodyValue\")\n    pw.expect(secretBodyValue).toBe(\"secret-body-value\")\n  \n    if (secretBodyValue) {\n      pw.expect(JSON.parse(pw.response.body.data).secretBodyKey).toBe(secretBodyValue)\n    }\n\n    pw.expect(pw.env.get(\"secretBodyValueFromPreReqScript\")).toBe(\"secret-body-value\")\n})",
-      "preRequestScript": "const secretBodyValueFromPreReqScript = pw.env.get(\"secretBodyValue\")\npw.env.set(\"secretBodyValueFromPreReqScript\", secretBodyValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-query-params",
-      "method": "GET",
-      "params": [
-        {
-          "key": "secretQueryParamKey",
-          "value": "<<secretQueryParamValue>>",
-          "active": true
-        }
-      ],
-      "headers": [],
-      "requestVariables": [],
-      "endpoint": "<<echoHoppBaseURL>>",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the query param value\", () => {\n    const secretQueryParamValue = pw.env.get(\"secretQueryParamValue\")\n    pw.expect(secretQueryParamValue).toBe(\"secret-query-param-value\")\n    \n    if (secretQueryParamValue) {\n      pw.expect(pw.response.body.args.secretQueryParamKey).toBe(secretQueryParamValue)\n    }\n\n    pw.expect(pw.env.get(\"secretQueryParamValueFromPreReqScript\")).toBe(\"secret-query-param-value\")\n})",
-      "preRequestScript": "const secretQueryParamValueFromPreReqScript = pw.env.get(\"secretQueryParamValue\")\npw.env.set(\"secretQueryParamValueFromPreReqScript\", secretQueryParamValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "basic",
-        "password": "<<secretBasicAuthPassword>>",
-        "username": "<<secretBasicAuthUsername>>",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-basic-auth",
-      "method": "GET",
-      "params": [],
-      "headers": [],
-      "requestVariables": [],
-      "endpoint": "<<httpbinBaseURL>>/basic-auth/<<secretBasicAuthUsername>>/<<secretBasicAuthPassword>>",
-      "testScript": "pw.test(\"Successfully parses secret variables holding basic auth credentials\", () => {\n\tconst secretBasicAuthUsername = pw.env.get(\"secretBasicAuthUsername\")\n  \tconst secretBasicAuthPassword = pw.env.get(\"secretBasicAuthPassword\")\n\n    pw.expect(secretBasicAuthUsername).toBe(\"test-user\")\n    pw.expect(secretBasicAuthPassword).toBe(\"test-pass\")\n\n    // The endpoint at times results in a `502` bad gateway\n    if (pw.response.status !== 200) {\n      return\n    }\n\n    if (secretBasicAuthUsername && secretBasicAuthPassword) {\n      const { authenticated, user } = pw.response.body\n      pw.expect(authenticated).toBe(true)\n      pw.expect(user).toBe(secretBasicAuthUsername)\n    }\n});",
-      "preRequestScript": ""
-    },
-    {
-      "v": "3",
-      "auth": {
-        "token": "<<secretBearerToken>>",
-        "authType": "bearer",
-        "password": "testpassword",
-        "username": "testuser",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-bearer-auth",
-      "method": "GET",
-      "params": [],
-      "headers": [],
-      "requestVariables": [],
-      "endpoint": "<<httpbinBaseURL>>/bearer",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the bearer token\", () => {\n    const secretBearerToken = pw.env.get(\"secretBearerToken\")\n  const preReqSecretBearerToken = pw.env.get(\"preReqSecretBearerToken\")\n\n    pw.expect(secretBearerToken).toBe(\"test-token\")\n\n    // Safeguard to prevent test failures due to the endpoint\n    if (pw.response.status !== 200) {\n      return\n    }\n\n    if (secretBearerToken) { \n      pw.expect(pw.response.body.token).toBe(secretBearerToken)\n      pw.expect(preReqSecretBearerToken).toBe(\"test-token\")\n    }\n});",
-      "preRequestScript": "const secretBearerToken = pw.env.get(\"secretBearerToken\")\npw.env.set(\"preReqSecretBearerToken\", secretBearerToken)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-fallback",
-      "method": "GET",
-      "params": [],
-      "headers": [],
-      "requestVariables": [],
-      "endpoint": "<<echoHoppBaseURL>>",
-      "testScript": "pw.test(\"Returns an empty string if the value for a secret environment variable is not found in the system environment\", () => {\n  pw.expect(pw.env.get(\"nonExistentValueInSystemEnv\")).toBe(\"\")\n})",
-      "preRequestScript": ""
-    }
-  ],
-  "auth": {
-    "authType": "inherit",
-    "authActive": false
-  },
-  "headers": []
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/secret-envs-persistence-coll.json

@@ -1,149 +0,0 @@
-{
-  "v": 2,
-  "name": "secret-envs-persistence-coll",
-  "folders": [],
-  "requests": [
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-headers",
-      "method": "GET",
-      "params": [],
-      "requestVariables": [],
-      "headers": [
-        {
-          "key": "Secret-Header-Key",
-          "value": "<<secretHeaderValue>>",
-          "active": true
-        }
-      ],
-      "endpoint": "<<echoHoppBaseURL>>",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the header value\", () => {\n    const secretHeaderValue = pw.env.getResolve(\"secretHeaderValue\")\n    pw.expect(secretHeaderValue).toBe(\"secret-header-value\")\n    \n    if (secretHeaderValue) {\n      pw.expect(pw.response.body.headers[\"secret-header-key\"]).toBe(secretHeaderValue)\n    }\n\n    pw.expect(pw.env.getResolve(\"secretHeaderValueFromPreReqScript\")).toBe(\"secret-header-value\")\n})",
-      "preRequestScript": "pw.env.set(\"secretHeaderValue\", \"secret-header-value\")\n\nconst secretHeaderValueFromPreReqScript = pw.env.getResolve(\"secretHeaderValue\")\npw.env.set(\"secretHeaderValueFromPreReqScript\", secretHeaderValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-headers-overrides",
-      "method": "GET",
-      "params": [],
-      "requestVariables": [],
-      "headers": [
-        {
-          "key": "Secret-Header-Key",
-          "value": "<<secretHeaderValue>>",
-          "active": true
-        }
-      ],
-      "endpoint": "<<echoHoppBaseURL>>",
-      "testScript": "pw.test(\"Value set at the pre-request script takes precedence\", () => {\n    const secretHeaderValue = pw.env.getResolve(\"secretHeaderValue\")\n    pw.expect(secretHeaderValue).toBe(\"secret-header-value-overriden\")\n    \n    if (secretHeaderValue) {\n      pw.expect(pw.response.body.headers[\"secret-header-key\"]).toBe(secretHeaderValue)\n    }\n\n    pw.expect(pw.env.getResolve(\"secretHeaderValueFromPreReqScript\")).toBe(\"secret-header-value-overriden\")\n})",
-      "preRequestScript": "pw.env.set(\"secretHeaderValue\", \"secret-header-value-overriden\")\n\nconst secretHeaderValueFromPreReqScript = pw.env.getResolve(\"secretHeaderValue\")\npw.env.set(\"secretHeaderValueFromPreReqScript\", secretHeaderValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": "{\n  \"secretBodyKey\": \"<<secretBodyValue>>\"\n}",
-        "contentType": "application/json"
-      },
-      "name": "test-secret-body",
-      "method": "POST",
-      "params": [],
-      "requestVariables": [],
-      "headers": [],
-      "endpoint": "<<echoHoppBaseURL>>/post",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the request body value\", () => {\n    const secretBodyValue = pw.env.get(\"secretBodyValue\")\n    pw.expect(secretBodyValue).toBe(\"secret-body-value\")\n  \n    if (secretBodyValue) {\n      pw.expect(JSON.parse(pw.response.body.data).secretBodyKey).toBe(secretBodyValue)\n    }\n\n    pw.expect(pw.env.get(\"secretBodyValueFromPreReqScript\")).toBe(\"secret-body-value\")\n})",
-      "preRequestScript": "const secretBodyValue = pw.env.get(\"secretBodyValue\")\n\nif (!secretBodyValue) { \n  pw.env.set(\"secretBodyValue\", \"secret-body-value\")\n}\n\nconst secretBodyValueFromPreReqScript = pw.env.get(\"secretBodyValue\")\npw.env.set(\"secretBodyValueFromPreReqScript\", secretBodyValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "none",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-query-params",
-      "method": "GET",
-      "params": [
-        {
-          "key": "secretQueryParamKey",
-          "value": "<<secretQueryParamValue>>",
-          "active": true
-        }
-      ],
-      "requestVariables": [],
-      "headers": [],
-      "endpoint": "<<echoHoppBaseURL>>",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the query param value\", () => {\n    const secretQueryParamValue = pw.env.get(\"secretQueryParamValue\")\n    pw.expect(secretQueryParamValue).toBe(\"secret-query-param-value\")\n    \n    if (secretQueryParamValue) {\n      pw.expect(pw.response.body.args.secretQueryParamKey).toBe(secretQueryParamValue)\n    }\n\n    pw.expect(pw.env.get(\"secretQueryParamValueFromPreReqScript\")).toBe(\"secret-query-param-value\")\n})",
-      "preRequestScript": "const secretQueryParamValue = pw.env.get(\"secretQueryParamValue\")\n\nif (!secretQueryParamValue) {\n  pw.env.set(\"secretQueryParamValue\", \"secret-query-param-value\")\n}\n\nconst secretQueryParamValueFromPreReqScript = pw.env.get(\"secretQueryParamValue\")\npw.env.set(\"secretQueryParamValueFromPreReqScript\", secretQueryParamValueFromPreReqScript)"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "authType": "basic",
-        "password": "<<secretBasicAuthPassword>>",
-        "username": "<<secretBasicAuthUsername>>",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-basic-auth",
-      "method": "GET",
-      "params": [],
-      "requestVariables": [],
-      "headers": [],
-      "endpoint": "<<httpbinBaseURL>>/basic-auth/<<secretBasicAuthUsername>>/<<secretBasicAuthPassword>>",
-      "testScript": "pw.test(\"Successfully parses secret variables holding basic auth credentials\", () => {\n\tconst secretBasicAuthUsername = pw.env.get(\"secretBasicAuthUsername\")\n  \tconst secretBasicAuthPassword = pw.env.get(\"secretBasicAuthPassword\")\n\n    pw.expect(secretBasicAuthUsername).toBe(\"test-user\")\n    pw.expect(secretBasicAuthPassword).toBe(\"test-pass\")\n\n    // The endpoint at times results in a `502` bad gateway\n    if (pw.response.status !== 200) {\n      return\n    }\n\n    if (secretBasicAuthUsername && secretBasicAuthPassword) {\n      const { authenticated, user } = pw.response.body\n      pw.expect(authenticated).toBe(true)\n      pw.expect(user).toBe(secretBasicAuthUsername)\n    }\n});",
-      "preRequestScript": "let secretBasicAuthUsername = pw.env.get(\"secretBasicAuthUsername\")\n\nlet secretBasicAuthPassword = pw.env.get(\"secretBasicAuthPassword\")\n\nif (!secretBasicAuthUsername) {\n  pw.env.set(\"secretBasicAuthUsername\", \"test-user\")\n}\n\nif (!secretBasicAuthPassword) {\n  pw.env.set(\"secretBasicAuthPassword\", \"test-pass\")\n}"
-    },
-    {
-      "v": "3",
-      "auth": {
-        "token": "<<secretBearerToken>>",
-        "authType": "bearer",
-        "password": "testpassword",
-        "username": "testuser",
-        "authActive": true
-      },
-      "body": {
-        "body": null,
-        "contentType": null
-      },
-      "name": "test-secret-bearer-auth",
-      "method": "GET",
-      "params": [],
-      "requestVariables": [],
-      "headers": [],
-      "endpoint": "<<httpbinBaseURL>>/bearer",
-      "testScript": "pw.test(\"Successfully parses secret variable holding the bearer token\", () => {\n    const secretBearerToken = pw.env.resolve(\"<<secretBearerToken>>\")\n  const preReqSecretBearerToken = pw.env.resolve(\"<<preReqSecretBearerToken>>\")\n\n    pw.expect(secretBearerToken).toBe(\"test-token\")\n\n    // Safeguard to prevent test failures due to the endpoint\n    if (pw.response.status !== 200) {\n      return\n    }\n\n    if (secretBearerToken) { \n      pw.expect(pw.response.body.token).toBe(secretBearerToken)\n      pw.expect(preReqSecretBearerToken).toBe(\"test-token\")\n    }\n});",
-      "preRequestScript": "let secretBearerToken = pw.env.resolve(\"<<secretBearerToken>>\")\n\nif (!secretBearerToken) {\n  pw.env.set(\"secretBearerToken\", \"test-token\")\n  secretBearerToken = pw.env.resolve(\"<<secretBearerToken>>\")\n}\n\npw.env.set(\"preReqSecretBearerToken\", secretBearerToken)"
-    }
-  ],
-  "auth": {
-    "authType": "inherit",
-    "authActive": false
-  },
-  "headers": []
-}

packages/hoppscotch-cli/src/__tests__/samples/collections/secret-envs-persistence-scripting-coll.json

@@ -1,31 +0,0 @@
-{
-  "v": 2,
-  "name": "secret-envs-persistence-scripting-req",
-  "folders": [],
-  "requests": [
-    {
-      "v": "3",
-      "endpoint": "https://echo.hoppscotch.io/post",
-      "name": "req",
-      "params": [],
-      "headers": [
-        {
-          "active": true,
-          "key": "Custom-Header",
-          "value": "<<customHeaderValueFromSecretVar>>"
-        }
-      ],
-      "method": "POST",
-      "auth": { "authType": "none", "authActive": true },
-      "preRequestScript": "pw.env.set(\"preReqVarOne\", \"pre-req-value-one\")\n\npw.env.set(\"preReqVarTwo\", \"pre-req-value-two\")\n\npw.env.set(\"customHeaderValueFromSecretVar\", \"custom-header-secret-value\")\n\npw.env.set(\"customBodyValue\", \"custom-body-value\")",
-      "testScript": "pw.test(\"Secret environment value set from the pre-request script takes precedence\", () => {\n  pw.expect(pw.env.get(\"preReqVarOne\")).toBe(\"pre-req-value-one\")\n})\n\npw.test(\"Successfully sets initial value for the secret variable from the pre-request script\", () => {\n  pw.env.set(\"postReqVarTwo\", \"post-req-value-two\")\n  pw.expect(pw.env.get(\"postReqVarTwo\")).toBe(\"post-req-value-two\")\n})\n\npw.test(\"Successfully resolves secret variable values referred in request headers that are set in pre-request script\", () => {\n  pw.expect(pw.response.body.headers[\"custom-header\"]).toBe(\"custom-header-secret-value\")\n})\n\npw.test(\"Successfully resolves secret variable values referred in request body that are set in pre-request script\", () => {\n  pw.expect(JSON.parse(pw.response.body.data).key).toBe(\"custom-body-value\")\n})\n\npw.test(\"Secret environment variable set from the post-request script takes precedence\", () => {\n  pw.env.set(\"postReqVarOne\", \"post-req-value-one\")\n  pw.expect(pw.env.get(\"postReqVarOne\")).toBe(\"post-req-value-one\")\n})\n\npw.test(\"Successfully sets initial value for the secret variable from the post-request script\", () => {\n  pw.env.set(\"postReqVarTwo\", \"post-req-value-two\")\n  pw.expect(pw.env.get(\"postReqVarTwo\")).toBe(\"post-req-value-two\")\n})\n\npw.test(\"Successfully removes environment variables via the pw.env.unset method\", () => {\n  pw.env.unset(\"preReqVarOne\")\n  pw.env.unset(\"postReqVarTwo\")\n\n  pw.expect(pw.env.get(\"preReqVarOne\")).toBe(undefined)\n  pw.expect(pw.env.get(\"postReqVarTwo\")).toBe(undefined)\n})",
-      "body": {
-        "contentType": "application/json",
-        "body": "{\n  \"key\": \"<<customBodyValue>>\"\n}"
-      },
-      "requestVariables": []
-    }
-  ],
-  "auth": { "authType": "inherit", "authActive": false },
-  "headers": []
-}

packages/hoppscotch-cli/src/__tests__/samples/env-flag-tests.json

@@ -4,7 +4,7 @@
   "folders": [],
   "requests": [
     {
-      "v": "3",
+      "v": "1",
       "endpoint": "<<URL>>",
       "name": "test1",
       "params": [],
@@ -16,8 +16,7 @@
       "body": {
         "contentType": "application/json",
         "body": "{\n  \"<<BODY_KEY>>\":\"<<BODY_VALUE>>\"\n}"
-      },
-      "requestVariables": []
+      }
     }
   ]
 }

packages/hoppscotch-cli/src/__tests__/samples/environments/bulk-envs.json

@@ -1,32 +0,0 @@
-[
-  {
-    "v": 0,
-    "name": "Env-I",
-    "variables": [
-      {
-        "key": "firstName",
-        "value": "John"
-      },
-      {
-        "key": "lastName",
-        "value": "Doe"
-      }
-    ]
-  },
-  {
-    "v": 1,
-    "id": "2",
-    "name": "Env-II",
-    "variables": [
-      {
-        "key": "baseUrl",
-        "value": "https://echo.hoppscotch.io",
-        "secret": false
-      },
-      {
-        "key": "secretVar",
-        "secret": true
-      }
-    ]
-  }
-]

packages/hoppscotch-cli/src/__tests__/samples/environments/env-v0.json

@@ -1,9 +0,0 @@
-{
-  "name": "env-v0",
-  "variables": [
-    {
-      "key": "baseURL",
-      "value": "https://echo.hoppscotch.io"
-    }
-  ]
-}

packages/hoppscotch-cli/src/__tests__/samples/environments/env-v1.json

@@ -1,10 +0,0 @@
-{
-    "name": "env-v0",
-    "variables": [
-      {
-        "key": "baseURL",
-        "value": "https://echo.hoppscotch.io",
-        "secret": false
-      }
-    ]
-  }

packages/hoppscotch-cli/src/__tests__/samples/environments/malformed-envs.json

@@ -1,16 +0,0 @@
-{
-  "id": 123,
-  "v": "1",
-  "name": "secret-envs",
-  "values": [
-    {
-      "key": "secretVar",
-      "secret": true
-    },
-    {
-      "key": "regularVar",
-      "secret": false,
-      "value": "regular-variable"
-    }
-  ]
-}

packages/hoppscotch-cli/src/__tests__/samples/environments/secret-envs-persistence-scripting-envs.json

@@ -1,27 +0,0 @@
-{
-  "v": 1,
-  "id": "2",
-  "name": "secret-envs-persistence-scripting-envs",
-  "variables": [
-    {
-      "key": "preReqVarOne",
-      "secret": true
-    },
-    {
-      "key": "preReqVarTwo",
-      "secret": true
-    },
-    {
-      "key": "postReqVarOne",
-      "secret": true
-    },
-    {
-      "key": "preReqVarTwo",
-      "secret": true
-    },
-    {
-      "key": "customHeaderValueFromSecretVar",
-      "secret": true
-    }
-  ]
-}

packages/hoppscotch-cli/src/__tests__/samples/environments/secret-envs.json

@@ -1,45 +0,0 @@
-{
-  "id": "2",
-  "v": 1,
-  "name": "secret-envs",
-  "variables": [
-    {
-      "key": "secretBearerToken",
-      "secret": true
-    },
-    {
-      "key": "secretBasicAuthUsername",
-      "secret": true
-    },
-    {
-      "key": "secretBasicAuthPassword",
-      "secret": true
-    },
-    {
-      "key": "secretQueryParamValue",
-      "secret": true
-    },
-    {
-      "key": "secretBodyValue",
-      "secret": true
-    },
-    {
-      "key": "secretHeaderValue",
-      "secret": true
-    },
-    {
-      "key": "nonExistentValueInSystemEnv",
-      "secret": true
-    },
-    {
-      "key": "echoHoppBaseURL",
-      "value": "https://echo.hoppscotch.io",
-      "secret": false
-    },
-    {
-      "key": "httpbinBaseURL",
-      "value": "https://httpbin.org",
-      "secret": false
-    }
-  ]
-}

packages/hoppscotch-cli/src/__tests__/samples/environments/secret-supplied-values-envs.json

@@ -1,51 +0,0 @@
-{
-  "v": 1,
-  "id": "2",
-  "name": "secret-values-envs",
-  "variables": [
-    {
-      "key": "secretBearerToken",
-      "value": "test-token",
-      "secret": true
-    },
-    {
-      "key": "secretBasicAuthUsername",
-      "value": "test-user",
-      "secret": true
-    },
-    {
-      "key": "secretBasicAuthPassword",
-      "value": "test-pass",
-      "secret": true
-    },
-    {
-      "key": "secretQueryParamValue",
-      "value": "secret-query-param-value",
-      "secret": true
-    },
-    {
-      "key": "secretBodyValue",
-      "value": "secret-body-value",
-      "secret": true
-    },
-    {
-      "key": "secretHeaderValue",
-      "value": "secret-header-value",
-      "secret": true
-    },
-    {
-      "key": "nonExistentValueInSystemEnv",
-      "secret": true
-    },
-    {
-      "key": "echoHoppBaseURL",
-      "value": "https://echo.hoppscotch.io",
-      "secret": false
-    },
-    {
-      "key": "httpbinBaseURL",
-      "value": "https://httpbin.org",
-      "secret": false
-    }
-  ]
-}

packages/hoppscotch-cli/src/__tests__/samples/fails.json

@@ -5,7 +5,7 @@
     "folders": [],
     "requests": [
       {
-        "v": "3",
+        "v": "1",
         "endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE1>>",
         "name": "",
         "params": [],
@@ -13,18 +13,20 @@
         "method": "GET",
         "auth": {
           "authType": "none",
-          "authActive": true
+          "authActive": true,
+          "addTo": "Headers",
+          "key": "",
+          "value": ""
         },
         "preRequestScript": "pw.env.set(\"HEADERS_TYPE1\", \"devblin_local1\");",
         "testScript": "// Check status code is 200\npwd.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"string\");\n});",
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE1>>\"\n}"
-        },
-        "requestVariables": []
+        }
       },
       {
-        "v": "3",
+        "v": "1",
         "endpoint": "https://echo.hoppscotch.dio/<<HEADERS_TYPE2>>",
         "name": "success",
         "params": [],
@@ -32,15 +34,17 @@
         "method": "GET",
         "auth": {
           "authType": "none",
-          "authActive": true
+          "authActive": true,
+          "addTo": "Headers",
+          "key": "",
+          "value": ""
         },
         "preRequestScript": "pw.env.setd(\"HEADERS_TYPE2\", \"devblin_local2\");",
         "testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(300);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n});",
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE2>>\"\n}"
-        },
-        "requestVariables": []
+        }
       }
     ]
   }

packages/hoppscotch-cli/src/__tests__/samples/malformed-collection.json

@@ -2,9 +2,9 @@
 	{
 		"v": 1,
 		"folders": [],
-		"requests":
+		"requests": 
 			{
-				"v": "3",
+				"v": "1",
 				"endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE1>>",
 				"name": "fail",
 				"params": [],
@@ -12,18 +12,20 @@
 				"method": "GET",
 				"auth": {
 					"authType": "none",
-					"authActive": true
+					"authActive": true,
+					"addTo": "Headers",
+					"key": "",
+					"value": ""
 				},
 				"preRequestScript": "pw.env.set(\"HEADERS_TYPE1\", \"devblin_local1\");",
 				"testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"string\");\n});",
 				"body": {
 					"contentType": "application/json",
 					"body": "{\n\"test\": \"<<HEADERS_TYPE1>>\"\n}"
-				},
-        "requestVariables": [],
+				}
 			},
 			{
-				"v": "3",
+				"v": "1",
 				"endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE2>>",
 				"name": "success",
 				"params": [],
@@ -31,15 +33,17 @@
 				"method": "GET",
 				"auth": {
 					"authType": "none",
-					"authActive": true
+					"authActive": true,
+					"addTo": "Headers",
+					"key": "",
+					"value": ""
 				},
 				"preRequestScript": "pw.env.set(\"HEADERS_TYPE2\", \"devblin_local2\");",
 				"testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(300);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n});",
 				"body": {
 					"contentType": "application/json",
 					"body": "{\n\"test\": \"<<HEADERS_TYPE2>>\"\n}"
-				},
-        "requestVariables": []
+				}
 			}
 		]
 	}

packages/hoppscotch-cli/src/__tests__/samples/notjson.txt

@@ -2,9 +2,9 @@
 	{
 		"v": 1,
 		"folders": [],
-		"requests":
+		"requests": 
 			{
-				"v": "2",
+				"v": "1",
 				"endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE1>>",
 				"name": "fail",
 				"params": [],
@@ -22,8 +22,7 @@
 				"body": {
 					"contentType": "application/json",
 					"body": "{\n\"test\": \"<<HEADERS_TYPE1>>\"\n}"
-				},
-        "requestVariables": []
+				}
 			}
 		]
 	}

packages/hoppscotch-cli/src/__tests__/samples/passes.json

@@ -5,7 +5,7 @@
     "folders": [],
     "requests": [
       {
-        "v": "3",
+        "v": "1",
         "endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE1>>",
         "name": "",
         "params": [],
@@ -13,18 +13,20 @@
         "method": "GET",
         "auth": {
           "authType": "none",
-          "authActive": true
+          "authActive": true,
+          "addTo": "Headers",
+          "key": "",
+          "value": ""
         },
         "preRequestScript": "pw.env.set(\"HEADERS_TYPE1\", \"devblin_local1\");",
         "testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n});",
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE1>>\"\n}"
-        },
-        "requestVariables": []
+        }
       },
       {
-        "v": "3",
+        "v": "1",
         "endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE2>>",
         "name": "success",
         "params": [],
@@ -32,15 +34,17 @@
         "method": "GET",
         "auth": {
           "authType": "none",
-          "authActive": true
+          "authActive": true,
+          "addTo": "Headers",
+          "key": "",
+          "value": ""
         },
         "preRequestScript": "pw.env.set(\"HEADERS_TYPE2\", \"devblin_local2\");",
         "testScript": "// Check status code is 200\npw.test(\"Status code is 200\", ()=> {\n    pw.expect(pw.response.status).toBe(200);\n});\n\n// Check JSON response property\npw.test(\"Check JSON response property\", ()=> {\n    pw.expect(pw.response.body.method).toBe(\"GET\");\n    pw.expect(pw.response.body.headers).toBeType(\"object\");\n});",
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE2>>\"\n}"
-        },
-        "requestVariables": []
+        }
       }
     ]
   }

packages/hoppscotch-cli/src/__tests__/samples/req-body-env-vars-coll.json

@@ -4,7 +4,7 @@
   "folders": [],
   "requests": [
     {
-      "v": "3",
+      "v": "1",
       "name": "test-request",
       "endpoint": "https://echo.hoppscotch.io",
       "method": "POST",
@@ -19,8 +19,7 @@
         "body": "{\n   \"firstName\": \"<<firstName>>\",\n   \"lastName\": \"<<lastName>>\",\n   \"greetText\": \"<<salutation>>, <<fullName>>\",\n   \"fullName\": \"<<fullName>>\",\n   \"id\": \"<<id>>\"\n}"
       },
       "preRequestScript": "",
-      "testScript": "pw.test(\"Status code is 200\", ()=> {\n  pw.expect(pw.response.status).toBe(200);\n});\n\npw.test(\"Successfully resolves environments recursively\", ()=> {\n  pw.expect(pw.env.getResolve(\"recursiveVarX\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"recursiveVarY\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"salutation\")).toBe(\"Hello\")\n});\n\npw.test(\"Successfully resolves environments referenced in the request body\", () => {\n  const expectedId = \"7\"\n  const expectedFirstName = \"John\"\n  const expectedLastName = \"Doe\"\n  const expectedFullName = `${expectedFirstName} ${expectedLastName}`\n  const expectedGreetText = `Hello, ${expectedFullName}`\n\n  pw.expect(pw.env.getResolve(\"recursiveVarX\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"recursiveVarY\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"salutation\")).toBe(\"Hello\")\n\n  const { id, firstName, lastName, fullName, greetText } = JSON.parse(pw.response.body.data)\n\n  pw.expect(id).toBe(expectedId)\n  pw.expect(expectedFirstName).toBe(firstName)\n  pw.expect(expectedLastName).toBe(lastName)\n  pw.expect(fullName).toBe(expectedFullName)\n  pw.expect(greetText).toBe(expectedGreetText)\n});",
-      "requestVariables": []
+      "testScript": "pw.test(\"Status code is 200\", ()=> {\n  pw.expect(pw.response.status).toBe(200);\n});\n\npw.test(\"Successfully resolves environments recursively\", ()=> {\n  pw.expect(pw.env.getResolve(\"recursiveVarX\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"recursiveVarY\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"salutation\")).toBe(\"Hello\")\n});\n\npw.test(\"Successfully resolves environments referenced in the request body\", () => {\n  const expectedId = \"7\"\n  const expectedFirstName = \"John\"\n  const expectedLastName = \"Doe\"\n  const expectedFullName = `${expectedFirstName} ${expectedLastName}`\n  const expectedGreetText = `Hello, ${expectedFullName}`\n\n  pw.expect(pw.env.getResolve(\"recursiveVarX\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"recursiveVarY\")).toBe(\"Hello\")\n  pw.expect(pw.env.getResolve(\"salutation\")).toBe(\"Hello\")\n\n  const { id, firstName, lastName, fullName, greetText } = JSON.parse(pw.response.body.data)\n\n  pw.expect(id).toBe(expectedId)\n  pw.expect(expectedFirstName).toBe(firstName)\n  pw.expect(expectedLastName).toBe(lastName)\n  pw.expect(fullName).toBe(expectedFullName)\n  pw.expect(greetText).toBe(expectedGreetText)\n});"
     }
   ],
   "auth": {

packages/hoppscotch-cli/src/__tests__/samples/req-body-env-vars-envs.json

@@ -1,5 +1,4 @@
 {
-  "v": 0,
   "name": "Response body sample",
   "variables": [
     {
@@ -35,4 +34,4 @@
       "value": "<<salutation>> <<fullName>>"
     }
   ]
-}
+}

packages/hoppscotch-cli/src/__tests__/utils.ts

@@ -3,16 +3,15 @@ import { resolve } from "path";
 
 import { ExecResponse } from "./types";
 
-export const runCLI = (args: string, options = {}): Promise<ExecResponse> => {
-  const CLI_PATH = resolve(__dirname, "../../bin/hopp.js");
-  const command = `node ${CLI_PATH} ${args}`;
+export const runCLI = (args: string): Promise<ExecResponse> =>
+  {
+    const CLI_PATH = resolve(__dirname, "../../bin/hopp");
+    const command = `node ${CLI_PATH} ${args}`
 
-  return new Promise((resolve) =>
-    exec(command, options, (error, stdout, stderr) =>
-      resolve({ error, stdout, stderr })
-    )
-  );
-};
+    return new Promise((resolve) =>
+      exec(command, (error, stdout, stderr) => resolve({ error, stdout, stderr }))
+    );
+  }
 
 export const trimAnsi = (target: string) => {
   const ansiRegex =
@@ -26,18 +25,7 @@ export const getErrorCode = (out: string) => {
   return ansiTrimmedStr.split(" ")[0];
 };
 
-export const getTestJsonFilePath = (
-  file: string,
-  kind: "collection" | "environment"
-) => {
-  const kindDir = {
-    collection: "collections",
-    environment: "environments",
-  }[kind];
-
-  const filePath = resolve(
-    __dirname,
-    `../../src/__tests__/samples/${kindDir}/${file}`
-  );
+export const getTestJsonFilePath = (file: string) => {
+  const filePath = resolve(__dirname, `../../src/__tests__/samples/${file}`);
   return filePath;
 };

packages/hoppscotch-cli/src/index.ts

@@ -1,7 +1,6 @@
 import chalk from "chalk";
 import { Command } from "commander";
 import * as E from "fp-ts/Either";
-
 import { version } from "../package.json";
 import { test } from "./commands/test";
 import { handleError } from "./handlers/error";
@@ -21,7 +20,7 @@ const CLI_AFTER_ALL_TXT = `\nFor more help, head on to ${accent(
   "https://docs.hoppscotch.io/documentation/clients/cli"
 )}`;
 
-const program = new Command();
+const program = new Command()
 
 program
   .name("hopp")

packages/hoppscotch-cli/src/interfaces/request.ts

@@ -21,7 +21,6 @@ export interface RequestStack {
  */
 export interface RequestConfig extends AxiosRequestConfig {
   supported: boolean;
-  displayUrl?: string
 }
 
 export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
@@ -31,7 +30,6 @@ export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
    * This contains path, params and environment variables all applied to it
    */
   effectiveFinalURL: string;
-  effectiveFinalDisplayURL?: string;
   effectiveFinalHeaders: { key: string; value: string; active: boolean }[];
   effectiveFinalParams: { key: string; value: string; active: boolean }[];
   effectiveFinalBody: FormData | string | null;

packages/hoppscotch-cli/src/options/test/env.ts

@@ -1,56 +1,43 @@
-import { Environment } from "@hoppscotch/data";
-import { entityReference } from "verzod";
-import { z } from "zod";
-
 import { error } from "../../types/errors";
 import {
-  HoppEnvKeyPairObject,
-  HoppEnvPair,
   HoppEnvs,
+  HoppEnvPair,
+  HoppEnvKeyPairObject,
+  HoppEnvExportObject,
+  HoppBulkEnvExportObject,
 } from "../../types/request";
 import { readJsonFile } from "../../utils/mutators";
-
 /**
- * Parses env json file for given path and validates the parsed env json object
- * @param path Path of env.json file to be parsed
- * @returns For successful parsing we get HoppEnvs object
+ * Parses env json file for given path and validates the parsed env json object.
+ * @param path Path of env.json file to be parsed.
+ * @returns For successful parsing we get HoppEnvs object.
  */
 export async function parseEnvsData(path: string) {
   const contents = await readJsonFile(path);
-  const envPairs: Array<HoppEnvPair | Record<string, string>> = [];
-
-  // The legacy key-value pair format that is still supported
+  const envPairs: Array<HoppEnvPair> = [];
   const HoppEnvKeyPairResult = HoppEnvKeyPairObject.safeParse(contents);
+  const HoppEnvExportObjectResult = HoppEnvExportObject.safeParse(contents);
+  const HoppBulkEnvExportObjectResult =
+    HoppBulkEnvExportObject.safeParse(contents);
 
-  // Shape of the single environment export object that is exported from the app
-  const HoppEnvExportObjectResult = Environment.safeParse(contents);
-
-  // Shape of the bulk environment export object that is exported from the app
-  const HoppBulkEnvExportObjectResult = z
-    .array(entityReference(Environment))
-    .safeParse(contents);
-
-  // CLI doesnt support bulk environments export
-  // Hence we check for this case and throw an error if it matches the format
+  // CLI doesnt support bulk environments export.
+  // Hence we check for this case and throw an error if it matches the format.
   if (HoppBulkEnvExportObjectResult.success) {
     throw error({ code: "BULK_ENV_FILE", path, data: error });
   }
 
-  //  Checks if the environment file is of the correct format
-  // If it doesnt match either of them, we throw an error
-  if (
-    !HoppEnvKeyPairResult.success &&
-    HoppEnvExportObjectResult.type === "err"
-  ) {
+  //  Checks if the environment file is of the correct format.
+  // If it doesnt match either of them, we throw an error.
+  if (!(HoppEnvKeyPairResult.success || HoppEnvExportObjectResult.success)) {
     throw error({ code: "MALFORMED_ENV_FILE", path, data: error });
   }
 
   if (HoppEnvKeyPairResult.success) {
     for (const [key, value] of Object.entries(HoppEnvKeyPairResult.data)) {
-      envPairs.push({ key, value, secret: false });
+      envPairs.push({ key, value });
     }
-  } else if (HoppEnvExportObjectResult.type === "ok") {
-    envPairs.push(...HoppEnvExportObjectResult.value.variables);
+  } else if (HoppEnvExportObjectResult.success) {
+    envPairs.push(...HoppEnvExportObjectResult.data.variables);
   }
 
   return <HoppEnvs>{ global: [], selected: envPairs };

packages/hoppscotch-cli/src/types/request.ts

@@ -1,18 +1,31 @@
-import { Environment, HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
-import { z } from "zod";
-
+import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
 import { TestReport } from "../interfaces/response";
 import { HoppCLIError } from "./errors";
+import { z } from "zod";
 
 export type FormDataEntry = {
   key: string;
   value: string | Blob;
 };
 
-export type HoppEnvPair = Environment["variables"][number];
+export type HoppEnvPair = { key: string; value: string };
 
 export const HoppEnvKeyPairObject = z.record(z.string(), z.string());
 
+// Shape of the single environment export object that is exported from the app.
+export const HoppEnvExportObject = z.object({
+  name: z.string(),
+  variables: z.array(
+    z.object({
+      key: z.string(),
+      value: z.string(),
+    })
+  ),
+});
+
+// Shape of the bulk environment export object that is exported from the app.
+export const HoppBulkEnvExportObject = z.array(HoppEnvExportObject);
+
 export type HoppEnvs = {
   global: HoppEnvPair[];
   selected: HoppEnvPair[];

packages/hoppscotch-cli/src/utils/checks.ts

@@ -1,3 +1,5 @@
+import { HoppCollection, isHoppRESTRequest } from "@hoppscotch/data";
+import * as A from "fp-ts/Array";
 import { CommanderError } from "commander";
 import { HoppCLIError, HoppErrnoException } from "../types/errors";
 
@@ -12,6 +14,48 @@ export const hasProperty = <P extends PropertyKey>(
   prop: P
 ): target is Record<P, unknown> => prop in target;
 
+/**
+ * Typeguard to check valid Hoppscotch REST Collection.
+ * @param param The object to be checked.
+ * @returns True, if unknown parameter is valid Hoppscotch REST Collection;
+ * False, otherwise.
+ */
+export const isRESTCollection = (param: unknown): param is HoppCollection => {
+  if (!!param && typeof param === "object") {
+    if (!hasProperty(param, "v") || typeof param.v !== "number") {
+      return false;
+    }
+    if (!hasProperty(param, "name") || typeof param.name !== "string") {
+      return false;
+    }
+    if (hasProperty(param, "id") && typeof param.id !== "string") {
+      return false;
+    }
+    if (!hasProperty(param, "requests") || !Array.isArray(param.requests)) {
+      return false;
+    } else {
+      // Checks each requests array to be valid HoppRESTRequest.
+      const checkRequests = A.every(isHoppRESTRequest)(param.requests);
+      if (!checkRequests) {
+        return false;
+      }
+    }
+    if (!hasProperty(param, "folders") || !Array.isArray(param.folders)) {
+      return false;
+    } else {
+      // Checks each folder to be valid REST collection.
+      const checkFolders = A.every(isRESTCollection)(param.folders);
+      if (!checkFolders) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  return false;
+};
+
 /**
  * Checks if given error data is of type HoppCLIError, based on existence
  * of code property.

packages/hoppscotch-cli/src/utils/collections.ts

@@ -131,7 +131,7 @@ const getCollectionStack = (collections: HoppCollection[]): CollectionStack[] =>
  * path of each request within collection-json file, failed-tests-report, errors,
  * total execution duration for requests, pre-request-scripts, test-scripts.
  * @returns True, if collection runner executed without any errors or failed test-cases.
- * False, if errors occurred or test-cases failed.
+ * False, if errors occured or test-cases failed.
  */
 export const collectionsRunnerResult = (
   requestsReport: RequestReport[]

packages/hoppscotch-cli/src/utils/display.ts

@@ -112,7 +112,7 @@ export const printTestsMetrics = (testsMetrics: TestMetrics) => {
 
 /**
  * Prints details of each reported error for a request with error code.
- * @param path Request's path in collection for which errors occurred.
+ * @param path Request's path in collection for which errors occured.
  * @param errorsReport List of errors reported.
  */
 export const printErrorsReport = (
@@ -176,7 +176,7 @@ export const printRequestRunner = {
    */
   start: (requestConfig: RequestConfig) => {
     const METHOD = BG_INFO(` ${requestConfig.method} `);
-    const ENDPOINT = requestConfig.displayUrl || requestConfig.url;
+    const ENDPOINT = requestConfig.url;
 
     process.stdout.write(`${METHOD} ${ENDPOINT}`);
   },

packages/hoppscotch-cli/src/utils/mutators.ts

@@ -1,46 +1,8 @@
-import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
 import fs from "fs/promises";
-import { entityReference } from "verzod";
-import { z } from "zod";
-
-import { error } from "../types/errors";
 import { FormDataEntry } from "../types/request";
-import { isHoppErrnoException } from "./checks";
-
-const getValidRequests = (
-  collections: HoppCollection[],
-  collectionFilePath: string
-) => {
-  return collections.map((collection) => {
-    // Validate requests using zod schema
-    const requestSchemaParsedResult = z
-      .array(entityReference(HoppRESTRequest))
-      .safeParse(collection.requests);
-
-    // Handle validation errors
-    if (!requestSchemaParsedResult.success) {
-      throw error({
-        code: "MALFORMED_COLLECTION",
-        path: collectionFilePath,
-        data: "Please check the collection data.",
-      });
-    }
-
-    // Recursively validate requests in nested folders
-    if (collection.folders.length > 0) {
-      collection.folders = getValidRequests(
-        collection.folders,
-        collectionFilePath
-      );
-    }
-
-    // Return validated collection
-    return {
-      ...collection,
-      requests: requestSchemaParsedResult.data,
-    };
-  });
-};
+import { error } from "../types/errors";
+import { isRESTCollection, isHoppErrnoException } from "./checks";
+import { HoppCollection } from "@hoppscotch/data";
 
 /**
  * Parses array of FormDataEntry to FormData.
@@ -105,11 +67,7 @@ export async function parseCollectionData(
     ? contents
     : [contents];
 
-  const collectionSchemaParsedResult = z
-    .array(entityReference(HoppCollection))
-    .safeParse(maybeArrayOfCollections);
-
-  if (!collectionSchemaParsedResult.success) {
+  if (maybeArrayOfCollections.some((x) => !isRESTCollection(x))) {
     throw error({
       code: "MALFORMED_COLLECTION",
       path,
@@ -117,5 +75,5 @@ export async function parseCollectionData(
     });
   }
 
-  return getValidRequests(collectionSchemaParsedResult.data, path);
+  return maybeArrayOfCollections as HoppCollection[];
 }

packages/hoppscotch-cli/src/utils/pre-request.ts

@@ -36,10 +36,7 @@ import { toFormData } from "./mutators";
 export const preRequestScriptRunner = (
   request: HoppRESTRequest,
   envs: HoppEnvs
-): TE.TaskEither<
-  HoppCLIError,
-  { effectiveRequest: EffectiveHoppRESTRequest } & { updatedEnvs: HoppEnvs }
-> =>
+): TE.TaskEither<HoppCLIError, EffectiveHoppRESTRequest> =>
   pipe(
     TE.of(request),
     TE.chain(({ preRequestScript }) =>
@@ -71,10 +68,7 @@ export const preRequestScriptRunner = (
 export function getEffectiveRESTRequest(
   request: HoppRESTRequest,
   environment: Environment
-): E.Either<
-  HoppCLIError,
-  { effectiveRequest: EffectiveHoppRESTRequest } & { updatedEnvs: HoppEnvs }
-> {
+): E.Either<HoppCLIError, EffectiveHoppRESTRequest> {
   const envVariables = environment.variables;
 
   // Parsing final headers with applied ENVs.
@@ -109,40 +103,27 @@ export function getEffectiveRESTRequest(
         key: "Authorization",
         value: `Basic ${btoa(`${username}:${password}`)}`,
       });
-    } else if (request.auth.authType === "bearer") {
+    } else if (
+      request.auth.authType === "bearer" ||
+      request.auth.authType === "oauth-2"
+    ) {
       effectiveFinalHeaders.push({
         active: true,
         key: "Authorization",
-        value: `Bearer ${parseTemplateString(request.auth.token, envVariables)}`,
+        value: `Bearer ${parseTemplateString(
+          request.auth.token,
+          envVariables
+        )}`,
       });
-    } else if (request.auth.authType === "oauth-2") {
-      const { addTo } = request.auth;
-
-      if (addTo === "HEADERS") {
-        effectiveFinalHeaders.push({
-          active: true,
-          key: "Authorization",
-          value: `Bearer ${parseTemplateString(request.auth.grantTypeInfo.token, envVariables)}`,
-        });
-      } else if (addTo === "QUERY_PARAMS") {
-        effectiveFinalParams.push({
-          active: true,
-          key: "access_token",
-          value: parseTemplateString(
-            request.auth.grantTypeInfo.token,
-            envVariables
-          ),
-        });
-      }
     } else if (request.auth.authType === "api-key") {
       const { key, value, addTo } = request.auth;
-      if (addTo === "HEADERS") {
+      if (addTo === "Headers") {
         effectiveFinalHeaders.push({
           active: true,
           key: parseTemplateString(key, envVariables),
           value: parseTemplateString(value, envVariables),
         });
-      } else if (addTo === "QUERY_PARAMS") {
+      } else if (addTo === "Query params") {
         effectiveFinalParams.push({
           active: true,
           key: parseTemplateString(key, envVariables),
@@ -181,30 +162,12 @@ export function getEffectiveRESTRequest(
   }
   const effectiveFinalURL = _effectiveFinalURL.right;
 
-  // Secret environment variables referenced in the request endpoint should be masked
-  let effectiveFinalDisplayURL;
-  if (envVariables.some(({ secret }) => secret)) {
-    const _effectiveFinalDisplayURL = parseTemplateStringE(
-      request.endpoint,
-      envVariables,
-      true
-    );
-
-    if (E.isRight(_effectiveFinalDisplayURL)) {
-      effectiveFinalDisplayURL = _effectiveFinalDisplayURL.right;
-    }
-  }
-
   return E.right({
-    effectiveRequest: {
-      ...request,
-      effectiveFinalURL,
-      effectiveFinalDisplayURL,
-      effectiveFinalHeaders,
-      effectiveFinalParams,
-      effectiveFinalBody,
-    },
-    updatedEnvs: { global: [], selected: envVariables },
+    ...request,
+    effectiveFinalURL,
+    effectiveFinalHeaders,
+    effectiveFinalParams,
+    effectiveFinalBody,
   });
 }
 

packages/hoppscotch-cli/src/utils/request.ts

@@ -1,4 +1,4 @@
-import { Environment, HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
+import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
 import axios, { Method } from "axios";
 import * as A from "fp-ts/Array";
 import * as E from "fp-ts/Either";
@@ -29,38 +29,6 @@ import { getTestScriptParams, hasFailedTestCases, testRunner } from "./test";
 
 // !NOTE: The `config.supported` checks are temporary until OAuth2 and Multipart Forms are supported
 
-/**
- * Processes given variable, which includes checking for secret variables
- * and getting value from system environment
- * @param variable Variable to be processed
- * @returns Updated variable with value from system environment
- */
-const processVariables = (variable: Environment["variables"][number]) => {
-  if (variable.secret) {
-    return {
-      ...variable,
-      value:
-        "value" in variable ? variable.value : process.env[variable.key] || "",
-    };
-  }
-  return variable;
-};
-
-/**
- * Processes given envs, which includes processing each variable in global
- * and selected envs
- * @param envs Global + selected envs used by requests with in collection
- * @returns Processed envs with each variable processed
- */
-const processEnvs = (envs: HoppEnvs) => {
-  const processedEnvs = {
-    global: envs.global.map(processVariables),
-    selected: envs.selected.map(processVariables),
-  };
-
-  return processedEnvs;
-};
-
 /**
  * Transforms given request data to request-config used by request-runner to
  * perform HTTP request.
@@ -70,7 +38,6 @@ const processEnvs = (envs: HoppEnvs) => {
 export const createRequest = (req: EffectiveHoppRESTRequest): RequestConfig => {
   const config: RequestConfig = {
     supported: true,
-    displayUrl: req.effectiveFinalDisplayURL,
   };
   const { finalBody, finalEndpoint, finalHeaders, finalParams } = getRequest;
   const reqParams = finalParams(req);
@@ -131,7 +98,6 @@ export const requestRunner =
       let status: number;
       const baseResponse = await axios(requestConfig);
       const { config } = baseResponse;
-      // PR-COMMENT: type error
       const runnerResponse: RequestRunnerResponse = {
         ...baseResponse,
         endpoint: getRequest.endpoint(config.url),
@@ -255,16 +221,9 @@ export const processRequest =
       effectiveFinalParams: [],
       effectiveFinalURL: "",
     };
-    let updatedEnvs = <HoppEnvs>{};
-
-    // Fetch values for secret environment variables from system environment
-    const processedEnvs = processEnvs(envs);
 
     // Executing pre-request-script
-    const preRequestRes = await preRequestScriptRunner(
-      request,
-      processedEnvs
-    )();
+    const preRequestRes = await preRequestScriptRunner(request, envs)();
     if (E.isLeft(preRequestRes)) {
       printPreRequestRunner.fail();
 
@@ -272,8 +231,8 @@ export const processRequest =
       report.errors.push(preRequestRes.left);
       report.result = report.result && false;
     } else {
-      // Updating effective-request and consuming updated envs after pre-request script execution
-      ({ effectiveRequest, updatedEnvs } = preRequestRes.right);
+      // Updating effective-request
+      effectiveRequest = preRequestRes.right;
     }
 
     // Creating request-config for request-runner.
@@ -311,7 +270,7 @@ export const processRequest =
     const testScriptParams = getTestScriptParams(
       _requestRunnerRes,
       request,
-      updatedEnvs
+      envs
     );
 
     // Executing test-runner.
@@ -351,7 +310,7 @@ export const processRequest =
  */
 export const preProcessRequest = (
   request: HoppRESTRequest,
-  collection: HoppCollection
+  collection: HoppCollection,
 ): HoppRESTRequest => {
   const tempRequest = Object.assign({}, request);
   const { headers: parentHeaders, auth: parentAuth } = collection;
@@ -376,10 +335,8 @@ export const preProcessRequest = (
     // Filter out header entries present in the parent (folder/collection) under the same name
     // This ensures the child headers take precedence over the parent headers
     const filteredEntries = parentHeaders.filter((parentHeaderEntries) => {
-      return !tempRequest.headers.some(
-        (reqHeaderEntries) => reqHeaderEntries.key === parentHeaderEntries.key
-      );
-    });
+      return !tempRequest.headers.some((reqHeaderEntries) => reqHeaderEntries.key === parentHeaderEntries.key)
+    })
     tempRequest.headers.push(...filteredEntries);
   } else if (!tempRequest.headers) {
     tempRequest.headers = [];