fix: feedback resolve

This reverts commit 852353f24d170726b400fb729ac4caef7acfeb19.

.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,7 +37,7 @@
       "vue": "3.3.9"
     },
     "packageExtensions": {
-      "httpsnippet@3.0.1": {
+      "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2024.3.0",
+  "version": "2023.12.3",
   "description": "",
   "author": "",
   "private": true,
@@ -24,83 +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/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/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": [
@@ -121,4 +118,4 @@
       "^src/(.*)$": "<rootDir>/$1"
     }
   }
-}
+}

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/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);
@@ -311,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)',
   })

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

@@ -24,8 +24,6 @@ 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';
 
 @Module({
   imports: [
@@ -98,8 +96,6 @@ import { ScheduleModule } from '@nestjs/schedule';
     UserCollectionModule,
     ShortcodeModule,
     InfraConfigModule,
-    PosthogModule,
-    ScheduleModule.forRoot(),
   ],
   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.ts

@@ -24,7 +24,7 @@ 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';
@@ -117,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,
       });
@@ -255,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,
     );
@@ -373,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)
@@ -737,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/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,21 +13,14 @@ 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]: [
     InfraConfigEnum.MAILER_SMTP_URL,
@@ -64,125 +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_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.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;
-}
-
-/**
- * Verify if 'infra_config' table is loaded with all entries
- * @returns boolean
- */
-export async function isInfraConfigTablePopulated(): Promise<boolean> {
-  const prisma = new PrismaService();
-  try {
-    const dbInfraConfigs = await prisma.infraConfig.findMany();
-    const infraConfigDefaultObjs = await getDefaultInfraConfigs();
-
-    const propsRemainingToInsert = infraConfigDefaultObjs.filter(
-      (p) => !dbInfraConfigs.find((e) => e.name === p.name),
-    );
-
-    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)
@@ -234,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,25 +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, stopApp } from './helper';
+import { ServiceStatus, getConfiguredSSOProviders, stopApp } from './helper';
 import { EnableAndDisableSSOArgs, InfraConfigArgs } from './input-args';
 import { AuthProvider } from 'src/auth/helper';
 
@@ -32,32 +30,76 @@ 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,
-  ];
-  // 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 {
+      // 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 getDefaultInfraConfigs();
+      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();
@@ -114,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);
 
@@ -138,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);
 
@@ -176,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;
@@ -204,22 +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 SSO for login/signup
    * @param provider Auth Provider to enable or disable
@@ -270,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 },
@@ -287,15 +298,7 @@ export class InfraConfigService implements OnModuleInit {
    * @param names Names of the InfraConfigs
    * @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 } },
@@ -321,28 +324,25 @@ export class InfraConfigService implements OnModuleInit {
    * 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();
@@ -358,60 +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_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.GOOGLE_CLIENT_ID:
+        case InfraConfigEnumForClient.GOOGLE_CLIENT_ID:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.GOOGLE_CLIENT_SECRET:
+        case InfraConfigEnumForClient.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:
+        case InfraConfigEnumForClient.GITHUB_CLIENT_ID:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.GITHUB_CLIENT_ID:
+        case InfraConfigEnumForClient.GITHUB_CLIENT_SECRET:
           if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
           break;
-        case InfraConfigEnum.GITHUB_CLIENT_SECRET:
+        case InfraConfigEnumForClient.MICROSOFT_CLIENT_ID:
           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.service.ts

@@ -25,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';

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/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/InfraConfig.ts

@@ -4,23 +4,30 @@ export enum InfraConfigEnum {
 
   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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoppscotch/cli",
-  "version": "0.7.0",
+  "version": "0.6.0",
   "description": "A CLI to run Hoppscotch test scripts in CI environments.",
   "homepage": "https://hoppscotch.io",
   "type": "module",
@@ -41,28 +41,26 @@
   "license": "MIT",
   "private": false,
   "dependencies": {
-    "axios": "1.6.7",
-    "chalk": "5.3.0",
-    "commander": "11.1.0",
-    "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(10000);
-
-    // 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,8 +67,7 @@
                 "body": {
                   "contentType": null,
                   "body": null
-                },
-                "requestVariables": []
+                }
               }
             ],
             "auth": {
@@ -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,27 +0,0 @@
-{
-    "v": 1,
-    "name": "coll-v1",
-    "folders": [],
-    "requests": [
-        {
-            "url": "https://httpbin.org",
-            "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,48 +0,0 @@
-{
-    "v": 1,
-    "name": "coll-v1",
-    "folders": [],
-    "requests": [
-        {
-            "v": "1",
-            "endpoint": "https://httpbin.org/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-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,54 +0,0 @@
-{
-    "v": 2,
-    "name": "coll-v2",
-    "folders": [],
-    "requests": [
-        {
-            "v": "2",
-            "endpoint": "https://httpbin.org/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-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,54 +0,0 @@
-{
-    "v": 2,
-    "name": "coll-v2",
-    "folders": [],
-    "requests": [
-        {
-            "v": "3",
-            "endpoint": "https://httpbin.org/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-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,113 +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": "<<baseURL>>/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": "<<baseURL>>/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(pw.response.body.json.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": "<<baseURL>>/get",
-      "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": "<<baseURL>>/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    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": "<<baseURL>>/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    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": "<<baseURL>>",
-      "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-setters-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": "<<baseURL>>/headers",
-      "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": "<<baseURL>>/headers",
-      "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": "<<baseURL>>/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(pw.response.body.json.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": "<<baseURL>>/get",
-      "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": "<<baseURL>>/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    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": "<<baseURL>>/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    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://httpbin.org/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 sccript\", () => {\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 sccript\", () => {\n  pw.expect(pw.response.body.json.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,40 +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": "baseURL",
-      "value": "https://httpbin.org",
-      "secret": false
-    }
-  ]
-}

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

@@ -1,46 +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": "baseURL",
-      "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,13 +3,13 @@ import { resolve } from "path";
 
 import { ExecResponse } from "./types";
 
-export const runCLI = (args: string, options = {}): Promise<ExecResponse> =>
+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 }))
+      exec(command, (error, stdout, stderr) => resolve({ error, stdout, stderr }))
     );
   }
 
@@ -25,12 +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/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,11 +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";
+import { error } from "../types/errors";
+import { isRESTCollection, isHoppErrnoException } from "./checks";
+import { HoppCollection } from "@hoppscotch/data";
 
 /**
  * Parses array of FormDataEntry to FormData.
@@ -70,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,
@@ -82,22 +75,5 @@ export async function parseCollectionData(
     });
   }
 
-  return collectionSchemaParsedResult.data.map((collection) => {
-    const requestSchemaParsedResult = z
-      .array(entityReference(HoppRESTRequest))
-      .safeParse(collection.requests);
-
-    if (!requestSchemaParsedResult.success) {
-      throw error({
-        code: "MALFORMED_COLLECTION",
-        path,
-        data: "Please check the collection data.",
-      });
-    }
-
-    return {
-      ...collection,
-      requests: requestSchemaParsedResult.data,
-    };
-  });
+  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,31 +103,18 @@ 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") {
@@ -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 = [];

packages/hoppscotch-common/.eslintrc.js

@@ -10,9 +10,6 @@ module.exports = {
   parserOptions: {
     sourceType: "module",
     requireConfigFile: false,
-    ecmaFeatures: {
-      jsx: false,
-    },
   },
   extends: [
     "@vue/typescript/recommended",

packages/hoppscotch-common/assets/scss/styles.scss

@@ -429,11 +429,6 @@ pre.ace_editor {
   }
 }
 
-.splitpanes__pane {
-  @apply will-change-auto;
-  transform: translateZ(0);
-}
-
 .smart-splitter .splitpanes__splitter {
   @apply relative;
   @apply before:absolute;
@@ -563,22 +558,12 @@ details[open] summary .indicator {
 .env-highlight {
   @apply text-accentContrast;
 
-  &.request-variable-highlight {
-    @apply bg-amber-500;
-    @apply hover:bg-amber-600;
+  &.env-found {
+    @apply bg-accentDark;
+    @apply hover:bg-accent;
   }
 
-  &.environment-variable-highlight {
-    @apply bg-green-500;
-    @apply hover:bg-green-600;
-  }
-
-  &.global-variable-highlight {
-    @apply bg-blue-500;
-    @apply hover:bg-blue-600;
-  }
-
-  &.environment-not-found-highlight {
+  &.env-not-found {
     @apply bg-red-500;
     @apply hover:bg-red-600;
   }

packages/hoppscotch-common/locales/en.json

@@ -24,10 +24,8 @@
     "go_back": "Go back",
     "go_forward": "Go forward",
     "group_by": "Group by",
-    "hide_secret": "Hide secret",
     "label": "Label",
     "learn_more": "Learn more",
-    "download_here": "Download here",
     "less": "Less",
     "more": "More",
     "new": "New",
@@ -45,7 +43,6 @@
     "search": "Search",
     "send": "Send",
     "share": "Share",
-    "show_secret": "Show secret",
     "start": "Start",
     "starting": "Starting",
     "stop": "Stop",
@@ -104,10 +101,8 @@
   "auth": {
     "account_exists": "Account exists with different credential - Login to link both accounts",
     "all_sign_in_options": "All sign in options",
-    "continue_with_auth_provider": "Continue with {provider}",
     "continue_with_email": "Continue with Email",
     "continue_with_github": "Continue with GitHub",
-    "continue_with_github_enterprise": "Continue with GitHub Enterprise",
     "continue_with_google": "Continue with Google",
     "continue_with_microsoft": "Continue with Microsoft",
     "email": "Email",
@@ -140,26 +135,7 @@
       "redirect_no_token_endpoint": "No Token Endpoint Defined",
       "something_went_wrong_on_oauth_redirect": "Something went wrong during OAuth Redirect",
       "something_went_wrong_on_token_generation": "Something went wrong on token generation",
-      "token_generation_oidc_discovery_failed": "Failure on token generation: OpenID Connect Discovery Failed",
-      "grant_type": "Grant Type",
-      "grant_type_auth_code": "Authorization Code",
-      "token_fetched_successfully": "Token fetched successfully",
-      "token_fetch_failed": "Failed to fetch token",
-      "validation_failed": "Validation Failed, please check the form fields",
-      "label_authorization_endpoint": "Authorization Endpoint",
-      "label_client_id": "Client ID",
-      "label_client_secret": "Client Secret",
-      "label_code_challenge": "Code Challenge",
-      "label_code_challenge_method": "Code Challenge Method",
-      "label_code_verifier": "Code Verifier",
-      "label_scopes": "Scopes",
-      "label_token_endpoint": "Token Endpoint",
-      "label_use_pkce": "Use PKCE",
-      "label_implicit": "Implicit",
-      "label_password": "Password",
-      "label_username": "Username",
-      "label_auth_code": "Authorization Code",
-      "label_client_credentials": "Client Credentials"
+      "token_generation_oidc_discovery_failed": "Failure on token generation: OpenID Connect Discovery Failed"
     },
     "pass_key_by": "Pass by",
     "password": "Password",
@@ -176,7 +152,7 @@
     "invalid_name": "Please provide a name for the collection",
     "invalid_root_move": "Collection already in the root",
     "moved": "Moved Successfully",
-    "my_collections": "Personal Collections",
+    "my_collections": "My Collections",
     "name": "My New Collection",
     "name_length_insufficient": "Collection name should be at least 3 characters long",
     "new": "New Collection",
@@ -188,12 +164,14 @@
     "save_as": "Save as",
     "save_to_collection": "Save to Collection",
     "select": "Select a Collection",
-    "select_location": "Select location"
+    "select_location": "Select location",
+    "select_team": "Select a team",
+    "team_collections": "Team Collections"
   },
   "confirm": {
     "close_unsaved_tab": "Are you sure you want to close this tab?",
     "close_unsaved_tabs": "Are you sure you want to close all tabs? {count} unsaved tabs will be lost.",
-    "exit_team": "Are you sure you want to leave this workspace?",
+    "exit_team": "Are you sure you want to leave this team?",
     "logout": "Are you sure you want to logout?",
     "remove_collection": "Are you sure you want to permanently delete this collection?",
     "remove_environment": "Are you sure you want to permanently delete this environment?",
@@ -201,7 +179,7 @@
     "remove_history": "Are you sure you want to permanently delete all history?",
     "remove_request": "Are you sure you want to permanently delete this request?",
     "remove_shared_request": "Are you sure you want to permanently delete this shared request?",
-    "remove_team": "Are you sure you want to delete this workspace?",
+    "remove_team": "Are you sure you want to delete this team?",
     "remove_telemetry": "Are you sure you want to opt-out of Telemetry?",
     "request_change": "Are you sure you want to discard current request, unsaved changes will be lost.",
     "save_unsaved_tab": "Do you want to save changes made in this tab?",
@@ -254,19 +232,17 @@
     "headers": "This request does not have any headers",
     "history": "History is empty",
     "invites": "Invite list is empty",
-    "members": "Workspace is empty",
+    "members": "Team is empty",
     "parameters": "This request does not have any parameters",
-    "pending_invites": "There are no pending invites for this workspace",
+    "pending_invites": "There are no pending invites for this team",
     "profile": "Login to view your profile",
     "protocols": "Protocols are empty",
-    "request_variables": "This request does not have any request variables",
     "schema": "Connect to a GraphQL endpoint to view schema",
-    "secret_environments": "Secrets are not synced to Hoppscotch",
     "shared_requests": "Shared requests are empty",
     "shared_requests_logout": "Login to view your shared requests or create a new one",
     "subscription": "Subscriptions are empty",
-    "team_name": "Workspace name empty",
-    "teams": "You don't belong to any workspaces",
+    "team_name": "Team name empty",
+    "teams": "You don't belong to any teams",
     "tests": "There are no tests for this request"
   },
   "environment": {
@@ -283,7 +259,7 @@
     "import_or_create": "Import or create a environment",
     "invalid_name": "Please provide a name for the environment",
     "list": "Environment variables",
-    "my_environments": "Personal Environments",
+    "my_environments": "My Environments",
     "name": "Name",
     "nested_overflow": "nested environment variables are limited to 10 levels",
     "new": "New Environment",
@@ -293,17 +269,14 @@
     "quick_peek": "Environment Quick Peek",
     "replace_with_variable": "Replace with variable",
     "scope": "Scope",
-    "secrets": "Secrets",
-    "secret_value": "Secret value",
     "select": "Select environment",
     "set": "Set environment",
     "set_as_environment": "Set as environment",
-    "team_environments": "Workspace Environments",
+    "team_environments": "Team Environments",
     "title": "Environments",
     "updated": "Environment updated",
     "value": "Value",
     "variable": "Variable",
-    "variables": "Variables",
     "variable_list": "Variable List"
   },
   "error": {
@@ -313,9 +286,8 @@
     "check_how_to_add_origin": "Check how you can add an origin",
     "curl_invalid_format": "cURL is not formatted properly",
     "danger_zone": "Danger zone",
-    "delete_account": "Your account is currently an owner in these workspaces:",
-    "delete_account_description": "You must either remove yourself, transfer ownership, or delete these workspaces before you can delete your account.",
-    "empty_profile_name": "Profile name cannot be empty",
+    "delete_account": "Your account is currently an owner in these teams:",
+    "delete_account_description": "You must either remove yourself, transfer ownership, or delete these teams before you can delete your account.",
     "empty_req_name": "Empty Request Name",
     "f12_details": "(F12 for details)",
     "gql_prettify_invalid_query": "Couldn't prettify an invalid query, solve query syntax errors and try again",
@@ -335,11 +307,9 @@
     "page_not_found": "This page could not be found",
     "please_install_extension": "Please install the extension and add origin to the extension.",
     "proxy_error": "Proxy error",
-    "same_profile_name": "Updated profile name is same as the current profile name",
     "script_fail": "Could not execute pre-request script",
     "something_went_wrong": "Something went wrong",
-    "test_script_fail": "Could not execute post-request script",
-    "reading_files": "Error while reading one or more files."
+    "test_script_fail": "Could not execute post-request script"
   },
   "export": {
     "as_json": "Export as JSON",
@@ -418,8 +388,8 @@
     "from_insomnia_description": "Import from Insomnia collection",
     "from_json": "Import from Hoppscotch",
     "from_json_description": "Import from Hoppscotch collection file",
-    "from_my_collections": "Import from Personal Collections",
-    "from_my_collections_description": "Import from Personal Collections file",
+    "from_my_collections": "Import from My Collections",
+    "from_my_collections_description": "Import from My Collections file",
     "from_openapi": "Import from OpenAPI",
     "from_openapi_description": "Import from OpenAPI specification file (YML/JSON)",
     "from_postman": "Import from Postman",
@@ -437,21 +407,16 @@
     "json_description": "Import collections from a Hoppscotch Collections JSON file",
     "postman_environment": "Postman Environment",
     "postman_environment_description": "Import Postman Environment from a JSON file",
-    "title": "Import",
-    "file_size_limit_exceeded_warning_multiple_files": "Chosen files exceed the recommended limit of 10MB. Only the first {files} selected will be imported",
-    "file_size_limit_exceeded_warning_single_file": "The currently chosen file exceeds the recommended limit of 10MB. Please select another file.",
-    "success": "Successfully imported"
+    "title": "Import"
   },
   "inspections": {
     "description": "Inspect possible errors",
     "environment": {
       "add_environment": "Add to Environment",
-      "add_environment_value": "Add value",
-      "empty_value": "Environment value is empty for the variable '{variable}' ",
       "not_found": "Environment variable “{environment}” not found."
     },
     "header": {
-      "cookie": "The browser doesn't allow Hoppscotch to set Cookie Headers. Please use Authorization Headers instead. However, our Hoppscotch Desktop App is live now and supports Cookies."
+      "cookie": "The browser doesn't allow Hoppscotch to set the Cookie Header. While we're working on the Hoppscotch Desktop App (coming soon), please use the Authorization Header instead."
     },
     "response": {
       "401_error": "Please check your authentication credentials.",
@@ -536,7 +501,7 @@
     "email_verification_mail": "A verification email has been sent to your email address. Please click on the link to verify your email address.",
     "no_permission": "You do not have permission to perform this action.",
     "owner": "Owner",
-    "owner_description": "Owners can add, edit, and delete requests, collections and workspace members.",
+    "owner_description": "Owners can add, edit, and delete requests, collections and team members.",
     "roles": "Roles",
     "roles_description": "Roles are used to control access to the shared collections.",
     "updated": "Profile updated",
@@ -583,7 +548,6 @@
     "raw_body": "Raw Request Body",
     "rename": "Rename Request",
     "renamed": "Request renamed",
-    "request_variables": "Request variables",
     "run": "Run",
     "save": "Save",
     "save_as": "Save as",
@@ -841,12 +805,12 @@
       "title": "Tabs"
     },
     "workspace": {
-      "delete": "Delete current workspace",
-      "edit": "Edit current workspace",
-      "invite": "Invite people to workspace",
-      "new": "Create new workspace",
+      "delete": "Delete current team",
+      "edit": "Edit current team",
+      "invite": "Invite people to team",
+      "new": "Create new team",
       "switch_to_personal": "Switch to your personal workspace",
-      "title": "Workspaces"
+      "title": "Teams"
     }
   },
   "sse": {
@@ -903,6 +867,7 @@
     "forum": "Ask questions and get answers",
     "github": "Follow us on Github",
     "shortcuts": "Browse app faster",
+    "team": "Get in touch with the team",
     "title": "Support",
     "twitter": "Follow us on Twitter"
   },
@@ -924,7 +889,6 @@
     "query": "Query",
     "schema": "Schema",
     "shared_requests": "Shared Requests",
-    "share_tab_request": "Share tab request",
     "socketio": "Socket.IO",
     "sse": "SSE",
     "tests": "Tests",
@@ -933,60 +897,60 @@
     "websocket": "WebSocket"
   },
   "team": {
-    "already_member": "You are already a member of this workspace. Contact your workspace owner.",
-    "create_new": "Create new workspace",
-    "deleted": "Workspace deleted",
-    "edit": "Edit Workspace",
+    "already_member": "You are already a member of this team. Contact your team owner.",
+    "create_new": "Create new team",
+    "deleted": "Team deleted",
+    "edit": "Edit Team",
     "email": "E-mail",
-    "email_do_not_match": "Email doesn't match with your account details. Contact your workspace owner.",
-    "exit": "Exit Workspace",
-    "exit_disabled": "Only owner cannot exit the workspace",
+    "email_do_not_match": "Email doesn't match with your account details. Contact your team owner.",
+    "exit": "Exit Team",
+    "exit_disabled": "Only owner cannot exit the team",
     "failed_invites": "Failed invites",
     "invalid_coll_id": "Invalid collection ID",
     "invalid_email_format": "Email format is invalid",
-    "invalid_id": "Invalid workspace ID. Contact your workspace owner.",
+    "invalid_id": "Invalid team ID. Contact your team owner.",
     "invalid_invite_link": "Invalid invite link",
-    "invalid_invite_link_description": "The link you followed is invalid. Contact your workspace owner.",
-    "invalid_member_permission": "Please provide a valid permission to the workspace member",
+    "invalid_invite_link_description": "The link you followed is invalid. Contact your team owner.",
+    "invalid_member_permission": "Please provide a valid permission to the team member",
     "invite": "Invite",
     "invite_more": "Invite more",
     "invite_tooltip": "Invite people to this workspace",
-    "invited_to_team": "{owner} invited you to join {workspace}",
+    "invited_to_team": "{owner} invited you to join {team}",
     "join": "Invitation accepted",
-    "join_team": "Join {workspace}",
-    "joined_team": "You have joined {workspace}",
-    "joined_team_description": "You are now a member of this workspace",
-    "left": "You left the workspace",
+    "join_beta": "Join the beta program to access teams.",
+    "join_team": "Join {team}",
+    "joined_team": "You have joined {team}",
+    "joined_team_description": "You are now a member of this team",
+    "left": "You left the team",
     "login_to_continue": "Login to continue",
-    "login_to_continue_description": "You need to be logged in to join a workspace.",
+    "login_to_continue_description": "You need to be logged in to join a team.",
     "logout_and_try_again": "Logout and sign in with another account",
-    "member_has_invite": "This email ID already has an invite. Contact your workspace owner.",
-    "member_not_found": "Member not found. Contact your workspace owner.",
+    "member_has_invite": "This email ID already has an invite. Contact your team owner.",
+    "member_not_found": "Member not found. Contact your team owner.",
     "member_removed": "User removed",
     "member_role_updated": "User roles updated",
     "members": "Members",
     "more_members": "+{count} more",
-    "name_length_insufficient": "Workspace name should be at least 6 characters long",
-    "name_updated": "Workspace name updated",
-    "new": "New Workspace",
-    "new_created": "New workspace created",
-    "new_name": "My New Workspace",
-    "no_access": "You do not have edit access to this workspace",
-    "no_invite_found": "Invitation not found. Contact your workspace owner.",
+    "name_length_insufficient": "Team name should be at least 6 characters long",
+    "name_updated": "Team name updated",
+    "new": "New Team",
+    "new_created": "New team created",
+    "new_name": "My New Team",
+    "no_access": "You do not have edit access to this team",
+    "no_invite_found": "Invitation not found. Contact your team owner.",
     "no_request_found": "Request not found.",
-    "not_found": "Workspace not found. Contact your workspace owner.",
-    "not_valid_viewer": "You are not a valid viewer. Contact your workspace owner.",
+    "not_found": "Team not found. Contact your team owner.",
+    "not_valid_viewer": "You are not a valid viewer. Contact your team owner.",
     "parent_coll_move": "Cannot move collection to a child collection",
     "pending_invites": "Pending invites",
     "permissions": "Permissions",
     "same_target_destination": "Same target and destination",
-    "saved": "Workspace saved",
-    "select_a_team": "Select a workspace",
+    "saved": "Team saved",
+    "select_a_team": "Select a team",
     "success_invites": "Success invites",
-    "title": "Workspaces",
+    "title": "Teams",
     "we_sent_invite_link": "We sent an invite link to all invitees!",
-    "we_sent_invite_link_description": "Ask all invitees to check their inbox. Click on the link to join the workspace.",
-    "search_title": "Team Requests"
+    "we_sent_invite_link_description": "Ask all invitees to check their inbox. Click on the link to join the team."
   },
   "team_environment": {
     "deleted": "Environment Deleted",
@@ -1012,14 +976,8 @@
   },
   "workspace": {
     "change": "Change workspace",
-    "personal": "Personal Workspace",
-    "other_workspaces": "My Workspaces",
-    "team": "Workspace",
+    "personal": "My Workspace",
+    "team": "Team Workspace",
     "title": "Workspaces"
-  },
-  "site_protection": {
-    "login_to_continue": "Login to continue",
-    "login_to_continue_description": "You need to be logged in to access this Hoppscotch Enterprise Instance.",
-    "error_fetching_site_protection_status": "Something Went Wrong While Fetching Site Protection Status"
   }
 }

packages/hoppscotch-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/common",
   "private": true,
-  "version": "2024.3.0",
+  "version": "2023.12.3",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
     "test": "vitest --run",
@@ -21,147 +21,147 @@
     "do-lintfix": "pnpm run lintfix"
   },
   "dependencies": {
-    "@apidevtools/swagger-parser": "10.1.0",
-    "@codemirror/autocomplete": "6.13.0",
-    "@codemirror/commands": "6.3.3",
-    "@codemirror/lang-javascript": "6.2.2",
-    "@codemirror/lang-json": "6.0.1",
-    "@codemirror/lang-xml": "6.1.0",
-    "@codemirror/language": "6.10.1",
-    "@codemirror/legacy-modes": "6.3.3",
-    "@codemirror/lint": "6.5.0",
-    "@codemirror/search": "6.5.6",
-    "@codemirror/state": "6.4.1",
-    "@codemirror/view": "6.25.1",
+    "@apidevtools/swagger-parser": "^10.1.0",
+    "@codemirror/autocomplete": "^6.11.1",
+    "@codemirror/commands": "^6.3.2",
+    "@codemirror/lang-javascript": "^6.2.1",
+    "@codemirror/lang-json": "^6.0.1",
+    "@codemirror/lang-xml": "^6.0.2",
+    "@codemirror/language": "6.9.3",
+    "@codemirror/legacy-modes": "^6.3.3",
+    "@codemirror/lint": "^6.4.2",
+    "@codemirror/search": "^6.5.5",
+    "@codemirror/state": "^6.3.3",
+    "@codemirror/view": "^6.22.3",
     "@hoppscotch/codemirror-lang-graphql": "workspace:^",
     "@hoppscotch/data": "workspace:^",
     "@hoppscotch/js-sandbox": "workspace:^",
-    "@hoppscotch/ui": "0.1.0",
-    "@hoppscotch/vue-toasted": "0.1.0",
+    "@hoppscotch/ui": "^0.1.0",
+    "@hoppscotch/vue-toasted": "^0.1.0",
     "@lezer/highlight": "1.2.0",
-    "@unhead/vue": "1.8.8",
-    "@urql/core": "4.2.0",
-    "@urql/devtools": "2.0.3",
-    "@urql/exchange-auth": "2.1.6",
-    "@urql/exchange-graphcache": "6.4.0",
-    "@vitejs/plugin-legacy": "4.1.1",
-    "@vueuse/core": "10.7.0",
-    "acorn-walk": "8.3.0",
-    "axios": "1.6.2",
-    "buffer": "6.0.3",
-    "cookie-es": "1.0.0",
-    "dioc": "1.0.1",
-    "esprima": "4.0.1",
-    "events": "3.3.0",
-    "fp-ts": "2.16.1",
-    "globalthis": "1.0.3",
-    "graphql": "16.8.1",
-    "graphql-language-service-interface": "2.10.2",
-    "graphql-tag": "2.12.6",
-    "httpsnippet": "3.0.1",
-    "insomnia-importers": "3.6.0",
-    "io-ts": "2.2.20",
-    "js-yaml": "4.1.0",
-    "jsonpath-plus": "7.2.0",
-    "lodash-es": "4.17.21",
-    "lossless-json": "3.0.2",
-    "minisearch": "6.3.0",
-    "nprogress": "0.2.0",
-    "paho-mqtt": "1.1.0",
-    "path": "0.12.7",
-    "postman-collection": "4.3.0",
-    "process": "0.11.10",
-    "qs": "6.11.2",
-    "quicktype-core": "23.0.79",
-    "rxjs": "7.8.1",
-    "set-cookie-parser": "2.6.0",
-    "set-cookie-parser-es": "1.0.5",
-    "socket.io-client-v2": "npm:socket.io-client@2.4.0",
-    "socket.io-client-v3": "npm:socket.io-client@3.1.3",
-    "socket.io-client-v4": "npm:socket.io-client@4.4.1",
-    "socketio-wildcard": "2.0.0",
-    "splitpanes": "3.1.5",
-    "stream-browserify": "3.0.0",
-    "subscriptions-transport-ws": "0.11.0",
-    "tern": "0.24.3",
-    "timers": "0.1.1",
-    "tippy.js": "6.3.7",
-    "url": "0.11.3",
-    "util": "0.12.5",
-    "uuid": "9.0.1",
-    "verzod": "0.2.2",
-    "vue": "3.3.9",
-    "vue-i18n": "9.8.0",
-    "vue-pdf-embed": "1.2.1",
-    "vue-router": "4.2.5",
+    "@unhead/vue": "^1.8.8",
+    "@urql/core": "^4.2.0",
+    "@urql/devtools": "^2.0.3",
+    "@urql/exchange-auth": "^2.1.6",
+    "@urql/exchange-graphcache": "^6.3.3",
+    "@vitejs/plugin-legacy": "^4.1.1",
+    "@vueuse/core": "^10.6.1",
+    "acorn-walk": "^8.3.0",
+    "axios": "^1.6.2",
+    "buffer": "^6.0.3",
+    "cookie-es": "^1.0.0",
+    "dioc": "^1.0.1",
+    "esprima": "^4.0.1",
+    "events": "^3.3.0",
+    "fp-ts": "^2.16.1",
+    "globalthis": "^1.0.3",
+    "graphql": "^16.8.1",
+    "graphql-language-service-interface": "^2.10.2",
+    "graphql-tag": "^2.12.6",
+    "httpsnippet": "^3.0.1",
+    "insomnia-importers": "^3.6.0",
+    "io-ts": "^2.2.20",
+    "js-yaml": "^4.1.0",
+    "jsonpath-plus": "^7.2.0",
+    "lodash-es": "^4.17.21",
+    "lossless-json": "^3.0.2",
+    "minisearch": "^6.3.0",
+    "nprogress": "^0.2.0",
+    "paho-mqtt": "^1.1.0",
+    "path": "^0.12.7",
+    "postman-collection": "^4.3.0",
+    "process": "^0.11.10",
+    "qs": "^6.11.2",
+    "quicktype-core": "^23.0.79",
+    "rxjs": "^7.8.1",
+    "set-cookie-parser": "^2.6.0",
+    "set-cookie-parser-es": "^1.0.5",
+    "socket.io-client-v2": "npm:socket.io-client@^2.4.0",
+    "socket.io-client-v3": "npm:socket.io-client@^3.1.3",
+    "socket.io-client-v4": "npm:socket.io-client@^4.4.1",
+    "socketio-wildcard": "^2.0.0",
+    "splitpanes": "^3.1.5",
+    "stream-browserify": "^3.0.0",
+    "subscriptions-transport-ws": "^0.11.0",
+    "tern": "^0.24.3",
+    "timers": "^0.1.1",
+    "tippy.js": "^6.3.7",
+    "url": "^0.11.3",
+    "util": "^0.12.5",
+    "uuid": "^9.0.1",
+    "verzod": "^0.2.0",
+    "vue": "^3.3.8",
+    "vue-i18n": "^9.7.1",
+    "vue-pdf-embed": "^1.2.1",
+    "vue-router": "^4.2.5",
     "vue-tippy": "6.3.1",
-    "vuedraggable-es": "4.1.1",
-    "wonka": "6.3.4",
-    "workbox-window": "7.0.0",
-    "xml-formatter": "3.6.0",
-    "yargs-parser": "21.1.1",
-    "zod": "3.22.4"
+    "vuedraggable-es": "^4.1.1",
+    "wonka": "^6.3.4",
+    "workbox-window": "^7.0.0",
+    "xml-formatter": "^3.6.0",
+    "yargs-parser": "^21.1.1",
+    "zod": "^3.22.4"
   },
   "devDependencies": {
-    "@esbuild-plugins/node-globals-polyfill": "0.2.3",
-    "@esbuild-plugins/node-modules-polyfill": "0.2.2",
-    "@graphql-codegen/add": "5.0.0",
-    "@graphql-codegen/cli": "5.0.0",
-    "@graphql-codegen/typed-document-node": "5.0.1",
-    "@graphql-codegen/typescript": "4.0.1",
-    "@graphql-codegen/typescript-operations": "4.0.1",
-    "@graphql-codegen/typescript-urql-graphcache": "3.0.0",
-    "@graphql-codegen/urql-introspection": "3.0.0",
-    "@graphql-typed-document-node/core": "3.2.0",
-    "@iconify-json/lucide": "1.1.144",
-    "@intlify/vite-plugin-vue-i18n": "7.0.0",
-    "@relmify/jest-fp-ts": "2.1.1",
-    "@rushstack/eslint-patch": "1.6.0",
-    "@types/har-format": "1.2.15",
-    "@types/js-yaml": "4.0.9",
-    "@types/lodash-es": "4.17.12",
-    "@types/lossless-json": "1.0.4",
-    "@types/nprogress": "0.2.3",
-    "@types/paho-mqtt": "1.0.10",
-    "@types/postman-collection": "3.5.10",
-    "@types/splitpanes": "2.2.6",
-    "@types/uuid": "9.0.7",
-    "@types/yargs-parser": "21.0.3",
-    "@typescript-eslint/eslint-plugin": "7.3.1",
-    "@typescript-eslint/parser": "7.3.1",
-    "@vitejs/plugin-vue": "4.5.1",
-    "@vue/compiler-sfc": "3.3.10",
-    "@vue/eslint-config-typescript": "12.0.0",
-    "@vue/runtime-core": "3.3.10",
-    "autoprefixer": "10.4.16",
-    "cross-env": "7.0.3",
-    "dotenv": "16.3.1",
-    "eslint": "8.57.0",
-    "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-vue": "9.24.0",
-    "glob": "10.3.10",
-    "npm-run-all": "4.1.5",
-    "openapi-types": "12.1.3",
-    "postcss": "8.4.31",
-    "prettier": "3.1.0",
-    "prettier-plugin-tailwindcss": "0.5.7",
-    "rollup-plugin-polyfill-node": "0.13.0",
-    "sass": "1.69.5",
-    "tailwindcss": "3.3.5",
-    "typescript": "5.3.2",
-    "unplugin-fonts": "1.1.1",
-    "unplugin-icons": "0.17.4",
-    "unplugin-vue-components": "0.25.2",
-    "vite": "4.5.0",
-    "vite-plugin-checker": "0.6.2",
-    "vite-plugin-fonts": "0.7.0",
-    "vite-plugin-html-config": "1.0.11",
-    "vite-plugin-inspect": "0.7.42",
-    "vite-plugin-pages": "0.31.0",
-    "vite-plugin-pages-sitemap": "1.6.1",
-    "vite-plugin-pwa": "0.17.3",
-    "vite-plugin-vue-layouts": "0.8.0",
-    "vitest": "0.34.6",
-    "vue-tsc": "1.8.24"
+    "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
+    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
+    "@graphql-codegen/add": "^5.0.0",
+    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/typed-document-node": "^5.0.1",
+    "@graphql-codegen/typescript": "^4.0.1",
+    "@graphql-codegen/typescript-operations": "^4.0.1",
+    "@graphql-codegen/typescript-urql-graphcache": "^3.0.0",
+    "@graphql-codegen/urql-introspection": "^3.0.0",
+    "@graphql-typed-document-node/core": "^3.2.0",
+    "@iconify-json/lucide": "^1.1.141",
+    "@intlify/vite-plugin-vue-i18n": "^7.0.0",
+    "@relmify/jest-fp-ts": "^2.1.1",
+    "@rushstack/eslint-patch": "^1.6.0",
+    "@types/har-format": "^1.2.15",
+    "@types/js-yaml": "^4.0.9",
+    "@types/lodash-es": "^4.17.12",
+    "@types/lossless-json": "^1.0.4",
+    "@types/nprogress": "^0.2.3",
+    "@types/paho-mqtt": "^1.0.10",
+    "@types/postman-collection": "^3.5.10",
+    "@types/splitpanes": "^2.2.6",
+    "@types/uuid": "^9.0.7",
+    "@types/yargs-parser": "^21.0.3",
+    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/parser": "^6.12.0",
+    "@vitejs/plugin-vue": "^4.5.0",
+    "@vue/compiler-sfc": "^3.3.8",
+    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/runtime-core": "^3.3.8",
+    "autoprefixer": "^10.4.14",
+    "cross-env": "^7.0.3",
+    "dotenv": "^16.3.1",
+    "eslint": "^8.54.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-vue": "^9.18.1",
+    "glob": "^10.3.10",
+    "npm-run-all": "^4.1.5",
+    "openapi-types": "^12.1.3",
+    "postcss": "^8.4.23",
+    "prettier": "^3.1.0",
+    "prettier-plugin-tailwindcss": "^0.5.7",
+    "rollup-plugin-polyfill-node": "^0.13.0",
+    "sass": "^1.69.5",
+    "tailwindcss": "^3.3.2",
+    "typescript": "^5.3.2",
+    "unplugin-fonts": "^1.1.1",
+    "unplugin-icons": "^0.17.4",
+    "unplugin-vue-components": "^0.25.2",
+    "vite": "^4.5.0",
+    "vite-plugin-checker": "^0.6.2",
+    "vite-plugin-fonts": "^0.7.0",
+    "vite-plugin-html-config": "^1.0.11",
+    "vite-plugin-inspect": "^0.7.42",
+    "vite-plugin-pages": "^0.31.0",
+    "vite-plugin-pages-sitemap": "^1.6.1",
+    "vite-plugin-pwa": "^0.17.0",
+    "vite-plugin-vue-layouts": "^0.8.0",
+    "vitest": "^0.34.6",
+    "vue-tsc": "^1.8.22"
   }
 }

packages/hoppscotch-common/src/components.d.ts

@@ -1,216 +1,213 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import "@vue/runtime-core"
+import '@vue/runtime-core'
 
 export {}
 
-declare module "@vue/runtime-core" {
+declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AppActionHandler: (typeof import("./components/app/ActionHandler.vue"))["default"]
-    AppBanner: (typeof import("./components/app/Banner.vue"))["default"]
-    AppContextMenu: (typeof import("./components/app/ContextMenu.vue"))["default"]
-    AppDeveloperOptions: (typeof import("./components/app/DeveloperOptions.vue"))["default"]
-    AppFooter: (typeof import("./components/app/Footer.vue"))["default"]
-    AppGitHubStarButton: (typeof import("./components/app/GitHubStarButton.vue"))["default"]
-    AppHeader: (typeof import("./components/app/Header.vue"))["default"]
-    AppInspection: (typeof import("./components/app/Inspection.vue"))["default"]
-    AppInterceptor: (typeof import("./components/app/Interceptor.vue"))["default"]
-    AppLogo: (typeof import("./components/app/Logo.vue"))["default"]
-    AppOptions: (typeof import("./components/app/Options.vue"))["default"]
-    AppPaneLayout: (typeof import("./components/app/PaneLayout.vue"))["default"]
-    AppShare: (typeof import("./components/app/Share.vue"))["default"]
-    AppShortcuts: (typeof import("./components/app/Shortcuts.vue"))["default"]
-    AppShortcutsEntry: (typeof import("./components/app/ShortcutsEntry.vue"))["default"]
-    AppShortcutsPrompt: (typeof import("./components/app/ShortcutsPrompt.vue"))["default"]
-    AppSidenav: (typeof import("./components/app/Sidenav.vue"))["default"]
-    AppSpotlight: (typeof import("./components/app/spotlight/index.vue"))["default"]
-    AppSpotlightEntry: (typeof import("./components/app/spotlight/Entry.vue"))["default"]
-    AppSpotlightEntryGQLHistory: (typeof import("./components/app/spotlight/entry/GQLHistory.vue"))["default"]
-    AppSpotlightEntryGQLRequest: (typeof import("./components/app/spotlight/entry/GQLRequest.vue"))["default"]
-    AppSpotlightEntryIconSelected: (typeof import("./components/app/spotlight/entry/IconSelected.vue"))["default"]
-    AppSpotlightEntryRESTHistory: (typeof import("./components/app/spotlight/entry/RESTHistory.vue"))["default"]
-    AppSpotlightEntryRESTRequest: (typeof import("./components/app/spotlight/entry/RESTRequest.vue"))["default"]
-    AppSupport: (typeof import("./components/app/Support.vue"))["default"]
-    Collections: (typeof import("./components/collections/index.vue"))["default"]
-    CollectionsAdd: (typeof import("./components/collections/Add.vue"))["default"]
-    CollectionsAddFolder: (typeof import("./components/collections/AddFolder.vue"))["default"]
-    CollectionsAddRequest: (typeof import("./components/collections/AddRequest.vue"))["default"]
-    CollectionsCollection: (typeof import("./components/collections/Collection.vue"))["default"]
-    CollectionsEdit: (typeof import("./components/collections/Edit.vue"))["default"]
-    CollectionsEditFolder: (typeof import("./components/collections/EditFolder.vue"))["default"]
-    CollectionsEditRequest: (typeof import("./components/collections/EditRequest.vue"))["default"]
-    CollectionsGraphql: (typeof import("./components/collections/graphql/index.vue"))["default"]
-    CollectionsGraphqlAdd: (typeof import("./components/collections/graphql/Add.vue"))["default"]
-    CollectionsGraphqlAddFolder: (typeof import("./components/collections/graphql/AddFolder.vue"))["default"]
-    CollectionsGraphqlAddRequest: (typeof import("./components/collections/graphql/AddRequest.vue"))["default"]
-    CollectionsGraphqlCollection: (typeof import("./components/collections/graphql/Collection.vue"))["default"]
-    CollectionsGraphqlEdit: (typeof import("./components/collections/graphql/Edit.vue"))["default"]
-    CollectionsGraphqlEditFolder: (typeof import("./components/collections/graphql/EditFolder.vue"))["default"]
-    CollectionsGraphqlEditRequest: (typeof import("./components/collections/graphql/EditRequest.vue"))["default"]
-    CollectionsGraphqlFolder: (typeof import("./components/collections/graphql/Folder.vue"))["default"]
-    CollectionsGraphqlImportExport: (typeof import("./components/collections/graphql/ImportExport.vue"))["default"]
-    CollectionsGraphqlRequest: (typeof import("./components/collections/graphql/Request.vue"))["default"]
-    CollectionsImportExport: (typeof import("./components/collections/ImportExport.vue"))["default"]
-    CollectionsMyCollections: (typeof import("./components/collections/MyCollections.vue"))["default"]
-    CollectionsProperties: (typeof import("./components/collections/Properties.vue"))["default"]
-    CollectionsRequest: (typeof import("./components/collections/Request.vue"))["default"]
-    CollectionsSaveRequest: (typeof import("./components/collections/SaveRequest.vue"))["default"]
-    CollectionsTeamCollections: (typeof import("./components/collections/TeamCollections.vue"))["default"]
-    CookiesAllModal: (typeof import("./components/cookies/AllModal.vue"))["default"]
-    CookiesEditCookie: (typeof import("./components/cookies/EditCookie.vue"))["default"]
-    Embeds: (typeof import("./components/embeds/index.vue"))["default"]
-    Environments: (typeof import("./components/environments/index.vue"))["default"]
-    EnvironmentsAdd: (typeof import("./components/environments/Add.vue"))["default"]
-    EnvironmentsImportExport: (typeof import("./components/environments/ImportExport.vue"))["default"]
-    EnvironmentsMy: (typeof import("./components/environments/my/index.vue"))["default"]
-    EnvironmentsMyDetails: (typeof import("./components/environments/my/Details.vue"))["default"]
-    EnvironmentsMyEnvironment: (typeof import("./components/environments/my/Environment.vue"))["default"]
-    EnvironmentsSelector: (typeof import("./components/environments/Selector.vue"))["default"]
-    EnvironmentsTeams: (typeof import("./components/environments/teams/index.vue"))["default"]
-    EnvironmentsTeamsDetails: (typeof import("./components/environments/teams/Details.vue"))["default"]
-    EnvironmentsTeamsEnvironment: (typeof import("./components/environments/teams/Environment.vue"))["default"]
-    FirebaseLogin: (typeof import("./components/firebase/Login.vue"))["default"]
-    FirebaseLogout: (typeof import("./components/firebase/Logout.vue"))["default"]
-    GraphqlAuthorization: (typeof import("./components/graphql/Authorization.vue"))["default"]
-    GraphqlField: (typeof import("./components/graphql/Field.vue"))["default"]
-    GraphqlHeaders: (typeof import("./components/graphql/Headers.vue"))["default"]
-    GraphqlQuery: (typeof import("./components/graphql/Query.vue"))["default"]
-    GraphqlRequest: (typeof import("./components/graphql/Request.vue"))["default"]
-    GraphqlRequestOptions: (typeof import("./components/graphql/RequestOptions.vue"))["default"]
-    GraphqlRequestTab: (typeof import("./components/graphql/RequestTab.vue"))["default"]
-    GraphqlResponse: (typeof import("./components/graphql/Response.vue"))["default"]
-    GraphqlSidebar: (typeof import("./components/graphql/Sidebar.vue"))["default"]
-    GraphqlSubscriptionLog: (typeof import("./components/graphql/SubscriptionLog.vue"))["default"]
-    GraphqlTabHead: (typeof import("./components/graphql/TabHead.vue"))["default"]
-    GraphqlType: (typeof import("./components/graphql/Type.vue"))["default"]
-    GraphqlTypeLink: (typeof import("./components/graphql/TypeLink.vue"))["default"]
-    GraphqlVariable: (typeof import("./components/graphql/Variable.vue"))["default"]
-    History: (typeof import("./components/history/index.vue"))["default"]
-    HistoryGraphqlCard: (typeof import("./components/history/graphql/Card.vue"))["default"]
-    HistoryRestCard: (typeof import("./components/history/rest/Card.vue"))["default"]
-    HoppButtonPrimary: (typeof import("@hoppscotch/ui"))["HoppButtonPrimary"]
-    HoppButtonSecondary: (typeof import("@hoppscotch/ui"))["HoppButtonSecondary"]
-    HoppSmartAnchor: (typeof import("@hoppscotch/ui"))["HoppSmartAnchor"]
-    HoppSmartCheckbox: (typeof import("@hoppscotch/ui"))["HoppSmartCheckbox"]
-    HoppSmartConfirmModal: (typeof import("@hoppscotch/ui"))["HoppSmartConfirmModal"]
-    HoppSmartExpand: (typeof import("@hoppscotch/ui"))["HoppSmartExpand"]
-    HoppSmartFileChip: (typeof import("@hoppscotch/ui"))["HoppSmartFileChip"]
-    HoppSmartInput: (typeof import("@hoppscotch/ui"))["HoppSmartInput"]
-    HoppSmartIntersection: (typeof import("@hoppscotch/ui"))["HoppSmartIntersection"]
-    HoppSmartItem: (typeof import("@hoppscotch/ui"))["HoppSmartItem"]
-    HoppSmartLink: (typeof import("@hoppscotch/ui"))["HoppSmartLink"]
-    HoppSmartModal: (typeof import("@hoppscotch/ui"))["HoppSmartModal"]
-    HoppSmartPicture: (typeof import("@hoppscotch/ui"))["HoppSmartPicture"]
-    HoppSmartPlaceholder: (typeof import("@hoppscotch/ui"))["HoppSmartPlaceholder"]
-    HoppSmartProgressRing: (typeof import("@hoppscotch/ui"))["HoppSmartProgressRing"]
-    HoppSmartRadio: (typeof import("@hoppscotch/ui"))["HoppSmartRadio"]
-    HoppSmartRadioGroup: (typeof import("@hoppscotch/ui"))["HoppSmartRadioGroup"]
-    HoppSmartSelectWrapper: (typeof import("@hoppscotch/ui"))["HoppSmartSelectWrapper"]
-    HoppSmartSlideOver: (typeof import("@hoppscotch/ui"))["HoppSmartSlideOver"]
-    HoppSmartSpinner: (typeof import("@hoppscotch/ui"))["HoppSmartSpinner"]
-    HoppSmartTab: (typeof import("@hoppscotch/ui"))["HoppSmartTab"]
-    HoppSmartTabs: (typeof import("@hoppscotch/ui"))["HoppSmartTabs"]
-    HoppSmartToggle: (typeof import("@hoppscotch/ui"))["HoppSmartToggle"]
-    HoppSmartTree: (typeof import("@hoppscotch/ui"))["HoppSmartTree"]
-    HoppSmartWindow: (typeof import("@hoppscotch/ui"))["HoppSmartWindow"]
-    HoppSmartWindows: (typeof import("@hoppscotch/ui"))["HoppSmartWindows"]
-    HttpAuthorization: (typeof import("./components/http/Authorization.vue"))["default"]
-    HttpAuthorizationApiKey: (typeof import("./components/http/authorization/ApiKey.vue"))["default"]
-    HttpAuthorizationBasic: (typeof import("./components/http/authorization/Basic.vue"))["default"]
-    HttpBody: (typeof import("./components/http/Body.vue"))["default"]
-    HttpBodyParameters: (typeof import("./components/http/BodyParameters.vue"))["default"]
-    HttpCodegenModal: (typeof import("./components/http/CodegenModal.vue"))["default"]
-    HttpHeaders: (typeof import("./components/http/Headers.vue"))["default"]
-    HttpImportCurl: (typeof import("./components/http/ImportCurl.vue"))["default"]
-    HttpOAuth2Authorization: (typeof import("./components/http/OAuth2Authorization.vue"))["default"]
-    HttpParameters: (typeof import("./components/http/Parameters.vue"))["default"]
-    HttpPreRequestScript: (typeof import("./components/http/PreRequestScript.vue"))["default"]
-    HttpRawBody: (typeof import("./components/http/RawBody.vue"))["default"]
-    HttpReqChangeConfirmModal: (typeof import("./components/http/ReqChangeConfirmModal.vue"))["default"]
-    HttpRequest: (typeof import("./components/http/Request.vue"))["default"]
-    HttpRequestOptions: (typeof import("./components/http/RequestOptions.vue"))["default"]
-    HttpRequestTab: (typeof import("./components/http/RequestTab.vue"))["default"]
-    HttpResponse: (typeof import("./components/http/Response.vue"))["default"]
-    HttpResponseMeta: (typeof import("./components/http/ResponseMeta.vue"))["default"]
-    HttpSidebar: (typeof import("./components/http/Sidebar.vue"))["default"]
-    HttpTabHead: (typeof import("./components/http/TabHead.vue"))["default"]
-    HttpTestResult: (typeof import("./components/http/TestResult.vue"))["default"]
-    HttpTestResultEntry: (typeof import("./components/http/TestResultEntry.vue"))["default"]
-    HttpTestResultEnv: (typeof import("./components/http/TestResultEnv.vue"))["default"]
-    HttpTestResultReport: (typeof import("./components/http/TestResultReport.vue"))["default"]
-    HttpTests: (typeof import("./components/http/Tests.vue"))["default"]
-    HttpURLEncodedParams: (typeof import("./components/http/URLEncodedParams.vue"))["default"]
-    IconLucideActivity: (typeof import("~icons/lucide/activity"))["default"]
-    IconLucideAlertTriangle: (typeof import("~icons/lucide/alert-triangle"))["default"]
-    IconLucideArrowLeft: (typeof import("~icons/lucide/arrow-left"))["default"]
-    IconLucideArrowUpRight: (typeof import("~icons/lucide/arrow-up-right"))["default"]
-    IconLucideBrush: (typeof import("~icons/lucide/brush"))["default"]
-    IconLucideCheckCircle: (typeof import("~icons/lucide/check-circle"))["default"]
-    IconLucideChevronRight: (typeof import("~icons/lucide/chevron-right"))["default"]
-    IconLucideGlobe: (typeof import("~icons/lucide/globe"))["default"]
-    IconLucideHelpCircle: (typeof import("~icons/lucide/help-circle"))["default"]
-    IconLucideInbox: (typeof import("~icons/lucide/inbox"))["default"]
-    IconLucideInfo: (typeof import("~icons/lucide/info"))["default"]
-    IconLucideLayers: (typeof import("~icons/lucide/layers"))["default"]
-    IconLucideListEnd: (typeof import("~icons/lucide/list-end"))["default"]
-    IconLucideMinus: (typeof import("~icons/lucide/minus"))["default"]
-    IconLucideRss: (typeof import("~icons/lucide/rss"))["default"]
-    IconLucideSearch: (typeof import("~icons/lucide/search"))["default"]
-    IconLucideUsers: (typeof import("~icons/lucide/users"))["default"]
-    IconLucideX: (typeof import("~icons/lucide/x"))["default"]
-    ImportExportBase: (typeof import("./components/importExport/Base.vue"))["default"]
-    ImportExportImportExportList: (typeof import("./components/importExport/ImportExportList.vue"))["default"]
-    ImportExportImportExportSourcesList: (typeof import("./components/importExport/ImportExportSourcesList.vue"))["default"]
-    ImportExportImportExportStepsFileImport: (typeof import("./components/importExport/ImportExportSteps/FileImport.vue"))["default"]
-    ImportExportImportExportStepsMyCollectionImport: (typeof import("./components/importExport/ImportExportSteps/MyCollectionImport.vue"))["default"]
-    ImportExportImportExportStepsUrlImport: (typeof import("./components/importExport/ImportExportSteps/UrlImport.vue"))["default"]
-    InterceptorsErrorPlaceholder: (typeof import("./components/interceptors/ErrorPlaceholder.vue"))["default"]
-    InterceptorsExtensionSubtitle: (typeof import("./components/interceptors/ExtensionSubtitle.vue"))["default"]
-    LensesHeadersRenderer: (typeof import("./components/lenses/HeadersRenderer.vue"))["default"]
-    LensesHeadersRendererEntry: (typeof import("./components/lenses/HeadersRendererEntry.vue"))["default"]
-    LensesRenderersAudioLensRenderer: (typeof import("./components/lenses/renderers/AudioLensRenderer.vue"))["default"]
-    LensesRenderersHTMLLensRenderer: (typeof import("./components/lenses/renderers/HTMLLensRenderer.vue"))["default"]
-    LensesRenderersImageLensRenderer: (typeof import("./components/lenses/renderers/ImageLensRenderer.vue"))["default"]
-    LensesRenderersJSONLensRenderer: (typeof import("./components/lenses/renderers/JSONLensRenderer.vue"))["default"]
-    LensesRenderersPDFLensRenderer: (typeof import("./components/lenses/renderers/PDFLensRenderer.vue"))["default"]
-    LensesRenderersRawLensRenderer: (typeof import("./components/lenses/renderers/RawLensRenderer.vue"))["default"]
-    LensesRenderersVideoLensRenderer: (typeof import("./components/lenses/renderers/VideoLensRenderer.vue"))["default"]
-    LensesRenderersXMLLensRenderer: (typeof import("./components/lenses/renderers/XMLLensRenderer.vue"))["default"]
-    LensesResponseBodyRenderer: (typeof import("./components/lenses/ResponseBodyRenderer.vue"))["default"]
-    ProfileUserDelete: (typeof import("./components/profile/UserDelete.vue"))["default"]
-    RealtimeCommunication: (typeof import("./components/realtime/Communication.vue"))["default"]
-    RealtimeConnectionConfig: (typeof import("./components/realtime/ConnectionConfig.vue"))["default"]
-    RealtimeLog: (typeof import("./components/realtime/Log.vue"))["default"]
-    RealtimeLogEntry: (typeof import("./components/realtime/LogEntry.vue"))["default"]
-    RealtimeSubscription: (typeof import("./components/realtime/Subscription.vue"))["default"]
-    SettingsExtension: (typeof import("./components/settings/Extension.vue"))["default"]
-    SettingsProxy: (typeof import("./components/settings/Proxy.vue"))["default"]
-    Share: (typeof import("./components/share/index.vue"))["default"]
-    ShareCreateModal: (typeof import("./components/share/CreateModal.vue"))["default"]
-    ShareCustomizeModal: (typeof import("./components/share/CustomizeModal.vue"))["default"]
-    ShareModal: (typeof import("./components/share/Modal.vue"))["default"]
-    ShareRequest: (typeof import("./components/share/Request.vue"))["default"]
-    ShareTemplatesButton: (typeof import("./components/share/templates/Button.vue"))["default"]
-    ShareTemplatesEmbeds: (typeof import("./components/share/templates/Embeds.vue"))["default"]
-    ShareTemplatesLink: (typeof import("./components/share/templates/Link.vue"))["default"]
-    SmartAccentModePicker: (typeof import("./components/smart/AccentModePicker.vue"))["default"]
-    SmartChangeLanguage: (typeof import("./components/smart/ChangeLanguage.vue"))["default"]
-    SmartColorModePicker: (typeof import("./components/smart/ColorModePicker.vue"))["default"]
-    SmartEnvInput: (typeof import("./components/smart/EnvInput.vue"))["default"]
-    TabPrimary: (typeof import("./components/tab/Primary.vue"))["default"]
-    TabSecondary: (typeof import("./components/tab/Secondary.vue"))["default"]
-    Teams: (typeof import("./components/teams/index.vue"))["default"]
-    TeamsAdd: (typeof import("./components/teams/Add.vue"))["default"]
-    TeamsEdit: (typeof import("./components/teams/Edit.vue"))["default"]
-    TeamsInvite: (typeof import("./components/teams/Invite.vue"))["default"]
-    TeamsMemberStack: (typeof import("./components/teams/MemberStack.vue"))["default"]
-    TeamsModal: (typeof import("./components/teams/Modal.vue"))["default"]
-    TeamsTeam: (typeof import("./components/teams/Team.vue"))["default"]
-    Tippy: (typeof import("vue-tippy"))["Tippy"]
-    WorkspaceCurrent: (typeof import("./components/workspace/Current.vue"))["default"]
-    WorkspaceSelector: (typeof import("./components/workspace/Selector.vue"))["default"]
+    AppActionHandler: typeof import('./components/app/ActionHandler.vue')['default']
+    AppBanner: typeof import('./components/app/Banner.vue')['default']
+    AppContextMenu: typeof import('./components/app/ContextMenu.vue')['default']
+    AppDeveloperOptions: typeof import('./components/app/DeveloperOptions.vue')['default']
+    AppFooter: typeof import('./components/app/Footer.vue')['default']
+    AppGitHubStarButton: typeof import('./components/app/GitHubStarButton.vue')['default']
+    AppHeader: typeof import('./components/app/Header.vue')['default']
+    AppInspection: typeof import('./components/app/Inspection.vue')['default']
+    AppInterceptor: typeof import('./components/app/Interceptor.vue')['default']
+    AppLogo: typeof import('./components/app/Logo.vue')['default']
+    AppOptions: typeof import('./components/app/Options.vue')['default']
+    AppPaneLayout: typeof import('./components/app/PaneLayout.vue')['default']
+    AppShare: typeof import('./components/app/Share.vue')['default']
+    AppShortcuts: typeof import('./components/app/Shortcuts.vue')['default']
+    AppShortcutsEntry: typeof import('./components/app/ShortcutsEntry.vue')['default']
+    AppShortcutsPrompt: typeof import('./components/app/ShortcutsPrompt.vue')['default']
+    AppSidenav: typeof import('./components/app/Sidenav.vue')['default']
+    AppSpotlight: typeof import('./components/app/spotlight/index.vue')['default']
+    AppSpotlightEntry: typeof import('./components/app/spotlight/Entry.vue')['default']
+    AppSpotlightEntryGQLHistory: typeof import('./components/app/spotlight/entry/GQLHistory.vue')['default']
+    AppSpotlightEntryGQLRequest: typeof import('./components/app/spotlight/entry/GQLRequest.vue')['default']
+    AppSpotlightEntryIconSelected: typeof import('./components/app/spotlight/entry/IconSelected.vue')['default']
+    AppSpotlightEntryRESTHistory: typeof import('./components/app/spotlight/entry/RESTHistory.vue')['default']
+    AppSpotlightEntryRESTRequest: typeof import('./components/app/spotlight/entry/RESTRequest.vue')['default']
+    AppSupport: typeof import('./components/app/Support.vue')['default']
+    Collections: typeof import('./components/collections/index.vue')['default']
+    CollectionsAdd: typeof import('./components/collections/Add.vue')['default']
+    CollectionsAddFolder: typeof import('./components/collections/AddFolder.vue')['default']
+    CollectionsAddRequest: typeof import('./components/collections/AddRequest.vue')['default']
+    CollectionsCollection: typeof import('./components/collections/Collection.vue')['default']
+    CollectionsEdit: typeof import('./components/collections/Edit.vue')['default']
+    CollectionsEditFolder: typeof import('./components/collections/EditFolder.vue')['default']
+    CollectionsEditRequest: typeof import('./components/collections/EditRequest.vue')['default']
+    CollectionsGraphql: typeof import('./components/collections/graphql/index.vue')['default']
+    CollectionsGraphqlAdd: typeof import('./components/collections/graphql/Add.vue')['default']
+    CollectionsGraphqlAddFolder: typeof import('./components/collections/graphql/AddFolder.vue')['default']
+    CollectionsGraphqlAddRequest: typeof import('./components/collections/graphql/AddRequest.vue')['default']
+    CollectionsGraphqlCollection: typeof import('./components/collections/graphql/Collection.vue')['default']
+    CollectionsGraphqlEdit: typeof import('./components/collections/graphql/Edit.vue')['default']
+    CollectionsGraphqlEditFolder: typeof import('./components/collections/graphql/EditFolder.vue')['default']
+    CollectionsGraphqlEditRequest: typeof import('./components/collections/graphql/EditRequest.vue')['default']
+    CollectionsGraphqlFolder: typeof import('./components/collections/graphql/Folder.vue')['default']
+    CollectionsGraphqlImportExport: typeof import('./components/collections/graphql/ImportExport.vue')['default']
+    CollectionsGraphqlRequest: typeof import('./components/collections/graphql/Request.vue')['default']
+    CollectionsImportExport: typeof import('./components/collections/ImportExport.vue')['default']
+    CollectionsMyCollections: typeof import('./components/collections/MyCollections.vue')['default']
+    CollectionsProperties: typeof import('./components/collections/Properties.vue')['default']
+    CollectionsRequest: typeof import('./components/collections/Request.vue')['default']
+    CollectionsSaveRequest: typeof import('./components/collections/SaveRequest.vue')['default']
+    CollectionsTeamCollections: typeof import('./components/collections/TeamCollections.vue')['default']
+    CookiesAllModal: typeof import('./components/cookies/AllModal.vue')['default']
+    CookiesEditCookie: typeof import('./components/cookies/EditCookie.vue')['default']
+    Embeds: typeof import('./components/embeds/index.vue')['default']
+    Environments: typeof import('./components/environments/index.vue')['default']
+    EnvironmentsAdd: typeof import('./components/environments/Add.vue')['default']
+    EnvironmentsImportExport: typeof import('./components/environments/ImportExport.vue')['default']
+    EnvironmentsMy: typeof import('./components/environments/my/index.vue')['default']
+    EnvironmentsMyDetails: typeof import('./components/environments/my/Details.vue')['default']
+    EnvironmentsMyEnvironment: typeof import('./components/environments/my/Environment.vue')['default']
+    EnvironmentsSelector: typeof import('./components/environments/Selector.vue')['default']
+    EnvironmentsTeams: typeof import('./components/environments/teams/index.vue')['default']
+    EnvironmentsTeamsDetails: typeof import('./components/environments/teams/Details.vue')['default']
+    EnvironmentsTeamsEnvironment: typeof import('./components/environments/teams/Environment.vue')['default']
+    FirebaseLogin: typeof import('./components/firebase/Login.vue')['default']
+    FirebaseLogout: typeof import('./components/firebase/Logout.vue')['default']
+    GraphqlAuthorization: typeof import('./components/graphql/Authorization.vue')['default']
+    GraphqlField: typeof import('./components/graphql/Field.vue')['default']
+    GraphqlHeaders: typeof import('./components/graphql/Headers.vue')['default']
+    GraphqlQuery: typeof import('./components/graphql/Query.vue')['default']
+    GraphqlRequest: typeof import('./components/graphql/Request.vue')['default']
+    GraphqlRequestOptions: typeof import('./components/graphql/RequestOptions.vue')['default']
+    GraphqlRequestTab: typeof import('./components/graphql/RequestTab.vue')['default']
+    GraphqlResponse: typeof import('./components/graphql/Response.vue')['default']
+    GraphqlSidebar: typeof import('./components/graphql/Sidebar.vue')['default']
+    GraphqlSubscriptionLog: typeof import('./components/graphql/SubscriptionLog.vue')['default']
+    GraphqlTabHead: typeof import('./components/graphql/TabHead.vue')['default']
+    GraphqlType: typeof import('./components/graphql/Type.vue')['default']
+    GraphqlTypeLink: typeof import('./components/graphql/TypeLink.vue')['default']
+    GraphqlVariable: typeof import('./components/graphql/Variable.vue')['default']
+    History: typeof import('./components/history/index.vue')['default']
+    HistoryGraphqlCard: typeof import('./components/history/graphql/Card.vue')['default']
+    HistoryRestCard: typeof import('./components/history/rest/Card.vue')['default']
+    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
+    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
+    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
+    HoppSmartCheckbox: typeof import('@hoppscotch/ui')['HoppSmartCheckbox']
+    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
+    HoppSmartExpand: typeof import('@hoppscotch/ui')['HoppSmartExpand']
+    HoppSmartFileChip: typeof import('@hoppscotch/ui')['HoppSmartFileChip']
+    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
+    HoppSmartIntersection: typeof import('@hoppscotch/ui')['HoppSmartIntersection']
+    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
+    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
+    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
+    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
+    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder']
+    HoppSmartProgressRing: typeof import('@hoppscotch/ui')['HoppSmartProgressRing']
+    HoppSmartRadio: typeof import('@hoppscotch/ui')['HoppSmartRadio']
+    HoppSmartRadioGroup: typeof import('@hoppscotch/ui')['HoppSmartRadioGroup']
+    HoppSmartSelectWrapper: typeof import('@hoppscotch/ui')['HoppSmartSelectWrapper']
+    HoppSmartSlideOver: typeof import('@hoppscotch/ui')['HoppSmartSlideOver']
+    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
+    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
+    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
+    HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
+    HoppSmartTree: typeof import('@hoppscotch/ui')['HoppSmartTree']
+    HoppSmartWindow: typeof import('@hoppscotch/ui')['HoppSmartWindow']
+    HoppSmartWindows: typeof import('@hoppscotch/ui')['HoppSmartWindows']
+    HttpAuthorization: typeof import('./components/http/Authorization.vue')['default']
+    HttpAuthorizationApiKey: typeof import('./components/http/authorization/ApiKey.vue')['default']
+    HttpAuthorizationBasic: typeof import('./components/http/authorization/Basic.vue')['default']
+    HttpBody: typeof import('./components/http/Body.vue')['default']
+    HttpBodyParameters: typeof import('./components/http/BodyParameters.vue')['default']
+    HttpCodegenModal: typeof import('./components/http/CodegenModal.vue')['default']
+    HttpHeaders: typeof import('./components/http/Headers.vue')['default']
+    HttpImportCurl: typeof import('./components/http/ImportCurl.vue')['default']
+    HttpOAuth2Authorization: typeof import('./components/http/OAuth2Authorization.vue')['default']
+    HttpParameters: typeof import('./components/http/Parameters.vue')['default']
+    HttpPreRequestScript: typeof import('./components/http/PreRequestScript.vue')['default']
+    HttpRawBody: typeof import('./components/http/RawBody.vue')['default']
+    HttpReqChangeConfirmModal: typeof import('./components/http/ReqChangeConfirmModal.vue')['default']
+    HttpRequest: typeof import('./components/http/Request.vue')['default']
+    HttpRequestOptions: typeof import('./components/http/RequestOptions.vue')['default']
+    HttpRequestTab: typeof import('./components/http/RequestTab.vue')['default']
+    HttpResponse: typeof import('./components/http/Response.vue')['default']
+    HttpResponseMeta: typeof import('./components/http/ResponseMeta.vue')['default']
+    HttpSidebar: typeof import('./components/http/Sidebar.vue')['default']
+    HttpTabHead: typeof import('./components/http/TabHead.vue')['default']
+    HttpTestResult: typeof import('./components/http/TestResult.vue')['default']
+    HttpTestResultEntry: typeof import('./components/http/TestResultEntry.vue')['default']
+    HttpTestResultEnv: typeof import('./components/http/TestResultEnv.vue')['default']
+    HttpTestResultReport: typeof import('./components/http/TestResultReport.vue')['default']
+    HttpTests: typeof import('./components/http/Tests.vue')['default']
+    HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.vue')['default']
+    IconLucideActivity: typeof import('~icons/lucide/activity')['default']
+    IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default']
+    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
+    IconLucideArrowUpRight: typeof import('~icons/lucide/arrow-up-right')['default']
+    IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default']
+    IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
+    IconLucideGlobe: typeof import('~icons/lucide/globe')['default']
+    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']
+    IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
+    IconLucideInfo: typeof import('~icons/lucide/info')['default']
+    IconLucideLayers: typeof import('~icons/lucide/layers')['default']
+    IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']
+    IconLucideMinus: typeof import('~icons/lucide/minus')['default']
+    IconLucideSearch: typeof import('~icons/lucide/search')['default']
+    IconLucideUsers: typeof import('~icons/lucide/users')['default']
+    IconLucideX: typeof import('~icons/lucide/x')['default']
+    ImportExportBase: typeof import('./components/importExport/Base.vue')['default']
+    ImportExportImportExportList: typeof import('./components/importExport/ImportExportList.vue')['default']
+    ImportExportImportExportSourcesList: typeof import('./components/importExport/ImportExportSourcesList.vue')['default']
+    ImportExportImportExportStepsFileImport: typeof import('./components/importExport/ImportExportSteps/FileImport.vue')['default']
+    ImportExportImportExportStepsMyCollectionImport: typeof import('./components/importExport/ImportExportSteps/MyCollectionImport.vue')['default']
+    ImportExportImportExportStepsUrlImport: typeof import('./components/importExport/ImportExportSteps/UrlImport.vue')['default']
+    InterceptorsErrorPlaceholder: typeof import('./components/interceptors/ErrorPlaceholder.vue')['default']
+    InterceptorsExtensionSubtitle: typeof import('./components/interceptors/ExtensionSubtitle.vue')['default']
+    LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']
+    LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default']
+    LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default']
+    LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default']
+    LensesRenderersImageLensRenderer: typeof import('./components/lenses/renderers/ImageLensRenderer.vue')['default']
+    LensesRenderersJSONLensRenderer: typeof import('./components/lenses/renderers/JSONLensRenderer.vue')['default']
+    LensesRenderersPDFLensRenderer: typeof import('./components/lenses/renderers/PDFLensRenderer.vue')['default']
+    LensesRenderersRawLensRenderer: typeof import('./components/lenses/renderers/RawLensRenderer.vue')['default']
+    LensesRenderersVideoLensRenderer: typeof import('./components/lenses/renderers/VideoLensRenderer.vue')['default']
+    LensesRenderersXMLLensRenderer: typeof import('./components/lenses/renderers/XMLLensRenderer.vue')['default']
+    LensesResponseBodyRenderer: typeof import('./components/lenses/ResponseBodyRenderer.vue')['default']
+    ProfileUserDelete: typeof import('./components/profile/UserDelete.vue')['default']
+    RealtimeCommunication: typeof import('./components/realtime/Communication.vue')['default']
+    RealtimeConnectionConfig: typeof import('./components/realtime/ConnectionConfig.vue')['default']
+    RealtimeLog: typeof import('./components/realtime/Log.vue')['default']
+    RealtimeLogEntry: typeof import('./components/realtime/LogEntry.vue')['default']
+    RealtimeSubscription: typeof import('./components/realtime/Subscription.vue')['default']
+    SettingsExtension: typeof import('./components/settings/Extension.vue')['default']
+    SettingsProxy: typeof import('./components/settings/Proxy.vue')['default']
+    Share: typeof import('./components/share/index.vue')['default']
+    ShareCreateModal: typeof import('./components/share/CreateModal.vue')['default']
+    ShareCustomizeModal: typeof import('./components/share/CustomizeModal.vue')['default']
+    ShareModal: typeof import('./components/share/Modal.vue')['default']
+    ShareRequest: typeof import('./components/share/Request.vue')['default']
+    ShareTemplatesButton: typeof import('./components/share/templates/Button.vue')['default']
+    ShareTemplatesEmbeds: typeof import('./components/share/templates/Embeds.vue')['default']
+    ShareTemplatesLink: typeof import('./components/share/templates/Link.vue')['default']
+    SmartAccentModePicker: typeof import('./components/smart/AccentModePicker.vue')['default']
+    SmartChangeLanguage: typeof import('./components/smart/ChangeLanguage.vue')['default']
+    SmartColorModePicker: typeof import('./components/smart/ColorModePicker.vue')['default']
+    SmartEnvInput: typeof import('./components/smart/EnvInput.vue')['default']
+    TabPrimary: typeof import('./components/tab/Primary.vue')['default']
+    TabSecondary: typeof import('./components/tab/Secondary.vue')['default']
+    Teams: typeof import('./components/teams/index.vue')['default']
+    TeamsAdd: typeof import('./components/teams/Add.vue')['default']
+    TeamsEdit: typeof import('./components/teams/Edit.vue')['default']
+    TeamsInvite: typeof import('./components/teams/Invite.vue')['default']
+    TeamsMemberStack: typeof import('./components/teams/MemberStack.vue')['default']
+    TeamsModal: typeof import('./components/teams/Modal.vue')['default']
+    TeamsTeam: typeof import('./components/teams/Team.vue')['default']
+    Tippy: typeof import('vue-tippy')['Tippy']
+    WorkspaceCurrent: typeof import('./components/workspace/Current.vue')['default']
+    WorkspaceSelector: typeof import('./components/workspace/Selector.vue')['default']
   }
+
 }

packages/hoppscotch-common/src/components/app/ContextMenu.vue

@@ -1,8 +1,8 @@
 <template>
   <div
     ref="contextMenuRef"
-    class="fixed transform -translate-x-10 -translate-y-8 rounded border border-dividerDark bg-popover p-2 shadow-lg"
-    :style="`top: ${position.top}px; left: ${position.left}px; z-index: 100;`"
+    class="fixed translate-y-8 transform rounded border border-dividerDark bg-popover p-2 shadow-lg"
+    :style="`top: ${position.top}px; left: ${position.left}px; z-index: 1000;`"
   >
     <div v-if="contextMenuOptions" class="flex flex-col">
       <div

packages/hoppscotch-common/src/components/app/Header.vue

@@ -23,7 +23,7 @@
       <div class="col-span-1 flex items-center justify-between space-x-2">
         <button
           class="flex h-full flex-1 cursor-text items-center justify-between self-stretch rounded border border-dividerDark bg-primaryDark px-2 text-secondaryLight transition hover:border-dividerDark hover:bg-primaryLight hover:text-secondary focus-visible:border-dividerDark focus-visible:bg-primaryLight focus-visible:text-secondary"
-          @click="invokeAction('modals.search.toggle', undefined, 'mouseclick')"
+          @click="invokeAction('modals.search.toggle')"
         >
           <span class="inline-flex flex-1 items-center">
             <icon-lucide-search class="svg-icons mr-2" />
@@ -330,11 +330,11 @@ const myTeams = useReadonlyStream(teamListAdapter.teamList$, null)
 
 const workspace = workspaceService.currentWorkspace
 
-const workspaceName = computed(() => {
-  return workspace.value.type === "personal"
+const workspaceName = computed(() =>
+  workspace.value.type === "personal"
     ? t("workspace.personal")
     : workspace.value.teamName
-})
+)
 
 const refetchTeams = () => {
   teamListAdapter.fetchList()

packages/hoppscotch-common/src/components/app/spotlight/entry/RESTTeamRequestEntry.vue

@@ -1,32 +0,0 @@
-<template>
-  <span class="flex flex-1 items-center space-x-2">
-    <template v-for="(title, index) in collectionTitles" :key="index">
-      <span class="block" :class="{ truncate: index !== 0 }">
-        {{ title }}
-      </span>
-      <icon-lucide-chevron-right class="flex flex-shrink-0" />
-    </template>
-    <span
-      v-if="request"
-      class="flex flex-shrink-0 truncate rounded-md border border-dividerDark px-1 text-tiny font-semibold"
-      :style="{ color: getMethodLabelColor(request.method) }"
-    >
-      {{ request.method.toUpperCase() }}
-    </span>
-    <span v-if="request" class="block">
-      {{ request.name }}
-    </span>
-  </span>
-</template>
-
-<script setup lang="ts">
-import { getMethodLabelColor } from "~/helpers/rest/labelColoring"
-
-defineProps<{
-  collectionTitles: string[]
-  request: {
-    name: string
-    method: string
-  }
-}>()
-</script>

packages/hoppscotch-common/src/components/app/spotlight/index.vue

@@ -3,7 +3,7 @@
     v-if="show"
     styles="sm:max-w-lg"
     full-width
-    @close="closeSpotlightModal"
+    @close="emit('hide-modal')"
   >
     <template #body>
       <div class="flex flex-col border-b border-divider transition">
@@ -86,37 +86,35 @@
 </template>
 
 <script setup lang="ts">
-import { useI18n } from "@composables/i18n"
+import { ref, computed, watch } from "vue"
 import { useService } from "dioc/vue"
-import { isEqual } from "lodash-es"
-import { computed, ref, watch } from "vue"
-import { platform } from "~/platform"
-import { HoppSpotlightSessionEventData } from "~/platform/analytics"
+import { useI18n } from "@composables/i18n"
 import {
+  SpotlightService,
   SpotlightSearchState,
   SpotlightSearcherResult,
-  SpotlightService,
 } from "~/services/spotlight"
+import { isEqual } from "lodash-es"
+import { HistorySpotlightSearcherService } from "~/services/spotlight/searchers/history.searcher"
+import { UserSpotlightSearcherService } from "~/services/spotlight/searchers/user.searcher"
+import { NavigationSpotlightSearcherService } from "~/services/spotlight/searchers/navigation.searcher"
+import { SettingsSpotlightSearcherService } from "~/services/spotlight/searchers/settings.searcher"
 import { CollectionsSpotlightSearcherService } from "~/services/spotlight/searchers/collections.searcher"
+import { MiscellaneousSpotlightSearcherService } from "~/services/spotlight/searchers/miscellaneous.searcher"
+import { TabSpotlightSearcherService } from "~/services/spotlight/searchers/tab.searcher"
+import { GeneralSpotlightSearcherService } from "~/services/spotlight/searchers/general.searcher"
+import { ResponseSpotlightSearcherService } from "~/services/spotlight/searchers/response.searcher"
+import { RequestSpotlightSearcherService } from "~/services/spotlight/searchers/request.searcher"
 import {
   EnvironmentsSpotlightSearcherService,
   SwitchEnvSpotlightSearcherService,
 } from "~/services/spotlight/searchers/environment.searcher"
-import { GeneralSpotlightSearcherService } from "~/services/spotlight/searchers/general.searcher"
-import { HistorySpotlightSearcherService } from "~/services/spotlight/searchers/history.searcher"
-import { InterceptorSpotlightSearcherService } from "~/services/spotlight/searchers/interceptor.searcher"
-import { MiscellaneousSpotlightSearcherService } from "~/services/spotlight/searchers/miscellaneous.searcher"
-import { NavigationSpotlightSearcherService } from "~/services/spotlight/searchers/navigation.searcher"
-import { RequestSpotlightSearcherService } from "~/services/spotlight/searchers/request.searcher"
-import { ResponseSpotlightSearcherService } from "~/services/spotlight/searchers/response.searcher"
-import { SettingsSpotlightSearcherService } from "~/services/spotlight/searchers/settings.searcher"
-import { TabSpotlightSearcherService } from "~/services/spotlight/searchers/tab.searcher"
-import { TeamsSpotlightSearcherService } from "~/services/spotlight/searchers/teamRequest.searcher"
-import { UserSpotlightSearcherService } from "~/services/spotlight/searchers/user.searcher"
 import {
   SwitchWorkspaceSpotlightSearcherService,
   WorkspaceSpotlightSearcherService,
 } from "~/services/spotlight/searchers/workspace.searcher"
+import { InterceptorSpotlightSearcherService } from "~/services/spotlight/searchers/interceptor.searcher"
+import { platform } from "~/platform"
 
 const t = useI18n()
 
@@ -145,7 +143,6 @@ useService(SwitchEnvSpotlightSearcherService)
 useService(WorkspaceSpotlightSearcherService)
 useService(SwitchWorkspaceSpotlightSearcherService)
 useService(InterceptorSpotlightSearcherService)
-useService(TeamsSpotlightSearcherService)
 
 platform.spotlight?.additionalSearchers?.forEach((searcher) =>
   useService(searcher)
@@ -293,17 +290,4 @@ function newUseArrowKeysForNavigation() {
 
   return { selectedEntry }
 }
-
-function closeSpotlightModal() {
-  const analyticsData: HoppSpotlightSessionEventData = {
-    action: "close",
-    searcherID: null,
-    rank: null,
-  }
-
-  // Sets the action indicating `close` and rank as `null` in the state for analytics event logging
-  spotlightService.setAnalyticsData(analyticsData)
-
-  emit("hide-modal")
-}
 </script>

packages/hoppscotch-common/src/components/collections/ImportExport.vue

@@ -263,7 +263,7 @@ const HoppOpenAPIImporter: ImporterOrExporter = {
       step: UrlSource({
         caption: "import.from_url",
         onImportFromURL: async (content) => {
-          const res = await hoppOpenAPIImporter([content])()
+          const res = await hoppOpenAPIImporter(content)()
 
           if (E.isRight(res)) {
             handleImportToStore(res.right)

packages/hoppscotch-common/src/components/collections/MyCollections.vue

@@ -694,7 +694,7 @@ class MyCollectionsAdapter implements SmartTreeAdapter<MyCollectionNode> {
     let target = collections[indexPaths.shift() as number]
 
     while (indexPaths.length > 0)
-      target = target?.folders[indexPaths.shift() as number]
+      target = target.folders[indexPaths.shift() as number]
 
     return target !== undefined ? target : null
   }

packages/hoppscotch-common/src/components/collections/Properties.vue

@@ -8,7 +8,7 @@
   >
     <template #body>
       <HoppSmartTabs
-        v-model="activeTab"
+        v-model="selectedOptionTab"
         styles="sticky overflow-x-auto flex-shrink-0 bg-primary top-0 z-10 !-py-4"
         render-inactive-tabs
       >
@@ -16,6 +16,7 @@
           <HttpHeaders
             v-model="editableCollection"
             :is-collection-property="true"
+            @change-tab="changeOptionTab"
           />
           <div
             class="bg-bannerInfo px-4 py-2 flex items-center sticky bottom-0"
@@ -33,7 +34,6 @@
             :is-collection-property="true"
             :is-root-collection="editingProperties?.isRootCollection"
             :inherited-properties="editingProperties?.inheritedProperties"
-            :source="source"
           />
           <div
             class="bg-bannerInfo px-4 py-2 flex items-center sticky bottom-0"
@@ -64,42 +64,28 @@
 </template>
 
 <script setup lang="ts">
+import { watch, ref } from "vue"
 import { useI18n } from "@composables/i18n"
-import {
-  GQLHeader,
-  HoppCollection,
-  HoppGQLAuth,
-  HoppRESTAuth,
-  HoppRESTHeaders,
-} from "@hoppscotch/data"
-import { useVModel } from "@vueuse/core"
-import { useService } from "dioc/vue"
+import { HoppCollection } from "@hoppscotch/data"
+import { RESTOptionTabs } from "../http/RequestOptions.vue"
+import { TeamCollection } from "~/helpers/teams/TeamCollection"
 import { clone } from "lodash-es"
-import { ref, watch } from "vue"
-
 import { HoppInheritedProperty } from "~/helpers/types/HoppInheritedProperties"
-import { PersistenceService } from "~/services/persistence"
 
-const persistenceService = useService(PersistenceService)
 const t = useI18n()
 
-export type EditingProperties = {
-  collection: Partial<HoppCollection> | null
+type EditingProperties = {
+  collection: HoppCollection | TeamCollection | null
   isRootCollection: boolean
   path: string
-  inheritedProperties?: HoppInheritedProperty
+  inheritedProperties: HoppInheritedProperty | undefined
 }
 
-type HoppCollectionAuth = HoppRESTAuth | HoppGQLAuth
-type HoppCollectionHeaders = HoppRESTHeaders | GQLHeader[]
-
 const props = withDefaults(
   defineProps<{
     show: boolean
     loadingState: boolean
     editingProperties: EditingProperties | null
-    source: "REST" | "GraphQL"
-    modelValue: string
   }>(),
   {
     show: false,
@@ -109,68 +95,50 @@ const props = withDefaults(
 )
 
 const emit = defineEmits<{
-  (
-    e: "set-collection-properties",
-    newCollection: Omit<EditingProperties, "inheritedProperties">
-  ): void
+  (e: "set-collection-properties", newCollection: any): void
   (e: "hide-modal"): void
-  (e: "update:modelValue"): void
 }>()
 
-const editableCollection = ref<{
-  headers: HoppCollectionHeaders
-  auth: HoppCollectionAuth
-}>({
+const editableCollection = ref({
+  body: {
+    contentType: null,
+    body: null,
+  },
   headers: [],
   auth: {
     authType: "inherit",
     authActive: false,
   },
-})
+}) as any
 
-watch(
-  editableCollection,
-  (updatedEditableCollection) => {
-    if (props.show && props.editingProperties) {
-      const unsavedCollectionProperties: EditingProperties = {
-        collection: updatedEditableCollection,
-        isRootCollection: props.editingProperties?.isRootCollection ?? false,
-        path: props.editingProperties?.path,
-        inheritedProperties: props.editingProperties?.inheritedProperties,
-      }
-      persistenceService.setLocalConfig(
-        "unsaved_collection_properties",
-        JSON.stringify(unsavedCollectionProperties)
-      )
-    }
-  },
-  {
-    deep: true,
-  }
-)
+const selectedOptionTab = ref("headers")
 
-const activeTab = useVModel(props, "modelValue", emit)
+const changeOptionTab = (tab: RESTOptionTabs) => {
+  selectedOptionTab.value = tab
+}
 
 watch(
   () => props.show,
   (show) => {
     if (show && props.editingProperties?.collection) {
       editableCollection.value.auth = clone(
-        props.editingProperties.collection.auth as HoppCollectionAuth
+        props.editingProperties.collection.auth
       )
       editableCollection.value.headers = clone(
-        props.editingProperties.collection.headers as HoppCollectionHeaders
+        props.editingProperties.collection.headers
       )
     } else {
       editableCollection.value = {
+        body: {
+          contentType: null,
+          body: null,
+        },
         headers: [],
         auth: {
           authType: "inherit",
           authActive: false,
         },
       }
-
-      persistenceService.removeLocalConfig("unsaved_collection_properties")
     }
   }
 )
@@ -178,6 +146,7 @@ watch(
 const saveEditedCollection = () => {
   if (!props.editingProperties) return
   const finalCollection = clone(editableCollection.value)
+  delete finalCollection.body
   const collection = {
     path: props.editingProperties.path,
     collection: {
@@ -186,12 +155,10 @@ const saveEditedCollection = () => {
     },
     isRootCollection: props.editingProperties.isRootCollection,
   }
-  emit("set-collection-properties", collection as EditingProperties)
-  persistenceService.removeLocalConfig("unsaved_collection_properties")
+  emit("set-collection-properties", collection)
 }
 
 const hideModal = () => {
-  persistenceService.removeLocalConfig("unsaved_collection_properties")
   emit("hide-modal")
 }
 </script>

packages/hoppscotch-common/src/components/collections/TeamCollections.vue

@@ -9,7 +9,7 @@
       "
     >
       <HoppButtonSecondary
-        v-if="hasNoTeamAccess || isShowingSearchResults"
+        v-if="hasNoTeamAccess"
         v-tippy="{ theme: 'tooltip' }"
         disabled
         class="!rounded-none"
@@ -36,9 +36,8 @@
           v-if="!saveRequest"
           v-tippy="{ theme: 'tooltip' }"
           :disabled="
-            (collectionsType.type === 'team-collections' &&
-              collectionsType.selectedTeam === undefined) ||
-            isShowingSearchResults
+            collectionsType.type === 'team-collections' &&
+            collectionsType.selectedTeam === undefined
           "
           :icon="IconImport"
           :title="t('modal.import_export')"
@@ -59,7 +58,7 @@
             :collections-type="collectionsType.type"
             :is-open="isOpen"
             :export-loading="exportLoading"
-            :has-no-team-access="hasNoTeamAccess || isShowingSearchResults"
+            :has-no-team-access="hasNoTeamAccess"
             :collection-move-loading="collectionMoveLoading"
             :is-last-item="node.data.isLastItem"
             :is-selected="
@@ -129,14 +128,6 @@
                     })
               }
             "
-            @click="
-              () => {
-                handleCollectionClick({
-                  collectionID: node.id,
-                  isOpen,
-                })
-              }
-            "
           />
           <CollectionsCollection
             v-if="node.data.type === 'folders'"
@@ -146,7 +137,7 @@
             :collections-type="collectionsType.type"
             :is-open="isOpen"
             :export-loading="exportLoading"
-            :has-no-team-access="hasNoTeamAccess || isShowingSearchResults"
+            :has-no-team-access="hasNoTeamAccess"
             :collection-move-loading="collectionMoveLoading"
             :is-last-item="node.data.isLastItem"
             :is-selected="
@@ -218,15 +209,6 @@
                     })
               }
             "
-            @click="
-              () => {
-                handleCollectionClick({
-                  // for the folders, we get a path, so we need to get the last part of the path which is the folder id
-                  collectionID: node.id.split('/').pop() as string,
-                  isOpen,
-                })
-              }
-            "
           />
           <CollectionsRequest
             v-if="node.data.type === 'requests'"
@@ -236,7 +218,7 @@
             :collections-type="collectionsType.type"
             :duplicate-loading="duplicateLoading"
             :is-active="isActiveRequest(node.data.data.data.id)"
-            :has-no-team-access="hasNoTeamAccess || isShowingSearchResults"
+            :has-no-team-access="hasNoTeamAccess"
             :request-move-loading="requestMoveLoading"
             :is-last-item="node.data.isLastItem"
             :is-selected="
@@ -301,15 +283,7 @@
         </template>
         <template #emptyNode="{ node }">
           <HoppSmartPlaceholder
-            v-if="filterText.length !== 0 && teamCollectionList.length === 0"
-            :text="`${t('state.nothing_found')} ‟${filterText}”`"
-          >
-            <template #icon>
-              <icon-lucide-search class="svg-icons opacity-75" />
-            </template>
-          </HoppSmartPlaceholder>
-          <HoppSmartPlaceholder
-            v-else-if="node === null"
+            v-if="node === null"
             :src="`/images/states/${colorMode.value}/pack.svg`"
             :alt="`${t('empty.collections')}`"
             :text="t('empty.collections')"
@@ -420,11 +394,6 @@ const props = defineProps({
     default: () => ({ type: "my-collections", selectedTeam: undefined }),
     required: true,
   },
-  filterText: {
-    type: String as PropType<string>,
-    default: "",
-    required: true,
-  },
   teamCollectionList: {
     type: Array as PropType<TeamCollection[]>,
     default: () => [],
@@ -467,8 +436,6 @@ const props = defineProps({
   },
 })
 
-const isShowingSearchResults = computed(() => props.filterText.length > 0)
-
 const emit = defineEmits<{
   (
     event: "add-request",
@@ -576,14 +543,6 @@ const emit = defineEmits<{
       }
     }
   ): void
-  (
-    event: "collection-click",
-    payload: {
-      // if the collection is open or not in the tree
-      isOpen: boolean
-      collectionID: string
-    }
-  ): void
   (event: "select", payload: Picked | null): void
   (event: "expand-team-collection", payload: string): void
   (event: "display-modal-add"): void
@@ -596,18 +555,6 @@ const getPath = (path: string) => {
   return pathArray.join("/")
 }
 
-const handleCollectionClick = (payload: {
-  collectionID: string
-  isOpen: boolean
-}) => {
-  const { collectionID, isOpen } = payload
-
-  emit("collection-click", {
-    collectionID,
-    isOpen,
-  })
-}
-
 const teamCollectionsList = toRef(props, "teamCollectionList")
 
 const hasNoTeamAccess = computed(

packages/hoppscotch-common/src/components/collections/graphql/index.vue

@@ -146,10 +146,8 @@
       @hide-modal="displayModalImportExport(false)"
     />
     <CollectionsProperties
-      v-model="collectionPropertiesModalActiveTab"
       :show="showModalEditProperties"
       :editing-properties="editingProperties"
-      source="GraphQL"
       @hide-modal="displayModalEditProperties(false)"
       @set-collection-properties="setCollectionProperties"
     />
@@ -157,7 +155,7 @@
 </template>
 
 <script setup lang="ts">
-import { nextTick, onMounted, ref } from "vue"
+import { nextTick, ref } from "vue"
 import { clone, cloneDeep } from "lodash-es"
 import {
   graphqlCollections$,
@@ -188,10 +186,6 @@ import { HoppInheritedProperty } from "~/helpers/types/HoppInheritedProperties"
 import { updateInheritedPropertiesForAffectedRequests } from "~/helpers/collection/collection"
 import { useToast } from "~/composables/toast"
 import { getRequestsByPath } from "~/helpers/collection/request"
-import { PersistenceService } from "~/services/persistence"
-import { PersistedOAuthConfig } from "~/services/oauth/oauth.service"
-import { GQLOptionTabs } from "~/components/graphql/RequestOptions.vue"
-import { EditingProperties } from "../Properties.vue"
 
 const t = useI18n()
 const toast = useToast()
@@ -225,7 +219,7 @@ const editingRequest = ref<HoppGQLRequest | null>(null)
 const editingRequestIndex = ref<number | null>(null)
 
 const editingProperties = ref<{
-  collection: Partial<HoppCollection> | null
+  collection: HoppCollection | null
   isRootCollection: boolean
   path: string
   inheritedProperties?: HoppInheritedProperty
@@ -238,53 +232,6 @@ const editingProperties = ref<{
 
 const filterText = ref("")
 
-const persistenceService = useService(PersistenceService)
-
-const collectionPropertiesModalActiveTab = ref<GQLOptionTabs>("headers")
-
-onMounted(() => {
-  const localOAuthTempConfig =
-    persistenceService.getLocalConfig("oauth_temp_config")
-
-  if (!localOAuthTempConfig) {
-    return
-  }
-
-  const { context, source, token }: PersistedOAuthConfig =
-    JSON.parse(localOAuthTempConfig)
-
-  if (source === "REST") {
-    return
-  }
-
-  if (context?.type === "collection-properties") {
-    // load the unsaved editing properties
-    const unsavedCollectionPropertiesString = persistenceService.getLocalConfig(
-      "unsaved_collection_properties"
-    )
-
-    if (unsavedCollectionPropertiesString) {
-      const unsavedCollectionProperties: EditingProperties = JSON.parse(
-        unsavedCollectionPropertiesString
-      )
-
-      const auth = unsavedCollectionProperties.collection?.auth
-
-      if (auth?.authType === "oauth-2") {
-        const grantTypeInfo = auth.grantTypeInfo
-
-        grantTypeInfo && (grantTypeInfo.token = token ?? "")
-      }
-
-      editingProperties.value = unsavedCollectionProperties
-    }
-
-    persistenceService.removeLocalConfig("oauth_temp_config")
-    collectionPropertiesModalActiveTab.value = "authorization"
-    showModalEditProperties.value = true
-  }
-})
-
 const filteredCollections = computed(() => {
   const collectionsClone = clone(collections.value)
 
@@ -610,7 +557,7 @@ const editProperties = ({
   if (collectionIndex === null || collection === null) return
 
   const parentIndex = collectionIndex.split("/").slice(0, -1).join("/") // remove last folder to get parent folder
-  let inheritedProperties = undefined
+  let inheritedProperties = {}
 
   if (parentIndex) {
     const { auth, headers } = cascadeParentCollectionForHeaderAuth(
@@ -621,7 +568,7 @@ const editProperties = ({
     inheritedProperties = {
       auth,
       headers,
-    }
+    } as HoppInheritedProperty
   }
 
   editingProperties.value = {
@@ -635,15 +582,11 @@ const editProperties = ({
 }
 
 const setCollectionProperties = (newCollection: {
-  collection: Partial<HoppCollection> | null
+  collection: HoppCollection
   path: string
   isRootCollection: boolean
 }) => {
   const { collection, path, isRootCollection } = newCollection
-  if (!collection) {
-    return
-  }
-
   if (isRootCollection) {
     editGraphqlCollection(parseInt(path), collection)
   } else {

packages/hoppscotch-common/src/components/collections/index.vue

@@ -24,6 +24,7 @@
         autocomplete="off"
         class="flex w-full bg-transparent px-4 py-2 h-8"
         :placeholder="t('action.search')"
+        :disabled="collectionsType.type === 'team-collections'"
       />
     </div>
     <CollectionsMyCollections
@@ -57,15 +58,8 @@
     <CollectionsTeamCollections
       v-else
       :collections-type="collectionsType"
-      :team-collection-list="
-        filterTexts.length > 0 ? teamsSearchResults : teamCollectionList
-      "
-      :team-loading-collections="
-        filterTexts.length > 0
-          ? collectionsBeingLoadedFromSearch
-          : teamLoadingCollections
-      "
-      :filter-text="filterTexts"
+      :team-collection-list="teamCollectionList"
+      :team-loading-collections="teamLoadingCollections"
       :export-loading="exportLoading"
       :duplicate-loading="duplicateLoading"
       :save-request="saveRequest"
@@ -93,7 +87,6 @@
       @expand-team-collection="expandTeamCollection"
       @display-modal-add="displayModalAdd(true)"
       @display-modal-import-export="displayModalImportExport(true)"
-      @collection-click="handleCollectionClick"
     />
     <div
       class="py-15 hidden flex-1 flex-col items-center justify-center bg-primaryDark px-4 text-secondaryLight"
@@ -161,10 +154,8 @@
       @hide-modal="displayTeamModalAdd(false)"
     />
     <CollectionsProperties
-      v-model="collectionPropertiesModalActiveTab"
       :show="showModalEditProperties"
       :editing-properties="editingProperties"
-      source="REST"
       @hide-modal="displayModalEditProperties(false)"
       @set-collection-properties="setCollectionProperties"
     />
@@ -172,7 +163,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, onMounted, PropType, ref, watch } from "vue"
+import { computed, nextTick, PropType, ref, watch } from "vue"
 import { useToast } from "@composables/toast"
 import { useI18n } from "@composables/i18n"
 import { Picked } from "~/helpers/types/HoppPicked"
@@ -208,7 +199,7 @@ import {
   HoppRESTRequest,
   makeCollection,
 } from "@hoppscotch/data"
-import { cloneDeep, debounce, isEqual } from "lodash-es"
+import { cloneDeep, isEqual } from "lodash-es"
 import { GQLError } from "~/helpers/backend/GQLClient"
 import {
   createNewRootCollection,
@@ -249,11 +240,6 @@ import { WorkspaceService } from "~/services/workspace.service"
 import { useService } from "dioc/vue"
 import { RESTTabService } from "~/services/tab/rest"
 import { HoppInheritedProperty } from "~/helpers/types/HoppInheritedProperties"
-import { TeamSearchService } from "~/helpers/teams/TeamsSearch.service"
-import { PersistenceService } from "~/services/persistence"
-import { PersistedOAuthConfig } from "~/services/oauth/oauth.service"
-import { RESTOptionTabs } from "../http/RequestOptions.vue"
-import { EditingProperties } from "./Properties.vue"
 
 const t = useI18n()
 const toast = useToast()
@@ -305,7 +291,12 @@ const editingRequestName = ref("")
 const editingRequestIndex = ref<number | null>(null)
 const editingRequestID = ref<string | null>(null)
 
-const editingProperties = ref<EditingProperties>({
+const editingProperties = ref<{
+  collection: Omit<HoppCollection, "v"> | TeamCollection | null
+  isRootCollection: boolean
+  path: string
+  inheritedProperties?: HoppInheritedProperty
+}>({
   collection: null,
   isRootCollection: false,
   path: "",
@@ -345,96 +336,6 @@ const teamLoadingCollections = useReadonlyStream(
   []
 )
 
-const {
-  cascadeParentCollectionForHeaderAuthForSearchResults,
-  searchTeams,
-  teamsSearchResults,
-  teamsSearchResultsLoading,
-  expandCollection,
-  expandingCollections,
-} = useService(TeamSearchService)
-
-watch(teamsSearchResults, (newSearchResults) => {
-  if (newSearchResults.length === 1 && filterTexts.value.length > 0) {
-    expandCollection(newSearchResults[0].id)
-  }
-})
-
-const debouncedSearch = debounce(searchTeams, 400)
-
-const collectionsBeingLoadedFromSearch = computed(() => {
-  const collections = []
-
-  if (teamsSearchResultsLoading.value) {
-    collections.push("root")
-  }
-
-  collections.push(...expandingCollections.value)
-
-  return collections
-})
-
-watch(
-  filterTexts,
-  (newFilterText) => {
-    if (collectionsType.value.type === "team-collections") {
-      const selectedTeamID = collectionsType.value.selectedTeam?.id
-
-      selectedTeamID &&
-        debouncedSearch(newFilterText, selectedTeamID)?.catch(() => {})
-    }
-  },
-  {
-    immediate: true,
-  }
-)
-const persistenceService = useService(PersistenceService)
-
-const collectionPropertiesModalActiveTab = ref<RESTOptionTabs>("headers")
-
-onMounted(() => {
-  const localOAuthTempConfig =
-    persistenceService.getLocalConfig("oauth_temp_config")
-
-  if (!localOAuthTempConfig) {
-    return
-  }
-
-  const { context, source, token }: PersistedOAuthConfig =
-    JSON.parse(localOAuthTempConfig)
-
-  if (source === "GraphQL") {
-    return
-  }
-
-  if (context?.type === "collection-properties") {
-    // load the unsaved editing properties
-    const unsavedCollectionPropertiesString = persistenceService.getLocalConfig(
-      "unsaved_collection_properties"
-    )
-
-    if (unsavedCollectionPropertiesString) {
-      const unsavedCollectionProperties: EditingProperties = JSON.parse(
-        unsavedCollectionPropertiesString
-      )
-
-      const auth = unsavedCollectionProperties.collection?.auth
-
-      if (auth?.authType === "oauth-2") {
-        const grantTypeInfo = auth.grantTypeInfo
-
-        grantTypeInfo && (grantTypeInfo.token = token ?? "")
-      }
-
-      editingProperties.value = unsavedCollectionProperties
-    }
-
-    persistenceService.removeLocalConfig("oauth_temp_config")
-    collectionPropertiesModalActiveTab.value = "authorization"
-    showModalEditProperties.value = true
-  }
-})
-
 watch(
   () => myTeams.value,
   (newTeams) => {
@@ -463,28 +364,7 @@ const switchToMyCollections = () => {
   teamCollectionAdapter.changeTeamID(null)
 }
 
-/**
- * right now, for search results, we rely on collection click + isOpen to expand the collection
- */
-const handleCollectionClick = (payload: {
-  collectionID: string
-  isOpen: boolean
-}) => {
-  if (
-    filterTexts.value.length > 0 &&
-    teamsSearchResults.value.length &&
-    payload.isOpen
-  ) {
-    expandCollection(payload.collectionID)
-    return
-  }
-}
-
 const expandTeamCollection = (collectionID: string) => {
-  if (filterTexts.value.length > 0 && teamsSearchResults.value) {
-    return
-  }
-
   teamCollectionAdapter.expandCollection(collectionID)
 }
 
@@ -734,8 +614,8 @@ const addNewRootCollection = (name: string) => {
         requests: [],
         headers: [],
         auth: {
-          authType: "none",
-          authActive: true,
+          authType: "inherit",
+          authActive: false,
         },
       })
     )
@@ -859,7 +739,7 @@ const onAddRequest = (requestName: string) => {
             saveContext: {
               originLocation: "team-collection",
               requestID: createRequestInCollection.id,
-              collectionID: path,
+              collectionID: createRequestInCollection.collection.id,
               teamID: createRequestInCollection.collection.team.id,
             },
             inheritedProperties: {
@@ -1450,25 +1330,13 @@ const selectRequest = (selectedRequest: {
   let possibleTab = null
 
   if (collectionsType.value.type === "team-collections") {
-    let inheritedProperties: HoppInheritedProperty | undefined = undefined
+    const { auth, headers } =
+      teamCollectionAdapter.cascadeParentCollectionForHeaderAuth(folderPath)
 
-    if (filterTexts.value.length > 0) {
-      const collectionID = folderPath.split("/").at(-1)
-
-      if (!collectionID) return
-
-      inheritedProperties =
-        cascadeParentCollectionForHeaderAuthForSearchResults(collectionID)
-    } else {
-      inheritedProperties =
-        teamCollectionAdapter.cascadeParentCollectionForHeaderAuth(folderPath)
-    }
-
-    const possibleTab = tabs.getTabRefWithSaveContext({
+    possibleTab = tabs.getTabRefWithSaveContext({
       originLocation: "team-collection",
       requestID: requestIndex,
     })
-
     if (possibleTab) {
       tabs.setActiveTab(possibleTab.value.id)
     } else {
@@ -1480,7 +1348,10 @@ const selectRequest = (selectedRequest: {
           requestID: requestIndex,
           collectionID: folderPath,
         },
-        inheritedProperties: inheritedProperties,
+        inheritedProperties: {
+          auth,
+          headers,
+        },
       })
     }
   } else {
@@ -2150,7 +2021,7 @@ const editProperties = (payload: {
         {
           parentID: "",
           parentName: "",
-          inheritedHeader: {},
+          inheritedHeaders: [],
         },
       ],
     } as HoppInheritedProperty
@@ -2168,7 +2039,7 @@ const editProperties = (payload: {
     }
 
     editingProperties.value = {
-      collection: collection as Partial<HoppCollection>,
+      collection,
       isRootCollection: isAlreadyInRoot(collectionIndex),
       path: collectionIndex,
       inheritedProperties,
@@ -2212,7 +2083,7 @@ const editProperties = (payload: {
     }
 
     editingProperties.value = {
-      collection: coll as unknown as Partial<HoppCollection>,
+      collection: coll,
       isRootCollection: isAlreadyInRoot(collectionIndex),
       path: collectionIndex,
       inheritedProperties,
@@ -2223,12 +2094,11 @@ const editProperties = (payload: {
 }
 
 const setCollectionProperties = (newCollection: {
-  collection: Partial<HoppCollection> | null
-  isRootCollection: boolean
+  collection: HoppCollection
   path: string
+  isRootCollection: boolean
 }) => {
   const { collection, path, isRootCollection } = newCollection
-  if (!collection) return
 
   if (collectionsType.value.type === "my-collections") {
     if (isRootCollection) {
@@ -2278,7 +2148,8 @@ const setCollectionProperties = (newCollection: {
           auth,
           headers,
         },
-        "rest"
+        "rest",
+        "team"
       )
     }, 200)
   }

packages/hoppscotch-common/src/components/cookies/EditCookie.vue

@@ -22,9 +22,9 @@
               <HoppButtonSecondary
                 v-tippy="{ theme: 'tooltip' }"
                 :title="t('state.linewrap')"
-                :class="{ '!text-accent': WRAP_LINES }"
+                :class="{ '!text-accent': linewrapEnabled }"
                 :icon="IconWrapText"
-                @click.prevent="toggleNestedSetting('WRAP_LINES', 'cookie')"
+                @click.prevent="linewrapEnabled = !linewrapEnabled"
               />
               <HoppButtonSecondary
                 v-tippy="{ theme: 'tooltip', allowHTML: true }"
@@ -102,8 +102,6 @@ import {
   useCopyResponse,
   useDownloadResponse,
 } from "~/composables/lens-actions"
-import { useNestedSetting } from "~/composables/settings"
-import { toggleNestedSetting } from "~/newstore/settings"
 
 // TODO: Build Managed Mode!
 
@@ -124,7 +122,7 @@ const toast = useToast()
 
 const cookieEditor = ref<HTMLElement>()
 const rawCookieString = ref("")
-const WRAP_LINES = useNestedSetting("WRAP_LINES", "cookie")
+const linewrapEnabled = ref(true)
 
 useCodemirror(
   cookieEditor,
@@ -133,7 +131,7 @@ useCodemirror(
     extendedEditorConfig: {
       mode: "text/plain",
       placeholder: `${t("cookies.modal.enter_cookie_string")}`,
-      lineWrapping: WRAP_LINES,
+      lineWrapping: linewrapEnabled,
     },
     linter: null,
     completer: null,