feat: revamped header wireframe

.gitignore

@@ -81,7 +81,10 @@ web_modules/
 
 # dotenv environment variable files
 .env
-.env.*
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache

docker-compose.yml

@@ -66,7 +66,6 @@ services:
   # The service that spins up all 3 services at once in one container
   hoppscotch-aio:
     container_name: hoppscotch-aio
-    restart: unless-stopped
     build:
       dockerfile: prod.Dockerfile
       context: .

package.json

@@ -25,7 +25,6 @@
   "devDependencies": {
     "@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",
@@ -33,9 +32,6 @@
     "lint-staged": "12.4.0"
   },
   "pnpm": {
-    "overrides": {
-      "vue": "3.3.9"
-    },
     "packageExtensions": {
       "httpsnippet@^3.0.1": {
         "peerDependencies": {

packages/codemirror-lang-graphql/package.json

@@ -17,9 +17,9 @@
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@codemirror/language": "6.9.3",
-    "@lezer/highlight": "1.2.0",
-    "@lezer/lr": "^1.3.14"
+    "@codemirror/language": "6.9.0",
+    "@lezer/highlight": "1.1.4",
+    "@lezer/lr": "^1.3.13"
   },
   "devDependencies": {
     "@lezer/generator": "^1.5.1",

packages/dioc/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

packages/dioc/README.md

@@ -0,0 +1,141 @@
+# dioc
+
+A small and lightweight dependency injection / inversion of control system.
+
+### About
+
+`dioc` is a really simple **DI/IOC** system where you write services (which are singletons per container) that can depend on each other and emit events that can be listened upon.
+
+### Demo
+
+```ts
+import { Service, Container } from "dioc"
+
+// Here is a simple service, which you can define by extending the Service class
+// and providing an ID static field (of type string)
+export class PersistenceService extends Service {
+  // This should be unique for each container
+  public static ID = "PERSISTENCE_SERVICE"
+
+  public read(key: string): string | undefined {
+    // ...
+  }
+
+  public write(key: string, value: string) {
+    // ...
+  }
+}
+
+type TodoServiceEvent =
+  | { type: "TODO_CREATED"; index: number }
+  | { type: "TODO_DELETED"; index: number }
+
+// Services have a built in event system
+// Define the generic argument to say what are the possible emitted values
+export class TodoService extends Service<TodoServiceEvent> {
+  public static ID = "TODO_SERVICE"
+
+  // Inject persistence service into this service
+  private readonly persistence = this.bind(PersistenceService)
+
+  public todos = []
+
+  // Service constructors cannot have arguments
+  constructor() {
+    super()
+
+    this.todos = JSON.parse(this.persistence.read("todos") ?? "[]")
+  }
+
+  public addTodo(text: string) {
+    // ...
+
+    // You can access services via the bound fields
+    this.persistence.write("todos", JSON.stringify(this.todos))
+
+    // This is how you emit an event
+    this.emit({
+      type: "TODO_CREATED",
+      index,
+    })
+  }
+
+  public removeTodo(index: number) {
+    // ...
+
+    this.emit({
+      type: "TODO_DELETED",
+      index,
+    })
+  }
+}
+
+// Services need a container to run in
+const container = new Container()
+
+// You can initialize and get services using Container#bind
+// It will automatically initialize the service (and its dependencies)
+const todoService = container.bind(TodoService) // Returns an instance of TodoService
+```
+
+### Demo (Unit Test)
+
+`dioc/testing` contains `TestContainer` which lets you bind mocked services to the container.
+
+```ts
+import { TestContainer } from "dioc/testing"
+import { TodoService, PersistenceService } from "./demo.ts" // The above demo code snippet
+import { describe, it, expect, vi } from "vitest"
+
+describe("TodoService", () => {
+  it("addTodo writes to persistence", () => {
+    const container = new TestContainer()
+
+    const writeFn = vi.fn()
+
+    // The first parameter is the service to mock and the second parameter
+    // is the mocked service fields and functions
+    container.bindMock(PersistenceService, {
+      read: () => undefined, // Not really important for this test
+      write: writeFn,
+    })
+
+    // the peristence service bind in TodoService will now use the
+    // above defined mocked implementation
+    const todoService = container.bind(TodoService)
+
+    todoService.addTodo("sup")
+
+    expect(writeFn).toHaveBeenCalledOnce()
+    expect(writeFn).toHaveBeenCalledWith("todos", JSON.stringify(["sup"]))
+  })
+})
+```
+
+### Demo (Vue)
+
+`dioc/vue` contains a Vue Plugin and a `useService` composable that allows Vue components to use the defined services.
+
+In the app entry point:
+
+```ts
+import { createApp } from "vue"
+import { diocPlugin } from "dioc/vue"
+
+const app = createApp()
+
+app.use(diocPlugin, {
+  container: new Container(), // You can pass in the container you want to provide to the components here
+})
+```
+
+In your Vue components:
+
+```vue
+<script setup>
+import { TodoService } from "./demo.ts" // The above demo
+import { useService } from "dioc/vue"
+
+const todoService = useService(TodoService) // Returns an instance of the TodoService class
+</script>
+```

packages/dioc/index.d.ts

@@ -0,0 +1,2 @@
+export { default } from "./dist/main.d.ts"
+export * from "./dist/main.d.ts"

packages/dioc/lib/container.ts

@@ -0,0 +1,147 @@
+import { Service } from "./service"
+import { Observable, Subject } from 'rxjs'
+
+/**
+ * Stores the current container instance in the current operating context.
+ *
+ * NOTE: This should not be used outside of dioc library code
+ */
+export let currentContainer: Container | null = null
+
+/**
+ * The events emitted by the container
+ *
+ * `SERVICE_BIND` - emitted when a service is bound to the container directly or as a dependency to another service
+ * `SERVICE_INIT` - emitted when a service is initialized
+ */
+export type ContainerEvent =
+  | {
+    type: 'SERVICE_BIND';
+
+    /** The Service ID of the service being bounded (the dependency) */
+    boundeeID: string;
+
+    /**
+     * The Service ID of the bounder that is binding the boundee (the dependent)
+     *
+     * NOTE: This will be undefined if the service is bound directly to the container
+     */
+    bounderID: string | undefined
+  }
+  | {
+    type: 'SERVICE_INIT';
+
+    /** The Service ID of the service being initialized */
+    serviceID: string
+  }
+
+/**
+ * The dependency injection container, allows for services to be initialized and maintains the dependency trees.
+ */
+export class Container {
+  /** Used during the `bind` operation to detect circular dependencies */
+  private bindStack: string[] = []
+
+  /** The map of bound services to their IDs */
+  protected boundMap = new Map<string, Service<unknown>>()
+
+  /** The RxJS observable representing the event stream */
+  protected event$ = new Subject<ContainerEvent>()
+
+  /**
+   * Returns whether a container has the given service bound
+   * @param service The service to check for
+   */
+  public hasBound<
+    T extends typeof Service<any> & { ID: string }
+  >(service: T): boolean {
+    return this.boundMap.has(service.ID)
+  }
+
+  /**
+   * Returns the service bound to the container with the given ID or if not found, undefined.
+   *
+   * NOTE: This is an advanced method and should not be used as much as possible.
+   *
+   * @param serviceID The ID of the service to get
+   */
+  public getBoundServiceWithID(serviceID: string): Service<unknown> | undefined {
+    return this.boundMap.get(serviceID)
+  }
+
+  /**
+   * Binds a service to the container. This is equivalent to marking a service as a dependency.
+   * @param service The class reference of a service to bind
+   * @param bounder The class reference of the service that is binding the service (if bound directly to the container, this should be undefined)
+   */
+  public bind<T extends typeof Service<any> & { ID: string }>(
+    service: T,
+    bounder: ((typeof Service<T>) & { ID: string }) | undefined = undefined
+  ): InstanceType<T> {
+    // We need to store the current container in a variable so that we can restore it after the bind operation
+    const oldCurrentContainer = currentContainer;
+    currentContainer = this;
+
+    // If the service is already bound, return the existing instance
+    if (this.hasBound(service)) {
+      this.event$.next({
+        type: 'SERVICE_BIND',
+        boundeeID: service.ID,
+        bounderID: bounder?.ID // Return the bounder ID if it is defined, else assume its the container
+      })
+
+      return this.boundMap.get(service.ID) as InstanceType<T> // Casted as InstanceType<T> because service IDs and types are expected to match
+    }
+
+    // Detect circular dependency and throw error
+    if (this.bindStack.findIndex((serviceID) => serviceID === service.ID) !== -1) {
+      const circularServices = `${this.bindStack.join(' -> ')} -> ${service.ID}`
+
+      throw new Error(`Circular dependency detected.\nChain: ${circularServices}`)
+    }
+
+    // Push the service ID onto the bind stack to detect circular dependencies
+    this.bindStack.push(service.ID)
+
+    // Initialize the service and emit events
+
+    // NOTE: We need to cast the service to any as TypeScript thinks that the service is abstract
+    const instance: Service<any> = new (service as any)()
+
+    this.boundMap.set(service.ID, instance)
+
+    this.bindStack.pop()
+
+    this.event$.next({
+      type: 'SERVICE_INIT',
+      serviceID: service.ID,
+    })
+
+    this.event$.next({
+      type: 'SERVICE_BIND',
+      boundeeID: service.ID,
+      bounderID: bounder?.ID
+    })
+
+
+    // Restore the current container
+    currentContainer = oldCurrentContainer;
+
+    // We expect the return type to match the service definition
+    return instance as InstanceType<T>
+  }
+
+  /**
+   * Returns an iterator of the currently bound service IDs and their instances
+   */
+  public getBoundServices(): IterableIterator<[string, Service<any>]> {
+    return this.boundMap.entries()
+  }
+
+  /**
+   * Returns the public container event stream
+   */
+  public getEventStream(): Observable<ContainerEvent> {
+    return this.event$.asObservable()
+  }
+}

packages/dioc/lib/main.ts

@@ -0,0 +1,2 @@
+export * from "./container"
+export * from "./service"

packages/dioc/lib/service.ts

@@ -0,0 +1,65 @@
+import { Observable, Subject } from 'rxjs'
+import { Container, currentContainer } from './container'
+
+/**
+ * A Dioc service that can bound to a container and can bind dependency services.
+ *
+ * NOTE: Services cannot have a constructor that takes arguments.
+ *
+ * @template EventDef The type of events that can be emitted by the service. These will be accessible by event streams
+ */
+export abstract class Service<EventDef = {}> {
+
+  /**
+   * The internal event stream of the service
+   */
+  private event$ = new Subject<EventDef>()
+
+  /** The container the service is bound to */
+  #container: Container
+
+  constructor() {
+    if (!currentContainer) {
+      throw new Error(
+        `Tried to initialize service with no container (ID: ${ (this.constructor as any).ID })`
+      )
+    }
+
+    this.#container = currentContainer
+  }
+
+  /**
+   * Binds a dependency service into this service.
+   * @param service The class reference of the service to bind
+   */
+  protected bind<T extends typeof Service<any> & { ID: string }>(service: T): InstanceType<T> {
+    if (!currentContainer) {
+      throw new Error('No currentContainer defined.')
+    }
+
+    return currentContainer.bind(service, this.constructor as typeof Service<any> & { ID: string })
+  }
+
+  /**
+   * Returns the container the service is bound to
+   */
+  protected getContainer(): Container {
+    return this.#container
+  }
+
+  /**
+   * Emits an event on the service's event stream
+   * @param event The event to emit
+   */
+  protected emit(event: EventDef) {
+    this.event$.next(event)
+  }
+
+  /**
+   * Returns the event stream of the service
+   */
+  public getEventStream(): Observable<EventDef> {
+
+    return this.event$.asObservable()
+  }
+}

packages/dioc/lib/testing.ts

@@ -0,0 +1,33 @@
+import { Container, Service } from "./main";
+
+/**
+ * A container that can be used for writing tests, contains additional methods
+ * for binding suitable for writing tests. (see `bindMock`).
+ */
+export class TestContainer extends Container {
+
+  /**
+   * Binds a mock service to the container.
+   *
+   * @param service
+   * @param mock
+   */
+  public bindMock<
+    T extends typeof Service<any> & { ID: string },
+    U extends Partial<InstanceType<T>>
+  >(service: T, mock: U): U {
+    if (this.boundMap.has(service.ID)) {
+      throw new Error(`Service '${service.ID}' already bound to container. Did you already call bindMock on this ?`)
+    }
+
+    this.boundMap.set(service.ID, mock as any)
+
+    this.event$.next({
+      type: "SERVICE_BIND",
+      boundeeID: service.ID,
+      bounderID: undefined,
+    })
+
+    return mock
+  }
+}

packages/dioc/lib/vue.ts

@@ -0,0 +1,34 @@
+import { Plugin, inject } from "vue"
+import { Container } from "./container"
+import { Service } from "./service"
+
+const VUE_CONTAINER_KEY = Symbol()
+
+// TODO: Some Vue version issue with plugin generics is breaking type checking
+/**
+ * The Vue Dioc Plugin, this allows the composables to work and access the container
+ *
+ * NOTE: Make sure you add `vue` as dependency to be able to use this plugin (duh)
+ */
+export const diocPlugin: Plugin = {
+  install(app, { container }) {
+    app.provide(VUE_CONTAINER_KEY, container)
+  }
+}
+
+/**
+ * A composable that binds a service to a Vue Component
+ *
+ * @param service The class reference of the service to bind
+ */
+export function useService<
+  T extends typeof Service<any> & { ID: string }
+>(service: T): InstanceType<T> {
+  const container = inject(VUE_CONTAINER_KEY) as Container | undefined | null
+
+  if (!container) {
+    throw new Error("Container not found, did you forget to install the dioc plugin?")
+  }
+
+  return container.bind(service)
+}

packages/dioc/package.json

@@ -0,0 +1,54 @@
+{
+  "name": "dioc",
+  "private": true,
+  "version": "0.1.0",
+  "type": "module",
+  "files": [
+    "dist",
+    "index.d.ts"
+  ],
+  "main": "./dist/counter.umd.cjs",
+  "module": "./dist/counter.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/main.d.ts",
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
+    },
+    "./vue": {
+      "types": "./dist/vue.d.ts",
+      "require": "./dist/vue.cjs",
+      "import": "./dist/vue.js"
+    },
+    "./testing": {
+      "types": "./dist/testing.d.ts",
+      "require": "./dist/testing.cjs",
+      "import": "./dist/testing.js"
+    }
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build && tsc --emitDeclarationOnly",
+    "prepare": "pnpm run build",
+    "test": "vitest run",
+    "do-test": "pnpm run test",
+    "test:watch": "vitest"
+  },
+  "devDependencies": {
+    "typescript": "^4.9.4",
+    "vite": "^4.0.4",
+    "vitest": "^0.29.3"
+  },
+  "dependencies": {
+    "rxjs": "^7.8.1"
+  },
+  "peerDependencies": {
+    "vue": "^3.2.25"
+  },
+  "peerDependenciesMeta": {
+    "vue": {
+      "optional": true
+    }
+  }
+}

packages/dioc/test/container.spec.ts

@@ -0,0 +1,262 @@
+import { it, expect, describe, vi } from "vitest"
+import { Service } from "../lib/service"
+import { Container, currentContainer, ContainerEvent } from "../lib/container"
+
+class TestServiceA extends Service {
+  public static ID = "TestServiceA"
+}
+
+class TestServiceB extends Service {
+  public static ID = "TestServiceB"
+
+  // Marked public to allow for testing
+  public readonly serviceA = this.bind(TestServiceA)
+}
+
+describe("Container", () => {
+  describe("getBoundServiceWithID", () => {
+    it("returns the service instance if it is bound to the container", () => {
+      const container = new Container()
+
+      const service = container.bind(TestServiceA)
+
+      expect(container.getBoundServiceWithID(TestServiceA.ID)).toBe(service)
+    })
+
+    it("returns undefined if the service is not bound to the container", () => {
+      const container = new Container()
+
+      expect(container.getBoundServiceWithID(TestServiceA.ID)).toBeUndefined()
+    })
+  })
+
+  describe("bind", () => {
+    it("correctly binds the service to it", () => {
+      const container = new Container()
+
+      const service = container.bind(TestServiceA)
+
+      // @ts-expect-error getContainer is defined as a protected property, but we are leveraging it here to check
+      expect(service.getContainer()).toBe(container)
+    })
+
+    it("after bind, the current container is set back to its previous value", () => {
+      const originalValue = currentContainer
+
+      const container = new Container()
+      container.bind(TestServiceA)
+
+      expect(currentContainer).toBe(originalValue)
+    })
+
+    it("dependent services are registered in the same container", () => {
+      const container = new Container()
+
+      const serviceB = container.bind(TestServiceB)
+
+      // @ts-expect-error getContainer is defined as a protected property, but we are leveraging it here to check
+      expect(serviceB.serviceA.getContainer()).toBe(container)
+    })
+
+    it("binding an already initialized service returns the initialized instance (services are singletons)", () => {
+      const container = new Container()
+
+      const serviceA = container.bind(TestServiceA)
+      const serviceA2 = container.bind(TestServiceA)
+
+      expect(serviceA).toBe(serviceA2)
+    })
+
+    it("binding a service which is a dependency of another service returns the same instance created from the dependency resolution (services are singletons)", () => {
+      const container = new Container()
+
+      const serviceB = container.bind(TestServiceB)
+      const serviceA = container.bind(TestServiceA)
+
+      expect(serviceB.serviceA).toBe(serviceA)
+    })
+
+    it("binding an initialized service as a dependency returns the same instance", () => {
+      const container = new Container()
+
+      const serviceA = container.bind(TestServiceA)
+      const serviceB = container.bind(TestServiceB)
+
+      expect(serviceB.serviceA).toBe(serviceA)
+    })
+
+    it("container emits an init event when an uninitialized service is initialized via bind and event only called once", () => {
+      const container = new Container()
+
+      const serviceFunc = vi.fn<
+        [ContainerEvent & { type: "SERVICE_INIT" }],
+        void
+      >()
+
+      container.getEventStream().subscribe((ev) => {
+        if (ev.type === "SERVICE_INIT") {
+          serviceFunc(ev)
+        }
+      })
+
+      const instance = container.bind(TestServiceA)
+
+      expect(serviceFunc).toHaveBeenCalledOnce()
+      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
+        type: "SERVICE_INIT",
+        serviceID: TestServiceA.ID,
+      })
+    })
+
+    it("the bind event emitted has an undefined bounderID when the service is bound directly to the container", () => {
+      const container = new Container()
+
+      const serviceFunc = vi.fn<
+        [ContainerEvent & { type: "SERVICE_BIND" }],
+        void
+      >()
+
+      container.getEventStream().subscribe((ev) => {
+        if (ev.type === "SERVICE_BIND") {
+          serviceFunc(ev)
+        }
+      })
+
+      container.bind(TestServiceA)
+
+      expect(serviceFunc).toHaveBeenCalledOnce()
+      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
+        type: "SERVICE_BIND",
+        boundeeID: TestServiceA.ID,
+        bounderID: undefined,
+      })
+    })
+
+    it("the bind event emitted has the correct bounderID when the service is bound to another service", () => {
+      const container = new Container()
+
+      const serviceFunc = vi.fn<
+        [ContainerEvent & { type: "SERVICE_BIND" }],
+        void
+      >()
+
+      container.getEventStream().subscribe((ev) => {
+        // We only care about the bind event of TestServiceA
+        if (ev.type === "SERVICE_BIND" && ev.boundeeID === TestServiceA.ID) {
+          serviceFunc(ev)
+        }
+      })
+
+      container.bind(TestServiceB)
+
+      expect(serviceFunc).toHaveBeenCalledOnce()
+      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
+        type: "SERVICE_BIND",
+        boundeeID: TestServiceA.ID,
+        bounderID: TestServiceB.ID,
+      })
+    })
+  })
+
+  describe("hasBound", () => {
+    it("returns true if the given service is bound to the container", () => {
+      const container = new Container()
+
+      container.bind(TestServiceA)
+
+      expect(container.hasBound(TestServiceA)).toEqual(true)
+    })
+
+    it("returns false if the given service is not bound to the container", () => {
+      const container = new Container()
+
+      expect(container.hasBound(TestServiceA)).toEqual(false)
+    })
+
+    it("returns true when the service is bound because it is a dependency of another service", () => {
+      const container = new Container()
+
+      container.bind(TestServiceB)
+
+      expect(container.hasBound(TestServiceA)).toEqual(true)
+    })
+  })
+
+  describe("getEventStream", () => {
+    it("returns an observable which emits events correctly when services are initialized", () => {
+      const container = new Container()
+
+      const serviceFunc = vi.fn<
+        [ContainerEvent & { type: "SERVICE_INIT" }],
+        void
+      >()
+
+      container.getEventStream().subscribe((ev) => {
+        if (ev.type === "SERVICE_INIT") {
+          serviceFunc(ev)
+        }
+      })
+
+      container.bind(TestServiceB)
+
+      expect(serviceFunc).toHaveBeenCalledTimes(2)
+      expect(serviceFunc).toHaveBeenNthCalledWith(1, <ContainerEvent>{
+        type: "SERVICE_INIT",
+        serviceID: TestServiceA.ID,
+      })
+      expect(serviceFunc).toHaveBeenNthCalledWith(2, <ContainerEvent>{
+        type: "SERVICE_INIT",
+        serviceID: TestServiceB.ID,
+      })
+    })
+
+    it("returns an observable which emits events correctly when services are bound", () => {
+      const container = new Container()
+
+      const serviceFunc = vi.fn<
+        [ContainerEvent & { type: "SERVICE_BIND" }],
+        void
+      >()
+
+      container.getEventStream().subscribe((ev) => {
+        if (ev.type === "SERVICE_BIND") {
+          serviceFunc(ev)
+        }
+      })
+
+      container.bind(TestServiceB)
+
+      expect(serviceFunc).toHaveBeenCalledTimes(2)
+      expect(serviceFunc).toHaveBeenNthCalledWith(1, <ContainerEvent>{
+        type: "SERVICE_BIND",
+        boundeeID: TestServiceA.ID,
+        bounderID: TestServiceB.ID,
+      })
+      expect(serviceFunc).toHaveBeenNthCalledWith(2, <ContainerEvent>{
+        type: "SERVICE_BIND",
+        boundeeID: TestServiceB.ID,
+        bounderID: undefined,
+      })
+    })
+  })
+
+  describe("getBoundServices", () => {
+    it("returns an iterator over all services bound to the container in the format [service id, service instance]", () => {
+      const container = new Container()
+
+      const instanceB = container.bind(TestServiceB)
+      const instanceA = instanceB.serviceA
+
+      expect(Array.from(container.getBoundServices())).toEqual([
+        [TestServiceA.ID, instanceA],
+        [TestServiceB.ID, instanceB],
+      ])
+    })
+
+    it("returns an empty iterator if no services are bound", () => {
+      const container = new Container()
+
+      expect(Array.from(container.getBoundServices())).toEqual([])
+    })
+  })
+})

packages/dioc/test/service.spec.ts

@@ -0,0 +1,66 @@
+import { describe, expect, it, vi } from "vitest"
+import { Service, Container } from "../lib/main"
+
+class TestServiceA extends Service {
+  public static ID = "TestServiceA"
+}
+
+class TestServiceB extends Service<"test"> {
+  public static ID = "TestServiceB"
+
+  // Marked public to allow for testing
+  public readonly serviceA = this.bind(TestServiceA)
+
+  public emitTestEvent() {
+    this.emit("test")
+  }
+}
+
+describe("Service", () => {
+  describe("constructor", () => {
+    it("throws an error if the service is initialized without a container", () => {
+      expect(() => new TestServiceA()).toThrowError(
+        "Tried to initialize service with no container (ID: TestServiceA)"
+      )
+    })
+  })
+
+  describe("bind", () => {
+    it("correctly binds the dependency service using the container", () => {
+      const container = new Container()
+
+      const serviceA = container.bind(TestServiceA)
+
+      const serviceB = container.bind(TestServiceB)
+      expect(serviceB.serviceA).toBe(serviceA)
+    })
+  })
+
+  describe("getContainer", () => {
+    it("returns the container the service is bound to", () => {
+      const container = new Container()
+
+      const serviceA = container.bind(TestServiceA)
+
+      // @ts-expect-error getContainer is a protected member, we are just using it to help with testing
+      expect(serviceA.getContainer()).toBe(container)
+    })
+  })
+
+  describe("getEventStream", () => {
+    it("returns the valid event stream of the service", () => {
+      const container = new Container()
+
+      const serviceB = container.bind(TestServiceB)
+
+      const serviceFunc = vi.fn()
+
+      serviceB.getEventStream().subscribe(serviceFunc)
+
+      serviceB.emitTestEvent()
+
+      expect(serviceFunc).toHaveBeenCalledOnce()
+      expect(serviceFunc).toHaveBeenCalledWith("test")
+    })
+  })
+})

packages/dioc/test/test-container.spec.ts

@@ -0,0 +1,92 @@
+import { describe, expect, it, vi } from "vitest"
+import { TestContainer } from "../lib/testing"
+import { Service } from "../lib/service"
+import { ContainerEvent } from "../lib/container"
+
+class TestServiceA extends Service {
+  public static ID = "TestServiceA"
+
+  public test() {
+    return "real"
+  }
+}
+
+class TestServiceB extends Service {
+  public static ID = "TestServiceB"
+
+  // declared public to help with testing
+  public readonly serviceA = this.bind(TestServiceA)
+
+  public test() {
+    return this.serviceA.test()
+  }
+}
+
+describe("TestContainer", () => {
+  describe("bindMock", () => {
+    it("returns the fake service defined", () => {
+      const container = new TestContainer()
+
+      const fakeService = {
+        test: () => "fake",
+      }
+
+      const result = container.bindMock(TestServiceA, fakeService)
+
+      expect(result).toBe(fakeService)
+    })
+
+    it("new services bound to the container get the mock service", () => {
+      const container = new TestContainer()
+
+      const fakeServiceA = {
+        test: () => "fake",
+      }
+
+      container.bindMock(TestServiceA, fakeServiceA)
+
+      const serviceB = container.bind(TestServiceB)
+
+      expect(serviceB.serviceA).toBe(fakeServiceA)
+    })
+
+    it("container emits SERVICE_BIND event", () => {
+      const container = new TestContainer()
+
+      const fakeServiceA = {
+        test: () => "fake",
+      }
+
+      const serviceFunc = vi.fn<[ContainerEvent, void]>()
+
+      container.getEventStream().subscribe((ev) => {
+        serviceFunc(ev)
+      })
+
+      container.bindMock(TestServiceA, fakeServiceA)
+
+      expect(serviceFunc).toHaveBeenCalledOnce()
+      expect(serviceFunc).toHaveBeenCalledWith(<ContainerEvent>{
+        type: "SERVICE_BIND",
+        boundeeID: TestServiceA.ID,
+        bounderID: undefined,
+      })
+    })
+
+    it("throws if service already bound", () => {
+      const container = new TestContainer()
+
+      const fakeServiceA = {
+        test: () => "fake",
+      }
+
+      container.bindMock(TestServiceA, fakeServiceA)
+
+      expect(() => {
+        container.bindMock(TestServiceA, fakeServiceA)
+      }).toThrowError(
+        "Service 'TestServiceA' already bound to container. Did you already call bindMock on this ?"
+      )
+    })
+  })
+})

packages/dioc/testing.d.ts

@@ -0,0 +1,2 @@
+export { default } from "./dist/testing.d.ts"
+export * from "./dist/testing.d.ts"

packages/dioc/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "ESNext",
+    "useDefineForClassFields": true,
+    "module": "ESNext",
+    "lib": ["ESNext", "DOM"],
+    "moduleResolution": "Node",
+    "strict": true,
+    "declaration": true,
+    "sourceMap": true,
+    "outDir": "dist",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noImplicitReturns": true,
+    "skipLibCheck": true
+  },
+  "include": ["lib"]
+}

packages/dioc/vite.config.ts

@@ -0,0 +1,16 @@
+import { defineConfig } from 'vite'
+
+export default defineConfig({
+  build: {
+    lib: {
+      entry: {
+        index: './lib/main.ts',
+        vue: './lib/vue.ts',
+        testing: './lib/testing.ts',
+      },
+    },
+    rollupOptions: {
+      external: ['vue'],
+    }
+  },
+})

packages/dioc/vitest.config.ts

@@ -0,0 +1,7 @@
+import { defineConfig } from "vitest/config"
+
+export default defineConfig({
+  test: {
+
+  }
+})

packages/dioc/vue.d.ts

@@ -0,0 +1,2 @@
+export { default } from "./dist/vue.d.ts"
+export * from "./dist/vue.d.ts"

packages/hoppscotch-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hoppscotch-backend",
-  "version": "2023.12.0-1",
+  "version": "2023.8.4-1",
   "description": "",
   "author": "",
   "private": true,
@@ -28,7 +28,6 @@
     "@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",

packages/hoppscotch-backend/prisma/migrations/20231124104640_infra_config/migration.sql

@@ -1,14 +0,0 @@
--- CreateTable
-CREATE TABLE "InfraConfig" (
-    "id" TEXT NOT NULL,
-    "name" TEXT NOT NULL,
-    "value" TEXT,
-    "active" BOOLEAN NOT NULL DEFAULT true,
-    "createdOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    "updatedOn" TIMESTAMP(3) NOT NULL,
-
-    CONSTRAINT "InfraConfig_pkey" PRIMARY KEY ("id")
-);
-
--- CreateIndex
-CREATE UNIQUE INDEX "InfraConfig_name_key" ON "InfraConfig"("name");

packages/hoppscotch-backend/prisma/migrations/20231130082054_collection_headers/migration.sql

@@ -1,5 +0,0 @@
--- AlterTable
-ALTER TABLE "TeamCollection" ADD COLUMN     "data" JSONB;
-
--- AlterTable
-ALTER TABLE "UserCollection" ADD COLUMN     "data" JSONB;

packages/hoppscotch-backend/prisma/schema.prisma

@@ -43,7 +43,6 @@ model TeamInvitation {
 model TeamCollection {
   id         String           @id @default(cuid())
   parentID   String?
-  data       Json?
   parent     TeamCollection?  @relation("TeamCollectionChildParent", fields: [parentID], references: [id])
   children   TeamCollection[] @relation("TeamCollectionChildParent")
   requests   TeamRequest[]
@@ -75,8 +74,7 @@ model Shortcode {
   creatorUid      String?
   User            User?    @relation(fields: [creatorUid], references: [uid])
   createdOn       DateTime @default(now())
-  updatedOn       DateTime @default(now()) @updatedAt
-
+  updatedOn       DateTime @updatedAt @default(now())
   @@unique(fields: [id, creatorUid], name: "creator_uid_shortcode_unique")
 }
 
@@ -197,7 +195,6 @@ model UserCollection {
   userUid    String
   user       User             @relation(fields: [userUid], references: [uid], onDelete: Cascade)
   title      String
-  data       Json?
   orderIndex Int
   type       ReqType
   createdOn  DateTime         @default(now()) @db.Timestamp(3)
@@ -209,12 +206,3 @@ enum TeamMemberRole {
   VIEWER
   EDITOR
 }
-
-model InfraConfig {
-  id        String   @id @default(cuid())
-  name      String   @unique
-  value     String?
-  active    Boolean  @default(true) // Use case: Let's say, Admin wants to disable Google SSO, but doesn't want to delete the config
-  createdOn DateTime @default(now()) @db.Timestamp(3)
-  updatedOn DateTime @updatedAt @db.Timestamp(3)
-}

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

@@ -4,6 +4,7 @@ import { AdminService } from './admin.service';
 import { PrismaModule } from '../prisma/prisma.module';
 import { PubSubModule } from '../pubsub/pubsub.module';
 import { UserModule } from '../user/user.module';
+import { MailerModule } from '../mailer/mailer.module';
 import { TeamModule } from '../team/team.module';
 import { TeamInvitationModule } from '../team-invitation/team-invitation.module';
 import { TeamEnvironmentsModule } from '../team-environments/team-environments.module';
@@ -11,20 +12,19 @@ import { TeamCollectionModule } from '../team-collection/team-collection.module'
 import { TeamRequestModule } from '../team-request/team-request.module';
 import { InfraResolver } from './infra.resolver';
 import { ShortcodeModule } from 'src/shortcode/shortcode.module';
-import { InfraConfigModule } from 'src/infra-config/infra-config.module';
 
 @Module({
   imports: [
     PrismaModule,
     PubSubModule,
     UserModule,
+    MailerModule,
     TeamModule,
     TeamInvitationModule,
     TeamEnvironmentsModule,
     TeamCollectionModule,
     TeamRequestModule,
     ShortcodeModule,
-    InfraConfigModule,
   ],
   providers: [InfraResolver, AdminResolver, AdminService],
   exports: [AdminService],

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

@@ -16,7 +16,6 @@ import {
   USER_ALREADY_INVITED,
 } from '../errors';
 import { ShortcodeService } from 'src/shortcode/shortcode.service';
-import { ConfigService } from '@nestjs/config';
 
 const mockPrisma = mockDeep<PrismaService>();
 const mockPubSub = mockDeep<PubSubService>();
@@ -28,7 +27,6 @@ const mockTeamInvitationService = mockDeep<TeamInvitationService>();
 const mockTeamCollectionService = mockDeep<TeamCollectionService>();
 const mockMailerService = mockDeep<MailerService>();
 const mockShortcodeService = mockDeep<ShortcodeService>();
-const mockConfigService = mockDeep<ConfigService>();
 
 const adminService = new AdminService(
   mockUserService,
@@ -41,7 +39,6 @@ const adminService = new AdminService(
   mockPrisma as any,
   mockMailerService,
   mockShortcodeService,
-  mockConfigService,
 );
 
 const invitedUsers: InvitedUsers[] = [

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

@@ -25,7 +25,6 @@ import { TeamEnvironmentsService } from '../team-environments/team-environments.
 import { TeamInvitationService } from '../team-invitation/team-invitation.service';
 import { TeamMemberRole } from '../team/team.model';
 import { ShortcodeService } from 'src/shortcode/shortcode.service';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class AdminService {
@@ -40,7 +39,6 @@ export class AdminService {
     private readonly prisma: PrismaService,
     private readonly mailerService: MailerService,
     private readonly shortcodeService: ShortcodeService,
-    private readonly configService: ConfigService,
   ) {}
 
   /**
@@ -81,7 +79,7 @@ export class AdminService {
         template: 'user-invitation',
         variables: {
           inviteeEmail: inviteeEmail,
-          magicLink: `${this.configService.get('VITE_BASE_URL')}`,
+          magicLink: `${process.env.VITE_BASE_URL}`,
         },
       });
     } catch (e) {

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

@@ -1,12 +1,5 @@
 import { UseGuards } from '@nestjs/common';
-import {
-  Args,
-  ID,
-  Mutation,
-  Query,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
+import { Args, ID, Query, ResolveField, Resolver } from '@nestjs/graphql';
 import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
 import { Infra } from './infra.model';
 import { AdminService } from './admin.service';
@@ -23,21 +16,11 @@ import { Team } from 'src/team/team.model';
 import { TeamInvitation } from 'src/team-invitation/team-invitation.model';
 import { GqlAdmin } from './decorators/gql-admin.decorator';
 import { ShortcodeWithUserEmail } from 'src/shortcode/shortcode.model';
-import { InfraConfig } from 'src/infra-config/infra-config.model';
-import { InfraConfigService } from 'src/infra-config/infra-config.service';
-import {
-  EnableAndDisableSSOArgs,
-  InfraConfigArgs,
-} from 'src/infra-config/input-args';
-import { InfraConfigEnumForClient } from 'src/types/InfraConfig';
 
 @UseGuards(GqlThrottlerGuard)
 @Resolver(() => Infra)
 export class InfraResolver {
-  constructor(
-    private adminService: AdminService,
-    private infraConfigService: InfraConfigService,
-  ) {}
+  constructor(private adminService: AdminService) {}
 
   @Query(() => Infra, {
     description: 'Fetch details of the Infrastructure',
@@ -239,76 +222,4 @@ export class InfraResolver {
       userEmail,
     );
   }
-
-  @Query(() => [InfraConfig], {
-    description: 'Retrieve configuration details for the instance',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async infraConfigs(
-    @Args({
-      name: 'configNames',
-      type: () => [InfraConfigEnumForClient],
-      description: 'Configs to fetch',
-    })
-    names: InfraConfigEnumForClient[],
-  ) {
-    const infraConfigs = await this.infraConfigService.getMany(names);
-    if (E.isLeft(infraConfigs)) throwErr(infraConfigs.left);
-    return infraConfigs.right;
-  }
-
-  @Query(() => [String], {
-    description: 'Allowed Auth Provider list',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  allowedAuthProviders() {
-    return this.infraConfigService.getAllowedAuthProviders();
-  }
-
-  /* Mutations */
-
-  @Mutation(() => [InfraConfig], {
-    description: 'Update Infra Configs',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async updateInfraConfigs(
-    @Args({
-      name: 'infraConfigs',
-      type: () => [InfraConfigArgs],
-      description: 'InfraConfigs to update',
-    })
-    infraConfigs: InfraConfigArgs[],
-  ) {
-    const updatedRes = await this.infraConfigService.updateMany(infraConfigs);
-    if (E.isLeft(updatedRes)) throwErr(updatedRes.left);
-    return updatedRes.right;
-  }
-
-  @Mutation(() => Boolean, {
-    description: 'Reset Infra Configs with default values (.env)',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async resetInfraConfigs() {
-    const resetRes = await this.infraConfigService.reset();
-    if (E.isLeft(resetRes)) throwErr(resetRes.left);
-    return true;
-  }
-
-  @Mutation(() => Boolean, {
-    description: 'Enable or Disable SSO for login/signup',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async enableAndDisableSSO(
-    @Args({
-      name: 'providerInfo',
-      type: () => [EnableAndDisableSSOArgs],
-      description: 'SSO provider and status',
-    })
-    providerInfo: EnableAndDisableSSOArgs[],
-  ) {
-    const isUpdated = await this.infraConfigService.enableAndDisableSSO(providerInfo);
-    if (E.isLeft(isUpdated)) throwErr(isUpdated.left);
-
-    return true;
-  }
 }

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

@@ -20,69 +20,51 @@ import { ShortcodeModule } from './shortcode/shortcode.module';
 import { COOKIES_NOT_FOUND } from './errors';
 import { ThrottlerModule } from '@nestjs/throttler';
 import { AppController } from './app.controller';
-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';
 
 @Module({
   imports: [
-    ConfigModule.forRoot({
-      isGlobal: true,
-      load: [async () => loadInfraConfiguration()],
-    }),
-    GraphQLModule.forRootAsync<ApolloDriverConfig>({
-      driver: ApolloDriver,
-      imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: async (configService: ConfigService) => {
-        return {
-          buildSchemaOptions: {
-            numberScalarMode: 'integer',
-          },
-          playground: configService.get('PRODUCTION') !== 'true',
-          autoSchemaFile: true,
-          installSubscriptionHandlers: true,
-          subscriptions: {
-            'subscriptions-transport-ws': {
-              path: '/graphql',
-              onConnect: (_, websocket) => {
-                try {
-                  const cookies = subscriptionContextCookieParser(
-                    websocket.upgradeReq.headers.cookie,
-                  );
-                  return {
-                    headers: { ...websocket?.upgradeReq?.headers, cookies },
-                  };
-                } catch (error) {
-                  throw new HttpException(COOKIES_NOT_FOUND, 400, {
-                    cause: new Error(COOKIES_NOT_FOUND),
-                  });
-                }
-              },
-            },
-          },
-          context: ({ req, res, connection }) => ({
-            req,
-            res,
-            connection,
-          }),
-        };
+    GraphQLModule.forRoot<ApolloDriverConfig>({
+      buildSchemaOptions: {
+        numberScalarMode: 'integer',
       },
-    }),
-    ThrottlerModule.forRootAsync({
-      imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: async (configService: ConfigService) => [
-        {
-          ttl: +configService.get('RATE_LIMIT_TTL'),
-          limit: +configService.get('RATE_LIMIT_MAX'),
+      playground: process.env.PRODUCTION !== 'true',
+      autoSchemaFile: true,
+      installSubscriptionHandlers: true,
+      subscriptions: {
+        'subscriptions-transport-ws': {
+          path: '/graphql',
+          onConnect: (_, websocket) => {
+            try {
+              const cookies = subscriptionContextCookieParser(
+                websocket.upgradeReq.headers.cookie,
+              );
+
+              return {
+                headers: { ...websocket?.upgradeReq?.headers, cookies },
+              };
+            } catch (error) {
+              throw new HttpException(COOKIES_NOT_FOUND, 400, {
+                cause: new Error(COOKIES_NOT_FOUND),
+              });
+            }
+          },
         },
-      ],
+      },
+      context: ({ req, res, connection }) => ({
+        req,
+        res,
+        connection,
+      }),
+      driver: ApolloDriver,
     }),
-    MailerModule.register(),
+    ThrottlerModule.forRoot([
+      {
+        ttl: +process.env.RATE_LIMIT_TTL,
+        limit: +process.env.RATE_LIMIT_MAX,
+      },
+    ]),
     UserModule,
-    AuthModule.register(),
+    AuthModule,
     AdminModule,
     UserSettingsModule,
     UserEnvironmentsModule,
@@ -95,7 +77,6 @@ import { MailerModule } from './mailer/mailer.module';
     TeamInvitationModule,
     UserCollectionModule,
     ShortcodeModule,
-    InfraConfigModule,
   ],
   providers: [GQLComplexityPlugin],
   controllers: [AppController],

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

@@ -2,6 +2,7 @@ import {
   Body,
   Controller,
   Get,
+  InternalServerErrorException,
   Post,
   Query,
   Request,
@@ -30,21 +31,11 @@ import { MicrosoftSSOGuard } from './guards/microsoft-sso-.guard';
 import { ThrottlerBehindProxyGuard } from 'src/guards/throttler-behind-proxy.guard';
 import { SkipThrottle } from '@nestjs/throttler';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
-import { ConfigService } from '@nestjs/config';
 
 @UseGuards(ThrottlerBehindProxyGuard)
 @Controller({ path: 'auth', version: '1' })
 export class AuthController {
-  constructor(
-    private authService: AuthService,
-    private configService: ConfigService,
-  ) {}
-
-  @Get('providers')
-  async getAuthProviders() {
-    const providers = await this.authService.getAuthProviders();
-    return { providers };
-  }
+  constructor(private authService: AuthService) {}
 
   /**
    ** Route to initiate magic-link auth for a users email
@@ -54,14 +45,8 @@ export class AuthController {
     @Body() authData: SignInMagicDto,
     @Query('origin') origin: string,
   ) {
-    if (
-      !authProviderCheck(
-        AuthProvider.EMAIL,
-        this.configService.get('INFRA.VITE_ALLOWED_AUTH_PROVIDERS'),
-      )
-    ) {
+    if (!authProviderCheck(AuthProvider.EMAIL))
       throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-    }
 
     const deviceIdToken = await this.authService.signInMagicLink(
       authData.email,

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

@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { AuthController } from './auth.controller';
 import { UserModule } from 'src/user/user.module';
+import { MailerModule } from 'src/mailer/mailer.module';
 import { PrismaModule } from 'src/prisma/prisma.module';
 import { PassportModule } from '@nestjs/passport';
 import { JwtModule } from '@nestjs/jwt';
@@ -11,47 +12,25 @@ import { GoogleStrategy } from './strategies/google.strategy';
 import { GithubStrategy } from './strategies/github.strategy';
 import { MicrosoftStrategy } from './strategies/microsoft.strategy';
 import { AuthProvider, authProviderCheck } from './helper';
-import { ConfigModule, ConfigService } from '@nestjs/config';
-import { loadInfraConfiguration } from 'src/infra-config/helper';
-import { InfraConfigModule } from 'src/infra-config/infra-config.module';
 
 @Module({
   imports: [
     PrismaModule,
     UserModule,
+    MailerModule,
     PassportModule,
-    JwtModule.registerAsync({
-      imports: [ConfigModule],
-      inject: [ConfigService],
-      useFactory: async (configService: ConfigService) => ({
-        secret: configService.get('JWT_SECRET'),
-      }),
+    JwtModule.register({
+      secret: process.env.JWT_SECRET,
     }),
-    InfraConfigModule,
   ],
-  providers: [AuthService, JwtStrategy, RTJwtStrategy],
+  providers: [
+    AuthService,
+    JwtStrategy,
+    RTJwtStrategy,
+    ...(authProviderCheck(AuthProvider.GOOGLE) ? [GoogleStrategy] : []),
+    ...(authProviderCheck(AuthProvider.GITHUB) ? [GithubStrategy] : []),
+    ...(authProviderCheck(AuthProvider.MICROSOFT) ? [MicrosoftStrategy] : []),
+  ],
   controllers: [AuthController],
 })
-export class AuthModule {
-  static async register() {
-    const env = await loadInfraConfiguration();
-    const allowedAuthProviders = env.INFRA.VITE_ALLOWED_AUTH_PROVIDERS;
-
-    const providers = [
-      ...(authProviderCheck(AuthProvider.GOOGLE, allowedAuthProviders)
-        ? [GoogleStrategy]
-        : []),
-      ...(authProviderCheck(AuthProvider.GITHUB, allowedAuthProviders)
-        ? [GithubStrategy]
-        : []),
-      ...(authProviderCheck(AuthProvider.MICROSOFT, allowedAuthProviders)
-        ? [MicrosoftStrategy]
-        : []),
-    ];
-
-    return {
-      module: AuthModule,
-      providers,
-    };
-  }
-}
+export class AuthModule {}

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

@@ -21,26 +21,15 @@ import { VerifyMagicDto } from './dto/verify-magic.dto';
 import { DateTime } from 'luxon';
 import * as argon2 from 'argon2';
 import * as E from 'fp-ts/Either';
-import { ConfigService } from '@nestjs/config';
-import { InfraConfigService } from 'src/infra-config/infra-config.service';
 
 const mockPrisma = mockDeep<PrismaService>();
 const mockUser = mockDeep<UserService>();
 const mockJWT = mockDeep<JwtService>();
 const mockMailer = mockDeep<MailerService>();
-const mockConfigService = mockDeep<ConfigService>();
-const mockInfraConfigService = mockDeep<InfraConfigService>();
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-const authService = new AuthService(
-  mockUser,
-  mockPrisma,
-  mockJWT,
-  mockMailer,
-  mockConfigService,
-  mockInfraConfigService,
-);
+const authService = new AuthService(mockUser, mockPrisma, mockJWT, mockMailer);
 
 const currentTime = new Date();
 
@@ -102,8 +91,6 @@ describe('signInMagicLink', () => {
     mockUser.createUserViaMagicLink.mockResolvedValue(user);
     // create new entry in VerificationToken table
     mockPrisma.verificationToken.create.mockResolvedValueOnce(passwordlessData);
-    // Read env variable 'MAGIC_LINK_TOKEN_VALIDITY' from config service
-    mockConfigService.get.mockReturnValue('3');
 
     const result = await authService.signInMagicLink(
       'dwight@dundermifflin.com',

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

@@ -28,8 +28,6 @@ import { AuthError } from 'src/types/AuthError';
 import { AuthUser, IsAdmin } from 'src/types/AuthUser';
 import { VerificationToken } from '@prisma/client';
 import { Origin } from './helper';
-import { ConfigService } from '@nestjs/config';
-import { InfraConfigService } from 'src/infra-config/infra-config.service';
 
 @Injectable()
 export class AuthService {
@@ -38,8 +36,6 @@ export class AuthService {
     private prismaService: PrismaService,
     private jwtService: JwtService,
     private readonly mailerService: MailerService,
-    private readonly configService: ConfigService,
-    private infraConfigService: InfraConfigService,
   ) {}
 
   /**
@@ -50,12 +46,10 @@ export class AuthService {
    */
   private async generateMagicLinkTokens(user: AuthUser) {
     const salt = await bcrypt.genSalt(
-      parseInt(this.configService.get('TOKEN_SALT_COMPLEXITY')),
+      parseInt(process.env.TOKEN_SALT_COMPLEXITY),
     );
     const expiresOn = DateTime.now()
-      .plus({
-        hours: parseInt(this.configService.get('MAGIC_LINK_TOKEN_VALIDITY')),
-      })
+      .plus({ hours: parseInt(process.env.MAGIC_LINK_TOKEN_VALIDITY) })
       .toISO()
       .toString();
 
@@ -101,13 +95,13 @@ export class AuthService {
    */
   private async generateRefreshToken(userUid: string) {
     const refreshTokenPayload: RefreshTokenPayload = {
-      iss: this.configService.get('VITE_BASE_URL'),
+      iss: process.env.VITE_BASE_URL,
       sub: userUid,
-      aud: [this.configService.get('VITE_BASE_URL')],
+      aud: [process.env.VITE_BASE_URL],
     };
 
     const refreshToken = await this.jwtService.sign(refreshTokenPayload, {
-      expiresIn: this.configService.get('REFRESH_TOKEN_VALIDITY'), //7 Days
+      expiresIn: process.env.REFRESH_TOKEN_VALIDITY, //7 Days
     });
 
     const refreshTokenHash = await argon2.hash(refreshToken);
@@ -133,9 +127,9 @@ export class AuthService {
    */
   async generateAuthTokens(userUid: string) {
     const accessTokenPayload: AccessTokenPayload = {
-      iss: this.configService.get('VITE_BASE_URL'),
+      iss: process.env.VITE_BASE_URL,
       sub: userUid,
-      aud: [this.configService.get('VITE_BASE_URL')],
+      aud: [process.env.VITE_BASE_URL],
     };
 
     const refreshToken = await this.generateRefreshToken(userUid);
@@ -143,7 +137,7 @@ export class AuthService {
 
     return E.right(<AuthTokens>{
       access_token: await this.jwtService.sign(accessTokenPayload, {
-        expiresIn: this.configService.get('ACCESS_TOKEN_VALIDITY'), //1 Day
+        expiresIn: process.env.ACCESS_TOKEN_VALIDITY, //1 Day
       }),
       refresh_token: refreshToken.right,
     });
@@ -224,14 +218,14 @@ export class AuthService {
     let url: string;
     switch (origin) {
       case Origin.ADMIN:
-        url = this.configService.get('VITE_ADMIN_URL');
+        url = process.env.VITE_ADMIN_URL;
         break;
       case Origin.APP:
-        url = this.configService.get('VITE_BASE_URL');
+        url = process.env.VITE_BASE_URL;
         break;
       default:
         // if origin is invalid by default set URL to Hoppscotch-App
-        url = this.configService.get('VITE_BASE_URL');
+        url = process.env.VITE_BASE_URL;
     }
 
     await this.mailerService.sendEmail(email, {
@@ -383,8 +377,4 @@ export class AuthService {
 
     return E.right(<IsAdmin>{ isAdmin: false });
   }
-
-  getAuthProviders() {
-    return this.infraConfigService.getAllowedAuthProviders();
-  }
 }

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

@@ -3,25 +3,14 @@ import { AuthGuard } from '@nestjs/passport';
 import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
 import { Observable } from 'rxjs';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class GithubSSOGuard extends AuthGuard('github') implements CanActivate {
-  constructor(private readonly configService: ConfigService) {
-    super();
-  }
-
   canActivate(
     context: ExecutionContext,
   ): boolean | Promise<boolean> | Observable<boolean> {
-    if (
-      !authProviderCheck(
-        AuthProvider.GITHUB,
-        this.configService.get('INFRA.VITE_ALLOWED_AUTH_PROVIDERS'),
-      )
-    ) {
+    if (!authProviderCheck(AuthProvider.GITHUB))
       throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-    }
 
     return super.canActivate(context);
   }

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

@@ -3,25 +3,14 @@ import { AuthGuard } from '@nestjs/passport';
 import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
 import { Observable } from 'rxjs';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class GoogleSSOGuard extends AuthGuard('google') implements CanActivate {
-  constructor(private readonly configService: ConfigService) {
-    super();
-  }
-
   canActivate(
     context: ExecutionContext,
   ): boolean | Promise<boolean> | Observable<boolean> {
-    if (
-      !authProviderCheck(
-        AuthProvider.GOOGLE,
-        this.configService.get('INFRA.VITE_ALLOWED_AUTH_PROVIDERS'),
-      )
-    ) {
+    if (!authProviderCheck(AuthProvider.GOOGLE))
       throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-    }
 
     return super.canActivate(context);
   }

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

@@ -3,31 +3,20 @@ import { AuthGuard } from '@nestjs/passport';
 import { AuthProvider, authProviderCheck, throwHTTPErr } from '../helper';
 import { Observable } from 'rxjs';
 import { AUTH_PROVIDER_NOT_SPECIFIED } from 'src/errors';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class MicrosoftSSOGuard
   extends AuthGuard('microsoft')
   implements CanActivate
 {
-  constructor(private readonly configService: ConfigService) {
-    super();
-  }
-
   canActivate(
     context: ExecutionContext,
   ): boolean | Promise<boolean> | Observable<boolean> {
-    if (
-      !authProviderCheck(
-        AuthProvider.MICROSOFT,
-        this.configService.get('INFRA.VITE_ALLOWED_AUTH_PROVIDERS'),
-      )
-    ) {
+    if (!authProviderCheck(AuthProvider.MICROSOFT))
       throwHTTPErr({
         message: AUTH_PROVIDER_NOT_SPECIFIED,
         statusCode: 404,
       });
-    }
 
     return super.canActivate(context);
   }

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

@@ -6,7 +6,6 @@ import { Response } from 'express';
 import * as cookie from 'cookie';
 import { AUTH_PROVIDER_NOT_SPECIFIED, COOKIES_NOT_FOUND } from 'src/errors';
 import { throwErr } from 'src/utils';
-import { ConfigService } from '@nestjs/config';
 
 enum AuthTokenType {
   ACCESS_TOKEN = 'access_token',
@@ -46,17 +45,15 @@ export const authCookieHandler = (
   redirect: boolean,
   redirectUrl: string | null,
 ) => {
-  const configService = new ConfigService();
-
   const currentTime = DateTime.now();
   const accessTokenValidity = currentTime
     .plus({
-      milliseconds: parseInt(configService.get('ACCESS_TOKEN_VALIDITY')),
+      milliseconds: parseInt(process.env.ACCESS_TOKEN_VALIDITY),
     })
     .toMillis();
   const refreshTokenValidity = currentTime
     .plus({
-      milliseconds: parseInt(configService.get('REFRESH_TOKEN_VALIDITY')),
+      milliseconds: parseInt(process.env.REFRESH_TOKEN_VALIDITY),
     })
     .toMillis();
 
@@ -78,12 +75,10 @@ export const authCookieHandler = (
   }
 
   // check to see if redirectUrl is a whitelisted url
-  const whitelistedOrigins = configService
-    .get('WHITELISTED_ORIGINS')
-    .split(',');
+  const whitelistedOrigins = process.env.WHITELISTED_ORIGINS.split(',');
   if (!whitelistedOrigins.includes(redirectUrl))
     // if it is not redirect by default to REDIRECT_URL
-    redirectUrl = configService.get('REDIRECT_URL');
+    redirectUrl = process.env.REDIRECT_URL;
 
   return res.status(HttpStatus.OK).redirect(redirectUrl);
 };
@@ -117,16 +112,13 @@ export const subscriptionContextCookieParser = (rawCookies: string) => {
  * @param provider Provider we want to check the presence of
  * @returns Boolean if provider specified is present or not
  */
-export function authProviderCheck(
-  provider: string,
-  VITE_ALLOWED_AUTH_PROVIDERS: string,
-) {
+export function authProviderCheck(provider: string) {
   if (!provider) {
     throwErr(AUTH_PROVIDER_NOT_SPECIFIED);
   }
 
-  const envVariables = VITE_ALLOWED_AUTH_PROVIDERS
-    ? VITE_ALLOWED_AUTH_PROVIDERS.split(',').map((provider) =>
+  const envVariables = process.env.VITE_ALLOWED_AUTH_PROVIDERS
+    ? process.env.VITE_ALLOWED_AUTH_PROVIDERS.split(',').map((provider) =>
         provider.trim().toUpperCase(),
       )
     : [];

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

@@ -5,20 +5,18 @@ import { AuthService } from '../auth.service';
 import { UserService } from 'src/user/user.service';
 import * as O from 'fp-ts/Option';
 import * as E from 'fp-ts/Either';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class GithubStrategy extends PassportStrategy(Strategy) {
   constructor(
     private authService: AuthService,
     private usersService: UserService,
-    private configService: ConfigService,
   ) {
     super({
-      clientID: configService.get('INFRA.GITHUB_CLIENT_ID'),
-      clientSecret: configService.get('INFRA.GITHUB_CLIENT_SECRET'),
-      callbackURL: configService.get('GITHUB_CALLBACK_URL'),
-      scope: [configService.get('GITHUB_SCOPE')],
+      clientID: process.env.GITHUB_CLIENT_ID,
+      clientSecret: process.env.GITHUB_CLIENT_SECRET,
+      callbackURL: process.env.GITHUB_CALLBACK_URL,
+      scope: [process.env.GITHUB_SCOPE],
       store: true,
     });
   }

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

@@ -5,20 +5,18 @@ import { UserService } from 'src/user/user.service';
 import * as O from 'fp-ts/Option';
 import { AuthService } from '../auth.service';
 import * as E from 'fp-ts/Either';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class GoogleStrategy extends PassportStrategy(Strategy) {
   constructor(
     private usersService: UserService,
     private authService: AuthService,
-    private configService: ConfigService,
   ) {
     super({
-      clientID: configService.get('INFRA.GOOGLE_CLIENT_ID'),
-      clientSecret: configService.get('INFRA.GOOGLE_CLIENT_SECRET'),
-      callbackURL: configService.get('GOOGLE_CALLBACK_URL'),
-      scope: configService.get('GOOGLE_SCOPE').split(','),
+      clientID: process.env.GOOGLE_CLIENT_ID,
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+      callbackURL: process.env.GOOGLE_CALLBACK_URL,
+      scope: process.env.GOOGLE_SCOPE.split(','),
       passReqToCallback: true,
       store: true,
     });

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

@@ -15,14 +15,10 @@ import {
   INVALID_ACCESS_TOKEN,
   USER_NOT_FOUND,
 } from 'src/errors';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
-  constructor(
-    private usersService: UserService,
-    private configService: ConfigService,
-  ) {
+  constructor(private usersService: UserService) {
     super({
       jwtFromRequest: ExtractJwt.fromExtractors([
         (request: Request) => {
@@ -33,7 +29,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
           return ATCookie;
         },
       ]),
-      secretOrKey: configService.get('JWT_SECRET'),
+      secretOrKey: process.env.JWT_SECRET,
     });
   }
 

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

@@ -5,21 +5,19 @@ import { AuthService } from '../auth.service';
 import { UserService } from 'src/user/user.service';
 import * as O from 'fp-ts/Option';
 import * as E from 'fp-ts/Either';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class MicrosoftStrategy extends PassportStrategy(Strategy) {
   constructor(
     private authService: AuthService,
     private usersService: UserService,
-    private configService: ConfigService,
   ) {
     super({
-      clientID: configService.get('INFRA.MICROSOFT_CLIENT_ID'),
-      clientSecret: configService.get('INFRA.MICROSOFT_CLIENT_SECRET'),
-      callbackURL: configService.get('MICROSOFT_CALLBACK_URL'),
-      scope: [configService.get('MICROSOFT_SCOPE')],
-      tenant: configService.get('MICROSOFT_TENANT'),
+      clientID: process.env.MICROSOFT_CLIENT_ID,
+      clientSecret: process.env.MICROSOFT_CLIENT_SECRET,
+      callbackURL: process.env.MICROSOFT_CALLBACK_URL,
+      scope: [process.env.MICROSOFT_SCOPE],
+      tenant: process.env.MICROSOFT_TENANT,
       store: true,
     });
   }

packages/hoppscotch-backend/src/auth/strategies/rt-jwt.strategy.ts

@@ -14,14 +14,10 @@ import {
   USER_NOT_FOUND,
 } from 'src/errors';
 import * as O from 'fp-ts/Option';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class RTJwtStrategy extends PassportStrategy(Strategy, 'jwt-refresh') {
-  constructor(
-    private usersService: UserService,
-    private configService: ConfigService,
-  ) {
+  constructor(private usersService: UserService) {
     super({
       jwtFromRequest: ExtractJwt.fromExtractors([
         (request: Request) => {
@@ -32,7 +28,7 @@ export class RTJwtStrategy extends PassportStrategy(Strategy, 'jwt-refresh') {
           return RTCookie;
         },
       ]),
-      secretOrKey: configService.get('JWT_SECRET'),
+      secretOrKey: process.env.JWT_SECRET,
     });
   }
 

packages/hoppscotch-backend/src/errors.ts

@@ -254,13 +254,6 @@ export const TEAM_COLL_INVALID_JSON = 'team_coll/invalid_json';
  */
 export const TEAM_NOT_OWNER = 'team_coll/team_not_owner' as const;
 
-/**
- * The Team Collection data is not valid
- * (TeamCollectionService)
- */
-export const TEAM_COLL_DATA_INVALID =
-  'team_coll/team_coll_data_invalid' as const;
-
 /**
  * Tried to perform an action on a request that doesn't accept their member role level
  * (GqlRequestTeamMemberGuard)
@@ -592,13 +585,6 @@ export const USER_COLL_REORDERING_FAILED =
 export const USER_COLL_SAME_NEXT_COLL =
   'user_coll/user_collection_and_next_user_collection_are_same' as const;
 
-/**
- * The User Collection data is not valid
- * (UserCollectionService)
- */
-export const USER_COLL_DATA_INVALID =
-  'user_coll/user_coll_data_invalid' as const;
-
 /**
  * The User Collection does not belong to the logged-in user
  * (UserCollectionService)
@@ -644,48 +630,3 @@ export const SHORTCODE_INVALID_PROPERTIES_JSON =
  */
 export const SHORTCODE_PROPERTIES_NOT_FOUND =
   'shortcode/properties_not_found' as const;
-
-/**
- * Infra Config not found
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_NOT_FOUND = 'infra_config/not_found' as const;
-
-/**
- * Infra Config update failed
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_UPDATE_FAILED = 'infra_config/update_failed' as const;
-
-/**
- * Infra Config not listed for onModuleInit creation
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_NOT_LISTED =
-  'infra_config/properly_not_listed' as const;
-
-/**
- * Infra Config reset failed
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_RESET_FAILED = 'infra_config/reset_failed' as const;
-
-/**
- * Infra Config invalid input for Config variable
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_INVALID_INPUT = 'infra_config/invalid_input' as const;
-
-/**
- * Infra Config service (auth provider/mailer/audit logs) not configured
- * (InfraConfigService)
- */
-export const INFRA_CONFIG_SERVICE_NOT_CONFIGURED =
-  'infra_config/service_not_configured' as const;
-
-/**
- * Error message for when the database table does not exist
- * (InfraConfigService)
- */
-export const DATABASE_TABLE_NOT_EXIST =
-  'Database migration not performed. Please check the FAQ for assistance: https://docs.hoppscotch.io/support/getting-started/faq';

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

@@ -1,44 +0,0 @@
-import { PrismaService } from 'src/prisma/prisma.service';
-
-export enum ServiceStatus {
-  ENABLE = 'ENABLE',
-  DISABLE = 'DISABLE',
-}
-
-/**
- * Load environment variables from the database and set them in the process
- *
- * @Description Fetch the 'infra_config' table from the database and return it as an object
- * (ConfigModule will set the environment variables in the process)
- */
-export async function loadInfraConfiguration() {
-  try {
-    const prisma = new PrismaService();
-
-    const infraConfigs = await prisma.infraConfig.findMany();
-
-    let environmentObject: Record<string, any> = {};
-    infraConfigs.forEach((infraConfig) => {
-      environmentObject[infraConfig.name] = infraConfig.value;
-    });
-
-    return { INFRA: environmentObject };
-  } catch (error) {
-    // Prisma throw error if 'Can't reach at database server' OR 'Table does not exist'
-    // Reason for not throwing error is, we want successful build during 'postinstall' and generate dist files
-    return { INFRA: {} };
-  }
-}
-
-/**
- * Stop the app after 5 seconds
- * (Docker will re-start the app)
- */
-export function stopApp() {
-  console.log('Stopping app in 5 seconds...');
-
-  setTimeout(() => {
-    console.log('Stopping app now...');
-    process.kill(process.pid, 'SIGTERM');
-  }, 5000);
-}

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

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

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

@@ -1,10 +0,0 @@
-import { Module } from '@nestjs/common';
-import { InfraConfigService } from './infra-config.service';
-import { PrismaModule } from 'src/prisma/prisma.module';
-
-@Module({
-  imports: [PrismaModule],
-  providers: [InfraConfigService],
-  exports: [InfraConfigService],
-})
-export class InfraConfigModule {}

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

@@ -1,109 +0,0 @@
-import { mockDeep, mockReset } from 'jest-mock-extended';
-import { PrismaService } from 'src/prisma/prisma.service';
-import { InfraConfigService } from './infra-config.service';
-import {
-  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';
-
-const mockPrisma = mockDeep<PrismaService>();
-const mockConfigService = mockDeep<ConfigService>();
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-const infraConfigService = new InfraConfigService(
-  mockPrisma,
-  mockConfigService,
-);
-
-beforeEach(() => {
-  mockReset(mockPrisma);
-});
-
-describe('InfraConfigService', () => {
-  describe('update', () => {
-    it('should update the infra config', 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(result).toEqualRight({ name, value });
-    });
-
-    it('should pass correct params to prisma update', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
-      const value = 'true';
-
-      jest.spyOn(helper, 'stopApp').mockReturnValueOnce();
-
-      await infraConfigService.update(name, value);
-
-      expect(mockPrisma.infraConfig.update).toHaveBeenCalledWith({
-        where: { name },
-        data: { value },
-      });
-      expect(mockPrisma.infraConfig.update).toHaveBeenCalledTimes(1);
-    });
-
-    it('should throw an error if the infra config update failed', async () => {
-      const name = InfraConfigEnum.GOOGLE_CLIENT_ID;
-      const value = 'true';
-
-      mockPrisma.infraConfig.update.mockRejectedValueOnce('null');
-
-      const result = await infraConfigService.update(name, value);
-      expect(result).toEqualLeft(INFRA_CONFIG_UPDATE_FAILED);
-    });
-  });
-
-  describe('get', () => {
-    it('should get the infra config', async () => {
-      const name = InfraConfigEnumForClient.GOOGLE_CLIENT_ID;
-      const value = 'true';
-
-      mockPrisma.infraConfig.findUniqueOrThrow.mockResolvedValueOnce({
-        id: '',
-        name,
-        value,
-        active: true,
-        createdOn: new Date(),
-        updatedOn: new Date(),
-      });
-      const result = await infraConfigService.get(name);
-      expect(result).toEqualRight({ name, value });
-    });
-
-    it('should pass correct params to prisma findUnique', async () => {
-      const name = InfraConfigEnumForClient.GOOGLE_CLIENT_ID;
-
-      await infraConfigService.get(name);
-
-      expect(mockPrisma.infraConfig.findUniqueOrThrow).toHaveBeenCalledWith({
-        where: { name },
-      });
-      expect(mockPrisma.infraConfig.findUniqueOrThrow).toHaveBeenCalledTimes(1);
-    });
-
-    it('should throw an error if the infra config does not exist', async () => {
-      const name = InfraConfigEnumForClient.GOOGLE_CLIENT_ID;
-
-      mockPrisma.infraConfig.findUniqueOrThrow.mockRejectedValueOnce('null');
-
-      const result = await infraConfigService.get(name);
-      expect(result).toEqualLeft(INFRA_CONFIG_NOT_FOUND);
-    });
-  });
-});

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

@@ -1,373 +0,0 @@
-import { Injectable, OnModuleInit } from '@nestjs/common';
-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,
-  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,
-} from 'src/errors';
-import { throwErr, validateEmail, validateSMTPUrl } from 'src/utils';
-import { ConfigService } from '@nestjs/config';
-import { ServiceStatus, stopApp } from './helper';
-import { EnableAndDisableSSOArgs, InfraConfigArgs } from './input-args';
-import { AuthProvider } from 'src/auth/helper';
-
-@Injectable()
-export class InfraConfigService implements OnModuleInit {
-  constructor(
-    private readonly prisma: PrismaService,
-    private readonly configService: ConfigService,
-  ) {}
-
-  async onModuleInit() {
-    await this.initializeInfraConfigTable();
-  }
-
-  getDefaultInfraConfigs(): { 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: process.env.VITE_ALLOWED_AUTH_PROVIDERS.toLocaleUpperCase(),
-      },
-    ];
-
-    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 = this.getDefaultInfraConfigs();
-
-      // Check if all the 'names' are listed in the default values
-      if (enumValues.length !== infraConfigDefaultObjs.length) {
-        throw new Error(INFRA_CONFIG_NOT_LISTED);
-      }
-
-      // Eliminate the rows (from 'infraConfigDefaultObjs') that are already present in the database table
-      const dbInfraConfigs = await this.prisma.infraConfig.findMany();
-      const propsToInsert = infraConfigDefaultObjs.filter(
-        (p) => !dbInfraConfigs.find((e) => e.name === p.name),
-      );
-
-      if (propsToInsert.length > 0) {
-        await this.prisma.infraConfig.createMany({ data: propsToInsert });
-        stopApp();
-      }
-    } catch (error) {
-      if (error.code === 'P1001') {
-        // Prisma error code for 'Can't reach at database server'
-        // We're not throwing error here because we want to allow the app to run 'pnpm install'
-      } else if (error.code === 'P2021') {
-        // Prisma error code for 'Table does not exist'
-        throwErr(DATABASE_TABLE_NOT_EXIST);
-      } else {
-        throwErr(error);
-      }
-    }
-  }
-
-  /**
-   * Typecast a database InfraConfig to a InfraConfig model
-   * @param dbInfraConfig database InfraConfig
-   * @returns InfraConfig model
-   */
-  cast(dbInfraConfig: DBInfraConfig) {
-    return <InfraConfig>{
-      name: dbInfraConfig.name,
-      value: dbInfraConfig.value ?? '',
-    };
-  }
-
-  /**
-   * Update InfraConfig by name
-   * @param name Name of the InfraConfig
-   * @param value Value of the InfraConfig
-   * @returns InfraConfig model
-   */
-  async update(
-    name: InfraConfigEnumForClient | InfraConfigEnum,
-    value: string,
-  ) {
-    const isValidate = this.validateEnvValues([{ name, value }]);
-    if (E.isLeft(isValidate)) return E.left(isValidate.left);
-
-    try {
-      const infraConfig = await this.prisma.infraConfig.update({
-        where: { name },
-        data: { value },
-      });
-
-      stopApp();
-
-      return E.right(this.cast(infraConfig));
-    } catch (e) {
-      return E.left(INFRA_CONFIG_UPDATE_FAILED);
-    }
-  }
-
-  /**
-   * Update InfraConfigs by name
-   * @param infraConfigs InfraConfigs to update
-   * @returns InfraConfig model
-   */
-  async updateMany(infraConfigs: InfraConfigArgs[]) {
-    const isValidate = this.validateEnvValues(infraConfigs);
-    if (E.isLeft(isValidate)) return E.left(isValidate.left);
-
-    try {
-      await this.prisma.$transaction(async (tx) => {
-        for (let i = 0; i < infraConfigs.length; i++) {
-          await tx.infraConfig.update({
-            where: { name: infraConfigs[i].name },
-            data: { value: infraConfigs[i].value },
-          });
-        }
-      });
-
-      stopApp();
-
-      return E.right(infraConfigs);
-    } catch (e) {
-      return E.left(INFRA_CONFIG_UPDATE_FAILED);
-    }
-  }
-
-  /**
-   * Check if the service is configured or not
-   * @param service Service can be Auth Provider, Mailer, Audit Log etc.
-   * @returns Either true or false
-   */
-  isServiceConfigured(service: AuthProvider) {
-    switch (service) {
-      case AuthProvider.GOOGLE:
-        return (
-          this.configService.get<string>('INFRA.GOOGLE_CLIENT_ID') &&
-          this.configService.get<string>('INFRA.GOOGLE_CLIENT_SECRET')
-        );
-      case AuthProvider.GITHUB:
-        return (
-          this.configService.get<string>('INFRA.GITHUB_CLIENT_ID') &&
-          !this.configService.get<string>('INFRA.GITHUB_CLIENT_SECRET')
-        );
-      case AuthProvider.MICROSOFT:
-        return (
-          this.configService.get<string>('INFRA.MICROSOFT_CLIENT_ID') &&
-          !this.configService.get<string>('INFRA.MICROSOFT_CLIENT_SECRET')
-        );
-      case AuthProvider.EMAIL:
-        return (
-          this.configService.get<string>('INFRA.MAILER_SMTP_URL') &&
-          this.configService.get<string>('INFRA.MAILER_ADDRESS_FROM')
-        );
-      default:
-        return false;
-    }
-  }
-
-  /**
-   * Enable or Disable SSO for login/signup
-   * @param provider Auth Provider to enable or disable
-   * @param status Status to enable or disable
-   * @returns Either true or an error
-   */
-  async enableAndDisableSSO(providerInfo: EnableAndDisableSSOArgs[]) {
-    const allowedAuthProviders = this.configService
-      .get<string>('INFRA.VITE_ALLOWED_AUTH_PROVIDERS')
-      .split(',');
-
-    let updatedAuthProviders = allowedAuthProviders;
-
-    for (let i = 0; i < providerInfo.length; i++) {
-      const { provider, status } = providerInfo[i];
-
-      if (status === ServiceStatus.ENABLE) {
-        const isConfigured = this.isServiceConfigured(provider);
-        if (!isConfigured) {
-          throwErr(INFRA_CONFIG_SERVICE_NOT_CONFIGURED);
-        }
-        updatedAuthProviders.push(provider);
-      } else if (status === ServiceStatus.DISABLE) {
-        updatedAuthProviders = updatedAuthProviders.filter(
-          (p) => p !== provider,
-        );
-      }
-    }
-
-    updatedAuthProviders = [...new Set(updatedAuthProviders)];
-
-    if (updatedAuthProviders.length === 0) {
-      return E.left(AUTH_PROVIDER_NOT_SPECIFIED);
-    }
-
-    const isUpdated = await this.update(
-      InfraConfigEnum.VITE_ALLOWED_AUTH_PROVIDERS,
-      updatedAuthProviders.join(','),
-    );
-    if (E.isLeft(isUpdated)) return E.left(isUpdated.left);
-
-    return E.right(true);
-  }
-
-  /**
-   * Get InfraConfig by name
-   * @param name Name of the InfraConfig
-   * @returns InfraConfig model
-   */
-  async get(name: InfraConfigEnumForClient) {
-    try {
-      const infraConfig = await this.prisma.infraConfig.findUniqueOrThrow({
-        where: { name },
-      });
-
-      return E.right(this.cast(infraConfig));
-    } catch (e) {
-      return E.left(INFRA_CONFIG_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Get InfraConfigs by names
-   * @param names Names of the InfraConfigs
-   * @returns InfraConfig model
-   */
-  async getMany(names: InfraConfigEnumForClient[]) {
-    try {
-      const infraConfigs = await this.prisma.infraConfig.findMany({
-        where: { name: { in: names } },
-      });
-
-      return E.right(infraConfigs.map((p) => this.cast(p)));
-    } catch (e) {
-      return E.left(INFRA_CONFIG_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Get allowed auth providers for login/signup
-   * @returns string[]
-   */
-  getAllowedAuthProviders() {
-    return this.configService
-      .get<string>('INFRA.VITE_ALLOWED_AUTH_PROVIDERS')
-      .split(',');
-  }
-
-  /**
-   * Reset all the InfraConfigs to their default values (from .env)
-   */
-  async reset() {
-    try {
-      const infraConfigDefaultObjs = this.getDefaultInfraConfigs();
-
-      await this.prisma.infraConfig.deleteMany({
-        where: { name: { in: infraConfigDefaultObjs.map((p) => p.name) } },
-      });
-      await this.prisma.infraConfig.createMany({
-        data: infraConfigDefaultObjs,
-      });
-
-      stopApp();
-
-      return E.right(true);
-    } catch (e) {
-      return E.left(INFRA_CONFIG_RESET_FAILED);
-    }
-  }
-
-  /**
-   * Validate the values of the InfraConfigs
-   */
-  validateEnvValues(
-    infraConfigs: {
-      name: InfraConfigEnumForClient | InfraConfigEnum;
-      value: string;
-    }[],
-  ) {
-    for (let i = 0; i < infraConfigs.length; i++) {
-      switch (infraConfigs[i].name) {
-        case InfraConfigEnumForClient.MAILER_SMTP_URL:
-          const isValidUrl = validateSMTPUrl(infraConfigs[i].value);
-          if (!isValidUrl) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.MAILER_ADDRESS_FROM:
-          const isValidEmail = validateEmail(infraConfigs[i].value);
-          if (!isValidEmail) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.GOOGLE_CLIENT_ID:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.GOOGLE_CLIENT_SECRET:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.GITHUB_CLIENT_ID:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.GITHUB_CLIENT_SECRET:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.MICROSOFT_CLIENT_ID:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        case InfraConfigEnumForClient.MICROSOFT_CLIENT_SECRET:
-          if (!infraConfigs[i].value) return E.left(INFRA_CONFIG_INVALID_INPUT);
-          break;
-        default:
-          break;
-      }
-    }
-
-    return E.right(true);
-  }
-}

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

@@ -1,30 +0,0 @@
-import { Field, InputType } from '@nestjs/graphql';
-import { InfraConfigEnumForClient } from 'src/types/InfraConfig';
-import { ServiceStatus } from './helper';
-import { AuthProvider } from 'src/auth/helper';
-
-@InputType()
-export class InfraConfigArgs {
-  @Field(() => InfraConfigEnumForClient, {
-    description: 'Infra Config Name',
-  })
-  name: InfraConfigEnumForClient;
-
-  @Field({
-    description: 'Infra Config Value',
-  })
-  value: string;
-}
-
-@InputType()
-export class EnableAndDisableSSOArgs {
-  @Field(() => AuthProvider, {
-    description: 'Auth Provider',
-  })
-  provider: AuthProvider;
-
-  @Field(() => ServiceStatus, {
-    description: 'Auth Provider Status',
-  })
-  status: ServiceStatus;
-}

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

@@ -1,4 +1,4 @@
-import { Global, Module } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { MailerModule as NestMailerModule } from '@nestjs-modules/mailer';
 import { HandlebarsAdapter } from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter';
 import { MailerService } from './mailer.service';
@@ -7,42 +7,24 @@ import {
   MAILER_FROM_ADDRESS_UNDEFINED,
   MAILER_SMTP_URL_UNDEFINED,
 } from 'src/errors';
-import { ConfigService } from '@nestjs/config';
-import { loadInfraConfiguration } from 'src/infra-config/helper';
 
-@Global()
 @Module({
-  imports: [],
+  imports: [
+    NestMailerModule.forRoot({
+      transport:
+        process.env.MAILER_SMTP_URL ?? throwErr(MAILER_SMTP_URL_UNDEFINED),
+      defaults: {
+        from:
+          process.env.MAILER_ADDRESS_FROM ??
+          throwErr(MAILER_FROM_ADDRESS_UNDEFINED),
+      },
+      template: {
+        dir: __dirname + '/templates',
+        adapter: new HandlebarsAdapter(),
+      },
+    }),
+  ],
   providers: [MailerService],
   exports: [MailerService],
 })
-export class MailerModule {
-  static async register() {
-    const env = await loadInfraConfiguration();
-
-    let mailerSmtpUrl = env.INFRA.MAILER_SMTP_URL;
-    let mailerAddressFrom = env.INFRA.MAILER_ADDRESS_FROM;
-
-    if (!env.INFRA.MAILER_SMTP_URL || !env.INFRA.MAILER_ADDRESS_FROM) {
-      const config = new ConfigService();
-      mailerSmtpUrl = config.get('MAILER_SMTP_URL');
-      mailerAddressFrom = config.get('MAILER_ADDRESS_FROM');
-    }
-
-    return {
-      module: MailerModule,
-      imports: [
-        NestMailerModule.forRoot({
-          transport: mailerSmtpUrl ?? throwErr(MAILER_SMTP_URL_UNDEFINED),
-          defaults: {
-            from: mailerAddressFrom ?? throwErr(MAILER_FROM_ADDRESS_UNDEFINED),
-          },
-          template: {
-            dir: __dirname + '/templates',
-            adapter: new HandlebarsAdapter(),
-          },
-        }),
-      ],
-    };
-  }
-}
+export class MailerModule {}

packages/hoppscotch-backend/src/main.ts

@@ -6,23 +6,18 @@ import { VersioningType } from '@nestjs/common';
 import * as session from 'express-session';
 import { emitGQLSchemaFile } from './gql-schema';
 import { checkEnvironmentAuthProvider } from './utils';
-import { ConfigService } from '@nestjs/config';
 
 async function bootstrap() {
+  console.log(`Running in production: ${process.env.PRODUCTION}`);
+  console.log(`Port: ${process.env.PORT}`);
+
+  checkEnvironmentAuthProvider();
+
   const app = await NestFactory.create(AppModule);
 
-  const configService = app.get(ConfigService);
-
-  console.log(`Running in production:  ${configService.get('PRODUCTION')}`);
-  console.log(`Port: ${configService.get('PORT')}`);
-
-  checkEnvironmentAuthProvider(
-    configService.get('VITE_ALLOWED_AUTH_PROVIDERS'),
-  );
-
   app.use(
     session({
-      secret: configService.get('SESSION_SECRET'),
+      secret: process.env.SESSION_SECRET,
     }),
   );
 
@@ -33,18 +28,18 @@ async function bootstrap() {
     }),
   );
 
-  if (configService.get('PRODUCTION') === 'false') {
+  if (process.env.PRODUCTION === 'false') {
     console.log('Enabling CORS with development settings');
 
     app.enableCors({
-      origin: configService.get('WHITELISTED_ORIGINS').split(','),
+      origin: process.env.WHITELISTED_ORIGINS.split(','),
       credentials: true,
     });
   } else {
     console.log('Enabling CORS with production settings');
 
     app.enableCors({
-      origin: configService.get('WHITELISTED_ORIGINS').split(','),
+      origin: process.env.WHITELISTED_ORIGINS.split(','),
       credentials: true,
     });
   }
@@ -52,13 +47,7 @@ async function bootstrap() {
     type: VersioningType.URI,
   });
   app.use(cookieParser());
-  await app.listen(configService.get('PORT') || 3170);
-
-  // Graceful shutdown
-  process.on('SIGTERM', async () => {
-    console.info('SIGTERM signal received');
-    await app.close();
-  });
+  await app.listen(process.env.PORT || 3170);
 }
 
 if (!process.env.GENERATE_GQL_SCHEMA) {

packages/hoppscotch-backend/src/pubsub/topicsDefs.ts

@@ -21,8 +21,8 @@ import {
 } from 'src/team-request/team-request.model';
 import { TeamInvitation } from 'src/team-invitation/team-invitation.model';
 import { InvitedUser } from '../admin/invited-user.model';
+import { UserCollection } from '@prisma/client';
 import {
-  UserCollection,
   UserCollectionRemovedData,
   UserCollectionReorderData,
 } from 'src/user-collection/user-collections.model';

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

@@ -504,24 +504,20 @@ describe('ShortcodeService', () => {
       );
       expect(result).toEqual(<ShortcodeWithUserEmail[]>[
         {
-          id: shortcodesWithUserEmail[0].id,
-          request: JSON.stringify(shortcodesWithUserEmail[0].request),
-          properties: JSON.stringify(
-            shortcodesWithUserEmail[0].embedProperties,
-          ),
-          createdOn: shortcodesWithUserEmail[0].createdOn,
+          id: shortcodes[0].id,
+          request: JSON.stringify(shortcodes[0].request),
+          properties: JSON.stringify(shortcodes[0].embedProperties),
+          createdOn: shortcodes[0].createdOn,
           creator: {
             uid: user.uid,
             email: user.email,
           },
         },
         {
-          id: shortcodesWithUserEmail[1].id,
-          request: JSON.stringify(shortcodesWithUserEmail[1].request),
-          properties: JSON.stringify(
-            shortcodesWithUserEmail[1].embedProperties,
-          ),
-          createdOn: shortcodesWithUserEmail[1].createdOn,
+          id: shortcodes[1].id,
+          request: JSON.stringify(shortcodes[1].request),
+          properties: JSON.stringify(shortcodes[1].embedProperties),
+          createdOn: shortcodes[1].createdOn,
           creator: {
             uid: user.uid,
             email: user.email,

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

@@ -14,13 +14,6 @@ export class CreateRootTeamCollectionArgs {
 
   @Field({ name: 'title', description: 'Title of the new collection' })
   title: string;
-
-  @Field({
-    name: 'data',
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
 }
 
 @ArgsType()
@@ -33,13 +26,6 @@ export class CreateChildTeamCollectionArgs {
 
   @Field({ name: 'childTitle', description: 'Title of the new collection' })
   childTitle: string;
-
-  @Field({
-    name: 'data',
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
 }
 
 @ArgsType()
@@ -47,14 +33,12 @@ export class RenameTeamCollectionArgs {
   @Field(() => ID, {
     name: 'collectionID',
     description: 'ID of the collection',
-    deprecationReason: 'Switch to updateTeamCollection mutation instead',
   })
   collectionID: string;
 
   @Field({
     name: 'newTitle',
     description: 'The updated title of the collection',
-    deprecationReason: 'Switch to updateTeamCollection mutation instead',
   })
   newTitle: string;
 }
@@ -114,26 +98,3 @@ export class ReplaceTeamCollectionArgs {
   })
   parentCollectionID?: string;
 }
-
-@ArgsType()
-export class UpdateTeamCollectionArgs {
-  @Field(() => ID, {
-    name: 'collectionID',
-    description: 'ID of the collection',
-  })
-  collectionID: string;
-
-  @Field({
-    name: 'newTitle',
-    description: 'The updated title of the collection',
-    nullable: true,
-  })
-  newTitle: string;
-
-  @Field({
-    name: 'data',
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
-}

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

@@ -12,17 +12,12 @@ export class TeamCollection {
   })
   title: string;
 
-  @Field({
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
-
   @Field(() => ID, {
     description: 'ID of the collection',
     nullable: true,
   })
   parentID: string;
+  teamID: string;
 }
 
 @ObjectType()

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

@@ -25,7 +25,6 @@ import {
   MoveTeamCollectionArgs,
   RenameTeamCollectionArgs,
   ReplaceTeamCollectionArgs,
-  UpdateTeamCollectionArgs,
   UpdateTeamCollectionOrderArgs,
 } from './input-type.args';
 import * as E from 'fp-ts/Either';
@@ -142,14 +141,7 @@ export class TeamCollectionResolver {
     );
 
     if (E.isLeft(teamCollections)) throwErr(teamCollections.left);
-    return <TeamCollection>{
-      id: teamCollections.right.id,
-      title: teamCollections.right.title,
-      parentID: teamCollections.right.parentID,
-      data: !teamCollections.right.data
-        ? null
-        : JSON.stringify(teamCollections.right.data),
-    };
+    return teamCollections.right;
   }
 
   // Mutations
@@ -163,7 +155,6 @@ export class TeamCollectionResolver {
     const teamCollection = await this.teamCollectionService.createCollection(
       args.teamID,
       args.title,
-      args.data,
       null,
     );
 
@@ -239,7 +230,6 @@ export class TeamCollectionResolver {
     const teamCollection = await this.teamCollectionService.createCollection(
       team.right.id,
       args.childTitle,
-      args.data,
       args.collectionID,
     );
 
@@ -249,7 +239,6 @@ export class TeamCollectionResolver {
 
   @Mutation(() => TeamCollection, {
     description: 'Rename a collection',
-    deprecationReason: 'Switch to updateTeamCollection mutation instead',
   })
   @UseGuards(GqlAuthGuard, GqlCollectionTeamMemberGuard)
   @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
@@ -314,23 +303,6 @@ export class TeamCollectionResolver {
     return request.right;
   }
 
-  @Mutation(() => TeamCollection, {
-    description: 'Update Team Collection details',
-  })
-  @UseGuards(GqlAuthGuard, GqlCollectionTeamMemberGuard)
-  @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async updateTeamCollection(@Args() args: UpdateTeamCollectionArgs) {
-    const updatedTeamCollection =
-      await this.teamCollectionService.updateTeamCollection(
-        args.collectionID,
-        args.data,
-        args.newTitle,
-      );
-
-    if (E.isLeft(updatedTeamCollection)) throwErr(updatedTeamCollection.left);
-    return updatedTeamCollection.right;
-  }
-
   // Subscriptions
 
   @Subscription(() => TeamCollection, {

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

@@ -1,7 +1,6 @@
 import { Team, TeamCollection as DBTeamCollection } from '@prisma/client';
 import { mockDeep, mockReset } from 'jest-mock-extended';
 import {
-  TEAM_COLL_DATA_INVALID,
   TEAM_COLL_DEST_SAME,
   TEAM_COLL_INVALID_JSON,
   TEAM_COLL_IS_PARENT_COLL,
@@ -18,7 +17,6 @@ import { PrismaService } from 'src/prisma/prisma.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { AuthUser } from 'src/types/AuthUser';
 import { TeamCollectionService } from './team-collection.service';
-import { TeamCollection } from './team-collection.model';
 
 const mockPrisma = mockDeep<PrismaService>();
 const mockPubSub = mockDeep<PubSubService>();
@@ -53,60 +51,35 @@ const rootTeamCollection: DBTeamCollection = {
   id: '123',
   orderIndex: 1,
   parentID: null,
-  data: {},
   title: 'Root Collection 1',
   teamID: team.id,
   createdOn: currentTime,
   updatedOn: currentTime,
 };
 
-const rootTeamCollectionsCasted: TeamCollection = {
-  id: rootTeamCollection.id,
-  title: rootTeamCollection.title,
-  parentID: rootTeamCollection.parentID,
-  data: JSON.stringify(rootTeamCollection.data),
-};
-
 const rootTeamCollection_2: DBTeamCollection = {
   id: 'erv',
   orderIndex: 2,
   parentID: null,
-  data: {},
   title: 'Root Collection 1',
   teamID: team.id,
   createdOn: currentTime,
   updatedOn: currentTime,
 };
 
-const rootTeamCollection_2Casted: TeamCollection = {
-  id: 'erv',
-  parentID: null,
-  data: JSON.stringify(rootTeamCollection_2.data),
-  title: 'Root Collection 1',
-};
-
 const childTeamCollection: DBTeamCollection = {
   id: 'rfe',
   orderIndex: 1,
   parentID: rootTeamCollection.id,
-  data: {},
   title: 'Child Collection 1',
   teamID: team.id,
   createdOn: currentTime,
   updatedOn: currentTime,
 };
 
-const childTeamCollectionCasted: TeamCollection = {
-  id: 'rfe',
-  parentID: rootTeamCollection.id,
-  data: JSON.stringify(childTeamCollection.data),
-  title: 'Child Collection 1',
-};
-
 const childTeamCollection_2: DBTeamCollection = {
   id: 'bgdz',
   orderIndex: 1,
-  data: {},
   parentID: rootTeamCollection_2.id,
   title: 'Child Collection 1',
   teamID: team.id,
@@ -114,20 +87,11 @@ const childTeamCollection_2: DBTeamCollection = {
   updatedOn: currentTime,
 };
 
-const childTeamCollection_2Casted: TeamCollection = {
-  id: 'bgdz',
-  data: JSON.stringify(childTeamCollection_2.data),
-  parentID: rootTeamCollection_2.id,
-  title: 'Child Collection 1',
-};
-
 const rootTeamCollectionList: DBTeamCollection[] = [
   {
     id: 'fdv',
     orderIndex: 1,
     parentID: null,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -138,8 +102,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 2,
     parentID: null,
     title: 'Root Collection 1',
-    data: {},
-
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -149,8 +111,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 3,
     parentID: null,
     title: 'Root Collection 1',
-    data: {},
-
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -159,8 +119,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     id: 'bre3',
     orderIndex: 4,
     parentID: null,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -171,8 +129,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 5,
     parentID: null,
     title: 'Root Collection 1',
-    data: {},
-
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -183,8 +139,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     parentID: null,
     title: 'Root Collection 1',
     teamID: team.id,
-    data: {},
-
     createdOn: currentTime,
     updatedOn: currentTime,
   },
@@ -194,8 +148,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     parentID: null,
     title: 'Root Collection 1',
     teamID: team.id,
-    data: {},
-
     createdOn: currentTime,
     updatedOn: currentTime,
   },
@@ -204,7 +156,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 8,
     parentID: null,
     title: 'Root Collection 1',
-    data: {},
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -214,7 +165,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 9,
     parentID: null,
     title: 'Root Collection 1',
-    data: {},
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -225,83 +175,17 @@ const rootTeamCollectionList: DBTeamCollection[] = [
     parentID: null,
     title: 'Root Collection 1',
     teamID: team.id,
-    data: {},
     createdOn: currentTime,
     updatedOn: currentTime,
   },
 ];
 
-const rootTeamCollectionListCasted: TeamCollection[] = [
-  {
-    id: 'fdv',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: 'fbbg',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: 'fgbfg',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: 'bre3',
-    parentID: null,
-    data: JSON.stringify(rootTeamCollection.data),
-    title: 'Root Collection 1',
-  },
-  {
-    id: 'hghgf',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: '123',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: '54tyh',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: '234re',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: '34rtg',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-  {
-    id: '45tgh',
-    parentID: null,
-    title: 'Root Collection 1',
-    data: JSON.stringify(rootTeamCollection.data),
-  },
-];
-
 const childTeamCollectionList: DBTeamCollection[] = [
   {
     id: '123',
     orderIndex: 1,
     parentID: rootTeamCollection.id,
     title: 'Root Collection 1',
-    data: {},
-
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -311,8 +195,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 2,
     parentID: rootTeamCollection.id,
     title: 'Root Collection 1',
-    data: {},
-
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -322,8 +204,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     orderIndex: 3,
     parentID: rootTeamCollection.id,
     title: 'Root Collection 1',
-    data: {},
-
     teamID: team.id,
     createdOn: currentTime,
     updatedOn: currentTime,
@@ -332,8 +212,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '567',
     orderIndex: 4,
     parentID: rootTeamCollection.id,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -343,8 +221,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '123',
     orderIndex: 5,
     parentID: rootTeamCollection.id,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -354,8 +230,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '678',
     orderIndex: 6,
     parentID: rootTeamCollection.id,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -365,8 +239,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '789',
     orderIndex: 7,
     parentID: rootTeamCollection.id,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -376,8 +248,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '890',
     orderIndex: 8,
     parentID: rootTeamCollection.id,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -387,7 +257,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '012',
     orderIndex: 9,
     parentID: rootTeamCollection.id,
-    data: {},
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -397,8 +266,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
     id: '0bhu',
     orderIndex: 10,
     parentID: rootTeamCollection.id,
-    data: {},
-
     title: 'Root Collection 1',
     teamID: team.id,
     createdOn: currentTime,
@@ -406,75 +273,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
   },
 ];
 
-const childTeamCollectionListCasted: TeamCollection[] = [
-  {
-    id: '123',
-    parentID: rootTeamCollection.id,
-    title: 'Root Collection 1',
-    data: JSON.stringify({}),
-  },
-  {
-    id: '345',
-    parentID: rootTeamCollection.id,
-    title: 'Root Collection 1',
-    data: JSON.stringify({}),
-  },
-  {
-    id: '456',
-    parentID: rootTeamCollection.id,
-    title: 'Root Collection 1',
-    data: JSON.stringify({}),
-  },
-  {
-    id: '567',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-
-    title: 'Root Collection 1',
-  },
-  {
-    id: '123',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-
-    title: 'Root Collection 1',
-  },
-  {
-    id: '678',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-
-    title: 'Root Collection 1',
-  },
-  {
-    id: '789',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-
-    title: 'Root Collection 1',
-  },
-  {
-    id: '890',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-
-    title: 'Root Collection 1',
-  },
-  {
-    id: '012',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-    title: 'Root Collection 1',
-  },
-  {
-    id: '0bhu',
-    parentID: rootTeamCollection.id,
-    data: JSON.stringify({}),
-
-    title: 'Root Collection 1',
-  },
-];
-
 beforeEach(() => {
   mockReset(mockPrisma);
   mockPubSub.publish.mockClear();
@@ -513,7 +311,7 @@ describe('getParentOfCollection', () => {
     const result = await teamCollectionService.getParentOfCollection(
       childTeamCollection.id,
     );
-    expect(result).toEqual(rootTeamCollectionsCasted);
+    expect(result).toEqual(rootTeamCollection);
   });
 
   test('should return null successfully for a root collection with valid collectionID', async () => {
@@ -549,7 +347,7 @@ describe('getChildrenOfCollection', () => {
       null,
       10,
     );
-    expect(result).toEqual(childTeamCollectionListCasted);
+    expect(result).toEqual(childTeamCollectionList);
   });
 
   test('should return a list of 3 child collections successfully with cursor being equal to the 7th item in the list', async () => {
@@ -565,9 +363,9 @@ describe('getChildrenOfCollection', () => {
       10,
     );
     expect(result).toEqual([
-      { ...childTeamCollectionListCasted[7] },
-      { ...childTeamCollectionListCasted[8] },
-      { ...childTeamCollectionListCasted[9] },
+      { ...childTeamCollectionList[7] },
+      { ...childTeamCollectionList[8] },
+      { ...childTeamCollectionList[9] },
     ]);
   });
 
@@ -594,7 +392,7 @@ describe('getTeamRootCollections', () => {
       null,
       10,
     );
-    expect(result).toEqual(rootTeamCollectionListCasted);
+    expect(result).toEqual(rootTeamCollectionList);
   });
 
   test('should return a list of 3 root collections successfully with cursor being equal to the 7th item in the list', async () => {
@@ -610,9 +408,9 @@ describe('getTeamRootCollections', () => {
       10,
     );
     expect(result).toEqual([
-      { ...rootTeamCollectionListCasted[7] },
-      { ...rootTeamCollectionListCasted[8] },
-      { ...rootTeamCollectionListCasted[9] },
+      { ...rootTeamCollectionList[7] },
+      { ...rootTeamCollectionList[8] },
+      { ...rootTeamCollectionList[9] },
     ]);
   });
 
@@ -666,7 +464,6 @@ describe('createCollection', () => {
     const result = await teamCollectionService.createCollection(
       rootTeamCollection.teamID,
       'ab',
-      JSON.stringify(rootTeamCollection.data),
       rootTeamCollection.id,
     );
     expect(result).toEqualLeft(TEAM_COLL_SHORT_TITLE);
@@ -681,27 +478,11 @@ describe('createCollection', () => {
     const result = await teamCollectionService.createCollection(
       rootTeamCollection.teamID,
       'abcd',
-      JSON.stringify(rootTeamCollection.data),
       rootTeamCollection.id,
     );
     expect(result).toEqualLeft(TEAM_NOT_OWNER);
   });
 
-  test('should throw TEAM_COLL_DATA_INVALID when parent TeamCollection does not belong to the team', async () => {
-    // isOwnerCheck
-    mockPrisma.teamCollection.findFirstOrThrow.mockResolvedValueOnce(
-      rootTeamCollection,
-    );
-
-    const result = await teamCollectionService.createCollection(
-      rootTeamCollection.teamID,
-      'abcd',
-      '{',
-      rootTeamCollection.id,
-    );
-    expect(result).toEqualLeft(TEAM_COLL_DATA_INVALID);
-  });
-
   test('should successfully create a new root TeamCollection with valid inputs', async () => {
     // isOwnerCheck
     mockPrisma.teamCollection.findFirstOrThrow.mockResolvedValueOnce(
@@ -715,10 +496,9 @@ describe('createCollection', () => {
     const result = await teamCollectionService.createCollection(
       rootTeamCollection.teamID,
       'abcdefg',
-      JSON.stringify(rootTeamCollection.data),
       rootTeamCollection.id,
     );
-    expect(result).toEqualRight(rootTeamCollectionsCasted);
+    expect(result).toEqualRight(rootTeamCollection);
   });
 
   test('should successfully create a new child TeamCollection with valid inputs', async () => {
@@ -734,10 +514,9 @@ describe('createCollection', () => {
     const result = await teamCollectionService.createCollection(
       childTeamCollection.teamID,
       childTeamCollection.title,
-      JSON.stringify(rootTeamCollection.data),
       rootTeamCollection.id,
     );
-    expect(result).toEqualRight(childTeamCollectionCasted);
+    expect(result).toEqualRight(childTeamCollection);
   });
 
   test('should send pubsub message to "team_coll/<teamID>/coll_added" if child TeamCollection is created successfully', async () => {
@@ -753,13 +532,11 @@ describe('createCollection', () => {
     const result = await teamCollectionService.createCollection(
       childTeamCollection.teamID,
       childTeamCollection.title,
-      JSON.stringify(rootTeamCollection.data),
-
       rootTeamCollection.id,
     );
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${childTeamCollection.teamID}/coll_added`,
-      childTeamCollectionCasted,
+      childTeamCollection,
     );
   });
 
@@ -776,13 +553,11 @@ describe('createCollection', () => {
     const result = await teamCollectionService.createCollection(
       rootTeamCollection.teamID,
       'abcdefg',
-      JSON.stringify(rootTeamCollection.data),
-
       rootTeamCollection.id,
     );
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${rootTeamCollection.teamID}/coll_added`,
-      rootTeamCollectionsCasted,
+      rootTeamCollection,
     );
   });
 });
@@ -812,7 +587,7 @@ describe('renameCollection', () => {
       'NewTitle',
     );
     expect(result).toEqualRight({
-      ...rootTeamCollectionsCasted,
+      ...rootTeamCollection,
       title: 'NewTitle',
     });
   });
@@ -850,7 +625,7 @@ describe('renameCollection', () => {
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${rootTeamCollection.teamID}/coll_updated`,
       {
-        ...rootTeamCollectionsCasted,
+        ...rootTeamCollection,
         title: 'NewTitle',
       },
     );
@@ -1057,8 +832,9 @@ describe('moveCollection', () => {
       null,
     );
     expect(result).toEqualRight({
-      ...childTeamCollectionCasted,
+      ...childTeamCollection,
       parentID: null,
+      orderIndex: 2,
     });
   });
 
@@ -1114,8 +890,9 @@ describe('moveCollection', () => {
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${childTeamCollection.teamID}/coll_moved`,
       {
-        ...childTeamCollectionCasted,
+        ...childTeamCollection,
         parentID: null,
+        orderIndex: 2,
       },
     );
   });
@@ -1154,8 +931,9 @@ describe('moveCollection', () => {
       childTeamCollection_2.id,
     );
     expect(result).toEqualRight({
-      ...rootTeamCollectionsCasted,
-      parentID: childTeamCollection_2Casted.id,
+      ...rootTeamCollection,
+      parentID: childTeamCollection_2.id,
+      orderIndex: 1,
     });
   });
 
@@ -1195,8 +973,9 @@ describe('moveCollection', () => {
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${childTeamCollection_2.teamID}/coll_moved`,
       {
-        ...rootTeamCollectionsCasted,
-        parentID: childTeamCollection_2Casted.id,
+        ...rootTeamCollection,
+        parentID: childTeamCollection_2.id,
+        orderIndex: 1,
       },
     );
   });
@@ -1235,8 +1014,9 @@ describe('moveCollection', () => {
       childTeamCollection_2.id,
     );
     expect(result).toEqualRight({
-      ...childTeamCollectionCasted,
-      parentID: childTeamCollection_2Casted.id,
+      ...childTeamCollection,
+      parentID: childTeamCollection_2.id,
+      orderIndex: 1,
     });
   });
 
@@ -1276,8 +1056,9 @@ describe('moveCollection', () => {
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${childTeamCollection.teamID}/coll_moved`,
       {
-        ...childTeamCollectionCasted,
-        parentID: childTeamCollection_2Casted.id,
+        ...childTeamCollection,
+        parentID: childTeamCollection_2.id,
+        orderIndex: 1,
       },
     );
   });
@@ -1373,7 +1154,7 @@ describe('updateCollectionOrder', () => {
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${childTeamCollectionList[4].teamID}/coll_order_updated`,
       {
-        collection: rootTeamCollectionListCasted[4],
+        collection: rootTeamCollectionList[4],
         nextCollection: null,
       },
     );
@@ -1454,8 +1235,8 @@ describe('updateCollectionOrder', () => {
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${childTeamCollectionList[2].teamID}/coll_order_updated`,
       {
-        collection: childTeamCollectionListCasted[4],
-        nextCollection: childTeamCollectionListCasted[2],
+        collection: childTeamCollectionList[4],
+        nextCollection: childTeamCollectionList[2],
       },
     );
   });
@@ -1521,7 +1302,7 @@ describe('importCollectionsFromJSON', () => {
     );
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${rootTeamCollection.teamID}/coll_added`,
-      rootTeamCollectionsCasted,
+      rootTeamCollection,
     );
   });
 });
@@ -1640,7 +1421,7 @@ describe('replaceCollectionsWithJSON', () => {
     );
     expect(mockPubSub.publish).toHaveBeenCalledWith(
       `team_coll/${rootTeamCollection.teamID}/coll_added`,
-      rootTeamCollectionsCasted,
+      rootTeamCollection,
     );
   });
 });
@@ -1677,64 +1458,4 @@ describe('totalCollectionsInTeam', () => {
   });
 });
 
-describe('updateTeamCollection', () => {
-  test('should throw TEAM_COLL_SHORT_TITLE if title is invalid', async () => {
-    const result = await teamCollectionService.updateTeamCollection(
-      rootTeamCollection.id,
-      JSON.stringify(rootTeamCollection.data),
-      'de',
-    );
-    expect(result).toEqualLeft(TEAM_COLL_SHORT_TITLE);
-  });
-
-  test('should throw TEAM_COLL_DATA_INVALID is collection data is invalid', async () => {
-    const result = await teamCollectionService.updateTeamCollection(
-      rootTeamCollection.id,
-      '{',
-      rootTeamCollection.title,
-    );
-    expect(result).toEqualLeft(TEAM_COLL_DATA_INVALID);
-  });
-
-  test('should throw TEAM_COLL_NOT_FOUND is collectionID is invalid', async () => {
-    mockPrisma.teamCollection.update.mockRejectedValueOnce('RecordNotFound');
-
-    const result = await teamCollectionService.updateTeamCollection(
-      'invalid_id',
-      JSON.stringify(rootTeamCollection.data),
-      rootTeamCollection.title,
-    );
-    expect(result).toEqualLeft(TEAM_COLL_NOT_FOUND);
-  });
-
-  test('should successfully update a collection', async () => {
-    mockPrisma.teamCollection.update.mockResolvedValueOnce(rootTeamCollection);
-
-    const result = await teamCollectionService.updateTeamCollection(
-      rootTeamCollection.id,
-      JSON.stringify({ foo: 'bar' }),
-      'new_title',
-    );
-    expect(result).toEqualRight({
-      data: JSON.stringify({ foo: 'bar' }),
-      title: 'new_title',
-      ...rootTeamCollectionsCasted,
-    });
-  });
-
-  test('should send pubsub message to "team_coll/<teamID>/coll_updated" if TeamCollection is updated successfully', async () => {
-    mockPrisma.teamCollection.update.mockResolvedValueOnce(rootTeamCollection);
-
-    const result = await teamCollectionService.updateTeamCollection(
-      rootTeamCollection.id,
-      JSON.stringify(rootTeamCollection.data),
-      rootTeamCollection.title,
-    );
-    expect(mockPubSub.publish).toHaveBeenCalledWith(
-      `team_coll/${rootTeamCollection.teamID}/coll_updated`,
-      rootTeamCollectionsCasted,
-    );
-  });
-});
-
 //ToDo: write test cases for exportCollectionsToJSON

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

@@ -13,7 +13,6 @@ import {
   TEAM_COLL_IS_PARENT_COLL,
   TEAM_COL_SAME_NEXT_COLL,
   TEAM_COL_REORDERING_FAILED,
-  TEAM_COLL_DATA_INVALID,
 } from '../errors';
 import { PubSubService } from '../pubsub/pubsub.service';
 import { isValidLength } from 'src/utils';
@@ -70,7 +69,6 @@ export class TeamCollectionService {
           this.generatePrismaQueryObjForFBCollFolder(f, teamID, index + 1),
         ),
       },
-      data: folder.data ?? undefined,
     };
   }
 
@@ -120,7 +118,6 @@ export class TeamCollectionService {
       name: collection.right.title,
       folders: childrenCollectionObjects,
       requests: requests.map((x) => x.request),
-      data: JSON.stringify(collection.right.data),
     };
 
     return E.right(result);
@@ -201,11 +198,8 @@ export class TeamCollectionService {
       ),
     );
 
-    teamCollections.forEach((collection) =>
-      this.pubsub.publish(
-        `team_coll/${destTeamID}/coll_added`,
-        this.cast(collection),
-      ),
+    teamCollections.forEach((x) =>
+      this.pubsub.publish(`team_coll/${destTeamID}/coll_added`, x),
     );
 
     return E.right(true);
@@ -274,11 +268,8 @@ export class TeamCollectionService {
       ),
     );
 
-    teamCollections.forEach((collections) =>
-      this.pubsub.publish(
-        `team_coll/${destTeamID}/coll_added`,
-        this.cast(collections),
-      ),
+    teamCollections.forEach((x) =>
+      this.pubsub.publish(`team_coll/${destTeamID}/coll_added`, x),
     );
 
     return E.right(true);
@@ -286,17 +277,11 @@ export class TeamCollectionService {
 
   /**
    * Typecast a database TeamCollection to a TeamCollection model
-   *
    * @param teamCollection database TeamCollection
    * @returns TeamCollection model
    */
   private cast(teamCollection: DBTeamCollection): TeamCollection {
-    return <TeamCollection>{
-      id: teamCollection.id,
-      title: teamCollection.title,
-      parentID: teamCollection.parentID,
-      data: !teamCollection.data ? null : JSON.stringify(teamCollection.data),
-    };
+    return <TeamCollection>{ ...teamCollection };
   }
 
   /**
@@ -339,7 +324,7 @@ export class TeamCollectionService {
     });
     if (!teamCollection) return null;
 
-    return !teamCollection.parent ? null : this.cast(teamCollection.parent);
+    return teamCollection.parent;
   }
 
   /**
@@ -350,12 +335,12 @@ export class TeamCollectionService {
    * @param take Number of items we want returned
    * @returns A list of child collections
    */
-  async getChildrenOfCollection(
+  getChildrenOfCollection(
     collectionID: string,
     cursor: string | null,
     take: number,
   ) {
-    const res = await this.prisma.teamCollection.findMany({
+    return this.prisma.teamCollection.findMany({
       where: {
         parentID: collectionID,
       },
@@ -366,12 +351,6 @@ export class TeamCollectionService {
       skip: cursor ? 1 : 0,
       cursor: cursor ? { id: cursor } : undefined,
     });
-
-    const childCollections = res.map((teamCollection) =>
-      this.cast(teamCollection),
-    );
-
-    return childCollections;
   }
 
   /**
@@ -387,7 +366,7 @@ export class TeamCollectionService {
     cursor: string | null,
     take: number,
   ) {
-    const res = await this.prisma.teamCollection.findMany({
+    return this.prisma.teamCollection.findMany({
       where: {
         teamID,
         parentID: null,
@@ -399,12 +378,6 @@ export class TeamCollectionService {
       skip: cursor ? 1 : 0,
       cursor: cursor ? { id: cursor } : undefined,
     });
-
-    const teamCollections = res.map((teamCollection) =>
-      this.cast(teamCollection),
-    );
-
-    return teamCollections;
   }
 
   /**
@@ -497,7 +470,6 @@ export class TeamCollectionService {
   async createCollection(
     teamID: string,
     title: string,
-    data: string | null = null,
     parentTeamCollectionID: string | null,
   ) {
     const isTitleValid = isValidLength(title, this.TITLE_LENGTH);
@@ -509,13 +481,6 @@ export class TeamCollectionService {
       if (O.isNone(isOwner)) return E.left(TEAM_NOT_OWNER);
     }
 
-    if (data === '') return E.left(TEAM_COLL_DATA_INVALID);
-    if (data) {
-      const jsonReq = stringToJson(data);
-      if (E.isLeft(jsonReq)) return E.left(TEAM_COLL_DATA_INVALID);
-      data = jsonReq.right;
-    }
-
     const isParent = parentTeamCollectionID
       ? {
           connect: {
@@ -533,23 +498,18 @@ export class TeamCollectionService {
           },
         },
         parent: isParent,
-        data: data ?? undefined,
         orderIndex: !parentTeamCollectionID
           ? (await this.getRootCollectionsCount(teamID)) + 1
           : (await this.getChildCollectionsCount(parentTeamCollectionID)) + 1,
       },
     });
 
-    this.pubsub.publish(
-      `team_coll/${teamID}/coll_added`,
-      this.cast(teamCollection),
-    );
+    this.pubsub.publish(`team_coll/${teamID}/coll_added`, teamCollection);
 
     return E.right(this.cast(teamCollection));
   }
 
   /**
-   * @deprecated Use updateTeamCollection method instead
    * Update the title of a TeamCollection
    *
    * @param collectionID The Collection ID
@@ -572,10 +532,10 @@ export class TeamCollectionService {
 
       this.pubsub.publish(
         `team_coll/${updatedTeamCollection.teamID}/coll_updated`,
-        this.cast(updatedTeamCollection),
+        updatedTeamCollection,
       );
 
-      return E.right(this.cast(updatedTeamCollection));
+      return E.right(updatedTeamCollection);
     } catch (error) {
       return E.left(TEAM_COLL_NOT_FOUND);
     }
@@ -734,8 +694,8 @@ export class TeamCollectionService {
    * @returns An Option of boolean, is parent or not
    */
   private async isParent(
-    collection: DBTeamCollection,
-    destCollection: DBTeamCollection,
+    collection: TeamCollection,
+    destCollection: TeamCollection,
   ): Promise<O.Option<boolean>> {
     //* Recursively check if collection is a parent by going up the tree of child-parent collections until we reach a root collection i.e parentID === null
     //* Valid condition, isParent returns false
@@ -1011,49 +971,4 @@ export class TeamCollectionService {
     const teamCollectionsCount = this.prisma.teamCollection.count();
     return teamCollectionsCount;
   }
-
-  /**
-   * Update Team Collection details
-   *
-   * @param collectionID Collection ID
-   * @param collectionData new header data in a JSONified string form
-   * @param newTitle New title of the collection
-   * @returns Updated TeamCollection
-   */
-  async updateTeamCollection(
-    collectionID: string,
-    collectionData: string = null,
-    newTitle: string = null,
-  ) {
-    try {
-      if (newTitle != null) {
-        const isTitleValid = isValidLength(newTitle, this.TITLE_LENGTH);
-        if (!isTitleValid) return E.left(TEAM_COLL_SHORT_TITLE);
-      }
-
-      if (collectionData === '') return E.left(TEAM_COLL_DATA_INVALID);
-      if (collectionData) {
-        const jsonReq = stringToJson(collectionData);
-        if (E.isLeft(jsonReq)) return E.left(TEAM_COLL_DATA_INVALID);
-        collectionData = jsonReq.right;
-      }
-
-      const updatedTeamCollection = await this.prisma.teamCollection.update({
-        where: { id: collectionID },
-        data: {
-          data: collectionData ?? undefined,
-          title: newTitle ?? undefined,
-        },
-      });
-
-      this.pubsub.publish(
-        `team_coll/${updatedTeamCollection.teamID}/coll_updated`,
-        this.cast(updatedTeamCollection),
-      );
-
-      return E.right(this.cast(updatedTeamCollection));
-    } catch (e) {
-      return E.left(TEAM_COLL_NOT_FOUND);
-    }
-  }
 }

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

@@ -1,4 +1,5 @@
 import { Module } from '@nestjs/common';
+import { MailerModule } from 'src/mailer/mailer.module';
 import { PrismaModule } from 'src/prisma/prisma.module';
 import { PubSubModule } from 'src/pubsub/pubsub.module';
 import { TeamModule } from 'src/team/team.module';
@@ -11,7 +12,7 @@ import { TeamInviteeGuard } from './team-invitee.guard';
 import { TeamTeamInviteExtResolver } from './team-teaminvite-ext.resolver';
 
 @Module({
-  imports: [PrismaModule, TeamModule, PubSubModule, UserModule],
+  imports: [PrismaModule, TeamModule, PubSubModule, UserModule, MailerModule],
   providers: [
     TeamInvitationService,
     TeamInvitationResolver,

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

@@ -20,7 +20,6 @@ import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { validateEmail } from '../utils';
 import { AuthUser } from 'src/types/AuthUser';
-import { ConfigService } from '@nestjs/config';
 
 @Injectable()
 export class TeamInvitationService {
@@ -29,8 +28,8 @@ export class TeamInvitationService {
     private readonly userService: UserService,
     private readonly teamService: TeamService,
     private readonly mailerService: MailerService,
+
     private readonly pubsub: PubSubService,
-    private readonly configService: ConfigService,
   ) {}
 
   /**
@@ -151,9 +150,7 @@ export class TeamInvitationService {
       template: 'team-invitation',
       variables: {
         invitee: creator.displayName ?? 'A Hoppscotch User',
-        action_url: `${this.configService.get('VITE_BASE_URL')}/join-team?id=${
-          dbInvitation.id
-        }`,
+        action_url: `${process.env.VITE_BASE_URL}/join-team?id=${dbInvitation.id}`,
         invite_team_name: team.name,
       },
     });

packages/hoppscotch-backend/src/team-request/team-request.service.spec.ts

@@ -42,7 +42,6 @@ const teamCollection: DbTeamCollection = {
   id: 'team-coll-1',
   parentID: null,
   teamID: team.id,
-  data: {},
   title: 'Team Collection 1',
   orderIndex: 1,
   createdOn: new Date(),

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

@@ -1,8 +1,6 @@
-// This interface defines how data will be received from the app when we are importing Hoppscotch collections
 export interface CollectionFolder {
   id?: string;
   folders: CollectionFolder[];
   requests: any[];
   name: string;
-  data?: string;
 }

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

@@ -1,29 +0,0 @@
-export enum InfraConfigEnum {
-  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',
-
-  VITE_ALLOWED_AUTH_PROVIDERS = 'VITE_ALLOWED_AUTH_PROVIDERS',
-}
-
-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',
-}

packages/hoppscotch-backend/src/user-collection/input-type.args.ts

@@ -6,13 +6,6 @@ import { PaginationArgs } from 'src/types/input-types.args';
 export class CreateRootUserCollectionArgs {
   @Field({ name: 'title', description: 'Title of the new user collection' })
   title: string;
-
-  @Field({
-    name: 'data',
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
 }
 @ArgsType()
 export class CreateChildUserCollectionArgs {
@@ -24,13 +17,6 @@ export class CreateChildUserCollectionArgs {
     description: 'ID of the parent to the new user collection',
   })
   parentUserCollectionID: string;
-
-  @Field({
-    name: 'data',
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
 }
 
 @ArgsType()
@@ -109,26 +95,3 @@ export class ImportUserCollectionsFromJSONArgs {
   })
   parentCollectionID?: string;
 }
-
-@ArgsType()
-export class UpdateUserCollectionsArgs {
-  @Field(() => ID, {
-    name: 'userCollectionID',
-    description: 'ID of the user collection',
-  })
-  userCollectionID: string;
-
-  @Field({
-    name: 'newTitle',
-    description: 'The updated title of the user collection',
-    nullable: true,
-  })
-  newTitle: string;
-
-  @Field({
-    name: 'data',
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
-}

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

@@ -30,7 +30,6 @@ import {
   MoveUserCollectionArgs,
   RenameUserCollectionsArgs,
   UpdateUserCollectionArgs,
-  UpdateUserCollectionsArgs,
 } from './input-type.args';
 import { ReqType } from 'src/types/RequestTypes';
 import * as E from 'fp-ts/Either';
@@ -143,13 +142,7 @@ export class UserCollectionResolver {
     );
 
     if (E.isLeft(userCollection)) throwErr(userCollection.left);
-    return <UserCollection>{
-      ...userCollection.right,
-      userID: userCollection.right.userUid,
-      data: !userCollection.right.data
-        ? null
-        : JSON.stringify(userCollection.right.data),
-    };
+    return userCollection.right;
   }
 
   @Query(() => UserCollectionExportJSONData, {
@@ -198,7 +191,6 @@ export class UserCollectionResolver {
       await this.userCollectionService.createUserCollection(
         user,
         args.title,
-        args.data,
         null,
         ReqType.REST,
       );
@@ -220,7 +212,6 @@ export class UserCollectionResolver {
       await this.userCollectionService.createUserCollection(
         user,
         args.title,
-        args.data,
         null,
         ReqType.GQL,
       );
@@ -241,7 +232,6 @@ export class UserCollectionResolver {
       await this.userCollectionService.createUserCollection(
         user,
         args.title,
-        args.data,
         args.parentUserCollectionID,
         ReqType.GQL,
       );
@@ -262,7 +252,6 @@ export class UserCollectionResolver {
       await this.userCollectionService.createUserCollection(
         user,
         args.title,
-        args.data,
         args.parentUserCollectionID,
         ReqType.REST,
       );
@@ -370,26 +359,6 @@ export class UserCollectionResolver {
     return importedCollection.right;
   }
 
-  @Mutation(() => UserCollection, {
-    description: 'Update a UserCollection',
-  })
-  @UseGuards(GqlAuthGuard)
-  async updateUserCollection(
-    @GqlUser() user: AuthUser,
-    @Args() args: UpdateUserCollectionsArgs,
-  ) {
-    const updatedUserCollection =
-      await this.userCollectionService.updateUserCollection(
-        args.newTitle,
-        args.data,
-        args.userCollectionID,
-        user.uid,
-      );
-
-    if (E.isLeft(updatedUserCollection)) throwErr(updatedUserCollection.left);
-    return updatedUserCollection.right;
-  }
-
   // Subscriptions
   @Subscription(() => UserCollection, {
     description: 'Listen for User Collection Creation',

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

@@ -12,7 +12,6 @@ import {
   USER_NOT_FOUND,
   USER_NOT_OWNER,
   USER_COLL_INVALID_JSON,
-  USER_COLL_DATA_INVALID,
 } from 'src/errors';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { AuthUser } from 'src/types/AuthUser';
@@ -44,12 +43,8 @@ export class UserCollectionService {
    */
   private cast(collection: UserCollection) {
     return <UserCollectionModel>{
-      id: collection.id,
-      title: collection.title,
-      type: collection.type,
-      parentID: collection.parentID,
+      ...collection,
       userID: collection.userUid,
-      data: !collection.data ? null : JSON.stringify(collection.data),
     };
   }
 
@@ -151,7 +146,7 @@ export class UserCollectionService {
       },
     });
 
-    return !parent ? null : this.cast(parent);
+    return parent;
   }
 
   /**
@@ -169,7 +164,7 @@ export class UserCollectionService {
     take: number,
     type: ReqType,
   ) {
-    const res = await this.prisma.userCollection.findMany({
+    return this.prisma.userCollection.findMany({
       where: {
         parentID: collectionID,
         type: type,
@@ -181,12 +176,6 @@ export class UserCollectionService {
       skip: cursor ? 1 : 0,
       cursor: cursor ? { id: cursor } : undefined,
     });
-
-    const childCollections = res.map((childCollection) =>
-      this.cast(childCollection),
-    );
-
-    return childCollections;
   }
 
   /**
@@ -222,20 +211,12 @@ export class UserCollectionService {
   async createUserCollection(
     user: AuthUser,
     title: string,
-    data: string | null = null,
     parentUserCollectionID: string | null,
     type: ReqType,
   ) {
     const isTitleValid = isValidLength(title, this.TITLE_LENGTH);
     if (!isTitleValid) return E.left(USER_COLL_SHORT_TITLE);
 
-    if (data === '') return E.left(USER_COLL_DATA_INVALID);
-    if (data) {
-      const jsonReq = stringToJson(data);
-      if (E.isLeft(jsonReq)) return E.left(USER_COLL_DATA_INVALID);
-      data = jsonReq.right;
-    }
-
     // If creating a child collection
     if (parentUserCollectionID !== null) {
       const parentCollection = await this.getUserCollection(
@@ -270,19 +251,15 @@ export class UserCollectionService {
           },
         },
         parent: isParent,
-        data: data ?? undefined,
         orderIndex: !parentUserCollectionID
           ? (await this.getRootCollectionsCount(user.uid)) + 1
           : (await this.getChildCollectionsCount(parentUserCollectionID)) + 1,
       },
     });
 
-    await this.pubsub.publish(
-      `user_coll/${user.uid}/created`,
-      this.cast(userCollection),
-    );
+    await this.pubsub.publish(`user_coll/${user.uid}/created`, userCollection);
 
-    return E.right(this.cast(userCollection));
+    return E.right(userCollection);
   }
 
   /**
@@ -299,7 +276,7 @@ export class UserCollectionService {
     take: number,
     type: ReqType,
   ) {
-    const res = await this.prisma.userCollection.findMany({
+    return this.prisma.userCollection.findMany({
       where: {
         userUid: user.uid,
         parentID: null,
@@ -312,12 +289,6 @@ export class UserCollectionService {
       skip: cursor ? 1 : 0,
       cursor: cursor ? { id: cursor } : undefined,
     });
-
-    const userCollections = res.map((childCollection) =>
-      this.cast(childCollection),
-    );
-
-    return userCollections;
   }
 
   /**
@@ -336,7 +307,7 @@ export class UserCollectionService {
     take: number,
     type: ReqType,
   ) {
-    const res = await this.prisma.userCollection.findMany({
+    return this.prisma.userCollection.findMany({
       where: {
         userUid: user.uid,
         parentID: userCollectionID,
@@ -346,16 +317,9 @@ export class UserCollectionService {
       skip: cursor ? 1 : 0,
       cursor: cursor ? { id: cursor } : undefined,
     });
-
-    const childCollections = res.map((childCollection) =>
-      this.cast(childCollection),
-    );
-
-    return childCollections;
   }
 
   /**
-   * @deprecated Use updateUserCollection method instead
    * Update the title of a UserCollection
    *
    * @param newTitle The new title of collection
@@ -387,10 +351,10 @@ export class UserCollectionService {
 
       this.pubsub.publish(
         `user_coll/${updatedUserCollection.userUid}/updated`,
-        this.cast(updatedUserCollection),
+        updatedUserCollection,
       );
 
-      return E.right(this.cast(updatedUserCollection));
+      return E.right(updatedUserCollection);
     } catch (error) {
       return E.left(USER_COLL_NOT_FOUND);
     }
@@ -627,10 +591,10 @@ export class UserCollectionService {
 
       this.pubsub.publish(
         `user_coll/${collection.right.userUid}/moved`,
-        this.cast(updatedCollection.right),
+        updatedCollection.right,
       );
 
-      return E.right(this.cast(updatedCollection.right));
+      return E.right(updatedCollection.right);
     }
 
     // destCollectionID != null i.e move into another collection
@@ -678,10 +642,10 @@ export class UserCollectionService {
 
     this.pubsub.publish(
       `user_coll/${collection.right.userUid}/moved`,
-      this.cast(updatedCollection.right),
+      updatedCollection.right,
     );
 
-    return E.right(this.cast(updatedCollection.right));
+    return E.right(updatedCollection.right);
   }
 
   /**
@@ -882,7 +846,6 @@ export class UserCollectionService {
           ...(x.request as Record<string, unknown>), // type casting x.request of type Prisma.JSONValue to an object to enable spread
         };
       }),
-      data: JSON.stringify(collection.right.data),
     };
 
     return E.right(result);
@@ -955,7 +918,6 @@ export class UserCollectionService {
               ...(x.request as Record<string, unknown>), // type casting x.request of type Prisma.JSONValue to an object to enable spread
             };
           }),
-          data: JSON.stringify(parentCollection.right.data),
         }),
         collectionType: parentCollection.right.type,
       });
@@ -1009,7 +971,6 @@ export class UserCollectionService {
           this.generatePrismaQueryObj(f, userID, index + 1, reqType),
         ),
       },
-      data: folder.data ?? undefined,
     };
   }
 
@@ -1079,63 +1040,10 @@ export class UserCollectionService {
       ),
     );
 
-    userCollections.forEach((collection) =>
-      this.pubsub.publish(`user_coll/${userID}/created`, this.cast(collection)),
+    userCollections.forEach((x) =>
+      this.pubsub.publish(`user_coll/${userID}/created`, x),
     );
 
     return E.right(true);
   }
-
-  /**
-   * Update a UserCollection
-   *
-   * @param newTitle The new title of collection
-   * @param userCollectionID The Collection Id
-   * @param userID The User UID
-   * @returns An Either of the updated UserCollection
-   */
-  async updateUserCollection(
-    newTitle: string = null,
-    collectionData: string | null = null,
-    userCollectionID: string,
-    userID: string,
-  ) {
-    if (collectionData === '') return E.left(USER_COLL_DATA_INVALID);
-
-    if (collectionData) {
-      const jsonReq = stringToJson(collectionData);
-      if (E.isLeft(jsonReq)) return E.left(USER_COLL_DATA_INVALID);
-      collectionData = jsonReq.right;
-    }
-
-    if (newTitle != null) {
-      const isTitleValid = isValidLength(newTitle, this.TITLE_LENGTH);
-      if (!isTitleValid) return E.left(USER_COLL_SHORT_TITLE);
-    }
-
-    // Check to see is the collection belongs to the user
-    const isOwner = await this.isOwnerCheck(userCollectionID, userID);
-    if (O.isNone(isOwner)) return E.left(USER_NOT_OWNER);
-
-    try {
-      const updatedUserCollection = await this.prisma.userCollection.update({
-        where: {
-          id: userCollectionID,
-        },
-        data: {
-          data: collectionData ?? undefined,
-          title: newTitle ?? undefined,
-        },
-      });
-
-      this.pubsub.publish(
-        `user_coll/${updatedUserCollection.userUid}/updated`,
-        this.cast(updatedUserCollection),
-      );
-
-      return E.right(this.cast(updatedUserCollection));
-    } catch (error) {
-      return E.left(USER_COLL_NOT_FOUND);
-    }
-  }
 }

packages/hoppscotch-backend/src/user-collection/user-collections.model.ts

@@ -13,12 +13,6 @@ export class UserCollection {
   })
   title: string;
 
-  @Field({
-    description: 'JSON string representing the collection data',
-    nullable: true,
-  })
-  data: string;
-
   @Field(() => ReqType, {
     description: 'Type of the user collection',
   })

packages/hoppscotch-backend/src/utils.ts

@@ -131,26 +131,6 @@ export const validateEmail = (email: string) => {
   ).test(email);
 };
 
-/**
- * Checks to see if the URL is valid or not
- * @param url The URL to validate
- * @returns boolean
- */
-export const validateSMTPUrl = (url: string) => {
-  // Possible valid formats
-  // smtp(s)://mail.example.com
-  // smtp(s)://user:pass@mail.example.com
-  // smtp(s)://mail.example.com:587
-  // smtp(s)://user:pass@mail.example.com:587
-
-  if (!url || url.length === 0) return false;
-
-  const regex =
-    /^(smtp|smtps):\/\/(?:([^:]+):([^@]+)@)?((?!\.)[^:]+)(?::(\d+))?$/;
-  if (regex.test(url)) return true;
-  return false;
-};
-
 /**
  * String to JSON parser
  * @param {str} str The string to parse
@@ -181,23 +161,21 @@ export function isValidLength(title: string, length: number) {
 
 /**
  * This function is called by bootstrap() in main.ts
- * It checks if the "VITE_ALLOWED_AUTH_PROVIDERS" environment variable is properly set or not.
+ *  It checks if the "VITE_ALLOWED_AUTH_PROVIDERS" environment variable is properly set or not.
  * If not, it throws an error.
  */
-export function checkEnvironmentAuthProvider(
-  VITE_ALLOWED_AUTH_PROVIDERS: string,
-) {
-  if (!VITE_ALLOWED_AUTH_PROVIDERS) {
+export function checkEnvironmentAuthProvider() {
+  if (!process.env.hasOwnProperty('VITE_ALLOWED_AUTH_PROVIDERS')) {
     throw new Error(ENV_NOT_FOUND_KEY_AUTH_PROVIDERS);
   }
 
-  if (VITE_ALLOWED_AUTH_PROVIDERS === '') {
+  if (process.env.VITE_ALLOWED_AUTH_PROVIDERS === '') {
     throw new Error(ENV_EMPTY_AUTH_PROVIDERS);
   }
 
-  const givenAuthProviders = VITE_ALLOWED_AUTH_PROVIDERS.split(',').map(
-    (provider) => provider.toLocaleUpperCase(),
-  );
+  const givenAuthProviders = process.env.VITE_ALLOWED_AUTH_PROVIDERS.split(
+    ',',
+  ).map((provider) => provider.toLocaleUpperCase());
   const supportedAuthProviders = Object.values(AuthProvider).map(
     (provider: string) => provider.toLocaleUpperCase(),
   );

packages/hoppscotch-cli/jest.config.ts

@@ -147,7 +147,7 @@ module.exports = {
   // The glob patterns Jest uses to detect test files
   testMatch: [
     // "**/__tests__/**/*.[jt]s?(x)",
-    "**/src/__tests__/commands/**/*.*.ts",
+    "**/src/__tests__/**/*.*.ts",
   ],
 
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped

packages/hoppscotch-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hoppscotch/cli",
-  "version": "0.5.0",
+  "version": "0.4.0",
   "description": "A CLI to run Hoppscotch test scripts in CI environments.",
   "homepage": "https://hoppscotch.io",
   "main": "dist/index.js",
@@ -19,9 +19,8 @@
     "debugger": "node debugger.js 9999",
     "prepublish": "pnpm exec tsup",
     "prettier-format": "prettier --config .prettierrc 'src/**/*.ts' --write",
-    "test": "pnpm run build && jest && rm -rf dist",
     "do-typecheck": "pnpm exec tsc --noEmit",
-    "do-test": "pnpm test"
+    "test": "pnpm run build && jest && rm -rf dist"
   },
   "keywords": [
     "cli",

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

@@ -1,64 +1,63 @@
 import { ExecException } from "child_process";
-
 import { HoppErrorCode } from "../../types/errors";
-import { runCLI, getErrorCode, getTestJsonFilePath } from "../utils";
+import { execAsync, getErrorCode, getTestJsonFilePath } from "../utils";
 
 describe("Test 'hopp test <file>' command:", () => {
   test("No collection file path provided.", async () => {
-    const args = "test";
-    const { stderr } = await runCLI(args);
-
+    const cmd = `node ./bin/hopp test`;
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+
     expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
   test("Collection file not found.", async () => {
-    const args = "test notfound.json";
-    const { stderr } = await runCLI(args);
-
+    const cmd = `node ./bin/hopp test notfound.json`;
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+
     expect(out).toBe<HoppErrorCode>("FILE_NOT_FOUND");
   });
 
   test("Collection file is invalid JSON.", async () => {
-    const args = `test ${getTestJsonFilePath(
+    const cmd = `node ./bin/hopp test ${getTestJsonFilePath(
       "malformed-collection.json"
     )}`;
-    const { stderr } = await runCLI(args);
-
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+
     expect(out).toBe<HoppErrorCode>("UNKNOWN_ERROR");
   });
-
+  
   test("Malformed collection file.", async () => {
-    const args = `test ${getTestJsonFilePath(
+    const cmd = `node ./bin/hopp test ${getTestJsonFilePath(
       "malformed-collection2.json"
     )}`;
-    const { stderr } = await runCLI(args);
-
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+
     expect(out).toBe<HoppErrorCode>("MALFORMED_COLLECTION");
   });
 
   test("Invalid arguement.", async () => {
-    const args = "invalid-arg";
-    const { stderr } = await runCLI(args);
-
+    const cmd = `node ./bin/hopp invalid-arg`;
+    const { stderr } = await execAsync(cmd);
     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 cmd = `node ./bin/hopp test ${getTestJsonFilePath("notjson.txt")}`;
+    const { stderr } = await execAsync(cmd);
     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);
+    const cmd = `node ./bin/hopp test ${getTestJsonFilePath("fails.json")}`;
+    const { error } = await execAsync(cmd);
 
     expect(error).not.toBeNull();
     expect(error).toMatchObject(<ExecException>{
@@ -67,83 +66,76 @@ describe("Test 'hopp test <file>' command:", () => {
   });
 
   test("No errors occured (exit code 0).", async () => {
-    const args = `test ${getTestJsonFilePath("passes.json")}`;
-    const { error } = await runCLI(args);
+    const cmd = `node ./bin/hopp test ${getTestJsonFilePath("passes.json")}`;
+    const { error } = await execAsync(cmd);
 
     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:", () => {
-  const VALID_TEST_ARGS = `test ${getTestJsonFilePath(
+  const VALID_TEST_CMD = `node ./bin/hopp test ${getTestJsonFilePath(
     "passes.json"
   )}`;
 
   test("No env file path provided.", async () => {
-    const args = `${VALID_TEST_ARGS} --env`;
-    const { stderr } = await runCLI(args);
-
+    const cmd = `${VALID_TEST_CMD} --env`;
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+
     expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
   test("ENV file not JSON type.", async () => {
-    const args = `${VALID_TEST_ARGS} --env ${getTestJsonFilePath("notjson.txt")}`;
-    const { stderr } = await runCLI(args);
-
+    const cmd = `${VALID_TEST_CMD} --env ${getTestJsonFilePath("notjson.txt")}`;
+    const { stderr } = await execAsync(cmd);
     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 cmd = `${VALID_TEST_CMD} --env notfound.json`;
+    const { stderr } = await execAsync(cmd);
     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 cmd = `node ./bin/hopp test ${TESTS_PATH} --env ${ENV_PATH}`;
+    const { error } = await execAsync(cmd);
 
-    const { error } = await runCLI(args);
     expect(error).toBeNull();
   });
 });
 
 describe("Test 'hopp test <file> --delay <delay_in_ms>' command:", () => {
-  const VALID_TEST_ARGS = `test ${getTestJsonFilePath(
+  const VALID_TEST_CMD = `node ./bin/hopp test ${getTestJsonFilePath(
     "passes.json"
   )}`;
 
   test("No value passed to delay flag.", async () => {
-    const args = `${VALID_TEST_ARGS} --delay`;
-    const { stderr } = await runCLI(args);
-
+    const cmd = `${VALID_TEST_CMD} --delay`;
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+
     expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
   test("Invalid value passed to delay flag.", async () => {
-    const args = `${VALID_TEST_ARGS} --delay 'NaN'`;
-    const { stderr } = await runCLI(args);
-
+    const cmd = `${VALID_TEST_CMD} --delay 'NaN'`;
+    const { stderr } = await execAsync(cmd);
     const out = getErrorCode(stderr);
+    console.log("invalid value thing", out)
     expect(out).toBe<HoppErrorCode>("INVALID_ARGUMENT");
   });
 
   test("Valid value passed to delay flag.", async () => {
-    const args = `${VALID_TEST_ARGS} --delay 1`;
-    const { error } = await runCLI(args);
+    const cmd = `${VALID_TEST_CMD} --delay 1`;
+    const { error } = await execAsync(cmd);
 
     expect(error).toBeNull();
   });

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

@@ -1,221 +0,0 @@
-[
-  {
-    "v": 1,
-    "name": "CollectionA",
-    "folders": [
-      {
-        "v": 1,
-        "name": "FolderA",
-        "folders": [
-          {
-            "v": 1,
-            "name": "FolderB",
-            "folders": [
-              {
-                "v": 1,
-                "name": "FolderC",
-                "folders": [],
-                "requests": [
-                  {
-                    "v": "1",
-                    "endpoint": "https://echo.hoppscotch.io",
-                    "name": "RequestD",
-                    "params": [],
-                    "headers": [
-                      {
-                        "active": true,
-                        "key": "X-Test-Header",
-                        "value": "Overriden at RequestD"
-                      }
-                    ],
-                    "method": "GET",
-                    "auth": {
-                      "authType": "basic",
-                      "authActive": true,
-                      "username": "username",
-                      "password": "password"
-                    },
-                    "preRequestScript": "",
-                    "testScript": "pw.test(\"Overrides auth and headers set at the parent folder\", ()=> {\n    pw.expect(pw.response.body.headers[\"x-test-header\"]).toBe(\"Overriden at RequestD\");\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Basic dXNlcm5hbWU6cGFzc3dvcmQ=\");\n});",
-                    "body": {
-                      "contentType": null,
-                      "body": null
-                    }
-                  }
-                ],
-                "auth": {
-                  "authType": "inherit",
-                  "authActive": true
-                },
-                "headers": []
-              }
-            ],
-            "requests": [
-              {
-                "v": "1",
-                "endpoint": "https://echo.hoppscotch.io",
-                "name": "RequestC",
-                "params": [],
-                "headers": [],
-                "method": "GET",
-                "auth": {
-                  "authType": "inherit",
-                  "authActive": true
-                },
-                "preRequestScript": "",
-                "testScript": "pw.test(\"Correctly inherits auth and headers from the parent folder\", ()=> {\n    pw.expect(pw.response.body.headers[\"x-test-header\"]).toBe(\"Overriden at FolderB\");\n  pw.expect(pw.response.body.headers[\"key\"]).toBe(\"test-key\");\n});",
-                "body": {
-                  "contentType": null,
-                  "body": null
-                }
-              }
-            ],
-            "auth": {
-              "authType": "api-key",
-              "authActive": true,
-              "addTo": "Headers",
-              "key": "key",
-              "value": "test-key"
-            },
-            "headers": [
-              {
-                "active": true,
-                "key": "X-Test-Header",
-                "value": "Overriden at FolderB"
-              }
-            ]
-          }
-        ],
-        "requests": [
-          {
-            "v": "1",
-            "endpoint": "https://echo.hoppscotch.io",
-            "name": "RequestB",
-            "params": [],
-            "headers": [],
-            "method": "GET",
-            "auth": {
-              "authType": "inherit",
-              "authActive": true
-            },
-            "preRequestScript": "",
-            "testScript": "pw.test(\"Correctly inherits auth and headers from the parent folder\", ()=> {\n    pw.expect(pw.response.body.headers[\"x-test-header\"]).toBe(\"Set at root collection\");\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer BearerToken\");\n});",
-            "body": {
-              "contentType": null,
-              "body": null
-            },
-            "id": "clpttpdq00003qp16kut6doqv"
-          }
-        ],
-        "auth": {
-          "authType": "inherit",
-          "authActive": true
-        },
-        "headers": []
-      }
-    ],
-    "requests": [
-      {
-        "v": "1",
-        "endpoint": "https://echo.hoppscotch.io",
-        "name": "RequestA",
-        "params": [],
-        "headers": [],
-        "method": "GET",
-        "auth": {
-          "authType": "inherit",
-          "authActive": true
-        },
-        "preRequestScript": "",
-        "testScript": "pw.test(\"Correctly inherits auth and headers from the root collection\", ()=> {\n    pw.expect(pw.response.body.headers[\"x-test-header\"]).toBe(\"Set at root collection\");\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer BearerToken\");\n});",
-        "body": {
-          "contentType": null,
-          "body": null
-        },
-        "id": "clpttpdq00003qp16kut6doqv"
-      }
-    ],
-    "headers": [
-      {
-        "active": true,
-        "key": "X-Test-Header",
-        "value": "Set at root collection"
-      }
-    ],
-    "auth": {
-      "authType": "bearer",
-      "authActive": true,
-      "token": "BearerToken"
-    }
-  },
-  {
-    "v": 1,
-    "name": "CollectionB",
-    "folders": [
-      {
-        "v": 1,
-        "name": "FolderA",
-        "folders": [],
-        "requests": [
-          {
-            "v": "1",
-            "endpoint": "https://echo.hoppscotch.io",
-            "name": "RequestB",
-            "params": [],
-            "headers": [],
-            "method": "GET",
-            "auth": {
-              "authType": "inherit",
-              "authActive": true
-            },
-            "preRequestScript": "",
-            "testScript": "pw.test(\"Correctly inherits auth and headers from the parent folder\", ()=> {\n    pw.expect(pw.response.body.headers[\"x-test-header\"]).toBe(\"Set at root collection\");\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer BearerToken\");\n});",
-            "body": {
-              "contentType": null,
-              "body": null
-            },
-            "id": "clpttpdq00003qp16kut6doqv"
-          }
-        ],
-        "auth": {
-          "authType": "inherit",
-          "authActive": true
-        },
-        "headers": []
-      }
-    ],
-    "requests": [
-      {
-        "v": "1",
-        "endpoint": "https://echo.hoppscotch.io",
-        "name": "RequestA",
-        "params": [],
-        "headers": [],
-        "method": "GET",
-        "auth": {
-          "authType": "inherit",
-          "authActive": true
-        },
-        "preRequestScript": "",
-        "testScript": "pw.test(\"Correctly inherits auth and headers from the root collection\", ()=> {\n    pw.expect(pw.response.body.headers[\"x-test-header\"]).toBe(\"Set at root collection\");\n  pw.expect(pw.response.body.headers[\"authorization\"]).toBe(\"Bearer BearerToken\");\n});",
-        "body": {
-          "contentType": null,
-          "body": null
-        },
-        "id": "clpttpdq00003qp16kut6doqv"
-      }
-    ],
-    "headers": [
-      {
-        "active": true,
-        "key": "X-Test-Header",
-        "value": "Set at root collection"
-      }
-    ],
-    "auth": {
-      "authType": "bearer",
-      "authActive": true,
-      "token": "BearerToken"
-    }
-  }
-]

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

@@ -1,6 +1,7 @@
 {
   "URL": "https://echo.hoppscotch.io",
   "HOST": "echo.hoppscotch.io",
+  "X-COUNTRY": "IN",
   "BODY_VALUE": "body_value",
   "BODY_KEY": "body_key"
 }

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

@@ -12,7 +12,7 @@
       "method": "POST",
       "auth": { "authType": "none", "authActive": true },
       "preRequestScript": "",
-      "testScript": "const HOST = pw.env.get(\"HOST\");\nconst UNSET_ENV = pw.env.get(\"UNSET_ENV\");\nconst EXPECTED_URL = \"https://echo.hoppscotch.io\";\nconst URL = pw.env.get(\"URL\");\nconst BODY_VALUE = pw.env.get(\"BODY_VALUE\");\n\n// Check JSON response property\npw.test(\"Check headers properties.\", ()=> {\n    pw.expect(pw.response.body.headers.host).toBe(HOST);\n});\n\npw.test(\"Check data properties.\", () => {\n\tconst DATA = pw.response.body.data;\n  \n    pw.expect(DATA).toBeType(\"string\");\n    pw.expect(JSON.parse(DATA).body_key).toBe(BODY_VALUE);\n});\n\npw.test(\"Check request URL.\", () => {\n  pw.expect(URL).toBe(EXPECTED_URL);\n})\n\npw.test(\"Check unset ENV.\", () => {\n  pw.expect(UNSET_ENV).toBeType(\"undefined\");\n})",
+      "testScript": "const HOST = pw.env.get(\"HOST\");\nconst UNSET_ENV = pw.env.get(\"UNSET_ENV\");\nconst EXPECTED_URL = \"https://echo.hoppscotch.io\";\nconst URL = pw.env.get(\"URL\");\nconst X_COUNTRY = pw.env.get(\"X-COUNTRY\");\nconst BODY_VALUE = pw.env.get(\"BODY_VALUE\");\n\n// Check JSON response property\npw.test(\"Check headers properties.\", ()=> {\n    pw.expect(pw.response.body.headers.host).toBe(HOST);\n\t   pw.expect(pw.response.body.headers[\"x-country\"]).toBe(X_COUNTRY);  \n});\n\npw.test(\"Check data properties.\", () => {\n\tconst DATA = pw.response.body.data;\n  \n    pw.expect(DATA).toBeType(\"string\");\n    pw.expect(JSON.parse(DATA).body_key).toBe(BODY_VALUE);\n});\n\npw.test(\"Check request URL.\", () => {\n  pw.expect(URL).toBe(EXPECTED_URL);\n})\n\npw.test(\"Check unset ENV.\", () => {\n  pw.expect(UNSET_ENV).toBeType(\"undefined\");\n})",
       "body": {
         "contentType": "application/json",
         "body": "{\n  \"<<BODY_KEY>>\":\"<<BODY_VALUE>>\"\n}"

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

@@ -1,17 +1,10 @@
 import { exec } from "child_process";
-import { resolve } from "path";
-
 import { ExecResponse } from "./types";
 
-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, (error, stdout, stderr) => resolve({ error, stdout, stderr }))
-    );
-  }
+export const execAsync = (command: string): Promise<ExecResponse> =>
+  new Promise((resolve) =>
+    exec(command, (error, stdout, stderr) => resolve({ error, stdout, stderr }))
+  );
 
 export const trimAnsi = (target: string) => {
   const ansiRegex =

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

@@ -1,8 +1,8 @@
-import { HoppCollection } from "@hoppscotch/data";
+import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
 import { HoppEnvs } from "./request";
 
 export type CollectionRunnerParam = {
-  collections: HoppCollection[];
+  collections: HoppCollection<HoppRESTRequest>[];
   envs: HoppEnvs;
   delay?: number;
 };

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

@@ -33,7 +33,7 @@ export type HoppEnvs = {
 
 export type CollectionStack = {
   path: string;
-  collection: HoppCollection;
+  collection: HoppCollection<HoppRESTRequest>;
 };
 
 export type RequestReport = {

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

@@ -1,4 +1,8 @@
-import { HoppCollection, isHoppRESTRequest } from "@hoppscotch/data";
+import {
+  HoppCollection,
+  HoppRESTRequest,
+  isHoppRESTRequest,
+} from "@hoppscotch/data";
 import * as A from "fp-ts/Array";
 import { CommanderError } from "commander";
 import { HoppCLIError, HoppErrnoException } from "../types/errors";
@@ -20,7 +24,9 @@ export const hasProperty = <P extends PropertyKey>(
  * @returns True, if unknown parameter is valid Hoppscotch REST Collection;
  * False, otherwise.
  */
-export const isRESTCollection = (param: unknown): param is HoppCollection => {
+export const isRESTCollection = (
+  param: unknown
+): param is HoppCollection<HoppRESTRequest> => {
   if (!!param && typeof param === "object") {
     if (!hasProperty(param, "v") || typeof param.v !== "number") {
       return false;
@@ -56,6 +62,7 @@ export const isRESTCollection = (param: unknown): param is HoppCollection => {
   return false;
 };
 
+
 /**
  * Checks if given error data is of type HoppCLIError, based on existence
  * of code property.

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

@@ -1,23 +1,21 @@
-import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
-import { bold } from "chalk";
-import { log } from "console";
 import * as A from "fp-ts/Array";
 import { pipe } from "fp-ts/function";
+import { bold } from "chalk";
+import { log } from "console";
 import round from "lodash/round";
-
-import { CollectionRunnerParam } from "../types/collections";
+import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
 import {
-  CollectionStack,
   HoppEnvs,
-  ProcessRequestParams,
+  CollectionStack,
   RequestReport,
+  ProcessRequestParams,
 } from "../types/request";
 import {
-  PreRequestMetrics,
-  RequestMetrics,
-  TestMetrics,
-} from "../types/response";
-import { DEFAULT_DURATION_PRECISION } from "./constants";
+  getRequestMetrics,
+  preProcessRequest,
+  processRequest,
+} from "./request";
+import { exceptionColors } from "./getters";
 import {
   printErrorsReport,
   printFailedTestsReport,
@@ -25,14 +23,15 @@ import {
   printRequestsMetrics,
   printTestsMetrics,
 } from "./display";
-import { exceptionColors } from "./getters";
-import { getPreRequestMetrics } from "./pre-request";
 import {
-  getRequestMetrics,
-  preProcessRequest,
-  processRequest,
-} from "./request";
+  PreRequestMetrics,
+  RequestMetrics,
+  TestMetrics,
+} from "../types/response";
 import { getTestMetrics } from "./test";
+import { DEFAULT_DURATION_PRECISION } from "./constants";
+import { getPreRequestMetrics } from "./pre-request";
+import { CollectionRunnerParam } from "../types/collections";
 
 const { WARN, FAIL } = exceptionColors;
 
@@ -42,23 +41,23 @@ const { WARN, FAIL } = exceptionColors;
  * @param param Data of hopp-collection with hopp-requests, envs to be processed.
  * @returns List of report for each processed request.
  */
-export const collectionsRunner = async (
-  param: CollectionRunnerParam
-): Promise<RequestReport[]> => {
-  const envs: HoppEnvs = param.envs;
-  const delay = param.delay ?? 0;
-  const requestsReport: RequestReport[] = [];
-  const collectionStack: CollectionStack[] = getCollectionStack(
-    param.collections
-  );
+export const collectionsRunner =
+  async (param: CollectionRunnerParam): Promise<RequestReport[]> =>
+   {
+    const envs: HoppEnvs = param.envs;
+    const delay = param.delay ?? 0;
+    const requestsReport: RequestReport[] = [];
+    const collectionStack: CollectionStack[] = getCollectionStack(
+      param.collections
+    );
 
-  while (collectionStack.length) {
-    // Pop out top-most collection from stack to be processed.
-    const { collection, path } = <CollectionStack>collectionStack.pop();
+    while (collectionStack.length) {
+      // Pop out top-most collection from stack to be processed.
+      const { collection, path } = <CollectionStack>collectionStack.pop();
 
       // Processing each request in collection
       for (const request of collection.requests) {
-        const _request = preProcessRequest(request as HoppRESTRequest, collection);
+        const _request = preProcessRequest(request);
         const requestPath = `${path}/${_request.name}`;
         const processRequestParams: ProcessRequestParams = {
           path: requestPath,
@@ -70,13 +69,13 @@ export const collectionsRunner = async (
         // Request processing initiated message.
         log(WARN(`\nRunning: ${bold(requestPath)}`));
 
-      // Processing current request.
-      const result = await processRequest(processRequestParams)();
+        // Processing current request.
+        const result = await processRequest(processRequestParams)();
 
-      // Updating global & selected envs with new envs from processed-request output.
-      const { global, selected } = result.envs;
-      envs.global = global;
-      envs.selected = selected;
+        // Updating global & selected envs with new envs from processed-request output.
+        const { global, selected } = result.envs;
+        envs.global = global;
+        envs.selected = selected;
 
         // Storing current request's report.
         const requestReport = result.report;
@@ -85,30 +84,15 @@ export const collectionsRunner = async (
 
       // Pushing remaining folders realted collection to stack.
       for (const folder of collection.folders) {
-        const updatedFolder: HoppCollection = { ...folder }
-
-        if (updatedFolder.auth?.authType === "inherit") {
-          updatedFolder.auth = collection.auth;
-        }
-
-        if (collection.headers?.length) {
-          // Filter out header entries present in the parent collection under the same name
-          // This ensures the folder headers take precedence over the collection headers
-          const filteredHeaders = collection.headers.filter((collectionHeaderEntries) => {
-            return !updatedFolder.headers.some((folderHeaderEntries) => folderHeaderEntries.key === collectionHeaderEntries.key)
-          })
-          updatedFolder.headers.push(...filteredHeaders);
-        }
-
         collectionStack.push({
-          path: `${path}/${updatedFolder.name}`,
-          collection: updatedFolder,
+          path: `${path}/${folder.name}`,
+          collection: folder,
         });
       }
     }
 
-  return requestsReport;
-};
+    return requestsReport;
+  };
 
 /**
  * Transforms collections to generate collection-stack which describes each collection's
@@ -116,7 +100,9 @@ export const collectionsRunner = async (
  * @param collections Hopp-collection objects to be mapped to collection-stack type.
  * @returns Mapped collections to collection-stack.
  */
-const getCollectionStack = (collections: HoppCollection[]): CollectionStack[] =>
+const getCollectionStack = (
+  collections: HoppCollection<HoppRESTRequest>[]
+): CollectionStack[] =>
   pipe(
     collections,
     A.map(

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

@@ -2,7 +2,7 @@ import fs from "fs/promises";
 import { FormDataEntry } from "../types/request";
 import { error } from "../types/errors";
 import { isRESTCollection, isHoppErrnoException } from "./checks";
-import { HoppCollection } from "@hoppscotch/data";
+import { HoppCollection, HoppRESTRequest } from "@hoppscotch/data";
 
 /**
  * Parses array of FormDataEntry to FormData.
@@ -35,20 +35,20 @@ export const parseErrorMessage = (e: unknown) => {
 };
 
 export async function readJsonFile(path: string): Promise<unknown> {
-  if (!path.endsWith(".json")) {
-    throw error({ code: "INVALID_FILE_TYPE", data: path });
+  if(!path.endsWith('.json')) {
+    throw error({ code: "INVALID_FILE_TYPE", data: path })
   }
 
   try {
-    await fs.access(path);
+    await fs.access(path)
   } catch (e) {
-    throw error({ code: "FILE_NOT_FOUND", path: path });
+    throw error({ code: "FILE_NOT_FOUND", path: path })
   }
 
   try {
-    return JSON.parse((await fs.readFile(path)).toString());
-  } catch (e) {
-    throw error({ code: "UNKNOWN_ERROR", data: e });
+    return JSON.parse((await fs.readFile(path)).toString())
+  } catch(e) {
+    throw error({ code: "UNKNOWN_ERROR", data: e })
   }
 }
 
@@ -56,24 +56,22 @@ export async function readJsonFile(path: string): Promise<unknown> {
  * Parses collection json file for given path:context.path, and validates
  * the parsed collectiona array.
  * @param path Collection json file path.
- * @returns For successful parsing we get array of HoppCollection,
+ * @returns For successful parsing we get array of HoppCollection<HoppRESTRequest>,
  */
 export async function parseCollectionData(
   path: string
-): Promise<HoppCollection[]> {
-  let contents = await readJsonFile(path);
+): Promise<HoppCollection<HoppRESTRequest>[]> {
+  let contents = await readJsonFile(path)
 
-  const maybeArrayOfCollections: unknown[] = Array.isArray(contents)
-    ? contents
-    : [contents];
+  const maybeArrayOfCollections: unknown[] = Array.isArray(contents) ? contents : [contents]
 
-  if (maybeArrayOfCollections.some((x) => !isRESTCollection(x))) {
+  if(maybeArrayOfCollections.some((x) => !isRESTCollection(x))) {
     throw error({
       code: "MALFORMED_COLLECTION",
       path,
       data: "Please check the collection data.",
-    });
+    })
   }
 
-  return maybeArrayOfCollections as HoppCollection[];
-}
+  return maybeArrayOfCollections as HoppCollection<HoppRESTRequest>[]
+};

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

@@ -6,24 +6,23 @@ import {
   parseTemplateString,
   parseTemplateStringE,
 } from "@hoppscotch/data";
-import { runPreRequestScript } from "@hoppscotch/js-sandbox/node";
-import * as A from "fp-ts/Array";
-import * as E from "fp-ts/Either";
-import * as O from "fp-ts/Option";
-import * as RA from "fp-ts/ReadonlyArray";
-import * as TE from "fp-ts/TaskEither";
+import { runPreRequestScript } from "@hoppscotch/js-sandbox";
 import { flow, pipe } from "fp-ts/function";
+import * as TE from "fp-ts/TaskEither";
+import * as E from "fp-ts/Either";
+import * as RA from "fp-ts/ReadonlyArray";
+import * as A from "fp-ts/Array";
+import * as O from "fp-ts/Option";
 import * as S from "fp-ts/string";
 import qs from "qs";
-
 import { EffectiveHoppRESTRequest } from "../interfaces/request";
-import { HoppCLIError, error } from "../types/errors";
+import { error, HoppCLIError } from "../types/errors";
 import { HoppEnvs } from "../types/request";
-import { PreRequestMetrics } from "../types/response";
 import { isHoppCLIError } from "./checks";
-import { arrayFlatMap, arraySort, tupleToRecord } from "./functions/array";
-import { getEffectiveFinalMetaData } from "./getters";
+import { tupleToRecord, arraySort, arrayFlatMap } from "./functions/array";
 import { toFormData } from "./mutators";
+import { getEffectiveFinalMetaData } from "./getters";
+import { PreRequestMetrics } from "../types/response";
 
 /**
  * Runs pre-request-script runner over given request which extracts set ENVs and

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

@@ -1,31 +1,31 @@
-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";
-import * as T from "fp-ts/Task";
-import * as TE from "fp-ts/TaskEither";
-import { pipe } from "fp-ts/function";
-import * as S from "fp-ts/string";
-import { hrtime } from "process";
 import { URL } from "url";
-import { EffectiveHoppRESTRequest, RequestConfig } from "../interfaces/request";
+import * as S from "fp-ts/string";
+import * as A from "fp-ts/Array";
+import * as T from "fp-ts/Task";
+import * as E from "fp-ts/Either";
+import * as TE from "fp-ts/TaskEither";
+import { HoppRESTRequest } from "@hoppscotch/data";
+import { responseErrors } from "./constants";
+import { getDurationInSeconds, getMetaDataPairs } from "./getters";
+import { testRunner, getTestScriptParams, hasFailedTestCases } from "./test";
+import { RequestConfig, EffectiveHoppRESTRequest } from "../interfaces/request";
 import { RequestRunnerResponse } from "../interfaces/response";
-import { HoppCLIError, error } from "../types/errors";
+import { preRequestScriptRunner } from "./pre-request";
 import {
   HoppEnvs,
   ProcessRequestParams,
   RequestReport,
 } from "../types/request";
-import { RequestMetrics } from "../types/response";
-import { responseErrors } from "./constants";
 import {
   printPreRequestRunner,
   printRequestRunner,
   printTestRunner,
 } from "./display";
-import { getDurationInSeconds, getMetaDataPairs } from "./getters";
-import { preRequestScriptRunner } from "./pre-request";
-import { getTestScriptParams, hasFailedTestCases, testRunner } from "./test";
+import { error, HoppCLIError } from "../types/errors";
+import { hrtime } from "process";
+import { RequestMetrics } from "../types/response";
+import { pipe } from "fp-ts/function";
 
 // !NOTE: The `config.supported` checks are temporary until OAuth2 and Multipart Forms are supported
 
@@ -309,12 +309,9 @@ export const processRequest =
  * @returns Updated request object free of invalid/missing data.
  */
 export const preProcessRequest = (
-  request: HoppRESTRequest,
-  collection: HoppCollection,
+  request: HoppRESTRequest
 ): HoppRESTRequest => {
   const tempRequest = Object.assign({}, request);
-  const { headers: parentHeaders, auth: parentAuth } = collection;
-
   if (!tempRequest.v) {
     tempRequest.v = "1";
   }
@@ -330,31 +327,18 @@ export const preProcessRequest = (
   if (!tempRequest.params) {
     tempRequest.params = [];
   }
-
-  if (parentHeaders?.length) {
-    // 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)
-    })
-    tempRequest.headers.push(...filteredEntries);
-  } else if (!tempRequest.headers) {
+  if (!tempRequest.headers) {
     tempRequest.headers = [];
   }
-
   if (!tempRequest.preRequestScript) {
     tempRequest.preRequestScript = "";
   }
   if (!tempRequest.testScript) {
     tempRequest.testScript = "";
   }
-
-  if (tempRequest.auth?.authType === "inherit") {
-    tempRequest.auth = parentAuth;
-  } else if (!tempRequest.auth) {
+  if (!tempRequest.auth) {
     tempRequest.auth = { authActive: false, authType: "none" };
   }
-
   if (!tempRequest.body) {
     tempRequest.body = { contentType: null, body: null };
   }

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

@@ -1,19 +1,17 @@
 import { HoppRESTRequest } from "@hoppscotch/data";
-import { TestDescriptor } from "@hoppscotch/js-sandbox";
-import { runTestScript } from "@hoppscotch/js-sandbox/node";
-import * as A from "fp-ts/Array";
-import * as RA from "fp-ts/ReadonlyArray";
-import * as T from "fp-ts/Task";
-import * as TE from "fp-ts/TaskEither";
-import { flow, pipe } from "fp-ts/function";
+import { execTestScript, TestDescriptor } from "@hoppscotch/js-sandbox";
 import { hrtime } from "process";
-
+import { flow, pipe } from "fp-ts/function";
+import * as RA from "fp-ts/ReadonlyArray";
+import * as A from "fp-ts/Array";
+import * as TE from "fp-ts/TaskEither";
+import * as T from "fp-ts/Task";
 import {
   RequestRunnerResponse,
   TestReport,
   TestScriptParams,
 } from "../interfaces/response";
-import { HoppCLIError, error } from "../types/errors";
+import { error, HoppCLIError } from "../types/errors";
 import { HoppEnvs } from "../types/request";
 import { ExpectResult, TestMetrics, TestRunnerRes } from "../types/response";
 import { getDurationInSeconds } from "./getters";
@@ -38,7 +36,7 @@ export const testRunner = (
       pipe(
         TE.of(testScriptData),
         TE.chain(({ testScript, response, envs }) =>
-          runTestScript(testScript, envs, response)
+          execTestScript(testScript, envs, response)
         )
       )
     ),

packages/hoppscotch-common/.eslintrc.js

@@ -69,7 +69,5 @@ module.exports = {
           "Do not use 'localStorage' directly. Please use the PersistenceService",
       },
     ],
-    eqeqeq: 1,
-    "no-else-return": 1,
   },
 }

packages/hoppscotch-common/.prettierrc.js

@@ -5,4 +5,5 @@ module.exports = {
   printWidth: 80,
   useTabs: false,
   tabWidth: 2,
+  plugins: ["prettier-plugin-tailwindcss"],
 }

packages/hoppscotch-common/assets/icons/graphql.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width=".88em" height="1em" viewBox="0 0 21 24"><path fill="currentColor" d="M12.731 2.751 17.666 5.6a2.138 2.138 0 1 1 2.07 3.548l-.015.003v5.7a2.14 2.14 0 1 1-2.098 3.502l-.002-.002-4.905 2.832a2.14 2.14 0 1 1-4.079.054l-.004.015-4.941-2.844a2.14 2.14 0 1 1-2.067-3.556l.015-.003V9.15a2.14 2.14 0 1 1 1.58-3.926l-.01-.005c.184.106.342.231.479.376l.001.001 4.938-2.85a2.14 2.14 0 1 1 4.096.021l.004-.015zm-.515.877a.766.766 0 0 1-.057.057l-.001.001 6.461 11.19c.026-.009.056-.016.082-.023V9.146a2.14 2.14 0 0 1-1.555-2.603l-.003.015.019-.072zm-3.015.059-.06-.06-4.946 2.852A2.137 2.137 0 0 1 2.749 9.12l-.015.004-.076.021v5.708l.084.023 6.461-11.19zm2.076.507a2.164 2.164 0 0 1-1.207-.004l.015.004-6.46 11.189c.286.276.496.629.597 1.026l.003.015h12.911c.102-.413.313-.768.599-1.043l.001-.001L11.28 4.194zm.986 16.227 4.917-2.838a1.748 1.748 0 0 1-.038-.142H4.222l-.021.083 4.939 2.852c.39-.403.936-.653 1.54-.653.626 0 1.189.268 1.581.696l.001.002z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" width=".88em" height="1em" viewBox="0 0 21 24" class="iconify iconify--fontisto"><path fill="currentColor" d="M12.731 2.751 17.666 5.6a2.138 2.138 0 1 1 2.07 3.548l-.015.003v5.7a2.14 2.14 0 1 1-2.098 3.502l-.002-.002-4.905 2.832a2.14 2.14 0 1 1-4.079.054l-.004.015-4.941-2.844a2.14 2.14 0 1 1-2.067-3.556l.015-.003V9.15a2.14 2.14 0 1 1 1.58-3.926l-.01-.005c.184.106.342.231.479.376l.001.001 4.938-2.85a2.14 2.14 0 1 1 4.096.021l.004-.015zm-.515.877a.766.766 0 0 1-.057.057l-.001.001 6.461 11.19c.026-.009.056-.016.082-.023V9.146a2.14 2.14 0 0 1-1.555-2.603l-.003.015.019-.072zm-3.015.059-.06-.06-4.946 2.852A2.137 2.137 0 0 1 2.749 9.12l-.015.004-.076.021v5.708l.084.023 6.461-11.19zm2.076.507a2.164 2.164 0 0 1-1.207-.004l.015.004-6.46 11.189c.286.276.496.629.597 1.026l.003.015h12.911c.102-.413.313-.768.599-1.043l.001-.001L11.28 4.194zm.986 16.227 4.917-2.838a1.748 1.748 0 0 1-.038-.142H4.222l-.021.083 4.939 2.852c.39-.403.936-.653 1.54-.653.626 0 1.189.268 1.581.696l.001.002z"/></svg>

packages/hoppscotch-common/assets/icons/mqtt.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 16 16"><path fill="currentColor" fill-rule="evenodd" d="M10.133 1h4.409a.5.5 0 0 1 .5.5v4.422c0 .026-.035.033-.045.01l-.048-.112a9.095 9.095 0 0 0-4.825-4.776c-.023-.01-.016-.044.01-.044Zm-8.588.275h-.5v1h.5c7.027 0 12.229 5.199 12.229 12.226v.5h1v-.5c0-7.58-5.65-13.226-13.229-13.226Zm.034 4.22h-.5v1h.5c2.361 0 4.348.837 5.744 2.238 1.395 1.401 2.227 3.395 2.227 5.758v.5h1v-.5c0-2.604-.921-4.859-2.52-6.463-1.596-1.605-3.845-2.532-6.45-2.532Zm-.528 8.996v-4.423c0-.041.033-.074.074-.074a4.923 4.923 0 0 1 4.923 4.922.074.074 0 0 1-.074.074H1.551a.5.5 0 0 1-.5-.5Z" clip-rule="evenodd"/></svg>

packages/hoppscotch-common/assets/icons/socketio.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 16 16"><path fill="currentColor" fill-rule="evenodd" d="M9.277 2.084a.5.5 0 0 1 .185.607l-2.269 5.5a.5.5 0 0 1-.462.309H3.5a.5.5 0 0 1-.354-.854l5.5-5.5a.5.5 0 0 1 .631-.062ZM4.707 7.5h1.69l1.186-2.875L4.707 7.5Zm2.016 6.416a.5.5 0 0 1-.185-.607l2.269-5.5a.5.5 0 0 1 .462-.309H12.5a.5.5 0 0 1 .354.854l-5.5 5.5a.5.5 0 0 1-.631.062Zm4.57-5.416h-1.69l-1.186 2.875L11.293 8.5Z" clip-rule="evenodd"/><path fill="currentColor" fill-rule="evenodd" d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0Zm-1 0A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z" clip-rule="evenodd"/></svg>

packages/hoppscotch-common/assets/icons/websocket.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 16 16"><path fill="currentColor" d="M1 2h4.257a2.5 2.5 0 0 1 1.768.732L9.293 5 5 9.293 3.732 8.025A2.5 2.5 0 0 1 3 6.257V4H2v2.257a3.5 3.5 0 0 0 1.025 2.475L5 10.707l1.25-1.25 2.396 2.397.708-.708L6.957 8.75 8.75 6.957l2.396 2.397.708-.708L9.457 6.25 10.707 5 7.732 2.025A3.5 3.5 0 0 0 5.257 1H1v1ZM10.646 2.354l2.622 2.62A2.5 2.5 0 0 1 14 6.744V12h1V6.743a3.5 3.5 0 0 0-1.025-2.475l-2.621-2.622-.707.708ZM4.268 13.975l-2.622-2.621.708-.708 2.62 2.622A2.5 2.5 0 0 0 6.744 14H15v1H6.743a3.5 3.5 0 0 1-2.475-1.025Z"/></svg>

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

@@ -29,6 +29,14 @@
   @apply antialiased;
   accent-color: var(--accent-color);
   font-variant-ligatures: common-ligatures;
+
+  // Colors
+  --info-color: #ec4899;
+  --success-color: #10b981;
+  --blue-color: #3b82f6;
+  --warning-color: #f59e0b;
+  --cl-error-color: #ef4444;
+  --sv-error-color: #dc2626;
 }
 
 ::-webkit-scrollbar-track {
@@ -57,7 +65,7 @@ input::placeholder,
 textarea::placeholder,
 .cm-placeholder {
   @apply text-secondary;
-  @apply opacity-50 #{!important};
+  @apply opacity-50;
 }
 
 input,
@@ -76,7 +84,7 @@ body {
   @apply font-medium;
   @apply select-none;
   @apply overflow-x-hidden;
-  @apply leading-body #{!important};
+  @apply leading-body;
   animation: fade 300ms forwards;
   -webkit-tap-highlight-color: transparent;
   -webkit-touch-callout: none;
@@ -158,7 +166,7 @@ a {
     @apply shadow-none #{!important};
     @apply fixed;
     @apply inline-flex;
-    @apply -mt-7;
+    @apply -mt-8;
   }
 }
 
@@ -174,7 +182,7 @@ a {
     @apply font-semibold;
     @apply px-2 py-1;
     @apply truncate;
-    @apply leading-body;
+    @apply leading-normal;
     @apply items-center;
 
     kbd {
@@ -221,7 +229,7 @@ a {
     @apply overflow-y-auto;
     @apply text-body text-secondary;
     @apply p-2;
-    @apply leading-body;
+    @apply leading-normal;
     @apply focus:outline-none;
     scroll-behavior: smooth;
 
@@ -253,7 +261,7 @@ a {
 
 hr {
   @apply border-b border-dividerLight;
-  @apply my-2 #{!important};
+  @apply my-2;
 }
 
 .heading {
@@ -342,33 +350,48 @@ pre.ace_editor {
   }
 }
 
+.select-wrapper {
+  @apply flex flex-1;
+  @apply relative;
+  @apply after:absolute;
+  @apply after:flex;
+  @apply after:inset-y-0;
+  @apply after:items-center;
+  @apply after:justify-center;
+  @apply after:pointer-events-none;
+  @apply after:font-icon;
+  @apply after:text-current;
+  @apply after:right-3;
+  @apply after:content-["\e5cf"];
+  @apply after:text-lg;
+}
+
 .info-response {
-  color: var(--status-info-color);
+  color: var(--info-color);
 }
 
 .success-response {
-  color: var(--status-success-color);
+  color: var(--success-color);
 }
 
-.redirect-response {
-  color: var(--status-redirect-color);
+.redir-response {
+  color: var(--warning-color);
 }
 
-.critical-error-response {
-  color: var(--status-critical-error-color);
+.cl-error-response {
+  color: var(--cl-error-color);
 }
 
-.server-error-response {
-  color: var(--status-server-error-color);
+.sv-error-response {
+  color: var(--sv-error-color);
 }
 
 .missing-data-response {
-  color: var(--status-missing-data-color);
+  @apply text-secondaryLight;
 }
 
 .toasted-container {
   @apply max-w-md;
-  @apply z-[10000];
 
   .toasted {
     &.toasted-primary {
@@ -514,13 +537,12 @@ pre.ace_editor {
   @apply inline-flex;
   @apply font-sans;
   @apply text-tiny;
-  @apply bg-dividerLight;
+  @apply bg-divider;
   @apply rounded;
   @apply ml-2;
-  @apply px-0.5;
-  @apply min-w-[1rem];
-  @apply min-h-[1rem];
-  @apply leading-none;
+  @apply px-1;
+  @apply min-w-5;
+  @apply min-h-5;
   @apply items-center;
   @apply justify-center;
   @apply border border-dividerDark;

packages/hoppscotch-common/assets/themes/accent-themes.scss

@@ -1,89 +1,89 @@
 @mixin green-theme {
-  --accent-color: theme("colors.emerald.500");
-  --accent-light-color: theme("colors.emerald.400");
-  --accent-dark-color: theme("colors.emerald.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.emerald.400");
-  --gradient-via-color: theme("colors.emerald.500");
-  --gradient-to-color: theme("colors.emerald.600");
+  --accent-color: #10b981;
+  --accent-light-color: #34d399;
+  --accent-dark-color: #059669;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #a7f3d0;
+  --gradient-via-color: #34d399;
+  --gradient-to-color: #059669;
 }
 
 @mixin teal-theme {
-  --accent-color: theme("colors.teal.500");
-  --accent-light-color: theme("colors.teal.400");
-  --accent-dark-color: theme("colors.teal.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.teal.400");
-  --gradient-via-color: theme("colors.teal.500");
-  --gradient-to-color: theme("colors.teal.600");
+  --accent-color: #14b8a6;
+  --accent-light-color: #2dd4bf;
+  --accent-dark-color: #0d9488;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #99f6e4;
+  --gradient-via-color: #2dd4bf;
+  --gradient-to-color: #0d9488;
 }
 
 @mixin blue-theme {
-  --accent-color: theme("colors.blue.500");
-  --accent-light-color: theme("colors.blue.400");
-  --accent-dark-color: theme("colors.blue.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.blue.400");
-  --gradient-via-color: theme("colors.blue.500");
-  --gradient-to-color: theme("colors.blue.600");
+  --accent-color: #3b82f6;
+  --accent-light-color: #60a5fa;
+  --accent-dark-color: #2563eb;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #bfdbfe;
+  --gradient-via-color: #60a5fa;
+  --gradient-to-color: #2563eb;
 }
 
 @mixin indigo-theme {
-  --accent-color: theme("colors.indigo.500");
-  --accent-light-color: theme("colors.indigo.400");
-  --accent-dark-color: theme("colors.indigo.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.indigo.400");
-  --gradient-via-color: theme("colors.indigo.500");
-  --gradient-to-color: theme("colors.indigo.600");
+  --accent-color: #6366f1;
+  --accent-light-color: #818cf8;
+  --accent-dark-color: #4f46e5;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #c7d2fe;
+  --gradient-via-color: #818cf8;
+  --gradient-to-color: #4f46e5;
 }
 
 @mixin purple-theme {
-  --accent-color: theme("colors.purple.500");
-  --accent-light-color: theme("colors.purple.400");
-  --accent-dark-color: theme("colors.purple.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.purple.400");
-  --gradient-via-color: theme("colors.purple.500");
-  --gradient-to-color: theme("colors.purple.600");
+  --accent-color: #8b5cf6;
+  --accent-light-color: #a78bfa;
+  --accent-dark-color: #7c3aed;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #ddd6fe;
+  --gradient-via-color: #a78bfa;
+  --gradient-to-color: #7c3aed;
 }
 
 @mixin yellow-theme {
-  --accent-color: theme("colors.amber.500");
-  --accent-light-color: theme("colors.amber.400");
-  --accent-dark-color: theme("colors.amber.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.amber.400");
-  --gradient-via-color: theme("colors.amber.500");
-  --gradient-to-color: theme("colors.amber.600");
+  --accent-color: #f59e0b;
+  --accent-light-color: #fbbf24;
+  --accent-dark-color: #d97706;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #fde68a;
+  --gradient-via-color: #fbbf24;
+  --gradient-to-color: #d97706;
 }
 
 @mixin orange-theme {
-  --accent-color: theme("colors.orange.500");
-  --accent-light-color: theme("colors.orange.400");
-  --accent-dark-color: theme("colors.orange.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.orange.400");
-  --gradient-via-color: theme("colors.orange.500");
-  --gradient-to-color: theme("colors.orange.600");
+  --accent-color: #f97316;
+  --accent-light-color: #fb923c;
+  --accent-dark-color: #ea580c;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #fed7aa;
+  --gradient-via-color: #fb923c;
+  --gradient-to-color: #ea580c;
 }
 
 @mixin red-theme {
-  --accent-color: theme("colors.red.500");
-  --accent-light-color: theme("colors.red.400");
-  --accent-dark-color: theme("colors.red.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.red.400");
-  --gradient-via-color: theme("colors.red.500");
-  --gradient-to-color: theme("colors.red.600");
+  --accent-color: #ef4444;
+  --accent-light-color: #f87171;
+  --accent-dark-color: #dc2626;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #fecaca;
+  --gradient-via-color: #f87171;
+  --gradient-to-color: #dc2626;
 }
 
 @mixin pink-theme {
-  --accent-color: theme("colors.pink.500");
-  --accent-light-color: theme("colors.pink.400");
-  --accent-dark-color: theme("colors.pink.600");
-  --accent-contrast-color: theme("colors.white");
-  --gradient-from-color: theme("colors.pink.400");
-  --gradient-via-color: theme("colors.pink.500");
-  --gradient-to-color: theme("colors.pink.600");
+  --accent-color: #ec4899;
+  --accent-light-color: #f472b6;
+  --accent-dark-color: #db2777;
+  --accent-contrast-color: #fff;
+  --gradient-from-color: #fbcfe8;
+  --gradient-via-color: #f472b6;
+  --gradient-to-color: #db2777;
 }

packages/hoppscotch-common/assets/themes/base-themes.scss

@@ -1,141 +1,81 @@
 @mixin base-theme {
   --font-sans: "Inter Variable", sans-serif;
+  --font-icon: "Material Symbols Rounded Variable";
   --font-mono: "Roboto Mono Variable", monospace;
   --font-size-body: 0.75rem;
-  --font-size-tiny: 0.625rem;
+  --font-size-tiny: 0.688rem;
   --line-height-body: 1rem;
   --upper-primary-sticky-fold: 4.125rem;
   --upper-secondary-sticky-fold: 6.188rem;
   --upper-tertiary-sticky-fold: 8.25rem;
   --upper-fourth-sticky-fold: 10.2rem;
-  --upper-mobile-primary-sticky-fold: 6.75rem;
-  --upper-mobile-secondary-sticky-fold: 8.813rem;
-  --upper-mobile-sticky-fold: 10.875rem;
+  --upper-mobile-primary-sticky-fold: 6.625rem;
+  --upper-mobile-secondary-sticky-fold: 8.688rem;
+  --upper-mobile-sticky-fold: 10.75rem;
   --upper-mobile-tertiary-sticky-fold: 8.25rem;
   --lower-primary-sticky-fold: 3rem;
   --lower-secondary-sticky-fold: 5.063rem;
   --lower-tertiary-sticky-fold: 7.125rem;
   --lower-fourth-sticky-fold: 9.188rem;
   --sidebar-primary-sticky-fold: 2rem;
-  --properties-primary-sticky-fold: 2.063rem;
-}
-
-@mixin light-theme {
-  --primary-color: theme("colors.white");
-  --primary-light-color: theme("colors.gray.50");
-  --primary-dark-color: theme("colors.gray.100");
-  --primary-contrast-color: #fdfdfd;
-
-  --secondary-color: theme("colors.gray.500");
-  --secondary-light-color: theme("colors.gray.400");
-  --secondary-dark-color: theme("colors.gray.900");
-
-  --divider-color: theme("colors.gray.100");
-  --divider-light-color: theme("colors.gray.100");
-  --divider-dark-color: theme("colors.gray.300");
-
-  --banner-info-color: theme("colors.stone.100");
-  --banner-warning-color: theme("colors.yellow.100");
-  --banner-error-color: theme("colors.red.100");
-
-  --tooltip-color: theme("colors.neutral.800");
-  --popover-color: theme("colors.white");
-
-  --method-get-color: theme("colors.green.500");
-  --method-post-color: theme("colors.amber.500");
-  --method-put-color: theme("colors.blue.500");
-  --method-patch-color: theme("colors.purple.500");
-  --method-delete-color: theme("colors.red.500");
-  --method-head-color: theme("colors.lime.500");
-  --method-options-color: theme("colors.pink.500");
-  --method-default-color: theme("colors.gray.500");
-
-  --status-info-color: theme("colors.blue.500");
-  --status-success-color: theme("colors.green.500");
-  --status-redirect-color: theme("colors.amber.500");
-  --status-critical-error-color: theme("colors.red.500");
-  --status-server-error-color: theme("colors.rose.500");
-  --status-missing-data-color: theme("colors.slate.500");
-
-  --editor-theme: "textmate";
 }
 
 @mixin dark-theme {
   --primary-color: #181818;
   --primary-light-color: #1c1c1e;
-  --primary-dark-color: theme("colors.neutral.800");
-  --primary-contrast-color: theme("colors.neutral.900");
+  --primary-dark-color: #262626;
+  --primary-contrast-color: #171717;
 
-  --secondary-color: theme("colors.neutral.400");
-  --secondary-light-color: theme("colors.neutral.500");
-  --secondary-dark-color: theme("colors.zinc.50");
+  --secondary-color: #a3a3a3;
+  --secondary-light-color: #737373;
+  --secondary-dark-color: #fafafa;
 
-  --divider-color: #1f1f1f;
+  --divider-color: #262626;
   --divider-light-color: #1f1f1f;
-  --divider-dark-color: theme("colors.zinc.800");
+  --divider-dark-color: #2d2d2d;
 
-  --banner-info-color: theme("colors.stone.800");
-  --banner-warning-color: theme("colors.yellow.800");
-  --banner-error-color: theme("colors.red.800");
-
-  --tooltip-color: theme("colors.neutral.100");
+  --error-color: #292524;
+  --tooltip-color: #f5f5f5;
   --popover-color: #1b1b1b;
-
-  --method-get-color: theme("colors.emerald.500");
-  --method-post-color: theme("colors.yellow.500");
-  --method-put-color: theme("colors.sky.500");
-  --method-patch-color: theme("colors.violet.500");
-  --method-delete-color: theme("colors.rose.500");
-  --method-head-color: theme("colors.teal.500");
-  --method-options-color: theme("colors.indigo.500");
-  --method-default-color: theme("colors.neutral.500");
-
-  --status-info-color: theme("colors.blue.500");
-  --status-success-color: theme("colors.green.500");
-  --status-redirect-color: theme("colors.amber.500");
-  --status-critical-error-color: theme("colors.red.500");
-  --status-server-error-color: theme("colors.rose.500");
-  --status-missing-data-color: theme("colors.slate.500");
-
   --editor-theme: "merbivore_soft";
 }
 
+@mixin light-theme {
+  --primary-color: #ffffff;
+  --primary-light-color: #f9fafb;
+  --primary-dark-color: #f3f4f6;
+  --primary-contrast-color: #fdfdfd;
+
+  --secondary-color: #6b7280;
+  --secondary-light-color: #9ca3af;
+  --secondary-dark-color: #111827;
+
+  --divider-color: #f3f4f6;
+  --divider-light-color: #f3f4f6;
+  --divider-dark-color: #d1d5db;
+
+  --error-color: #fef3c7;
+  --tooltip-color: #262626;
+  --popover-color: #ffffff;
+  --editor-theme: "textmate";
+}
+
 @mixin black-theme {
   --primary-color: #0f0f0f;
-  --primary-light-color: theme("colors.neutral.900");
+  --primary-light-color: #171717;
   --primary-dark-color: #181818;
   --primary-contrast-color: #0f0f0f;
 
-  --secondary-color: theme("colors.neutral.400");
-  --secondary-light-color: theme("colors.neutral.500");
-  --secondary-dark-color: theme("colors.neutral.50");
+  --secondary-color: #a3a3a3;
+  --secondary-light-color: #737373;
+  --secondary-dark-color: #f5f5f5;
 
-  --divider-color: theme("colors.neutral.900");
-  --divider-light-color: theme("colors.neutral.900");
-  --divider-dark-color: theme("colors.zinc.800");
-
-  --banner-info-color: theme("colors.stone.900");
-  --banner-warning-color: theme("colors.yellow.900");
-  --banner-error-color: theme("colors.red.900");
-
-  --tooltip-color: theme("colors.neutral.100");
-  --popover-color: theme("colors.stone.950");
-
-  --method-get-color: theme("colors.emerald.500");
-  --method-post-color: theme("colors.yellow.500");
-  --method-put-color: theme("colors.sky.500");
-  --method-patch-color: theme("colors.violet.500");
-  --method-delete-color: theme("colors.rose.500");
-  --method-head-color: theme("colors.teal.500");
-  --method-options-color: theme("colors.indigo.500");
-  --method-default-color: theme("colors.zinc.500");
-
-  --status-info-color: theme("colors.blue.500");
-  --status-success-color: theme("colors.green.500");
-  --status-redirect-color: theme("colors.amber.500");
-  --status-critical-error-color: theme("colors.red.500");
-  --status-server-error-color: theme("colors.rose.500");
-  --status-missing-data-color: theme("colors.slate.500");
+  --divider-color: #1c1c1e;
+  --divider-light-color: #181818;
+  --divider-dark-color: #323232;
 
+  --error-color: #1c1917;
+  --tooltip-color: #f5f5f5;
+  --popover-color: #0f0f0f;
   --editor-theme: "twilight";
 }

packages/hoppscotch-common/assets/themes/editor-themes.scss

@@ -1,41 +1,41 @@
-@mixin light-editor-theme {
-  --editor-type-color: theme("colors.violet.600");
-  --editor-name-color: theme("colors.red.600");
-  --editor-operator-color: theme("colors.indigo.600");
-  --editor-invalid-color: theme("colors.red.600");
-  --editor-separator-color: theme("colors.gray.600");
-  --editor-meta-color: theme("colors.gray.600");
-  --editor-variable-color: theme("colors.emerald.600");
-  --editor-link-color: theme("colors.cyan.600");
-  --editor-process-color: theme("colors.blue.600");
-  --editor-constant-color: theme("colors.fuchsia.600");
-  --editor-keyword-color: theme("colors.pink.600");
+@mixin dark-editor-theme {
+  --editor-type-color: #a78bfa;
+  --editor-name-color: #60a5fa;
+  --editor-operator-color: #818cf8;
+  --editor-invalid-color: #f87171;
+  --editor-separator-color: #9ca3af;
+  --editor-meta-color: #9ca3af;
+  --editor-variable-color: #34d399;
+  --editor-link-color: #22d3ee;
+  --editor-process-color: #e879f9;
+  --editor-constant-color: #a78bfa;
+  --editor-keyword-color: #f472b6;
 }
 
-@mixin dark-editor-theme {
-  --editor-type-color: theme("colors.violet.400");
-  --editor-name-color: theme("colors.blue.400");
-  --editor-operator-color: theme("colors.indigo.400");
-  --editor-invalid-color: theme("colors.red.400");
-  --editor-separator-color: theme("colors.gray.400");
-  --editor-meta-color: theme("colors.gray.400");
-  --editor-variable-color: theme("colors.emerald.400");
-  --editor-link-color: theme("colors.cyan.400");
-  --editor-process-color: theme("colors.fuchsia.400");
-  --editor-constant-color: theme("colors.violet.400");
-  --editor-keyword-color: theme("colors.pink.400");
+@mixin light-editor-theme {
+  --editor-type-color: #7c3aed;
+  --editor-name-color: #dc2626;
+  --editor-operator-color: #4f46e5;
+  --editor-invalid-color: #dc2626;
+  --editor-separator-color: #4b5563;
+  --editor-meta-color: #4b5563;
+  --editor-variable-color: #059669;
+  --editor-link-color: #0891b2;
+  --editor-process-color: #2563eb;
+  --editor-constant-color: #c026d3;
+  --editor-keyword-color: #db2777;
 }
 
 @mixin black-editor-theme {
-  --editor-type-color: theme("colors.violet.400");
-  --editor-name-color: theme("colors.fuchsia.400");
-  --editor-operator-color: theme("colors.indigo.400");
-  --editor-invalid-color: theme("colors.red.400");
-  --editor-separator-color: theme("colors.gray.400");
-  --editor-meta-color: theme("colors.gray.400");
-  --editor-variable-color: theme("colors.emerald.400");
-  --editor-link-color: theme("colors.cyan.400");
-  --editor-process-color: theme("colors.violet.400");
-  --editor-constant-color: theme("colors.blue.400");
-  --editor-keyword-color: theme("colors.pink.400");
+  --editor-type-color: #a78bfa;
+  --editor-name-color: #e879f9;
+  --editor-operator-color: #818cf8;
+  --editor-invalid-color: #f87171;
+  --editor-separator-color: #9ca3af;
+  --editor-meta-color: #9ca3af;
+  --editor-variable-color: #34d399;
+  --editor-link-color: #22d3ee;
+  --editor-process-color: #a78bfa;
+  --editor-constant-color: #60a5fa;
+  --editor-keyword-color: #f472b6;
 }

packages/hoppscotch-common/languages.json

@@ -78,6 +78,12 @@
     "iso": "he-HE",
     "name": "עִברִית"
   },
+  {
+    "code": "hi",
+    "file": "hi.json",
+    "iso": "hi-HI",
+    "name": "हिन्दी"
+  },
   {
     "code": "hu",
     "file": "hu.json",

packages/hoppscotch-common/locales/af.json

@@ -1,6 +1,5 @@
 {
   "action": {
-    "add": "Add",
     "autoscroll": "Autoscroll",
     "cancel": "Kanselleer",
     "choose_file": "Kies 'n lêer",
@@ -11,7 +10,6 @@
     "connect": "Koppel",
     "connecting": "Connecting",
     "copy": "Kopieer",
-    "create": "Create",
     "delete": "Vee uit",
     "disconnect": "Ontkoppel",
     "dismiss": "Weier",
@@ -33,7 +31,6 @@
     "open_workspace": "Open workspace",
     "paste": "Paste",
     "prettify": "Prettify",
-    "properties": "Properties",
     "remove": "Verwyder",
     "rename": "Rename",
     "restore": "Herstel",
@@ -42,7 +39,6 @@
     "scroll_to_top": "Scroll to top",
     "search": "Soek",
     "send": "Stuur",
-    "share": "Share",
     "start": "Begin",
     "starting": "Starting",
     "stop": "Stop",
@@ -61,9 +57,7 @@
   "app": {
     "chat_with_us": "Gesels met ons",
     "contact_us": "Kontak Ons",
-    "cookies": "Cookies",
     "copy": "Kopieer",
-    "copy_interface_type": "Copy interface type",
     "copy_user_id": "Copy User Auth Token",
     "developer_option": "Developer options",
     "developer_option_description": "Developer tools which helps in development and maintenance of Hoppscotch.",
@@ -79,7 +73,6 @@
     "keyboard_shortcuts": "Sleutelbord kortpaaie",
     "name": "Hoppscotch",
     "new_version_found": "Nuwe weergawe gevind. Herlaai om op te dateer.",
-    "open_in_hoppscotch": "Open in Hoppscotch",
     "options": "Options",
     "proxy_privacy_policy": "Volmag privaatheidsbeleid",
     "reload": "Herlaai",
@@ -119,27 +112,10 @@
   },
   "authorization": {
     "generate_token": "Genereer teken",
-    "graphql_headers": "Authorization Headers are sent as part of the payload to connection_init",
     "include_in_url": "Sluit in by URL",
-    "inherited_from": "Inherited from {auth} from Parent Collection {collection} ",
     "learn": "Leer hoe",
-    "oauth": {
-      "redirect_auth_server_returned_error": "Auth Server returned an error state",
-      "redirect_auth_token_request_failed": "Request to get the auth token failed",
-      "redirect_auth_token_request_invalid_response": "Invalid Response from the Token Endpoint when requesting for an auth token",
-      "redirect_invalid_state": "Invalid State value present in the redirect",
-      "redirect_no_auth_code": "No Authorization Code present in the redirect",
-      "redirect_no_client_id": "No Client ID defined",
-      "redirect_no_client_secret": "No Client Secret Defined",
-      "redirect_no_code_verifier": "No Code Verifier Defined",
-      "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"
-    },
     "pass_key_by": "Pass by",
     "password": "Wagwoord",
-    "save_to_inherit": "Please save this request in any collection to inherit the authorization",
     "token": "Teken",
     "type": "Magtigingstipe",
     "username": "Gebruikersnaam"
@@ -148,7 +124,6 @@
     "created": "Versameling geskep",
     "different_parent": "Cannot reorder collection with different parent",
     "edit": "Wysig versameling",
-    "import_or_create": "Import or create a collection",
     "invalid_name": "Gee 'n geldige naam vir die versameling",
     "invalid_root_move": "Collection already in the root",
     "moved": "Moved Successfully",
@@ -157,8 +132,6 @@
     "name_length_insufficient": "Collection name should be at least 3 characters long",
     "new": "Nuwe versameling",
     "order_changed": "Collection Order Updated",
-    "properties": "Collection Properties",
-    "properties_updated": "Collection Properties Updated",
     "renamed": "Versameling hernoem",
     "request_in_use": "Request in use",
     "save_as": "Stoor as",
@@ -178,7 +151,6 @@
     "remove_folder": "Weet u seker dat u hierdie vouer permanent wil uitvee?",
     "remove_history": "Is u seker dat u alle geskiedenis permanent wil uitvee?",
     "remove_request": "Is u seker dat u hierdie versoek permanent wil uitvee?",
-    "remove_shared_request": "Are you sure you want to permanently delete this shared request?",
     "remove_team": "Weet u seker dat u hierdie span wil uitvee?",
     "remove_telemetry": "Weet u seker dat u van Telemetry wil afskakel?",
     "request_change": "Are you sure you want to discard current request, unsaved changes will be lost.",
@@ -190,24 +162,6 @@
     "open_request_in_new_tab": "Open request in new tab",
     "set_environment_variable": "Set as variable"
   },
-  "cookies": {
-    "modal": {
-      "cookie_expires": "Expires",
-      "cookie_name": "Name",
-      "cookie_path": "Path",
-      "cookie_string": "Cookie string",
-      "cookie_value": "Value",
-      "empty_domain": "Domain is empty",
-      "empty_domains": "Domain list is empty",
-      "enter_cookie_string": "Enter cookie string",
-      "interceptor_no_support": "Your currently selected interceptor does not support cookies. Select a different Interceptor and try again.",
-      "managed_tab": "Managed",
-      "new_domain_name": "New domain name",
-      "no_cookies_in_domain": "No cookies set for this domain",
-      "raw_tab": "Raw",
-      "set": "Set a cookie"
-    }
-  },
   "count": {
     "header": "Koptekst {count}",
     "message": "Boodskap {count}",
@@ -238,13 +192,11 @@
     "profile": "Login to view your profile",
     "protocols": "Protokolle is leeg",
     "schema": "Koppel aan 'n GraphQL -eindpunt",
-    "shared_requests": "Shared requests are empty",
-    "shared_requests_logout": "Login to view your shared requests or create a new one",
+    "shortcodes": "Shortcodes are empty",
     "subscription": "Subscriptions are empty",
     "team_name": "Spannaam leeg",
     "teams": "Spanne is leeg",
-    "tests": "Daar is geen toetse vir hierdie versoek nie",
-    "shortcodes": "Shortcodes are empty"
+    "tests": "Daar is geen toetse vir hierdie versoek nie"
   },
   "environment": {
     "add_to_global": "Add to Global",
@@ -257,7 +209,6 @@
     "empty_variables": "No variables",
     "global": "Global",
     "global_variables": "Global variables",
-    "import_or_create": "Import or create a environment",
     "invalid_name": "Gee 'n geldige naam vir die omgewing",
     "list": "Environment variables",
     "my_environments": "My Environments",
@@ -281,10 +232,8 @@
     "variable_list": "Veranderlike lys"
   },
   "error": {
-    "authproviders_load_error": "Unable to load auth providers",
     "browser_support_sse": "Dit lyk nie asof hierdie blaaier ondersteuning vir bedieners gestuurde geleenthede het nie.",
     "check_console_details": "Kyk na die konsole -log vir meer inligting.",
-    "check_how_to_add_origin": "Check how you can add an origin",
     "curl_invalid_format": "cURL is nie behoorlik geformateer nie",
     "danger_zone": "Danger zone",
     "delete_account": "Your account is currently an owner in these teams:",
@@ -300,12 +249,9 @@
     "json_prettify_invalid_body": "Kon nie 'n ongeldige liggaam mooi maak nie, los json -sintaksisfoute op en probeer weer",
     "network_error": "There seems to be a network error. Please try again.",
     "network_fail": "Kon nie versoek stuur nie",
-    "no_collections_to_export": "No collections to export. Please create a collection to get started.",
     "no_duration": "Geen duur nie",
-    "no_environments_to_export": "No environments to export. Please create an environment to get started.",
     "no_results_found": "No matches found",
     "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",
     "script_fail": "Kon nie voorafversoekskrip uitvoer nie",
     "something_went_wrong": "Iets het verkeerd geloop",
@@ -314,7 +260,6 @@
   "export": {
     "as_json": "Uitvoer as JSON",
     "create_secret_gist": "Skep geheime Gist",
-    "failed": "Something went wrong while exporting",
     "gist_created": "Gis geskep",
     "require_github": "Teken in met GitHub om 'n geheime idee te skep",
     "title": "Export"
@@ -341,9 +286,6 @@
     "subscriptions": "Inskrywings",
     "switch_connection": "Switch connection"
   },
-  "graphql_collections": {
-    "title": "GraphQL Collections"
-  },
   "group": {
     "time": "Time",
     "url": "URL"
@@ -355,8 +297,6 @@
   },
   "helpers": {
     "authorization": "Die magtigingskop sal outomaties gegenereer word wanneer u die versoek stuur.",
-    "collection_properties_authorization": " This authorization will be set for every request in this collection.",
-    "collection_properties_header": "This header will be set for every request in this collection.",
     "generate_documentation_first": "Genereer eers dokumentasie",
     "network_fail": "Kon nie die API -eindpunt bereik nie. Kontroleer u netwerkverbinding en probeer weer.",
     "offline": "Dit lyk asof u vanlyn is. Data in hierdie werkruimte is moontlik nie op datum nie.",
@@ -376,10 +316,7 @@
   "import": {
     "collections": "Voer versamelings in",
     "curl": "Voer cURL in",
-    "environments_from_gist": "Import From Gist",
-    "environments_from_gist_description": "Import Hoppscotch Environments From Gist",
     "failed": "Invoer misluk",
-    "from_file": "Import from File",
     "from_gist": "Invoer vanaf Gist",
     "from_gist_description": "Import from Gist URL",
     "from_insomnia": "Import from Insomnia",
@@ -394,17 +331,11 @@
     "from_postman_description": "Import from Postman collection",
     "from_url": "Import from URL",
     "gist_url": "Voer Gist URL in",
-    "gql_collections_from_gist_description": "Import GraphQL Collections From Gist",
-    "hoppscotch_environment": "Hoppscotch Environment",
-    "hoppscotch_environment_description": "Import Hoppscotch Environment JSON file",
     "import_from_url_invalid_fetch": "Couldn't get data from the url",
     "import_from_url_invalid_file_format": "Error while importing collections",
     "import_from_url_invalid_type": "Unsupported type. accepted values are 'hoppscotch', 'openapi', 'postman', 'insomnia'",
     "import_from_url_success": "Collections Imported",
-    "insomnia_environment_description": "Import Insomnia Environment from a JSON/YAML file",
     "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": "Invoer"
   },
   "inspections": {
@@ -442,10 +373,8 @@
     "close_unsaved_tab": "You have unsaved changes",
     "collections": "Versamelings",
     "confirm": "Bevestig",
-    "customize_request": "Customize Request",
     "edit_request": "Wysig versoek",
-    "import_export": "Invoer uitvoer",
-    "share_request": "Share Request"
+    "import_export": "Invoer uitvoer"
   },
   "mqtt": {
     "already_subscribed": "You are already subscribed to this topic.",
@@ -520,14 +449,13 @@
       "structured": "Structured",
       "text": "Text"
     },
+    "copy_link": "Kopieer skakel",
     "different_collection": "Cannot reorder requests from different collections",
     "duplicated": "Request duplicated",
     "duration": "Duur",
     "enter_curl": "Voer cURL in",
     "generate_code": "Genereer kode",
     "generated_code": "Kode gegenereer",
-    "go_to_authorization_tab": "Go to Authorization tab",
-    "go_to_body_tab": "Go to Body tab",
     "header_list": "Koplys",
     "invalid_name": "Gee 'n naam vir die versoek",
     "method": "Metode",
@@ -552,14 +480,12 @@
     "saved": "Versoek gestoor",
     "share": "Deel",
     "share_description": "Share Hoppscotch with your friends",
-    "share_request": "Share Request",
     "stop": "Stop",
     "title": "Versoek",
     "type": "Soort versoek",
     "url": "URL",
     "variables": "Veranderlikes",
-    "view_my_links": "View my links",
-    "copy_link": "Kopieer skakel"
+    "view_my_links": "View my links"
   },
   "response": {
     "audio": "Audio",
@@ -587,7 +513,6 @@
     "account_description": "Pas u rekeninginstellings aan.",
     "account_email_description": "Jou primêre e -posadres.",
     "account_name_description": "Dit is u vertoonnaam.",
-    "additional": "Additional Settings",
     "background": "Agtergrond",
     "black_mode": "Swart",
     "choose_language": "Kies taal",
@@ -634,31 +559,14 @@
     "verified_email": "Verified email",
     "verify_email": "Verify email"
   },
-  "shared_requests": {
-    "button": "Button",
-    "button_info": "Create a 'Run in Hoppscotch' button for your website, blog or a README.",
-    "copy_html": "Copy HTML",
-    "copy_link": "Copy Link",
-    "copy_markdown": "Copy Markdown",
-    "creating_widget": "Creating widget",
-    "customize": "Customize",
-    "deleted": "Shared request deleted",
-    "description": "Select a widget, you can change and customize this later",
-    "embed": "Embed",
-    "embed_info": "Add a mini 'Hoppscotch API Playground' to your website, blog or documentation.",
-    "link": "Link",
-    "link_info": "Create a shareable link to share with anyone on the internet with view access.",
-    "modified": "Shared request modified",
-    "not_found": "Shared request not found",
-    "open_new_tab": "Open in new tab",
-    "preview": "Preview",
-    "run_in_hoppscotch": "Run in Hoppscotch",
-    "theme": {
-      "dark": "Dark",
-      "light": "Light",
-      "system": "System",
-      "title": "Theme"
-    }
+  "shortcodes": {
+    "actions": "Actions",
+    "created_on": "Created on",
+    "deleted": "Shortcode deleted",
+    "method": "Method",
+    "not_found": "Shortcode not found",
+    "short_code": "Short code",
+    "url": "URL"
   },
   "shortcut": {
     "general": {
@@ -688,6 +596,7 @@
       "title": "Others"
     },
     "request": {
+      "copy_request_link": "Kopieer versoekskakel",
       "delete_method": "Kies DELETE metode",
       "get_method": "Kies GET -metode",
       "head_method": "Kies HOOF metode",
@@ -702,10 +611,8 @@
       "save_request": "Save Request",
       "save_to_collections": "Stoor in versamelings",
       "send_request": "Stuur versoek",
-      "share_request": "Share Request",
       "show_code": "Generate code snippet",
-      "title": "Versoek",
-      "copy_request_link": "Kopieer versoekskakel"
+      "title": "Versoek"
     },
     "response": {
       "copy": "Copy response to clipboard",
@@ -828,7 +735,6 @@
     "connection_error": "Failed to connect",
     "connection_failed": "Connection failed",
     "connection_lost": "Connection lost",
-    "copied_interface_to_clipboard": "Copied {language} interface type to clipboard",
     "copied_to_clipboard": "Na knipbord gekopieer",
     "deleted": "Uitgevee",
     "deprecated": "GEDRAGTEER",
@@ -836,12 +742,10 @@
     "disconnected": "Ontkoppel",
     "disconnected_from": "Ontkoppel van {name}",
     "docs_generated": "Dokumentasie gegenereer",
-    "download_failed": "Download failed",
     "download_started": "Aflaai begin",
     "enabled": "Geaktiveer",
     "file_imported": "Lêer ingevoer",
     "finished_in": "Klaar in {duration} ms",
-    "hide": "Hide",
     "history_deleted": "Geskiedenis uitgevee",
     "linewrap": "Draai lyne toe",
     "loading": "Laai tans ...",
@@ -852,7 +756,6 @@
     "published_error": "Something went wrong while publishing msg: {topic} to topic: {message}",
     "published_message": "Published message: {message} to topic: {topic}",
     "reconnection_error": "Failed to reconnect",
-    "show": "Show",
     "subscribed_failed": "Failed to subscribe to topic: {topic}",
     "subscribed_success": "Successfully subscribed to topic: {topic}",
     "unsubscribed_failed": "Failed to unsubscribe from topic: {topic}",
@@ -888,7 +791,6 @@
     "queries": "Navrae",
     "query": "Navraag",
     "schema": "Schema",
-    "shared_requests": "Shared Requests",
     "socketio": "Socket.IO",
     "sse": "SSE",
     "tests": "Toetse",
@@ -905,7 +807,6 @@
     "email_do_not_match": "Email doesn't match with your account details. Contact your team owner.",
     "exit": "Verlaat span",
     "exit_disabled": "Slegs eienaar kan nie die span verlaat nie",
-    "failed_invites": "Failed invites",
     "invalid_coll_id": "Invalid collection ID",
     "invalid_email_format": "Die e -posformaat is ongeldig",
     "invalid_id": "Invalid team ID. Contact your team owner.",
@@ -947,7 +848,6 @@
     "same_target_destination": "Same target and destination",
     "saved": "Span gered",
     "select_a_team": "Select a team",
-    "success_invites": "Success invites",
     "title": "Spanne",
     "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 team."
@@ -979,14 +879,5 @@
     "personal": "My Workspace",
     "team": "Team Workspace",
     "title": "Workspaces"
-  },
-  "shortcodes": {
-    "actions": "Actions",
-    "created_on": "Created on",
-    "deleted": "Shortcode deleted",
-    "method": "Method",
-    "not_found": "Shortcode not found",
-    "short_code": "Short code",
-    "url": "URL"
   }
 }

packages/hoppscotch-common/locales/ar.json

@@ -1,6 +1,5 @@
 {
   "action": {
-    "add": "Add",
     "autoscroll": "Autoscroll",
     "cancel": "الغاء",
     "choose_file": "اختيار ملف",
@@ -11,7 +10,6 @@
     "connect": "الاتصال",
     "connecting": "Connecting",
     "copy": "نسخ",
-    "create": "Create",
     "delete": "حذف",
     "disconnect": "قطع الاتصال",
     "dismiss": "رفض",
@@ -33,7 +31,6 @@
     "open_workspace": "Open workspace",
     "paste": "لصق",
     "prettify": "جمال",
-    "properties": "Properties",
     "remove": "ازالة",
     "rename": "Rename",
     "restore": "اعادة",
@@ -42,7 +39,6 @@
     "scroll_to_top": "Scroll to top",
     "search": "بحث",
     "send": "ارسل",
-    "share": "Share",
     "start": "ابدأ",
     "starting": "Starting",
     "stop": "قف",
@@ -61,9 +57,7 @@
   "app": {
     "chat_with_us": "دردش معنا",
     "contact_us": "اتصل بنا",
-    "cookies": "Cookies",
     "copy": "انسخ",
-    "copy_interface_type": "Copy interface type",
     "copy_user_id": "Copy User Auth Token",
     "developer_option": "Developer options",
     "developer_option_description": "Developer tools which helps in development and maintenance of Hoppscotch.",
@@ -79,7 +73,6 @@
     "keyboard_shortcuts": "اختصارات لوحة المفاتيح",
     "name": "هوبسكوتش",
     "new_version_found": "تم العثور على نسخة جديدة. قم بالتحديث للتحديث.",
-    "open_in_hoppscotch": "Open in Hoppscotch",
     "options": "Options",
     "proxy_privacy_policy": "سياسة خصوصية الوكيل",
     "reload": "إعادة تحميل",
@@ -119,27 +112,10 @@
   },
   "authorization": {
     "generate_token": "توليد رمز",
-    "graphql_headers": "Authorization Headers are sent as part of the payload to connection_init",
     "include_in_url": "تضمين في URL",
-    "inherited_from": "Inherited from {auth} from Parent Collection {collection} ",
     "learn": "تعلم كيف",
-    "oauth": {
-      "redirect_auth_server_returned_error": "Auth Server returned an error state",
-      "redirect_auth_token_request_failed": "Request to get the auth token failed",
-      "redirect_auth_token_request_invalid_response": "Invalid Response from the Token Endpoint when requesting for an auth token",
-      "redirect_invalid_state": "Invalid State value present in the redirect",
-      "redirect_no_auth_code": "No Authorization Code present in the redirect",
-      "redirect_no_client_id": "No Client ID defined",
-      "redirect_no_client_secret": "No Client Secret Defined",
-      "redirect_no_code_verifier": "No Code Verifier Defined",
-      "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"
-    },
     "pass_key_by": "Pass by",
     "password": "كلمة المرور",
-    "save_to_inherit": "Please save this request in any collection to inherit the authorization",
     "token": "رمز",
     "type": "نوع التفويض",
     "username": "اسم المستخدم"
@@ -148,7 +124,6 @@
     "created": "تم إنشاء المجموعة",
     "different_parent": "Cannot reorder collection with different parent",
     "edit": "تحرير المجموعة",
-    "import_or_create": "Import or create a collection",
     "invalid_name": "الرجاء تقديم اسم صالح للمجموعة",
     "invalid_root_move": "Collection already in the root",
     "moved": "Moved Successfully",
@@ -157,8 +132,6 @@
     "name_length_insufficient": "اسم المجموعة يجب ان لايقل على 3 رموز",
     "new": "مجموعة جديدة",
     "order_changed": "Collection Order Updated",
-    "properties": "Collection Properties",
-    "properties_updated": "Collection Properties Updated",
     "renamed": "تمت إعادة تسمية المجموعة",
     "request_in_use": "Request in use",
     "save_as": "حفظ باسم",
@@ -178,7 +151,6 @@
     "remove_folder": "هل أنت متأكد أنك تريد حذف هذا المجلد نهائيًا؟",
     "remove_history": "هل أنت متأكد أنك تريد حذف كل المحفوظات بشكل دائم؟",
     "remove_request": "هل أنت متأكد أنك تريد حذف هذا الطلب نهائيًا؟",
-    "remove_shared_request": "Are you sure you want to permanently delete this shared request?",
     "remove_team": "هل أنت متأكد أنك تريد حذف هذا الفريق؟",
     "remove_telemetry": "هل أنت متأكد أنك تريد الانسحاب من القياس عن بعد؟",
     "request_change": "Are you sure you want to discard current request, unsaved changes will be lost.",
@@ -190,24 +162,6 @@
     "open_request_in_new_tab": "Open request in new tab",
     "set_environment_variable": "Set as variable"
   },
-  "cookies": {
-    "modal": {
-      "cookie_expires": "Expires",
-      "cookie_name": "Name",
-      "cookie_path": "Path",
-      "cookie_string": "Cookie string",
-      "cookie_value": "Value",
-      "empty_domain": "Domain is empty",
-      "empty_domains": "Domain list is empty",
-      "enter_cookie_string": "Enter cookie string",
-      "interceptor_no_support": "Your currently selected interceptor does not support cookies. Select a different Interceptor and try again.",
-      "managed_tab": "Managed",
-      "new_domain_name": "New domain name",
-      "no_cookies_in_domain": "No cookies set for this domain",
-      "raw_tab": "Raw",
-      "set": "Set a cookie"
-    }
-  },
   "count": {
     "header": "رأس {count}",
     "message": "الرسالة {count}",
@@ -238,13 +192,11 @@
     "profile": "سجل الدخول لرؤية فريقك",
     "protocols": "البروتوكولات فارغة",
     "schema": "اتصل بنقطة نهاية GraphQL",
-    "shared_requests": "Shared requests are empty",
-    "shared_requests_logout": "Login to view your shared requests or create a new one",
+    "shortcodes": "Shortcodes are empty",
     "subscription": "Subscriptions are empty",
     "team_name": "اسم الفريق فارغ",
     "teams": "الفرق فارغة",
-    "tests": "لا توجد اختبارات لهذا الطلب",
-    "shortcodes": "Shortcodes are empty"
+    "tests": "لا توجد اختبارات لهذا الطلب"
   },
   "environment": {
     "add_to_global": "Add to Global",
@@ -257,7 +209,6 @@
     "empty_variables": "No variables",
     "global": "Global",
     "global_variables": "Global variables",
-    "import_or_create": "Import or create a environment",
     "invalid_name": "الرجاء تقديم اسم صالح للبيئة",
     "list": "Environment variables",
     "my_environments": "My Environments",
@@ -281,10 +232,8 @@
     "variable_list": "قائمة متغيرة"
   },
   "error": {
-    "authproviders_load_error": "Unable to load auth providers",
     "browser_support_sse": "يبدو أن هذا المستعرض لا يدعم أحداث إرسال الخادم.",
     "check_console_details": "تحقق من سجل وحدة التحكم للحصول على التفاصيل.",
-    "check_how_to_add_origin": "Check how you can add an origin",
     "curl_invalid_format": "لم يتم تنسيق cURL بشكل صحيح",
     "danger_zone": "Danger zone",
     "delete_account": "Your account is currently an owner in these teams:",
@@ -300,12 +249,9 @@
     "json_prettify_invalid_body": "تعذر تجميل جسم غير صالح وحل أخطاء بناء جملة json وحاول مرة أخرى",
     "network_error": "There seems to be a network error. Please try again.",
     "network_fail": "تعذر إرسال الطلب",
-    "no_collections_to_export": "No collections to export. Please create a collection to get started.",
     "no_duration": "لا مدة",
-    "no_environments_to_export": "No environments to export. Please create an environment to get started.",
     "no_results_found": "No matches found",
     "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",
     "script_fail": "تعذر تنفيذ نص الطلب المسبق",
     "something_went_wrong": "هناك خطأ ما",
@@ -314,7 +260,6 @@
   "export": {
     "as_json": "تصدير بتنسيق JSON",
     "create_secret_gist": "إنشاء جوهر سري",
-    "failed": "Something went wrong while exporting",
     "gist_created": "خلقت الجست",
     "require_github": "تسجيل الدخول باستخدام GitHub لإنشاء جوهر سري",
     "title": "Export"
@@ -341,9 +286,6 @@
     "subscriptions": "الاشتراكات",
     "switch_connection": "Switch connection"
   },
-  "graphql_collections": {
-    "title": "GraphQL Collections"
-  },
   "group": {
     "time": "Time",
     "url": "URL"
@@ -355,8 +297,6 @@
   },
   "helpers": {
     "authorization": "سيتم إنشاء رأس التفويض تلقائيًا عند إرسال الطلب.",
-    "collection_properties_authorization": " This authorization will be set for every request in this collection.",
-    "collection_properties_header": "This header will be set for every request in this collection.",
     "generate_documentation_first": "قم بإنشاء الوثائق أولاً",
     "network_fail": "تعذر الوصول إلى نقطة نهاية API. تحقق من اتصالك بالشبكة وحاول مرة أخرى.",
     "offline": "يبدو أنك غير متصل بالإنترنت. قد لا تكون البيانات الموجودة في مساحة العمل هذه محدثة.",
@@ -376,10 +316,7 @@
   "import": {
     "collections": "مجموعات الاستيراد",
     "curl": "استيراد cURL",
-    "environments_from_gist": "Import From Gist",
-    "environments_from_gist_description": "Import Hoppscotch Environments From Gist",
     "failed": "فشل الاستيراد",
-    "from_file": "Import from File",
     "from_gist": "الاستيراد من Gist",
     "from_gist_description": "استيراد من Gist URL",
     "from_insomnia": "استيراد من Insomnia",
@@ -394,17 +331,11 @@
     "from_postman_description": "استيراد من مجموعة Postman",
     "from_url": "استيراد من رابط",
     "gist_url": "أدخل عنوان URL لـ Gist",
-    "gql_collections_from_gist_description": "Import GraphQL Collections From Gist",
-    "hoppscotch_environment": "Hoppscotch Environment",
-    "hoppscotch_environment_description": "Import Hoppscotch Environment JSON file",
     "import_from_url_invalid_fetch": "Couldn't get data from the url",
     "import_from_url_invalid_file_format": "Error while importing collections",
     "import_from_url_invalid_type": "Unsupported type. accepted values are 'hoppscotch', 'openapi', 'postman', 'insomnia'",
     "import_from_url_success": "Collections Imported",
-    "insomnia_environment_description": "Import Insomnia Environment from a JSON/YAML file",
     "json_description": "استيراد مجموعة من ملفHoppscotch Collections JSON file",
-    "postman_environment": "Postman Environment",
-    "postman_environment_description": "Import Postman Environment from a JSON file",
     "title": "يستورد"
   },
   "inspections": {
@@ -442,10 +373,8 @@
     "close_unsaved_tab": "You have unsaved changes",
     "collections": "المجموعات",
     "confirm": "يتأكد",
-    "customize_request": "Customize Request",
     "edit_request": "تحرير الطلب",
-    "import_export": "استيراد و تصدير",
-    "share_request": "Share Request"
+    "import_export": "استيراد و تصدير"
   },
   "mqtt": {
     "already_subscribed": "You are already subscribed to this topic.",
@@ -520,14 +449,13 @@
       "structured": "Structured",
       "text": "Text"
     },
+    "copy_link": "نسخ الوصلة",
     "different_collection": "Cannot reorder requests from different collections",
     "duplicated": "Request duplicated",
     "duration": "مدة",
     "enter_curl": "أدخل cURL",
     "generate_code": "إنشاء التعليمات البرمجية",
     "generated_code": "رمز تم إنشاؤه",
-    "go_to_authorization_tab": "Go to Authorization tab",
-    "go_to_body_tab": "Go to Body tab",
     "header_list": "قائمة الرأس",
     "invalid_name": "يرجى تقديم اسم للطلب",
     "method": "طريقة",
@@ -552,14 +480,12 @@
     "saved": "تم حفظ الطلب",
     "share": "يشارك",
     "share_description": "Share Hoppscotch with your friends",
-    "share_request": "Share Request",
     "stop": "Stop",
     "title": "طلب",
     "type": "نوع الطلب",
     "url": "URL",
     "variables": "المتغيرات",
-    "view_my_links": "View my links",
-    "copy_link": "نسخ الوصلة"
+    "view_my_links": "View my links"
   },
   "response": {
     "audio": "Audio",
@@ -587,7 +513,6 @@
     "account_description": "تخصيص إعدادات حسابك.",
     "account_email_description": "عنوان بريدك الإلكتروني الأساسي.",
     "account_name_description": "هذا هو اسم العرض الخاص بك.",
-    "additional": "Additional Settings",
     "background": "خلفية",
     "black_mode": "أسود",
     "choose_language": "اختر اللغة",
@@ -634,31 +559,14 @@
     "verified_email": "Verified email",
     "verify_email": "تأكيد البريد الإلكتروني"
   },
-  "shared_requests": {
-    "button": "Button",
-    "button_info": "Create a 'Run in Hoppscotch' button for your website, blog or a README.",
-    "copy_html": "Copy HTML",
-    "copy_link": "Copy Link",
-    "copy_markdown": "Copy Markdown",
-    "creating_widget": "Creating widget",
-    "customize": "Customize",
-    "deleted": "Shared request deleted",
-    "description": "Select a widget, you can change and customize this later",
-    "embed": "Embed",
-    "embed_info": "Add a mini 'Hoppscotch API Playground' to your website, blog or documentation.",
-    "link": "Link",
-    "link_info": "Create a shareable link to share with anyone on the internet with view access.",
-    "modified": "Shared request modified",
-    "not_found": "Shared request not found",
-    "open_new_tab": "Open in new tab",
-    "preview": "Preview",
-    "run_in_hoppscotch": "Run in Hoppscotch",
-    "theme": {
-      "dark": "Dark",
-      "light": "Light",
-      "system": "System",
-      "title": "Theme"
-    }
+  "shortcodes": {
+    "actions": "Actions",
+    "created_on": "Created on",
+    "deleted": "Shortcode deleted",
+    "method": "Method",
+    "not_found": "Shortcode not found",
+    "short_code": "Short code",
+    "url": "URL"
   },
   "shortcut": {
     "general": {
@@ -688,6 +596,7 @@
       "title": "Others"
     },
     "request": {
+      "copy_request_link": "نسخ ارتباط الطلب",
       "delete_method": "حدد طريقة الحذف",
       "get_method": "حدد طريقة GET",
       "head_method": "حدد طريقة HEAD",
@@ -702,10 +611,8 @@
       "save_request": "Save Request",
       "save_to_collections": "حفظ في المجموعات",
       "send_request": "ارسل طلب",
-      "share_request": "Share Request",
       "show_code": "Generate code snippet",
-      "title": "طلب",
-      "copy_request_link": "نسخ ارتباط الطلب"
+      "title": "طلب"
     },
     "response": {
       "copy": "Copy response to clipboard",
@@ -828,7 +735,6 @@
     "connection_error": "Failed to connect",
     "connection_failed": "Connection failed",
     "connection_lost": "Connection lost",
-    "copied_interface_to_clipboard": "Copied {language} interface type to clipboard",
     "copied_to_clipboard": "نسخ إلى الحافظة",
     "deleted": "تم الحذف",
     "deprecated": "إهمال",
@@ -836,12 +742,10 @@
     "disconnected": "انقطع الاتصال",
     "disconnected_from": "انقطع الاتصال بـ {name}",
     "docs_generated": "تم إنشاء الوثائق",
-    "download_failed": "Download failed",
     "download_started": "بدأ التنزيل",
     "enabled": "ممكن",
     "file_imported": "تم استيراد الملف",
     "finished_in": "انتهى في {duration} مللي ثانية",
-    "hide": "Hide",
     "history_deleted": "تم حذف السجل",
     "linewrap": "خطوط الالتفاف",
     "loading": "تحميل...",
@@ -852,7 +756,6 @@
     "published_error": "Something went wrong while publishing msg: {topic} to topic: {message}",
     "published_message": "Published message: {message} to topic: {topic}",
     "reconnection_error": "Failed to reconnect",
-    "show": "Show",
     "subscribed_failed": "Failed to subscribe to topic: {topic}",
     "subscribed_success": "Successfully subscribed to topic: {topic}",
     "unsubscribed_failed": "Failed to unsubscribe from topic: {topic}",
@@ -888,7 +791,6 @@
     "queries": "استفسارات",
     "query": "استفسار",
     "schema": "مخطط",
-    "shared_requests": "Shared Requests",
     "socketio": "مقبس",
     "sse": "SSE",
     "tests": "الاختبارات",
@@ -905,7 +807,6 @@
     "email_do_not_match": "البريد الإلكتروني لا يتوافق مع معلومات حسابك. اتصل بمدير الفريق.",
     "exit": "فريق الخروج",
     "exit_disabled": "فقط المالك لا يمكنه الخروج من الفريق",
-    "failed_invites": "Failed invites",
     "invalid_coll_id": "Invalid collection ID",
     "invalid_email_format": "تنسيق البريد الإلكتروني غير صالح",
     "invalid_id": "معرف الفريق غير صالح. اتصل بمدير الفريق.",
@@ -947,7 +848,6 @@
     "same_target_destination": "Same target and destination",
     "saved": "فريق حفظ",
     "select_a_team": "اختر فريق",
-    "success_invites": "Success invites",
     "title": "فرق",
     "we_sent_invite_link": "لقد أرسلنا رابط دعوة لجميع المدعوين!",
     "we_sent_invite_link_description": "اطلب من جميع المدعوين التحقق من صندوق الوارد الخاص بهم. انقر على الرابط للانضمام إلى الفريق."
@@ -979,14 +879,5 @@
     "personal": "My Workspace",
     "team": "Team Workspace",
     "title": "Workspaces"
-  },
-  "shortcodes": {
-    "actions": "Actions",
-    "created_on": "Created on",
-    "deleted": "Shortcode deleted",
-    "method": "Method",
-    "not_found": "Shortcode not found",
-    "short_code": "Short code",
-    "url": "URL"
   }
 }

packages/hoppscotch-common/locales/ca.json

@@ -1,6 +1,5 @@
 {
   "action": {
-    "add": "Add",
     "autoscroll": "Autoscroll",
     "cancel": "Cancel·lar",
     "choose_file": "Triar un fitxer",
@@ -11,7 +10,6 @@
     "connect": "Connectar",
     "connecting": "Connecting",
     "copy": "Copiar",
-    "create": "Create",
     "delete": "Eliminar",
     "disconnect": "Desconnectar",
     "dismiss": "Tancar",
@@ -33,7 +31,6 @@
     "open_workspace": "Obrir espai de treball",
     "paste": "Enganxar",
     "prettify": "Fes-ho bonic",
-    "properties": "Properties",
     "remove": "Eliminar",
     "rename": "Rename",
     "restore": "Restaurar",
@@ -42,7 +39,6 @@
     "scroll_to_top": "Desplaceu-vos cap a dalt",
     "search": "Cercar",
     "send": "Enviar",
-    "share": "Share",
     "start": "Començar",
     "starting": "Starting",
     "stop": "Aturar",
@@ -61,9 +57,7 @@
   "app": {
     "chat_with_us": "Xateja amb nosaltres",
     "contact_us": "Contacta amb nosaltres",
-    "cookies": "Cookies",
     "copy": "Copiar",
-    "copy_interface_type": "Copy interface type",
     "copy_user_id": "Copiar User Auth Token",
     "developer_option": "Opcions de desenvolupador",
     "developer_option_description": "Eines de desenvolupament que ajuden en el desenvolupament i manteniment de Hoppscotch.",
@@ -79,7 +73,6 @@
     "keyboard_shortcuts": "Dreceres de teclat",
     "name": "Hoppscotch",
     "new_version_found": "S'ha trobat una nova versió. Refresca per actualitzar.",
-    "open_in_hoppscotch": "Open in Hoppscotch",
     "options": "Opcions",
     "proxy_privacy_policy": "Política de privadesa del servidor intermediari (proxy)",
     "reload": "Recarregar",
@@ -119,27 +112,10 @@
   },
   "authorization": {
     "generate_token": "Generar Token",
-    "graphql_headers": "Authorization Headers are sent as part of the payload to connection_init",
     "include_in_url": "Inclou a l'URL",
-    "inherited_from": "Inherited from {auth} from Parent Collection {collection} ",
     "learn": "Aprèn com",
-    "oauth": {
-      "redirect_auth_server_returned_error": "Auth Server returned an error state",
-      "redirect_auth_token_request_failed": "Request to get the auth token failed",
-      "redirect_auth_token_request_invalid_response": "Invalid Response from the Token Endpoint when requesting for an auth token",
-      "redirect_invalid_state": "Invalid State value present in the redirect",
-      "redirect_no_auth_code": "No Authorization Code present in the redirect",
-      "redirect_no_client_id": "No Client ID defined",
-      "redirect_no_client_secret": "No Client Secret Defined",
-      "redirect_no_code_verifier": "No Code Verifier Defined",
-      "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"
-    },
     "pass_key_by": "Passar per",
     "password": "Contrasenya",
-    "save_to_inherit": "Please save this request in any collection to inherit the authorization",
     "token": "Token",
     "type": "Tipus d'autorització",
     "username": "Nom d'usuari"
@@ -148,7 +124,6 @@
     "created": "Col·lecció creada",
     "different_parent": "Cannot reorder collection with different parent",
     "edit": "Editar la col·lecció",
-    "import_or_create": "Import or create a collection",
     "invalid_name": "Proporcioneu un nom vàlid per a la col·lecció",
     "invalid_root_move": "Collection already in the root",
     "moved": "Moved Successfully",
@@ -157,8 +132,6 @@
     "name_length_insufficient": "El nom de la col·lecció ha de tenir almenys 3 caràcters",
     "new": "Nova col · lecció",
     "order_changed": "Collection Order Updated",
-    "properties": "Collection Properties",
-    "properties_updated": "Collection Properties Updated",
     "renamed": "S'ha canviat el nom de la col·lecció",
     "request_in_use": "Request in use",
     "save_as": "Guardar com",
@@ -178,7 +151,6 @@
     "remove_folder": "Està segur que vol suprimir definitivament aquesta carpeta?",
     "remove_history": "Està segur que vol suprimir definitivament tot l'historial?",
     "remove_request": "Està segur que vol suprimir definitivament aquesta sol·licitud?",
-    "remove_shared_request": "Are you sure you want to permanently delete this shared request?",
     "remove_team": "Està segur que vol suprimir aquest equip?",
     "remove_telemetry": "Està segur que vol desactivar Telemetry?",
     "request_change": "Està segur que vol descartar la sol·licitud actual, els canvis no desats es perdran.",
@@ -190,24 +162,6 @@
     "open_request_in_new_tab": "Open request in new tab",
     "set_environment_variable": "Set as variable"
   },
-  "cookies": {
-    "modal": {
-      "cookie_expires": "Expires",
-      "cookie_name": "Name",
-      "cookie_path": "Path",
-      "cookie_string": "Cookie string",
-      "cookie_value": "Value",
-      "empty_domain": "Domain is empty",
-      "empty_domains": "Domain list is empty",
-      "enter_cookie_string": "Enter cookie string",
-      "interceptor_no_support": "Your currently selected interceptor does not support cookies. Select a different Interceptor and try again.",
-      "managed_tab": "Managed",
-      "new_domain_name": "New domain name",
-      "no_cookies_in_domain": "No cookies set for this domain",
-      "raw_tab": "Raw",
-      "set": "Set a cookie"
-    }
-  },
   "count": {
     "header": "Capçalera {count}",
     "message": "Missatges {count}",
@@ -238,13 +192,11 @@
     "profile": "Inicia sessió per veure el vostre perfil",
     "protocols": "Els protocols estan buits",
     "schema": "Connecta't a un endpoint GraphQL",
-    "shared_requests": "Shared requests are empty",
-    "shared_requests_logout": "Login to view your shared requests or create a new one",
+    "shortcodes": "Els shortcodes estan buits",
     "subscription": "Subscriptions are empty",
     "team_name": "El nom de l'equip és buit",
     "teams": "Els equips estan buits",
-    "tests": "No hi ha proves per a aquesta sol·licitud",
-    "shortcodes": "Els shortcodes estan buits"
+    "tests": "No hi ha proves per a aquesta sol·licitud"
   },
   "environment": {
     "add_to_global": "Afegir-ho a Global",
@@ -257,7 +209,6 @@
     "empty_variables": "No variables",
     "global": "Global",
     "global_variables": "Global variables",
-    "import_or_create": "Import or create a environment",
     "invalid_name": "Proporcioneu un nom vàlid per a l'entorn",
     "list": "Environment variables",
     "my_environments": "My Environments",
@@ -281,10 +232,8 @@
     "variable_list": "Llista de variables"
   },
   "error": {
-    "authproviders_load_error": "Unable to load auth providers",
     "browser_support_sse": "Sembla que aquest navegador no és compatible amb els Esdeveniments Enviats pel Servidor (Server Sent Events).",
     "check_console_details": "Consulta el registre de la consola per obtenir més informació.",
-    "check_how_to_add_origin": "Check how you can add an origin",
     "curl_invalid_format": "cURL no està formatat correctament",
     "danger_zone": "Danger zone",
     "delete_account": "Your account is currently an owner in these teams:",
@@ -300,12 +249,9 @@
     "json_prettify_invalid_body": "No s'ha pogut personalitzar un cos no vàlid, resol els errors de sintaxi json i tornar-ho a provar",
     "network_error": "Sembla que hi ha un error de xarxa. Si us plau torna-ho a provar.",
     "network_fail": "No s'ha pogut enviar la sol·licitud",
-    "no_collections_to_export": "No collections to export. Please create a collection to get started.",
     "no_duration": "Sense durada",
-    "no_environments_to_export": "No environments to export. Please create an environment to get started.",
     "no_results_found": "No s'ha trobat cap coincidència",
     "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",
     "script_fail": "No s'ha pogut executar l'script de sol·licitud prèvia",
     "something_went_wrong": "Alguna cosa ha anat malament",
@@ -314,7 +260,6 @@
   "export": {
     "as_json": "Exporta com a JSON",
     "create_secret_gist": "Crear un Gist secret",
-    "failed": "Something went wrong while exporting",
     "gist_created": "Gist creat",
     "require_github": "Inicieu la sessió amb GitHub per crear un Gisst secret",
     "title": "Exportar"
@@ -341,9 +286,6 @@
     "subscriptions": "Subscripcions",
     "switch_connection": "Switch connection"
   },
-  "graphql_collections": {
-    "title": "GraphQL Collections"
-  },
   "group": {
     "time": "Time",
     "url": "URL"
@@ -355,8 +297,6 @@
   },
   "helpers": {
     "authorization": "La capçalera de l'autorització es generarà automàticament quan envieu la sol·licitud.",
-    "collection_properties_authorization": " This authorization will be set for every request in this collection.",
-    "collection_properties_header": "This header will be set for every request in this collection.",
     "generate_documentation_first": "Genereu documentació primer",
     "network_fail": "No es pot arribar al punt final de l'API. Comproveu la connexió de xarxa i torneu-ho a provar.",
     "offline": "Sembla que estàs fora de línia. És possible que les dades d'aquest espai de treball no estiguin actualitzades.",
@@ -376,10 +316,7 @@
   "import": {
     "collections": "Importar col·leccions",
     "curl": "Importar cURL",
-    "environments_from_gist": "Import From Gist",
-    "environments_from_gist_description": "Import Hoppscotch Environments From Gist",
     "failed": "La importació ha fallat",
-    "from_file": "Import from File",
     "from_gist": "Importar des de Gist",
     "from_gist_description": "Importar des de l'URL de Gist",
     "from_insomnia": "Importar des d'Insomnia",
@@ -394,17 +331,11 @@
     "from_postman_description": "Importar des de la col·lecció de Postman",
     "from_url": "Importar des de l'URL",
     "gist_url": "Introduïu l'URL del Gist",
-    "gql_collections_from_gist_description": "Import GraphQL Collections From Gist",
-    "hoppscotch_environment": "Hoppscotch Environment",
-    "hoppscotch_environment_description": "Import Hoppscotch Environment JSON file",
     "import_from_url_invalid_fetch": "No s'han pogut obtenir dades de l'URL",
     "import_from_url_invalid_file_format": "S'ha produït un error en importar les col·leccions",
     "import_from_url_invalid_type": "Tipus no compatible. Els valors acceptats són 'hoppscotch', 'openapi', 'postman', 'insomnia'",
     "import_from_url_success": "Col·leccions importades",
-    "insomnia_environment_description": "Import Insomnia Environment from a JSON/YAML file",
     "json_description": "Importar col·leccions des d'un fitxer JSON de col·leccions Hoppscotch",
-    "postman_environment": "Postman Environment",
-    "postman_environment_description": "Import Postman Environment from a JSON file",
     "title": "Importació"
   },
   "inspections": {
@@ -442,10 +373,8 @@
     "close_unsaved_tab": "You have unsaved changes",
     "collections": "Col·leccions",
     "confirm": "Confirmar",
-    "customize_request": "Customize Request",
     "edit_request": "Sol·licitud d'edició",
-    "import_export": "Importar / Exportar",
-    "share_request": "Share Request"
+    "import_export": "Importar / Exportar"
   },
   "mqtt": {
     "already_subscribed": "You are already subscribed to this topic.",
@@ -520,14 +449,13 @@
       "structured": "Estructurat",
       "text": "Text"
     },
+    "copy_link": "Copia l'enllaç",
     "different_collection": "Cannot reorder requests from different collections",
     "duplicated": "Request duplicated",
     "duration": "Durada",
     "enter_curl": "Introduïu cURL",
     "generate_code": "Generar codi",
     "generated_code": "Codi generat",
-    "go_to_authorization_tab": "Go to Authorization tab",
-    "go_to_body_tab": "Go to Body tab",
     "header_list": "Llista de capçaleres",
     "invalid_name": "Proporcioneu un nom per a la sol·licitud",
     "method": "Mètode",
@@ -552,14 +480,12 @@
     "saved": "S'ha desat la sol·licitud",
     "share": "Compartir",
     "share_description": "Comparteix Hoppscotch amb els teus amics",
-    "share_request": "Share Request",
     "stop": "Stop",
     "title": "Sol·licitud",
     "type": "Tipus de sol·licitud",
     "url": "URL",
     "variables": "Variables",
-    "view_my_links": "Visualitzar els meus enllaços",
-    "copy_link": "Copia l'enllaç"
+    "view_my_links": "Visualitzar els meus enllaços"
   },
   "response": {
     "audio": "Audio",
@@ -587,7 +513,6 @@
     "account_description": "Personalitzeu la configuració del compte.",
     "account_email_description": "La vostra adreça de correu electrònic principal.",
     "account_name_description": "Aquest és el vostre nom d'exposició",
-    "additional": "Additional Settings",
     "background": "Fons",
     "black_mode": "Negre",
     "choose_language": "Tria l'idioma",
@@ -634,31 +559,14 @@
     "verified_email": "Verified email",
     "verify_email": "Verificar correu electronic"
   },
-  "shared_requests": {
-    "button": "Button",
-    "button_info": "Create a 'Run in Hoppscotch' button for your website, blog or a README.",
-    "copy_html": "Copy HTML",
-    "copy_link": "Copy Link",
-    "copy_markdown": "Copy Markdown",
-    "creating_widget": "Creating widget",
-    "customize": "Customize",
-    "deleted": "Shared request deleted",
-    "description": "Select a widget, you can change and customize this later",
-    "embed": "Embed",
-    "embed_info": "Add a mini 'Hoppscotch API Playground' to your website, blog or documentation.",
-    "link": "Link",
-    "link_info": "Create a shareable link to share with anyone on the internet with view access.",
-    "modified": "Shared request modified",
-    "not_found": "Shared request not found",
-    "open_new_tab": "Open in new tab",
-    "preview": "Preview",
-    "run_in_hoppscotch": "Run in Hoppscotch",
-    "theme": {
-      "dark": "Dark",
-      "light": "Light",
-      "system": "System",
-      "title": "Theme"
-    }
+  "shortcodes": {
+    "actions": "Accions",
+    "created_on": "Creat el",
+    "deleted": "S'ha suprimit el shortcode",
+    "method": "Mètode",
+    "not_found": "No s'ha trobat el shortcode",
+    "short_code": "Short code",
+    "url": "URL"
   },
   "shortcut": {
     "general": {
@@ -688,6 +596,7 @@
       "title": "Others"
     },
     "request": {
+      "copy_request_link": "Copiar l'enllaç de la sol·licitud",
       "delete_method": "Seleccionar el mètode DELETE",
       "get_method": "Seleccionar el mètode GET",
       "head_method": "Seleccionar el mètode HEAD",
@@ -702,10 +611,8 @@
       "save_request": "Save Request",
       "save_to_collections": "Guardar a les col·leccions",
       "send_request": "Enviar sol.licitud",
-      "share_request": "Share Request",
       "show_code": "Generate code snippet",
-      "title": "Sol·licitud",
-      "copy_request_link": "Copiar l'enllaç de la sol·licitud"
+      "title": "Sol·licitud"
     },
     "response": {
       "copy": "Copy response to clipboard",
@@ -828,7 +735,6 @@
     "connection_error": "No s'ha pogut connectar",
     "connection_failed": "Connexió fallida",
     "connection_lost": "Connexió perduda",
-    "copied_interface_to_clipboard": "Copied {language} interface type to clipboard",
     "copied_to_clipboard": "Copiat al porta-retalls",
     "deleted": "Eliminat",
     "deprecated": "Obsolet",
@@ -836,12 +742,10 @@
     "disconnected": "Desconnectat",
     "disconnected_from": "Desconnectat de {name}",
     "docs_generated": "Documentació generada",
-    "download_failed": "Download failed",
     "download_started": "S'ha iniciat la baixada",
     "enabled": "Activat",
     "file_imported": "Fitxer importat",
     "finished_in": "Acabat en {duration} ms",
-    "hide": "Hide",
     "history_deleted": "S'ha suprimit l'historial",
     "linewrap": "Embolcar línies",
     "loading": "S'està carregant...",
@@ -852,7 +756,6 @@
     "published_error": "S'ha produït un error en publicar el missatge: {topic} al tema: {message}",
     "published_message": "Missatge publicat: {missatge} al tema: {tema}",
     "reconnection_error": "No s'ha pogut tornar a connectar",
-    "show": "Show",
     "subscribed_failed": "No s'ha pogut subscriure al tema: {topic}",
     "subscribed_success": "S'ha subscrit correctament al tema: {topic}",
     "unsubscribed_failed": "No s'ha pogut cancel·lar la subscripció al tema: {topic}",
@@ -888,7 +791,6 @@
     "queries": "Consultes",
     "query": "Consulta",
     "schema": "Schema",
-    "shared_requests": "Shared Requests",
     "socketio": "Socket.IO",
     "sse": "SSE",
     "tests": "Proves",
@@ -905,7 +807,6 @@
     "email_do_not_match": "El correu electrònic no coincideix amb les dades del vostre compte. Contacta amb el propietari del teu equip.",
     "exit": "Sortir de l'equip",
     "exit_disabled": "L'únic propietari no pot sortir de l'equip",
-    "failed_invites": "Failed invites",
     "invalid_coll_id": "Invalid collection ID",
     "invalid_email_format": "El format del correu electrònic no és vàlid",
     "invalid_id": "Identificador d'equip no vàlid. Contacta amb el propietari del teu equip.",
@@ -947,7 +848,6 @@
     "same_target_destination": "Same target and destination",
     "saved": "S'ha guardat l'equip",
     "select_a_team": "Select a team",
-    "success_invites": "Success invites",
     "title": "Equips",
     "we_sent_invite_link": "Hem enviat un enllaç d'invitació a tots els convidats!",
     "we_sent_invite_link_description": "Demaneu a tots els convidats que comprovin la seva safata d'entrada. Feu clic a l'enllaç per unir-vos a l'equip."
@@ -979,14 +879,5 @@
     "personal": "My Workspace",
     "team": "Team Workspace",
     "title": "Workspaces"
-  },
-  "shortcodes": {
-    "actions": "Accions",
-    "created_on": "Creat el",
-    "deleted": "S'ha suprimit el shortcode",
-    "method": "Mètode",
-    "not_found": "No s'ha trobat el shortcode",
-    "short_code": "Short code",
-    "url": "URL"
   }
 }

packages/hoppscotch-common/locales/cn.json

@@ -1,6 +1,5 @@
 {
   "action": {
-    "add": "Add",
     "autoscroll": "自动滚动",
     "cancel": "取消",
     "choose_file": "选择文件",
@@ -11,7 +10,6 @@
     "connect": "连接",
     "connecting": "连接中",
     "copy": "复制",
-    "create": "Create",
     "delete": "删除",
     "disconnect": "断开连接",
     "dismiss": "忽略",
@@ -33,7 +31,6 @@
     "open_workspace": "打开工作区",
     "paste": "粘贴",
     "prettify": "美化",
-    "properties": "Properties",
     "remove": "移除",
     "rename": "Rename",
     "restore": "恢复",
@@ -42,7 +39,6 @@
     "scroll_to_top": "滚动至顶部",
     "search": "搜索",
     "send": "发送",
-    "share": "Share",
     "start": "开始",
     "starting": "正在开始",
     "stop": "停止",
@@ -61,9 +57,7 @@
   "app": {
     "chat_with_us": "与我们交谈",
     "contact_us": "联系我们",
-    "cookies": "Cookies",
     "copy": "复制",
-    "copy_interface_type": "Copy interface type",
     "copy_user_id": "复制认证 Token",
     "developer_option": "开发者选项",
     "developer_option_description": "开发者工具，有助于开发和维护 Hoppscotch。",
@@ -79,7 +73,6 @@
     "keyboard_shortcuts": "键盘快捷键",
     "name": "Hoppscotch",
     "new_version_found": "已发现新版本。刷新页面以更新。",
-    "open_in_hoppscotch": "Open in Hoppscotch",
     "options": "选项",
     "proxy_privacy_policy": "代理隐私政策",
     "reload": "重新加载",
@@ -119,27 +112,10 @@
   },
   "authorization": {
     "generate_token": "生成令牌",
-    "graphql_headers": "Authorization Headers are sent as part of the payload to connection_init",
     "include_in_url": "包含在 URL 内",
-    "inherited_from": "Inherited from {auth} from Parent Collection {collection} ",
     "learn": "了解更多",
-    "oauth": {
-      "redirect_auth_server_returned_error": "Auth Server returned an error state",
-      "redirect_auth_token_request_failed": "Request to get the auth token failed",
-      "redirect_auth_token_request_invalid_response": "Invalid Response from the Token Endpoint when requesting for an auth token",
-      "redirect_invalid_state": "Invalid State value present in the redirect",
-      "redirect_no_auth_code": "No Authorization Code present in the redirect",
-      "redirect_no_client_id": "No Client ID defined",
-      "redirect_no_client_secret": "No Client Secret Defined",
-      "redirect_no_code_verifier": "No Code Verifier Defined",
-      "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"
-    },
     "pass_key_by": "传递方式",
     "password": "密码",
-    "save_to_inherit": "Please save this request in any collection to inherit the authorization",
     "token": "令牌",
     "type": "授权类型",
     "username": "用户名"
@@ -148,7 +124,6 @@
     "created": "集合已创建",
     "different_parent": "不能用不同的父类来重新排序集合",
     "edit": "编辑集合",
-    "import_or_create": "Import or create a collection",
     "invalid_name": "请提供有效的集合名称",
     "invalid_root_move": "该集合已经在根级了",
     "moved": "移动完成",
@@ -157,8 +132,6 @@
     "name_length_insufficient": "集合名字至少需要 3 个字符",
     "new": "新建集合",
     "order_changed": "集合顺序已更新",
-    "properties": "Collection Properties",
-    "properties_updated": "Collection Properties Updated",
     "renamed": "集合已更名",
     "request_in_use": "请求正在使用中",
     "save_as": "另存为",
@@ -178,7 +151,6 @@
     "remove_folder": "你确定要永久删除该文件夹吗？",
     "remove_history": "你确定要永久删除全部历史记录吗？",
     "remove_request": "你确定要永久删除该请求吗？",
-    "remove_shared_request": "Are you sure you want to permanently delete this shared request?",
     "remove_team": "你确定要删除该团队吗？",
     "remove_telemetry": "你确定要退出遥测服务吗？",
     "request_change": "你确定你要放弃当前的请求，未保存的修改将被丢失。",
@@ -190,24 +162,6 @@
     "open_request_in_new_tab": "Open request in new tab",
     "set_environment_variable": "Set as variable"
   },
-  "cookies": {
-    "modal": {
-      "cookie_expires": "Expires",
-      "cookie_name": "Name",
-      "cookie_path": "Path",
-      "cookie_string": "Cookie string",
-      "cookie_value": "Value",
-      "empty_domain": "Domain is empty",
-      "empty_domains": "Domain list is empty",
-      "enter_cookie_string": "Enter cookie string",
-      "interceptor_no_support": "Your currently selected interceptor does not support cookies. Select a different Interceptor and try again.",
-      "managed_tab": "Managed",
-      "new_domain_name": "New domain name",
-      "no_cookies_in_domain": "No cookies set for this domain",
-      "raw_tab": "Raw",
-      "set": "Set a cookie"
-    }
-  },
   "count": {
     "header": "请求头 {count}",
     "message": "消息 {count}",
@@ -238,13 +192,11 @@
     "profile": "登录以查看你的个人资料",
     "protocols": "协议为空",
     "schema": "连接至 GraphQL 端点",
-    "shared_requests": "Shared requests are empty",
-    "shared_requests_logout": "Login to view your shared requests or create a new one",
+    "shortcodes": "Shortcodes 为空",
     "subscription": "订阅为空",
     "team_name": "团队名称为空",
     "teams": "团队为空",
-    "tests": "没有针对该请求的测试",
-    "shortcodes": "Shortcodes 为空"
+    "tests": "没有针对该请求的测试"
   },
   "environment": {
     "add_to_global": "添加到全局环境",
@@ -257,7 +209,6 @@
     "empty_variables": "No variables",
     "global": "Global",
     "global_variables": "Global variables",
-    "import_or_create": "Import or create a environment",
     "invalid_name": "请提供有效的环境名称",
     "list": "Environment variables",
     "my_environments": "我的环境",
@@ -281,10 +232,8 @@
     "variable_list": "变量列表"
   },
   "error": {
-    "authproviders_load_error": "Unable to load auth providers",
     "browser_support_sse": "该浏览器似乎不支持 SSE。",
     "check_console_details": "检查控制台日志以获悉详情",
-    "check_how_to_add_origin": "Check how you can add an origin",
     "curl_invalid_format": "cURL 格式不正确",
     "danger_zone": "危险区域",
     "delete_account": "您的帐号目前为这些团队的拥有者：",
@@ -300,12 +249,9 @@
     "json_prettify_invalid_body": "无法美化无效的请求头，处理 JSON 语法错误并重试",
     "network_error": "好像发生了网络错误，请重试。",
     "network_fail": "无法发送请求",
-    "no_collections_to_export": "No collections to export. Please create a collection to get started.",
     "no_duration": "无持续时间",
-    "no_environments_to_export": "No environments to export. Please create an environment to get started.",
     "no_results_found": "找不到结果",
     "page_not_found": "找不到此頁面",
-    "please_install_extension": "Please install the extension and add origin to the extension.",
     "proxy_error": "Proxy error",
     "script_fail": "无法执行预请求脚本",
     "something_went_wrong": "发生了一些错误",
@@ -314,7 +260,6 @@
   "export": {
     "as_json": "导出为 JSON",
     "create_secret_gist": "创建私密 Gist",
-    "failed": "Something went wrong while exporting",
     "gist_created": "已创建 Gist",
     "require_github": "使用 GitHub 登录以创建私密 Gist",
     "title": "导出"
@@ -341,9 +286,6 @@
     "subscriptions": "订阅",
     "switch_connection": "Switch connection"
   },
-  "graphql_collections": {
-    "title": "GraphQL Collections"
-  },
   "group": {
     "time": "时间",
     "url": "网址"
@@ -355,8 +297,6 @@
   },
   "helpers": {
     "authorization": "授权头将会在你发送请求时自动生成。",
-    "collection_properties_authorization": " This authorization will be set for every request in this collection.",
-    "collection_properties_header": "This header will be set for every request in this collection.",
     "generate_documentation_first": "请先生成文档",
     "network_fail": "无法到达 API 端点。请检查网络连接并重试。",
     "offline": "你似乎处于离线状态，该工作区中的数据可能不是最新。",
@@ -376,10 +316,7 @@
   "import": {
     "collections": "导入集合",
     "curl": "导入 cURL",
-    "environments_from_gist": "Import From Gist",
-    "environments_from_gist_description": "Import Hoppscotch Environments From Gist",
     "failed": "导入失败",
-    "from_file": "Import from File",
     "from_gist": "从 Gist 导入",
     "from_gist_description": "从 Gist URL 导入",
     "from_insomnia": "从 Insomnia 导入",
@@ -394,17 +331,11 @@
     "from_postman_description": "从 Postman 集合中导入",
     "from_url": "从 URL 导入",
     "gist_url": "输入 Gist URL",
-    "gql_collections_from_gist_description": "Import GraphQL Collections From Gist",
-    "hoppscotch_environment": "Hoppscotch Environment",
-    "hoppscotch_environment_description": "Import Hoppscotch Environment JSON file",
     "import_from_url_invalid_fetch": "无法从网址取得资料",
     "import_from_url_invalid_file_format": "导入组合时发生错误",
     "import_from_url_invalid_type": "不支持此类型。可接受的值为 'hoppscotch'、'openapi'、'postman'、'insomnia'",
     "import_from_url_success": "已导入组合",
-    "insomnia_environment_description": "Import Insomnia Environment from a JSON/YAML file",
     "json_description": "从 Hoppscotch 的集合文件导入（JSON）",
-    "postman_environment": "Postman Environment",
-    "postman_environment_description": "Import Postman Environment from a JSON file",
     "title": "导入"
   },
   "inspections": {
@@ -442,10 +373,8 @@
     "close_unsaved_tab": "有未保存的变更",
     "collections": "集合",
     "confirm": "确认",
-    "customize_request": "Customize Request",
     "edit_request": "编辑请求",
-    "import_export": "导入/导出",
-    "share_request": "Share Request"
+    "import_export": "导入/导出"
   },
   "mqtt": {
     "already_subscribed": "您已经订阅了此主题。",
@@ -520,14 +449,13 @@
       "structured": "结构",
       "text": "文字"
     },
+    "copy_link": "复制链接",
     "different_collection": "不能对来自不同集合的请求进行重新排序",
     "duplicated": "重复的请求",
     "duration": "持续时间",
     "enter_curl": "输入 cURL",
     "generate_code": "生成代码",
     "generated_code": "已生成代码",
-    "go_to_authorization_tab": "Go to Authorization tab",
-    "go_to_body_tab": "Go to Body tab",
     "header_list": "请求头列表",
     "invalid_name": "请提供请求名称",
     "method": "方法",
@@ -552,14 +480,12 @@
     "saved": "请求已保存",
     "share": "分享",
     "share_description": "分享 Hoppscotch 给你的朋友",
-    "share_request": "Share Request",
     "stop": "Stop",
     "title": "请求",
     "type": "请求类型",
     "url": "URL",
     "variables": "变量",
-    "view_my_links": "查看我的链接",
-    "copy_link": "复制链接"
+    "view_my_links": "查看我的链接"
   },
   "response": {
     "audio": "Audio",
@@ -587,7 +513,6 @@
     "account_description": "自定义您的帐户设置。",
     "account_email_description": "您的主要电子邮箱地址。",
     "account_name_description": "这是您的显示名称。",
-    "additional": "Additional Settings",
     "background": "背景",
     "black_mode": "黑色",
     "choose_language": "选择语言",
@@ -634,31 +559,14 @@
     "verified_email": "已验证电子邮件地址",
     "verify_email": "验证电子邮箱"
   },
-  "shared_requests": {
-    "button": "Button",
-    "button_info": "Create a 'Run in Hoppscotch' button for your website, blog or a README.",
-    "copy_html": "Copy HTML",
-    "copy_link": "Copy Link",
-    "copy_markdown": "Copy Markdown",
-    "creating_widget": "Creating widget",
-    "customize": "Customize",
-    "deleted": "Shared request deleted",
-    "description": "Select a widget, you can change and customize this later",
-    "embed": "Embed",
-    "embed_info": "Add a mini 'Hoppscotch API Playground' to your website, blog or documentation.",
-    "link": "Link",
-    "link_info": "Create a shareable link to share with anyone on the internet with view access.",
-    "modified": "Shared request modified",
-    "not_found": "Shared request not found",
-    "open_new_tab": "Open in new tab",
-    "preview": "Preview",
-    "run_in_hoppscotch": "Run in Hoppscotch",
-    "theme": {
-      "dark": "Dark",
-      "light": "Light",
-      "system": "System",
-      "title": "Theme"
-    }
+  "shortcodes": {
+    "actions": "操作",
+    "created_on": "创建于",
+    "deleted": "已刪除快捷键",
+    "method": "方法",
+    "not_found": "找不到快捷键",
+    "short_code": "快捷键",
+    "url": "URL"
   },
   "shortcut": {
     "general": {
@@ -688,6 +596,7 @@
       "title": "Others"
     },
     "request": {
+      "copy_request_link": "复制请求链接",
       "delete_method": "选择 DELETE 方法",
       "get_method": "选择 GET 方法",
       "head_method": "选择 HEAD 方法",
@@ -702,10 +611,8 @@
       "save_request": "Save Request",
       "save_to_collections": "保存到集合",
       "send_request": "发送请求",
-      "share_request": "Share Request",
       "show_code": "Generate code snippet",
-      "title": "请求",
-      "copy_request_link": "复制请求链接"
+      "title": "请求"
     },
     "response": {
       "copy": "复制响应至剪贴板",
@@ -828,7 +735,6 @@
     "connection_error": "连接错误",
     "connection_failed": "连接失败",
     "connection_lost": "连接丢失",
-    "copied_interface_to_clipboard": "Copied {language} interface type to clipboard",
     "copied_to_clipboard": "已复制到剪贴板",
     "deleted": "已删除",
     "deprecated": "已弃用",
@@ -836,12 +742,10 @@
     "disconnected": "断开连接",
     "disconnected_from": "与 {name} 断开连接",
     "docs_generated": "已生成文档",
-    "download_failed": "Download failed",
     "download_started": "开始下载",
     "enabled": "启用",
     "file_imported": "文件已导入",
     "finished_in": "在 {duration} 毫秒内完成",
-    "hide": "Hide",
     "history_deleted": "历史记录已删除",
     "linewrap": "换行",
     "loading": "正在加载……",
@@ -852,7 +756,6 @@
     "published_error": "将信息：{topic}发布至主题：{message}时发生错误",
     "published_message": "已将此信息：{message} 发布至主题：{topic}",
     "reconnection_error": "重连失败",
-    "show": "Show",
     "subscribed_failed": "无法订阅此主题：{topic}",
     "subscribed_success": "成功订阅此主题：{topic}",
     "unsubscribed_failed": "无法取消订阅此主题：{topic}",
@@ -888,7 +791,6 @@
     "queries": "查询",
     "query": "查询",
     "schema": "Schema",
-    "shared_requests": "Shared Requests",
     "socketio": "Socket.IO",
     "sse": "SSE",
     "tests": "测试",
@@ -905,7 +807,6 @@
     "email_do_not_match": "邮箱无法与你的帐户信息匹配。请联系你的团队者。",
     "exit": "退出团队",
     "exit_disabled": "团队所有者无法退出团队",
-    "failed_invites": "Failed invites",
     "invalid_coll_id": "无效的集合 ID",
     "invalid_email_format": "电子邮箱格式无效",
     "invalid_id": "无效的团队 ID，请联系你的团队者。",
@@ -947,7 +848,6 @@
     "same_target_destination": "目标相同",
     "saved": "团队已保存",
     "select_a_team": "选择团队",
-    "success_invites": "Success invites",
     "title": "团队",
     "we_sent_invite_link": "我们向所有受邀者发送了邀请链接！",
     "we_sent_invite_link_description": "请所有受邀者检查他们的收件箱，点击链接以加入团队。"
@@ -979,14 +879,5 @@
     "personal": "我的工作空间",
     "team": "团队工作空间",
     "title": "工作空间"
-  },
-  "shortcodes": {
-    "actions": "操作",
-    "created_on": "创建于",
-    "deleted": "已刪除快捷键",
-    "method": "方法",
-    "not_found": "找不到快捷键",
-    "short_code": "快捷键",
-    "url": "URL"
   }
 }