chore: bump version to 2023.4.2

fix: reset envs when user switches workspaces (#3039 )
Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>
2023-05-11 13:53:28 +05:30 · 2023-05-11 02:03:35 +05:30 · 2023-05-10 19:16:28 +05:30 · 2023-05-10 19:14:16 +05:30 · 2023-05-10 18:59:57 +05:30 · 2023-05-09 15:58:44 +05:30
1035 changed files with 31702 additions and 80288 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,5 +5,5 @@
  "features": {
    "ghcr.io/NicoVIII/devcontainer-features/pnpm:1": {}
  },
-  "postCreateCommand": "cp .env.example .env && pnpm i"
+  "postCreateCommand": "mv .env.example .env && pnpm i"
 }
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +0,0 @@
-node_modules
-**/*/node_modules
--- a/.env.example
+++ b/.env.example
@@ -12,8 +12,7 @@ SESSION_SECRET='add some secret here'

 # Hoppscotch App Domain Config
 REDIRECT_URL="http://localhost:3000"
-WHITELISTED_ORIGINS="http://localhost:3170,http://localhost:3000,http://localhost:3100"
-VITE_ALLOWED_AUTH_PROVIDERS=GOOGLE,GITHUB,MICROSOFT,EMAIL
+WHITELISTED_ORIGINS = "http://localhost:3170,http://localhost:3000,http://localhost:3100"

 # Google Auth Config
 GOOGLE_CLIENT_ID="************************************************"
@@ -32,7 +31,6 @@ MICROSOFT_CLIENT_ID="************************************************"
 MICROSOFT_CLIENT_SECRET="************************************************"
 MICROSOFT_CALLBACK_URL="http://localhost:3170/v1/auth/microsoft/callback"
 MICROSOFT_SCOPE="user.read"
-MICROSOFT_TENANT="common"

 # Mailer config
 MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com"
@@ -53,12 +51,9 @@ VITE_ADMIN_URL=http://localhost:3100

 # Backend URLs
 VITE_BACKEND_GQL_URL=http://localhost:3170/graphql
-VITE_BACKEND_WS_URL=ws://localhost:3170/graphql
+VITE_BACKEND_WS_URL=wss://localhost:3170/graphql
 VITE_BACKEND_API_URL=http://localhost:3170/v1

 # Terms Of Service And Privacy Policy Links (Optional)
 VITE_APP_TOS_LINK=https://docs.hoppscotch.io/support/terms
 VITE_APP_PRIVACY_POLICY_LINK=https://docs.hoppscotch.io/support/privacy
-
-# Set to `true` for subpath based access
-ENABLE_SUBPATH_BASED_ACCESS=false
--- a/.github/workflows/release-push-docker.yml
+++ b/.github/workflows/release-push-docker.yml
@@ -1,84 +0,0 @@
-name: "Push containers to Docker Hub on release"
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup environment
-        run: cp .env.example .env
-
-      - name: Setup QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Build and push the backend container
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: backend
-          push: true
-          platforms: |
-            linux/amd64
-            linux/arm64
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:${{ github.ref_name }}
-
-      - name: Build and push the frontend container
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: app
-          push: true
-          platforms: |
-            linux/amd64
-            linux/arm64
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:${{ github.ref_name }}
-
-      - name: Build and push the admin dashboard container
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: sh_admin
-          push: true
-          platforms: |
-            linux/amd64
-            linux/arm64
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:${{ github.ref_name }}
-
-      - name: Build and push the AIO container
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          file: ./prod.Dockerfile
-          target: aio
-          push: true
-          platforms: |
-            linux/amd64
-            linux/arm64
-          tags: |
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:latest
-            ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:${{ github.ref_name }}
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,9 +2,9 @@ name: Node.js CI

 on:
  push:
-    branches: [main, staging, "release/**"]
+    branches: [main, staging]
  pull_request:
-    branches: [main, staging, "release/**"]
+    branches: [main, staging]

 jobs:
  test:
--- a/.github/workflows/ui.yml
+++ b/.github/workflows/ui.yml
@@ -1,42 +0,0 @@
-name: Deploy to Netlify (ui)
-
-on:
-  push:
-    branches: [main]
-    # run this workflow only if an update is made to the ui package
-    paths:
-      - "packages/hoppscotch-ui/**"
-  workflow_dispatch:
-
-jobs:
-  deploy:
-    name: Deploy
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup environment
-        run: mv .env.example .env
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2.2.4
-        with:
-          version: 8
-          run_install: true
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node }}
-          cache: pnpm
-
-      - name: Build site
-        run: pnpm run generate-ui
-
-      # Deploy the ui site with netlify-cli
-      - name: Deploy to Netlify (ui)
-        run: npx netlify-cli@15.11.0 deploy --dir=packages/hoppscotch-ui/.histoire/dist --prod
-        env:
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_UI_SITE_ID }}
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
--- a/.gitignore
+++ b/.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
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -1,8 +1,3 @@
 module.exports = {
-  semi: false,
-  trailingComma: "es5",
-  singleQuote: false,
-  printWidth: 80,
-  useTabs: false,
-  tabWidth: 2
+  semi: false
 }
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -0,0 +1,14 @@
+{
+  "recommendations": [
+    "antfu.iconify",
+    "vue.volar",
+    "esbenp.prettier-vscode",
+    "dbaeumer.vscode-eslint",
+    "editorconfig.editorconfig",
+    "csstools.postcss",
+    "folke.vscode-monorepo-workspace"
+  ],
+  "unwantedRecommendations": [
+    "octref.vetur"
+  ]
+}
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -6,8 +6,8 @@ We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
 identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.

 We pledge to act and interact in ways that contribute to an open, welcoming,
 diverse, inclusive, and healthy community.
@@ -22,17 +22,17 @@ community include:
 * Giving and gracefully accepting constructive feedback
 * Accepting responsibility and apologizing to those affected by our mistakes,
  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall
-  community
+* Focusing on what is best not just for us as individuals, but for the
+  overall community

 Examples of unacceptable behavior include:

-* The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
 * Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email address,
-  without their explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
  professional setting

@@ -82,15 +82,15 @@ behavior was inappropriate. A public apology may be requested.

 ### 2. Warning

-**Community Impact**: A violation through a single incident or series of
-actions.
+**Community Impact**: A violation through a single incident or series
+of actions.

 **Consequence**: A warning with consequences for continued behavior. No
 interaction with the people involved, including unsolicited interaction with
 those enforcing the Code of Conduct, for a specified period of time. This
 includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
+like social media. Violating these terms may lead to a temporary or
+permanent ban.

 ### 3. Temporary Ban

@@ -106,27 +106,23 @@ Violating these terms may lead to a permanent ban.
 ### 4. Permanent Ban

 **Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
+standards, including sustained inappropriate behavior,  harassment of an
 individual, or aggression toward or disparagement of classes of individuals.

-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.

 ## Attribution

 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.

-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).

 [homepage]: https://www.contributor-covenant.org
-[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
-[Mozilla CoC]: https://github.com/mozilla/diversity
-[FAQ]: https://www.contributor-covenant.org/faq
-[translations]: https://www.contributor-covenant.org/translations
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
--- a/README.md
+++ b/README.md
@@ -2,18 +2,23 @@
  <a href="https://hoppscotch.io">
    <img
      src="https://avatars.githubusercontent.com/u/56705483"
-      alt="Hoppscotch"
+      alt="Hoppscotch Logo"
      height="64"
    />
  </a>
-  <h3>
+  <br />
+  <p>
+    <h3>
+      <b>
+        Hoppscotch
+      </b>
+    </h3>
+  </p>
+  <p>
    <b>
-      Hoppscotch
+      Open source API development ecosystem
    </b>
-  </h3>
-  <b>
-    Open Source API Development Ecosystem
-  </b>
+  </p>
  <p>

 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen?logo=github)](CODE_OF_CONDUCT.md) [![Website](https://img.shields.io/website?url=https%3A%2F%2Fhoppscotch.io&logo=hoppscotch)](https://hoppscotch.io) [![Tests](https://github.com/hoppscotch/hoppscotch/actions/workflows/tests.yml/badge.svg)](https://github.com/hoppscotch/hoppscotch/actions) [![Tweet](https://img.shields.io/twitter/url?url=https%3A%2F%2Fhoppscotch.io%2F)](https://twitter.com/share?text=%F0%9F%91%BD%20Hoppscotch%20%E2%80%A2%20Open%20source%20API%20development%20ecosystem%20-%20Helps%20you%20create%20requests%20faster,%20saving%20precious%20time%20on%20development.&url=https://hoppscotch.io&hashtags=hoppscotch&via=hoppscotch_io)
@@ -29,18 +34,23 @@
  </p>
  <br />
  <p>
-    <a href="https://hoppscotch.io">
-      <picture>
-        <source media="(prefers-color-scheme: dark)" srcset="./packages/hoppscotch-common/public/images/banner-dark.png">
-        <source media="(prefers-color-scheme: light)" srcset="./packages/hoppscotch-common/public/images/banner-light.png">
-        <img alt="Hoppscotch" src="./packages/hoppscotch-common/public/images/banner-dark.png">
-      </picture>
+    <a href="https://hoppscotch.io/#gh-light-mode-only" target="_blank">
+      <img
+        src="./packages/hoppscotch-common/public/images/banner-light.png"
+        alt="Hoppscotch"
+        width="100%"
+      />
+    </a>
+    <a href="https://hoppscotch.io/#gh-dark-mode-only" target="_blank">
+      <img
+        src="./packages/hoppscotch-common/public/images/banner-dark.png"
+        alt="Hoppscotch"
+        width="100%"
+      />
    </a>
  </p>
 </div>

-_We highly recommend you take a look at the [**Hoppscotch Documentation**](https://docs.hoppscotch.io) to learn more about the app._
-
 #### **Support**

 [![Chat on Discord](https://img.shields.io/badge/chat-Discord-7289DA?logo=discord)](https://hoppscotch.io/discord) [![Chat on Telegram](https://img.shields.io/badge/chat-Telegram-2CA5E0?logo=telegram)](https://hoppscotch.io/telegram) [![Discuss on GitHub](https://img.shields.io/badge/discussions-GitHub-333333?logo=github)](https://github.com/hoppscotch/hoppscotch/discussions)
@@ -49,9 +59,9 @@ _We highly recommend you take a look at the [**Hoppscotch Documentation**](https

 ❤️ **Lightweight:** Crafted with minimalistic UI design.

-⚡️ **Fast:** Send requests and get responses in real time.
+⚡️ **Fast:** Send requests and get/copy responses in real-time.

-🗄️ **HTTP Methods:** Request methods define the type of action you are requesting to be performed.
+**HTTP Methods**

 - `GET` - Requests retrieve resource information
 - `POST` - The server creates a new entry in a database
@@ -64,15 +74,17 @@ _We highly recommend you take a look at the [**Hoppscotch Documentation**](https
 - `TRACE` - Performs a message loop-back test along the path to the target resource
 - `<custom>` - Some APIs use custom request methods such as `LIST`. Type in your custom methods.

-🌈 **Theming:** Customizable combinations for background, foreground, and accent colors — [customize now](https://hoppscotch.io/settings).
+🌈 **Make it yours:** Customizable combinations for background, foreground, and accent colors — [customize now](https://hoppscotch.io/settings).

- Choose a theme: System preference, Light, Dark, and Black
- Choose accent colors: Green, Teal, Blue, Indigo, Purple, Yellow, Orange, Red, and Pink
+**Theming**
+
+- Choose a theme: System (default), Light, Dark, and Black
+- Choose accent color: Green (default), Teal, Blue, Indigo, Purple, Yellow, Orange, Red, and Pink
 - Distraction-free Zen mode

-_Customized themes are synced with your cloud/local session._
+_Customized themes are synced with cloud / local session_

-🔥 **PWA:** Install as a [Progressive Web App](https://web.dev/progressive-web-apps) on your device.
+🔥 **PWA:** Install as a [PWA](https://web.dev/what-are-pwas/) on your device.

 - Instant loading with Service Workers
 - Offline support
@@ -95,7 +107,7 @@ _Customized themes are synced with your cloud/local session._

 📡 **Server-Sent Events:** Receive a stream of updates from a server over an HTTP connection without resorting to polling.

-🌩 **Socket.IO:** Send and Receive data with the SocketIO server.
+🌩 **Socket.IO:** Send and Receive data with SocketIO server.

 🦟 **MQTT:** Subscribe and Publish to topics of an MQTT Broker.

@@ -115,7 +127,7 @@ _Customized themes are synced with your cloud/local session._
 - OAuth 2.0
 - OIDC Access Token/PKCE

-📢 **Headers:** Describes the format the body of your request is being sent in.
+📢 **Headers:** Describes the format the body of your request is being sent as.

 📫 **Parameters:** Use request parameters to set varying parts in simulated requests.

@@ -125,14 +137,14 @@ _Customized themes are synced with your cloud/local session._
 - FormData, JSON, and many more
 - Toggle between key-value and RAW input parameter list

-📮 **Response:** Contains the status line, headers, and the message/response body.
+👋 **Response:** Contains the status line, headers, and the message/response body.

- Copy the response to the clipboard
- Download the response as a file
+- Copy response to clipboard
+- Download response as a file
 - View response headers
- View raw and preview HTML, image, JSON, and XML responses
+- View raw and preview of HTML, image, JSON, XML responses

-⏰ **History:** Request entries are synced with your cloud/local session storage.
+⏰ **History:** Request entries are synced with cloud / local session storage to restore with a single click.

 📁 **Collections:** Keep your API requests organized with collections and folders. Reuse them with a single click.

@@ -140,32 +152,7 @@ _Customized themes are synced with your cloud/local session._
 - Nested folders
 - Export and import as a file or GitHub gist

-_Collections are synced with your cloud/local session storage._
-
-📜 **Pre-Request Scripts:** Snippets of code associated with a request that is executed before the request is sent.
-
- Set environment variables
- Include timestamp in the request headers
- Send a random alphanumeric string in the URL parameters
- Any JavaScript functions
-
-👨‍👩‍👧‍👦 **Teams:** Helps you collaborate across your teams to design, develop, and test APIs faster.
-
- Create unlimited teams
- Create unlimited shared collections
- Create unlimited team members
- Role-based access control
- Cloud sync
- Multiple devices
-
-👥 **Workspaces:** Organize your personal and team collections environments into workspaces. Easily switch between workspaces to manage multiple projects.
-
- Create unlimited workspaces
- Switch between personal and team workspaces
-
-⌨️ **Keyboard Shortcuts:** Optimized for efficiency.
-
-> **[Read our documentation on Keyboard Shortcuts](https://docs.hoppscotch.io/documentation/features/shortcuts)**
+_Collections are synced with cloud / local session storage_

 🌐 **Proxy:** Enable Proxy Mode from Settings to access blocked APIs.

@@ -174,31 +161,60 @@ _Collections are synced with your cloud/local session storage._
 - Access APIs served in non-HTTPS (`http://`) endpoints
 - Use your Proxy URL

-_Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/hoppscotch/proxyscotch)** - **[Privacy Policy](https://docs.hoppscotch.io/support/privacy)**._
+_Official proxy server is hosted by Hoppscotch - **[GitHub](https://github.com/hoppscotch/proxyscotch)** - **[Privacy Policy](https://docs.hoppscotch.io/support/privacy)**_
+
+📜 **Pre-Request Scripts β:** Snippets of code associated with a request that is executed before the request is sent.
+
+- Set environment variables
+- Include timestamp in the request headers
+- Send a random alphanumeric string in the URL parameters
+- Any JavaScript functions
+
+📄 **API Documentation:** Create and share dynamic API documentation easily, quickly.
+
+1. Add your requests to Collections and Folders
+2. Export Collections and easily share your APIs with the rest of your team
+3. Import Collections and Generate Documentation on-the-go
+
+⌨️ **Keyboard Shortcuts:** Optimized for efficiency.
+
+> **[Read our documentation on Keyboard Shortcuts](https://docs.hoppscotch.io/documentation/features/shortcuts)**

 🌎 **i18n:** Experience the app in your language.

-Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) for details on our [`CODE OF CONDUCT`](CODE_OF_CONDUCT.md) and the process for submitting pull requests to us.
+Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) for details on our [`CODE OF CONDUCT`](CODE_OF_CONDUCT.md), and the process for submitting pull requests to us.

-☁️ **Auth + Sync:** Sign in and sync your data in real-time across all your devices.
+📦 **Add-ons:** Official add-ons for hoppscotch.

-**Sign in with:**
+- **[Proxy](https://github.com/hoppscotch/proxyscotch)** - A simple proxy server created for Hoppscotch
+- **[CLI β](https://github.com/hoppscotch/hopp-cli)** - A CLI solution for Hoppscotch
+- **[Browser Extensions](https://github.com/hoppscotch/hoppscotch-extension)** - Browser extensions that simplifies access to Hoppscotch
+
+  [![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_16x16.png) **Firefox**](https://addons.mozilla.org/en-US/firefox/addon/hoppscotch) &nbsp;|&nbsp; [![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_16x16.png) **Chrome**](https://chrome.google.com/webstore/detail/hoppscotch-extension-for-c/amknoiejhlmhancpahfcfcfhllgkpbld)
+
+  > **Extensions fixes `CORS` issues.**
+
+- **[Hopp-Doc-Gen](https://github.com/hoppscotch/hopp-doc-gen)** - An API doc generator CLI for Hoppscotch
+
+_Add-ons are developed and maintained under **[Hoppscotch Organization](https://github.com/hoppscotch)**._
+
+☁️ **Auth + Sync:** Sign in and sync your data in real-time.
+
+**Sign in with**

 - GitHub
 - Google
 - Microsoft
 - Email
- SSO (Single Sign-On)[^EE]

-**🔄 Synchronize your data:** Handoff to continue tasks on your other devices.
+**Synchronize your data**

- Workspaces
 - History
 - Collections
 - Environments
 - Settings

-✅ **Post-Request Tests:** Write tests associated with a request that is executed after the request's response.
+✅ **Post-Request Tests β:** Write tests associated with a request that is executed after the request's response.

 - Check the status code as an integer
 - Filter response headers
@@ -206,7 +222,7 @@ Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) f
 - Set environment variables
 - Write JavaScript code

-🌱 **Environments:** Environment variables allow you to store and reuse values in your requests and scripts.
+🌱 **Environments** : Environment variables allow you to store and reuse values in your requests and scripts.

 - Unlimited environments and variables
 - Initialize through the pre-request script
@@ -225,31 +241,22 @@ Help us to translate Hoppscotch. Please read [`TRANSLATIONS`](TRANSLATIONS.md) f

 </details>

+👨‍👩‍👧‍👦 **Teams β:** Helps you collaborate across your team to design, develop, and test APIs faster.
+
+- Unlimited teams
+- Unlimited shared collections
+- Unlimited team members
+- Role-based access control
+- Cloud sync
+- Multiple devices
+
 🚚 **Bulk Edit:** Edit key-value pairs in bulk.

 - Entries are separated by newline
 - Keys and values are separated by `:`
 - Prepend `#` to any row you want to add but keep disabled

-🎛️ **Admin dashboard:** Manage your team and invite members.
-
- Insights
- Manage users
- Manage teams
-
-📦 **Add-ons:** Official add-ons for hoppscotch.
-
- **[Hoppscotch CLI](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-cli)** - Command-line interface for Hoppscotch.
- **[Proxy](https://github.com/hoppscotch/proxyscotch)** - A simple proxy server created for Hoppscotch.
- **[Browser Extensions](https://github.com/hoppscotch/hoppscotch-extension)** - Browser extensions that enhance your Hoppscotch experience.
-
-  [![Firefox](https://raw.github.com/alrra/browser-logos/master/src/firefox/firefox_16x16.png) **Firefox**](https://addons.mozilla.org/en-US/firefox/addon/hoppscotch) &nbsp;|&nbsp; [![Chrome](https://raw.github.com/alrra/browser-logos/master/src/chrome/chrome_16x16.png) **Chrome**](https://chrome.google.com/webstore/detail/hoppscotch-extension-for-c/amknoiejhlmhancpahfcfcfhllgkpbld)
-
-  > **Extensions fix `CORS` issues.**
-
-_Add-ons are developed and maintained under **[Hoppscotch Organization](https://github.com/hoppscotch)**._
-
-**For a complete list of features, please read our [documentation](https://docs.hoppscotch.io).**
+**For more features, please read our [documentation](https://docs.hoppscotch.io).**

 ## **Demo**

@@ -261,9 +268,18 @@ _Add-ons are developed and maintained under **[Hoppscotch Organization](https://
 2. Click "Send" to simulate the request
 3. View the response

+## **Built with**
+
+- [HTML](https://developer.mozilla.org/en-US/docs/Web/HTML)
+- [CSS](https://developer.mozilla.org/en-US/docs/Web/CSS), [SCSS](https://sass-lang.com), [Windi CSS](https://windicss.org)
+- [JavaScript](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
+- [TypeScript](https://www.typescriptlang.org)
+- [Vue](https://vuejs.org)
+- [Vite](https://vitejs.dev)
+
 ## **Developing**

-Follow our [self-hosting documentation](https://docs.hoppscotch.io/documentation/self-host/getting-started) to get started with the development environment.
+Follow our [self-hosting guide](https://docs.hoppscotch.io/documentation/self-host/getting-started) to get started with the development environment.

 ## **Contributing**

@@ -281,7 +297,7 @@ See the [`CHANGELOG`](CHANGELOG.md) file for details.

 ## **Authors**

-This project owes its existence to the collective efforts of all those who contribute — [contribute now](CONTRIBUTING.md).
+This project exists thanks to all the people who contribute — [contribute](CONTRIBUTING.md).

 <div align="center">
  <a href="https://github.com/hoppscotch/hoppscotch/graphs/contributors">
@@ -293,6 +309,4 @@ This project owes its existence to the collective efforts of all those who contr

 ## **License**

-This project is licensed under the [MIT License](https://opensource.org/licenses/MIT) — see the [`LICENSE`](LICENSE) file for details.
-
-[^EE]: Enterprise edition feature. [Learn more](https://docs.hoppscotch.io/documentation/self-host/getting-started).
+This project is licensed under the [MIT License](https://opensource.org/licenses/MIT) - see the [`LICENSE`](LICENSE) file for details.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,9 +2,8 @@

 This document outlines security procedures and general policies for the Hoppscotch project.

- [Security Policy](#security-policy)
-  - [Reporting a security vulnerability](#reporting-a-security-vulnerability)
-  - [Incident response process](#incident-response-process)
+1. [Reporting a security vulnerability](#reporting-a-security-vulnerability)
+3. [Incident response process](#incident-response-process)

 ## Reporting a security vulnerability

--- a/TRANSLATIONS.md
+++ b/TRANSLATIONS.md
@@ -9,24 +9,26 @@ Before you start working on a new language, please look through the [open pull r
 if there is no existing translation, you can create a new one by following these steps:

 1. **[Fork the repository](https://github.com/hoppscotch/hoppscotch/fork).**
-2. **Checkout the `main` branch for latest translations.**
-3. **Create a new branch for your translation with base branch `main`.**
+2. **Checkout the `i18n` branch for latest translations.**
+3. **Create a new branch for your translation with base branch `i18n`.**
 4. **Create target language file in the [`/packages/hoppscotch-common/locales`](https://github.com/hoppscotch/hoppscotch/tree/main/packages/hoppscotch-common/locales) directory.**
 5. **Copy the contents of the source file [`/packages/hoppscotch-common/locales/en.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-common/locales/en.json) to the target language file.**
 6. **Translate the strings in the target language file.**
 7. **Add your language entry to [`/packages/hoppscotch-common/languages.json`](https://github.com/hoppscotch/hoppscotch/blob/main/packages/hoppscotch-common/languages.json).**
-8. **Save and commit changes.**
+8. **Save & commit changes.**
 9. **Send a pull request.**

 _You may send a pull request before all steps above are complete: e.g., you may want to ask for help with translations, or getting tests to pass. However, your pull request will not be merged until all steps above are complete._

+`i18n` branch will be merged into `main` branch once every week.
+
 Completing an initial translation of the whole site is a fairly large task. One way to break that task up is to work with other translators through pull requests on your fork. You can also [add collaborators to your fork](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository) if you'd like to invite other translators to commit directly to your fork and share responsibility for merging pull requests.

 ## Updating a translation

 ### Corrections

-If you notice spelling or grammar errors, typos, or opportunities for better phrasing, open a pull request with your suggested fix. If you see a problem that you aren't sure of or don't have time to fix, [open an issue](https://github.com/hoppscotch/hoppscotch/issues/new/choose).
+If you notice spelling or grammar errors, typos, or opportunities for better phrasing, open a pull request with your suggested fix. If you see a problem that you aren't sure of or don't have time to fix, open an issue.

 ### Broken links

--- a/aio-multiport-setup.Caddyfile
+++ b/aio-multiport-setup.Caddyfile
@@ -1,19 +0,0 @@
-:3000 {
-	try_files {path} /
-	root * /site/selfhost-web
-	file_server
-}
-
-:3100 {
-	try_files {path} /
-	root * /site/sh-admin-multiport-setup
-	file_server
-}
-
-:3170 {
-	reverse_proxy localhost:8080
-}
-
-:80 {
-	respond 404
-}
--- a/aio-subpath-access.Caddyfile
+++ b/aio-subpath-access.Caddyfile
@@ -1,37 +0,0 @@
-:3000 {
-	respond 404
-}
-
-:3100 {
-	respond 404
-}
-
-:3170 {
-	reverse_proxy localhost:8080
-}
-
-:80 {
-	# Serve the `selfhost-web` SPA by default
-	root * /site/selfhost-web
-	file_server
-
-	handle_path /admin* {
-		root * /site/sh-admin-subpath-access
-		file_server
-
-		# Ensures any non-existent file in the server is routed to the SPA
-		try_files {path} /
-	}
-
-	# Handle requests under `/backend*` path
-	handle_path /backend* {
-		reverse_proxy localhost:8080
-	}
-
-	# Catch-all route for unknown paths, serves `selfhost-web` SPA
-	handle {
-		root * /site/selfhost-web
-		file_server
-		try_files {path} /
-	}
-}
--- a/aio_run.mjs
+++ b/aio_run.mjs
@@ -1,73 +0,0 @@
-#!/usr/local/bin/node
-// @ts-check
-
-import { execSync, spawn } from "child_process"
-import fs from "fs"
-import process from "process"
-
-function runChildProcessWithPrefix(command, args, prefix) {
-  const childProcess = spawn(command, args);
-
-  childProcess.stdout.on('data', (data) => {
-    const output = data.toString().trim().split('\n');
-    output.forEach((line) => {
-      console.log(`${prefix} | ${line}`);
-    });
-  });
-
-  childProcess.stderr.on('data', (data) => {
-    const error = data.toString().trim().split('\n');
-    error.forEach((line) => {
-      console.error(`${prefix} | ${line}`);
-    });
-  });
-
-  childProcess.on('close', (code) => {
-    console.log(`${prefix} Child process exited with code ${code}`);
-  });
-
-  childProcess.on('error', (stuff) => {
-    console.log("error")
-    console.log(stuff)
-  })
-
-  return childProcess
-}
-
-const envFileContent = Object.entries(process.env)
-  .filter(([env]) => env.startsWith("VITE_"))
-  .map(([env, val]) => `${env}=${
-    (val.startsWith("\"") && val.endsWith("\""))
-      ? val
-      : `"${val}"`
-  }`)
-  .join("\n")
-
-fs.writeFileSync("build.env", envFileContent)
-
-execSync(`npx import-meta-env -x build.env -e build.env -p "/site/**/*"`)
-
-fs.rmSync("build.env")
-
-const caddyFileName = process.env.ENABLE_SUBPATH_BASED_ACCESS === 'true' ? 'aio-subpath-access.Caddyfile' : 'aio-multiport-setup.Caddyfile'
-const caddyProcess = runChildProcessWithPrefix("caddy", ["run", "--config", `/etc/caddy/${caddyFileName}`, "--adapter", "caddyfile"], "App/Admin Dashboard Caddy")
-const backendProcess = runChildProcessWithPrefix("pnpm", ["run", "start:prod"], "Backend Server")
-
-caddyProcess.on("exit", (code) => {
-  console.log(`Exiting process because Caddy Server exited with code ${code}`)
-  process.exit(code)
-})
-
-backendProcess.on("exit", (code) => {
-  console.log(`Exiting process because Backend Server exited with code ${code}`)
-  process.exit(code)
-})
-
-process.on('SIGINT', () => {
-  console.log("SIGINT received, exiting...")
-
-  caddyProcess.kill("SIGINT")
-  backendProcess.kill("SIGINT")
-
-  process.exit(0)
-})
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,108 +7,6 @@ services:
  # This service runs the backend app in the port 3170
  hoppscotch-backend:
    container_name: hoppscotch-backend
-    build:
-      dockerfile: prod.Dockerfile
-      context: .
-      target: backend
-    env_file:
-      - ./.env
-    restart: always
-    environment:
-      # Edit the below line to match your PostgresDB URL if you have an outside DB (make sure to update the .env file as well)
-      - DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch?connect_timeout=300
-      - PORT=8080
-    volumes:
-      # Uncomment the line below when modifying code. Only applicable when using the "dev" target.
-      # - ./packages/hoppscotch-backend/:/usr/src/app
-      - /usr/src/app/node_modules/
-    depends_on:
-      hoppscotch-db:
-        condition: service_healthy
-    ports:
-      - "3180:80"
-      - "3170:3170"
-
-  # The main hoppscotch app. This will be hosted at port 3000
-  # NOTE: To do TLS or play around with how the app is hosted, you can look into the Caddyfile for
-  #       the SH admin dashboard server at packages/hoppscotch-selfhost-web/Caddyfile
-  hoppscotch-app:
-    container_name: hoppscotch-app
-    build:
-      dockerfile: prod.Dockerfile
-      context: .
-      target: app
-    env_file:
-      - ./.env
-    depends_on:
-      - hoppscotch-backend
-    ports:
-      - "3080:80"
-      - "3000:3000"
-
-  # The Self Host dashboard for managing the app. This will be hosted at port 3100
-  # NOTE: To do TLS or play around with how the app is hosted, you can look into the Caddyfile for
-  #       the SH admin dashboard server at packages/hoppscotch-sh-admin/Caddyfile
-  hoppscotch-sh-admin:
-    container_name: hoppscotch-sh-admin
-    build:
-      dockerfile: prod.Dockerfile
-      context: .
-      target: sh_admin
-    env_file:
-      - ./.env
-    depends_on:
-      - hoppscotch-backend
-    ports:
-      - "3280:80"
-      - "3100:3100"
-
-  # 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: .
-      target: aio
-    env_file:
-      - ./.env
-    depends_on:
-      hoppscotch-db:
-        condition: service_healthy
-    ports:
-      - "3000:3000"
-      - "3100:3100"
-      - "3170:3170"
-      - "3080:80"
-
-  # The preset DB service, you can delete/comment the below lines if
-  # you are using an external postgres instance
-  # This will be exposed at port 5432
-  hoppscotch-db:
-    image: postgres:15
-    ports:
-      - "5432:5432"
-    user: postgres
-    environment:
-      # The default user defined by the docker image
-      POSTGRES_USER: postgres
-      # NOTE: Please UPDATE THIS PASSWORD!
-      POSTGRES_PASSWORD: testpass
-      POSTGRES_DB: hoppscotch
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "sh -c 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}'"
-        ]
-      interval: 5s
-      timeout: 5s
-      retries: 10
-
-  # All the services listed below are deprececated
-  hoppscotch-old-backend:
-    container_name: hoppscotch-old-backend
    build:
      dockerfile: packages/hoppscotch-backend/Dockerfile
      context: .
@@ -121,35 +19,53 @@ services:
      - DATABASE_URL=postgresql://postgres:testpass@hoppscotch-db:5432/hoppscotch?connect_timeout=300
      - PORT=3000
    volumes:
-      # Uncomment the line below when modifying code. Only applicable when using the "dev" target.
-      # - ./packages/hoppscotch-backend/:/usr/src/app
+      - ./packages/hoppscotch-backend/:/usr/src/app
      - /usr/src/app/node_modules/
    depends_on:
-      hoppscotch-db:
-        condition: service_healthy
+      - hoppscotch-db
    ports:
      - "3170:3000"

-  hoppscotch-old-app:
-    container_name: hoppscotch-old-app
+  # The main hoppscotch app. This will be hosted at port 3000
+  # NOTE: To do TLS or play around with how the app is hosted, you can look into the Caddyfile for
+  #       the SH admin dashboard server at packages/hoppscotch-selfhost-web/Caddyfile
+  hoppscotch-app:
+    container_name: hoppscotch-app
    build:
      dockerfile: packages/hoppscotch-selfhost-web/Dockerfile
      context: .
    env_file:
      - ./.env
    depends_on:
-      - hoppscotch-old-backend
+      - hoppscotch-backend
    ports:
      - "3000:8080"

-  hoppscotch-old-sh-admin:
-    container_name: hoppscotch-old-sh-admin
+  # The Self Host dashboard for managing the app. This will be hosted at port 3100
+  # NOTE: To do TLS or play around with how the app is hosted, you can look into the Caddyfile for
+  #       the SH admin dashboard server at packages/hoppscotch-sh-admin/Caddyfile
+  hoppscotch-sh-admin:
+    container_name: hoppscotch-sh-admin
    build:
      dockerfile: packages/hoppscotch-sh-admin/Dockerfile
      context: .
    env_file:
      - ./.env
    depends_on:
-      - hoppscotch-old-backend
+      - hoppscotch-backend
    ports:
      - "3100:8080"
+
+  # The preset DB service, you can delete/comment the below lines if
+  # you are using an external postgres instance
+  # This will be exposed at port 5432
+  hoppscotch-db:
+    image: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      # NOTE: Please UPDATE THIS PASSWORD!
+      POSTGRES_PASSWORD: testpass
+      POSTGRES_DB: hoppscotch
+
+
--- a/healthcheck.sh
+++ b/healthcheck.sh
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-curlCheck() {
-  if ! curl -s --head "$1" | head -n 1 | grep -q "HTTP/1.[01] [23].."; then
-    echo "URL request failed!"
-    exit 1
-  else
-    echo "URL request succeeded!"
-  fi
-}
-
-curlCheck "http://localhost:3000"
-curlCheck "http://localhost:3100"
-curlCheck "http://localhost:3170/ping"
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
    "dev": "pnpm -r do-dev",
    "gen-gql": "cross-env GQL_SCHEMA_EMIT_LOCATION='../../../gql-gen/backend-schema.gql' pnpm -r generate-gql-sdl",
    "generate": "pnpm -r do-build-prod",
-    "start": "http-server packages/hoppscotch-selfhost-web/dist -p 3000",
+    "start": "http-server packages/hoppscotch-web/dist -p 3000",
    "lint": "pnpm -r do-lint",
    "typecheck": "pnpm -r do-typecheck",
    "lintfix": "pnpm -r do-lintfix",
@@ -22,26 +22,15 @@
  "workspaces": [
    "./packages/*"
  ],
+  "dependencies": {
+    "husky": "^7.0.4",
+    "lint-staged": "^12.3.8"
+  },
  "devDependencies": {
    "@commitlint/cli": "^16.2.3",
    "@commitlint/config-conventional": "^16.2.1",
-    "@hoppscotch/ui": "^0.1.0",
-    "@types/node": "17.0.27",
+    "@types/node": "^17.0.24",
    "cross-env": "^7.0.3",
-    "http-server": "^14.1.1",
-    "husky": "^7.0.4",
-    "lint-staged": "12.4.0"
-  },
-  "pnpm": {
-    "overrides": {
-      "vue": "3.3.9"
-    },
-    "packageExtensions": {
-      "httpsnippet@^3.0.1": {
-        "peerDependencies": {
-          "ajv": "6.12.3"
-        }
-      }
-    }
+    "http-server": "^14.1.1"
  }
 }
--- a/packages/codemirror-lang-graphql/package.json
+++ b/packages/codemirror-lang-graphql/package.json
@@ -17,16 +17,16 @@
  "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.2.0",
+    "@lezer/highlight": "^1.0.0",
+    "@lezer/lr": "^1.2.0"
  },
  "devDependencies": {
-    "@lezer/generator": "^1.5.1",
+    "@lezer/generator": "^1.1.0",
    "mocha": "^9.2.2",
-    "rollup": "^3.29.3",
-    "rollup-plugin-dts": "^6.0.2",
-    "rollup-plugin-ts": "^3.4.5",
-    "typescript": "^5.2.2"
+    "rollup": "^2.70.2",
+    "rollup-plugin-dts": "^4.2.1",
+    "rollup-plugin-ts": "^2.0.7",
+    "typescript": "^4.6.3"
  }
 }
--- a/packages/hoppscotch-backend/backend.Caddyfile
+++ b/packages/hoppscotch-backend/backend.Caddyfile
@@ -1,3 +0,0 @@
-:80 :3170 {
-	reverse_proxy localhost:8080
-}
--- a/packages/hoppscotch-backend/package.json
+++ b/packages/hoppscotch-backend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hoppscotch-backend",
-  "version": "2023.12.5",
+  "version": "2023.4.2",
  "description": "",
  "author": "",
  "private": true,
@@ -24,18 +24,18 @@
    "do-test": "pnpm run test"
  },
  "dependencies": {
-    "@apollo/server": "^4.9.4",
-    "@nestjs-modules/mailer": "^1.9.1",
-    "@nestjs/apollo": "^12.0.9",
-    "@nestjs/common": "^10.2.6",
-    "@nestjs/config": "^3.1.1",
-    "@nestjs/core": "^10.2.6",
-    "@nestjs/graphql": "^12.0.9",
-    "@nestjs/jwt": "^10.1.1",
-    "@nestjs/passport": "^10.0.2",
-    "@nestjs/platform-express": "^10.2.6",
-    "@nestjs/throttler": "^5.0.0",
-    "@prisma/client": "^5.8.0",
+    "@nestjs-modules/mailer": "^1.8.1",
+    "@nestjs/apollo": "^10.1.6",
+    "@nestjs/common": "^9.2.1",
+    "@nestjs/core": "^9.2.1",
+    "@nestjs/graphql": "^10.1.6",
+    "@nestjs/jwt": "^10.0.1",
+    "@nestjs/passport": "^9.0.0",
+    "@nestjs/platform-express": "^9.2.1",
+    "@nestjs/throttler": "^4.0.0",
+    "@prisma/client": "^4.7.1",
+    "apollo-server-express": "^3.11.1",
+    "apollo-server-plugin-base": "^3.7.1",
    "argon2": "^0.30.3",
    "bcrypt": "^5.1.0",
    "cookie": "^0.5.0",
@@ -43,9 +43,9 @@
    "express": "^4.17.1",
    "express-session": "^1.17.3",
    "fp-ts": "^2.13.1",
-    "graphql": "^16.8.1",
+    "graphql": "^15.5.0",
    "graphql-query-complexity": "^0.12.0",
-    "graphql-redis-subscriptions": "^2.6.0",
+    "graphql-redis-subscriptions": "^2.5.0",
    "graphql-subscriptions": "^2.0.0",
    "handlebars": "^4.7.7",
    "io-ts": "^2.2.16",
@@ -57,15 +57,15 @@
    "passport-jwt": "^4.0.1",
    "passport-local": "^1.0.0",
    "passport-microsoft": "^1.0.0",
-    "prisma": "^5.8.0",
+    "prisma": "^4.7.1",
    "reflect-metadata": "^0.1.13",
    "rimraf": "^3.0.2",
    "rxjs": "^7.6.0"
  },
  "devDependencies": {
-    "@nestjs/cli": "^10.1.18",
-    "@nestjs/schematics": "^10.0.2",
-    "@nestjs/testing": "^10.2.6",
+    "@nestjs/cli": "^9.1.5",
+    "@nestjs/schematics": "^9.0.3",
+    "@nestjs/testing": "^9.2.1",
    "@relmify/jest-fp-ts": "^2.0.2",
    "@types/argon2": "^0.15.0",
    "@types/bcrypt": "^5.0.0",
--- a/packages/hoppscotch-backend/prisma/migrations/20231106120154_embeds_addition/migration.sql
+++ b/packages/hoppscotch-backend/prisma/migrations/20231106120154_embeds_addition/migration.sql
@@ -1,15 +0,0 @@
-/*
-  Warnings:
-
-  - A unique constraint covering the columns `[id]` on the table `Shortcode` will be added. If there are existing duplicate values, this will fail.
-
-*/
-- AlterTable
-ALTER TABLE "Shortcode" ADD COLUMN     "embedProperties" JSONB,
-ADD COLUMN     "updatedOn" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;
-
-- CreateIndex
-CREATE UNIQUE INDEX "Shortcode_id_key" ON "Shortcode"("id");
-
-- AddForeignKey
-ALTER TABLE "Shortcode" ADD CONSTRAINT "Shortcode_creatorUid_fkey" FOREIGN KEY ("creatorUid") REFERENCES "User"("uid") ON DELETE SET NULL ON UPDATE CASCADE;
--- a/packages/hoppscotch-backend/prisma/migrations/20231124104640_infra_config/migration.sql
+++ b/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");
--- a/packages/hoppscotch-backend/prisma/migrations/20231130082054_collection_headers/migration.sql
+++ b/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;
--- a/packages/hoppscotch-backend/prisma/schema.prisma
+++ b/packages/hoppscotch-backend/prisma/schema.prisma
@@ -5,7 +5,7 @@ datasource db {

 generator client {
  provider      = "prisma-client-js"
-  binaryTargets = ["native", "debian-openssl-1.1.x", "debian-openssl-3.0.x"]
+  binaryTargets = ["native", "debian-openssl-1.1.x"]
 }

 model Team {
@@ -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[]
@@ -69,13 +68,10 @@ model TeamRequest {
 }

 model Shortcode {
-  id              String   @id @unique
-  request         Json
-  embedProperties Json?
-  creatorUid      String?
-  User            User?    @relation(fields: [creatorUid], references: [uid])
-  createdOn       DateTime @default(now())
-  updatedOn       DateTime @default(now()) @updatedAt
+  id         String   @id
+  request    Json
+  creatorUid String?
+  createdOn  DateTime @default(now())

  @@unique(fields: [id, creatorUid], name: "creator_uid_shortcode_unique")
 }
@@ -106,7 +102,6 @@ model User {
  currentGQLSession  Json?
  createdOn          DateTime            @default(now()) @db.Timestamp(3)
  invitedUsers       InvitedUsers[]
-  shortcodes         Shortcode[]
 }

 model Account {
@@ -197,7 +192,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 +203,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)
-}
--- a/packages/hoppscotch-backend/prod_run.mjs
+++ b/packages/hoppscotch-backend/prod_run.mjs
@@ -1,66 +0,0 @@
-#!/usr/local/bin/node
-// @ts-check
-
-import { spawn } from 'child_process';
-import process from 'process';
-
-function runChildProcessWithPrefix(command, args, prefix) {
-  const childProcess = spawn(command, args);
-
-  childProcess.stdout.on('data', (data) => {
-    const output = data.toString().trim().split('\n');
-    output.forEach((line) => {
-      console.log(`${prefix} | ${line}`);
-    });
-  });
-
-  childProcess.stderr.on('data', (data) => {
-    const error = data.toString().trim().split('\n');
-    error.forEach((line) => {
-      console.error(`${prefix} | ${line}`);
-    });
-  });
-
-  childProcess.on('close', (code) => {
-    console.log(`${prefix} Child process exited with code ${code}`);
-  });
-
-  childProcess.on('error', (stuff) => {
-    console.error('error');
-    console.error(stuff);
-  });
-
-  return childProcess;
-}
-
-const caddyProcess = runChildProcessWithPrefix(
-  'caddy',
-  ['run', '--config', '/etc/caddy/backend.Caddyfile', '--adapter', 'caddyfile'],
-  'App/Admin Dashboard Caddy',
-);
-const backendProcess = runChildProcessWithPrefix(
-  'pnpm',
-  ['run', 'start:prod'],
-  'Backend Server',
-);
-
-caddyProcess.on('exit', (code) => {
-  console.log(`Exiting process because Caddy Server exited with code ${code}`);
-  process.exit(code);
-});
-
-backendProcess.on('exit', (code) => {
-  console.log(
-    `Exiting process because Backend Server exited with code ${code}`,
-  );
-  process.exit(code);
-});
-
-process.on('SIGINT', () => {
-  console.log('SIGINT received, exiting...');
-
-  caddyProcess.kill('SIGINT');
-  backendProcess.kill('SIGINT');
-
-  process.exit(0);
-});
--- a/packages/hoppscotch-backend/src/admin/admin.model.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.model.ts
@@ -1,9 +1,4 @@
-import { ObjectType, OmitType } from '@nestjs/graphql';
-import { User } from 'src/user/user.model';
+import { ObjectType } from '@nestjs/graphql';

@ObjectType()
-export class Admin extends OmitType(User, [
-  'isAdmin',
-  'currentRESTSession',
-  'currentGQLSession',
-]) {}
+export class Admin {}
--- a/packages/hoppscotch-backend/src/admin/admin.module.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.module.ts
@@ -4,29 +4,26 @@ 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';
 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],
+  providers: [AdminResolver, AdminService],
  exports: [AdminService],
 })
 export class AdminModule {}
--- a/packages/hoppscotch-backend/src/admin/admin.resolver.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.resolver.ts
@@ -21,15 +21,15 @@ import { InvitedUser } from './invited-user.model';
 import { GqlUser } from '../decorators/gql-user.decorator';
 import { PubSubService } from '../pubsub/pubsub.service';
 import { Team, TeamMember } from '../team/team.model';
+import { User } from '../user/user.model';
+import { TeamInvitation } from '../team-invitation/team-invitation.model';
+import { PaginationArgs } from '../types/input-types.args';
 import {
  AddUserToTeamArgs,
  ChangeUserRoleInTeamArgs,
 } from './input-types.args';
 import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
 import { SkipThrottle } from '@nestjs/throttler';
-import { User } from 'src/user/user.model';
-import { PaginationArgs } from 'src/types/input-types.args';
-import { TeamInvitation } from 'src/team-invitation/team-invitation.model';

@UseGuards(GqlThrottlerGuard)
@Resolver(() => Admin)
@@ -51,7 +51,6 @@ export class AdminResolver {

  @ResolveField(() => [User], {
    description: 'Returns a list of all admin users in infra',
-    deprecationReason: 'Use `infra` query instead',
  })
  @UseGuards(GqlAuthGuard, GqlAdminGuard)
  async admins() {
@@ -60,7 +59,6 @@ export class AdminResolver {
  }
  @ResolveField(() => User, {
    description: 'Returns a user info by UID',
-    deprecationReason: 'Use `infra` query instead',
  })
  @UseGuards(GqlAuthGuard, GqlAdminGuard)
  async userInfo(
@@ -78,7 +76,6 @@ export class AdminResolver {

  @ResolveField(() => [User], {
    description: 'Returns a list of all the users in infra',
-    deprecationReason: 'Use `infra` query instead',
  })
  @UseGuards(GqlAuthGuard, GqlAdminGuard)
  async allUsers(
@@ -91,7 +88,6 @@ export class AdminResolver {

  @ResolveField(() => [InvitedUser], {
    description: 'Returns a list of all the invited users',
-    deprecationReason: 'Use `infra` query instead',
  })
  async invitedUsers(@Parent() admin: Admin): Promise<InvitedUser[]> {
    const users = await this.adminService.fetchInvitedUsers();
@@ -100,7 +96,6 @@ export class AdminResolver {

  @ResolveField(() => [Team], {
    description: 'Returns a list of all the teams in the infra',
-    deprecationReason: 'Use `infra` query instead',
  })
  async allTeams(
    @Parent() admin: Admin,
@@ -111,7 +106,6 @@ export class AdminResolver {
  }
  @ResolveField(() => Team, {
    description: 'Returns a team info by ID when requested by Admin',
-    deprecationReason: 'Use `infra` query instead',
  })
  async teamInfo(
    @Parent() admin: Admin,
@@ -129,7 +123,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return count of all the members in a team',
-    deprecationReason: 'Use `infra` query instead',
  })
  async membersCountInTeam(
    @Parent() admin: Admin,
@@ -147,7 +140,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return count of all the stored collections in a team',
-    deprecationReason: 'Use `infra` query instead',
  })
  async collectionCountInTeam(
    @Parent() admin: Admin,
@@ -163,7 +155,6 @@ export class AdminResolver {
  }
  @ResolveField(() => Number, {
    description: 'Return count of all the stored requests in a team',
-    deprecationReason: 'Use `infra` query instead',
  })
  async requestCountInTeam(
    @Parent() admin: Admin,
@@ -180,7 +171,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return count of all the stored environments in a team',
-    deprecationReason: 'Use `infra` query instead',
  })
  async environmentCountInTeam(
    @Parent() admin: Admin,
@@ -197,7 +187,6 @@ export class AdminResolver {

  @ResolveField(() => [TeamInvitation], {
    description: 'Return all the pending invitations in a team',
-    deprecationReason: 'Use `infra` query instead',
  })
  async pendingInvitationCountInTeam(
    @Parent() admin: Admin,
@@ -216,7 +205,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return total number of Users in organization',
-    deprecationReason: 'Use `infra` query instead',
  })
  async usersCount() {
    return this.adminService.getUsersCount();
@@ -224,7 +212,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return total number of Teams in organization',
-    deprecationReason: 'Use `infra` query instead',
  })
  async teamsCount() {
    return this.adminService.getTeamsCount();
@@ -232,7 +219,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return total number of Team Collections in organization',
-    deprecationReason: 'Use `infra` query instead',
  })
  async teamCollectionsCount() {
    return this.adminService.getTeamCollectionsCount();
@@ -240,7 +226,6 @@ export class AdminResolver {

  @ResolveField(() => Number, {
    description: 'Return total number of Team Requests in organization',
-    deprecationReason: 'Use `infra` query instead',
  })
  async teamRequestsCount() {
    return this.adminService.getTeamRequestsCount();
@@ -426,40 +411,6 @@ export class AdminResolver {
    return deletedTeam.right;
  }

-  @Mutation(() => Boolean, {
-    description: 'Revoke a team Invite by Invite ID',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async revokeTeamInviteByAdmin(
-    @Args({
-      name: 'inviteID',
-      description: 'Team Invite ID',
-      type: () => ID,
-    })
-    inviteID: string,
-  ): Promise<boolean> {
-    const invite = await this.adminService.revokeTeamInviteByID(inviteID);
-    if (E.isLeft(invite)) throwErr(invite.left);
-    return true;
-  }
-
-  @Mutation(() => Boolean, {
-    description: 'Revoke Shortcode by ID',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async revokeShortcodeByAdmin(
-    @Args({
-      name: 'code',
-      description: 'The shortcode to delete',
-      type: () => ID,
-    })
-    code: string,
-  ): Promise<boolean> {
-    const res = await this.adminService.deleteShortcode(code);
-    if (E.isLeft(res)) throwErr(res.left);
-    return true;
-  }
-
  /* Subscriptions */

  @Subscription(() => InvitedUser, {
--- a/packages/hoppscotch-backend/src/admin/admin.service.spec.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.service.spec.ts
@@ -15,8 +15,6 @@ import {
  INVALID_EMAIL,
  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>();
@@ -27,8 +25,6 @@ const mockTeamRequestService = mockDeep<TeamRequestService>();
 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,
@@ -40,8 +36,6 @@ const adminService = new AdminService(
  mockPubSub as any,
  mockPrisma as any,
  mockMailerService,
-  mockShortcodeService,
-  mockConfigService,
 );

 const invitedUsers: InvitedUsers[] = [
--- a/packages/hoppscotch-backend/src/admin/admin.service.ts
+++ b/packages/hoppscotch-backend/src/admin/admin.service.ts
@@ -11,7 +11,6 @@ import {
  INVALID_EMAIL,
  ONLY_ONE_ADMIN_ACCOUNT,
  TEAM_INVITE_ALREADY_MEMBER,
-  TEAM_INVITE_NO_INVITE_FOUND,
  USER_ALREADY_INVITED,
  USER_IS_ADMIN,
  USER_NOT_FOUND,
@@ -24,8 +23,6 @@ import { TeamRequestService } from '../team-request/team-request.service';
 import { TeamEnvironmentsService } from '../team-environments/team-environments.service';
 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 {
@@ -39,8 +36,6 @@ export class AdminService {
    private readonly pubsub: PubSubService,
    private readonly prisma: PrismaService,
    private readonly mailerService: MailerService,
-    private readonly shortcodeService: ShortcodeService,
-    private readonly configService: ConfigService,
  ) {}

  /**
@@ -78,10 +73,10 @@ export class AdminService {

    try {
      await this.mailerService.sendUserInvitationEmail(inviteeEmail, {
-        template: 'user-invitation',
+        template: 'code-your-own',
        variables: {
          inviteeEmail: inviteeEmail,
-          magicLink: `${this.configService.get('VITE_BASE_URL')}`,
+          magicLink: `${process.env.VITE_BASE_URL}`,
        },
      });
    } catch (e) {
@@ -186,7 +181,7 @@ export class AdminService {
   * @returns an array team invitations
   */
  async pendingInvitationCountInTeam(teamID: string) {
-    const invitations = await this.teamInvitationService.getTeamInvitations(
+    const invitations = await this.teamInvitationService.getAllTeamInvitations(
      teamID,
    );

@@ -241,11 +236,11 @@ export class AdminService {
    const user = await this.userService.findUserByEmail(userEmail);
    if (O.isNone(user)) return E.left(USER_NOT_FOUND);

-    const teamMember = await this.teamService.getTeamMemberTE(
+    const isUserAlreadyMember = await this.teamService.getTeamMemberTE(
      teamID,
      user.value.uid,
    )();
-    if (E.isLeft(teamMember)) {
+    if (E.left(isUserAlreadyMember)) {
      const addedUser = await this.teamService.addMemberToTeamWithEmail(
        teamID,
        userEmail,
@@ -253,18 +248,6 @@ export class AdminService {
      );
      if (E.isLeft(addedUser)) return E.left(addedUser.left);

-      const userInvitation =
-        await this.teamInvitationService.getTeamInviteByEmailAndTeamID(
-          userEmail,
-          teamID,
-        );
-
-      if (E.isRight(userInvitation)) {
-        await this.teamInvitationService.revokeInvitation(
-          userInvitation.right.id,
-        );
-      }
-
      return E.right(addedUser.right);
    }

@@ -421,50 +404,4 @@ export class AdminService {
    if (E.isLeft(team)) return E.left(team.left);
    return E.right(team.right);
  }
-
-  /**
-   * Revoke a team invite by ID
-   * @param inviteID Team Invite ID
-   * @returns an Either of boolean or error
-   */
-  async revokeTeamInviteByID(inviteID: string) {
-    const teamInvite = await this.teamInvitationService.revokeInvitation(
-      inviteID,
-    );
-
-    if (E.isLeft(teamInvite)) return E.left(teamInvite.left);
-
-    return E.right(teamInvite.right);
-  }
-
-  /**
-   * Fetch all created ShortCodes
-   *
-   * @param args Pagination arguments
-   * @param userEmail User email
-   * @returns ShortcodeWithUserEmail
-   */
-  async fetchAllShortcodes(
-    cursorID: string,
-    take: number,
-    userEmail: string = null,
-  ) {
-    return this.shortcodeService.fetchAllShortcodes(
-      { cursor: cursorID, take },
-      userEmail,
-    );
-  }
-
-  /**
-   * Delete a Shortcode
-   *
-   * @param shortcodeID ID of Shortcode being deleted
-   * @returns Boolean on successful deletion
-   */
-  async deleteShortcode(shortcodeID: string) {
-    const result = await this.shortcodeService.deleteShortcode(shortcodeID);
-
-    if (E.isLeft(result)) return E.left(result.left);
-    return E.right(result.right);
-  }
 }
--- a/packages/hoppscotch-backend/src/admin/infra.model.ts
+++ b/packages/hoppscotch-backend/src/admin/infra.model.ts
@@ -1,10 +0,0 @@
-import { Field, ObjectType } from '@nestjs/graphql';
-import { Admin } from './admin.model';
-
-@ObjectType()
-export class Infra {
-  @Field(() => Admin, {
-    description: 'Admin who executed the action',
-  })
-  executedBy: Admin;
-}
--- a/packages/hoppscotch-backend/src/admin/infra.resolver.ts
+++ b/packages/hoppscotch-backend/src/admin/infra.resolver.ts
@@ -1,314 +0,0 @@
-import { UseGuards } from '@nestjs/common';
-import {
-  Args,
-  ID,
-  Mutation,
-  Query,
-  ResolveField,
-  Resolver,
-} from '@nestjs/graphql';
-import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
-import { Infra } from './infra.model';
-import { AdminService } from './admin.service';
-import { GqlAuthGuard } from 'src/guards/gql-auth.guard';
-import { GqlAdminGuard } from './guards/gql-admin.guard';
-import { User } from 'src/user/user.model';
-import { AuthUser } from 'src/types/AuthUser';
-import { throwErr } from 'src/utils';
-import * as E from 'fp-ts/Either';
-import { Admin } from './admin.model';
-import { PaginationArgs } from 'src/types/input-types.args';
-import { InvitedUser } from './invited-user.model';
-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,
-  ) {}
-
-  @Query(() => Infra, {
-    description: 'Fetch details of the Infrastructure',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  infra(@GqlAdmin() admin: Admin) {
-    const infra: Infra = { executedBy: admin };
-    return infra;
-  }
-
-  @ResolveField(() => [User], {
-    description: 'Returns a list of all admin users in infra',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async admins() {
-    const admins = await this.adminService.fetchAdmins();
-    return admins;
-  }
-
-  @ResolveField(() => User, {
-    description: 'Returns a user info by UID',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async userInfo(
-    @Args({
-      name: 'userUid',
-      type: () => ID,
-      description: 'The user UID',
-    })
-    userUid: string,
-  ): Promise<AuthUser> {
-    const user = await this.adminService.fetchUserInfo(userUid);
-    if (E.isLeft(user)) throwErr(user.left);
-    return user.right;
-  }
-
-  @ResolveField(() => [User], {
-    description: 'Returns a list of all the users in infra',
-  })
-  @UseGuards(GqlAuthGuard, GqlAdminGuard)
-  async allUsers(@Args() args: PaginationArgs): Promise<AuthUser[]> {
-    const users = await this.adminService.fetchUsers(args.cursor, args.take);
-    return users;
-  }
-
-  @ResolveField(() => [InvitedUser], {
-    description: 'Returns a list of all the invited users',
-  })
-  async invitedUsers(): Promise<InvitedUser[]> {
-    const users = await this.adminService.fetchInvitedUsers();
-    return users;
-  }
-
-  @ResolveField(() => [Team], {
-    description: 'Returns a list of all the teams in the infra',
-  })
-  async allTeams(@Args() args: PaginationArgs): Promise<Team[]> {
-    const teams = await this.adminService.fetchAllTeams(args.cursor, args.take);
-    return teams;
-  }
-
-  @ResolveField(() => Team, {
-    description: 'Returns a team info by ID when requested by Admin',
-  })
-  async teamInfo(
-    @Args({
-      name: 'teamID',
-      type: () => ID,
-      description: 'Team ID for which info to fetch',
-    })
-    teamID: string,
-  ): Promise<Team> {
-    const team = await this.adminService.getTeamInfo(teamID);
-    if (E.isLeft(team)) throwErr(team.left);
-    return team.right;
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return count of all the members in a team',
-  })
-  async membersCountInTeam(
-    @Args({
-      name: 'teamID',
-      type: () => ID,
-      description: 'Team ID for which team members to fetch',
-      nullable: false,
-    })
-    teamID: string,
-  ): Promise<number> {
-    const teamMembersCount = await this.adminService.membersCountInTeam(teamID);
-    return teamMembersCount;
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return count of all the stored collections in a team',
-  })
-  async collectionCountInTeam(
-    @Args({
-      name: 'teamID',
-      type: () => ID,
-      description: 'Team ID for which team members to fetch',
-    })
-    teamID: string,
-  ): Promise<number> {
-    const teamCollCount = await this.adminService.collectionCountInTeam(teamID);
-    return teamCollCount;
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return count of all the stored requests in a team',
-  })
-  async requestCountInTeam(
-    @Args({
-      name: 'teamID',
-      type: () => ID,
-      description: 'Team ID for which team members to fetch',
-    })
-    teamID: string,
-  ): Promise<number> {
-    const teamReqCount = await this.adminService.requestCountInTeam(teamID);
-    return teamReqCount;
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return count of all the stored environments in a team',
-  })
-  async environmentCountInTeam(
-    @Args({
-      name: 'teamID',
-      type: () => ID,
-      description: 'Team ID for which team members to fetch',
-    })
-    teamID: string,
-  ): Promise<number> {
-    const envsCount = await this.adminService.environmentCountInTeam(teamID);
-    return envsCount;
-  }
-
-  @ResolveField(() => [TeamInvitation], {
-    description: 'Return all the pending invitations in a team',
-  })
-  async pendingInvitationCountInTeam(
-    @Args({
-      name: 'teamID',
-      type: () => ID,
-      description: 'Team ID for which team members to fetch',
-    })
-    teamID: string,
-  ) {
-    const invitations = await this.adminService.pendingInvitationCountInTeam(
-      teamID,
-    );
-    return invitations;
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return total number of Users in organization',
-  })
-  async usersCount() {
-    return this.adminService.getUsersCount();
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return total number of Teams in organization',
-  })
-  async teamsCount() {
-    return this.adminService.getTeamsCount();
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return total number of Team Collections in organization',
-  })
-  async teamCollectionsCount() {
-    return this.adminService.getTeamCollectionsCount();
-  }
-
-  @ResolveField(() => Number, {
-    description: 'Return total number of Team Requests in organization',
-  })
-  async teamRequestsCount() {
-    return this.adminService.getTeamRequestsCount();
-  }
-
-  @ResolveField(() => [ShortcodeWithUserEmail], {
-    description: 'Returns a list of all the shortcodes in the infra',
-  })
-  async allShortcodes(
-    @Args() args: PaginationArgs,
-    @Args({
-      name: 'userEmail',
-      nullable: true,
-      description: 'Users email to filter shortcodes by',
-    })
-    userEmail: string,
-  ) {
-    return await this.adminService.fetchAllShortcodes(
-      args.cursor,
-      args.take,
-      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;
-  }
-}
--- a/packages/hoppscotch-backend/src/app.controller.ts
+++ b/packages/hoppscotch-backend/src/app.controller.ts
@@ -1,9 +0,0 @@
-import { Controller, Get } from '@nestjs/common';
-
-@Controller('ping')
-export class AppController {
-  @Get()
-  ping(): string {
-    return 'Success';
-  }
-}
--- a/packages/hoppscotch-backend/src/app.module.ts
+++ b/packages/hoppscotch-backend/src/app.module.ts
@@ -19,70 +19,54 @@ import { UserCollectionModule } from './user-collection/user-collection.module';
 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'),
+      cors: {
+        origin: process.env.WHITELISTED_ORIGINS.split(','),
+        credentials: true,
+      },
+      playground: process.env.PRODUCTION !== 'true',
+      debug: 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,
+    }),
+    ThrottlerModule.forRoot({
+      ttl: +process.env.RATE_LIMIT_TTL,
+      limit: +process.env.RATE_LIMIT_MAX,
    }),
-    MailerModule.register(),
    UserModule,
-    AuthModule.register(),
+    AuthModule,
    AdminModule,
    UserSettingsModule,
    UserEnvironmentsModule,
@@ -95,9 +79,7 @@ import { MailerModule } from './mailer/mailer.module';
    TeamInvitationModule,
    UserCollectionModule,
    ShortcodeModule,
-    InfraConfigModule,
  ],
  providers: [GQLComplexityPlugin],
-  controllers: [AppController],
 })
 export class AppModule {}
--- a/packages/hoppscotch-backend/src/auth/auth.controller.ts
+++ b/packages/hoppscotch-backend/src/auth/auth.controller.ts
@@ -4,6 +4,7 @@ import {
  Get,
  Post,
  Query,
+  Req,
  Request,
  Res,
  UseGuards,
@@ -18,33 +19,17 @@ import { JwtAuthGuard } from './guards/jwt-auth.guard';
 import { GqlUser } from 'src/decorators/gql-user.decorator';
 import { AuthUser } from 'src/types/AuthUser';
 import { RTCookie } from 'src/decorators/rt-cookie.decorator';
-import {
-  AuthProvider,
-  authCookieHandler,
-  authProviderCheck,
-  throwHTTPErr,
-} from './helper';
+import { authCookieHandler, throwHTTPErr } from './helper';
 import { GoogleSSOGuard } from './guards/google-sso.guard';
 import { GithubSSOGuard } from './guards/github-sso.guard';
 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,15 +39,6 @@ export class AuthController {
    @Body() authData: SignInMagicDto,
    @Query('origin') origin: string,
  ) {
-    if (
-      !authProviderCheck(
-        AuthProvider.EMAIL,
-        this.configService.get('INFRA.VITE_ALLOWED_AUTH_PROVIDERS'),
-      )
-    ) {
-      throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-    }
-
    const deviceIdToken = await this.authService.signInMagicLink(
      authData.email,
      origin,
--- a/packages/hoppscotch-backend/src/auth/auth.module.ts
+++ b/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';
@@ -10,48 +11,25 @@ import { RTJwtStrategy } from './strategies/rt-jwt.strategy';
 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,
+    GoogleStrategy,
+    GithubStrategy,
+    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 {}
--- a/packages/hoppscotch-backend/src/auth/auth.service.spec.ts
+++ b/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',
--- a/packages/hoppscotch-backend/src/auth/auth.service.ts
+++ b/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,18 +218,18 @@ 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, {
-      template: 'user-invitation',
+    await this.mailerService.sendAuthEmail(email, {
+      template: 'code-your-own',
      variables: {
        inviteeEmail: email,
        magicLink: `${url}/enter?token=${generatedTokens.token}`,
@@ -383,8 +377,4 @@ export class AuthService {

    return E.right(<IsAdmin>{ isAdmin: false });
  }
-
-  getAuthProviders() {
-    return this.infraConfigService.getAllowedAuthProviders();
-  }
 }
--- a/packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts
+++ b/packages/hoppscotch-backend/src/auth/guards/github-sso.guard.ts
@@ -1,31 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { ExecutionContext, Injectable } from '@nestjs/common';
 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'),
-      )
-    ) {
-      throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-    }
-
-    return super.canActivate(context);
-  }
-
+export class GithubSSOGuard extends AuthGuard('github') {
  getAuthenticateOptions(context: ExecutionContext) {
    const req = context.switchToHttp().getRequest();

--- a/packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts
+++ b/packages/hoppscotch-backend/src/auth/guards/google-sso.guard.ts
@@ -1,31 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { ExecutionContext, Injectable } from '@nestjs/common';
 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'),
-      )
-    ) {
-      throwHTTPErr({ message: AUTH_PROVIDER_NOT_SPECIFIED, statusCode: 404 });
-    }
-
-    return super.canActivate(context);
-  }
-
+export class GoogleSSOGuard extends AuthGuard('google') {
  getAuthenticateOptions(context: ExecutionContext) {
    const req = context.switchToHttp().getRequest();

--- a/packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts
+++ b/packages/hoppscotch-backend/src/auth/guards/microsoft-sso-.guard.ts
@@ -1,37 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { ExecutionContext, Injectable } from '@nestjs/common';
 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'),
-      )
-    ) {
-      throwHTTPErr({
-        message: AUTH_PROVIDER_NOT_SPECIFIED,
-        statusCode: 404,
-      });
-    }
-
-    return super.canActivate(context);
-  }
-
+export class MicrosoftSSOGuard extends AuthGuard('microsoft') {
  getAuthenticateOptions(context: ExecutionContext) {
    const req = context.switchToHttp().getRequest();

--- a/packages/hoppscotch-backend/src/auth/helper.ts
+++ b/packages/hoppscotch-backend/src/auth/helper.ts
@@ -1,12 +1,10 @@
-import { HttpException, HttpStatus } from '@nestjs/common';
+import { ForbiddenException, HttpException, HttpStatus } from '@nestjs/common';
 import { DateTime } from 'luxon';
 import { AuthError } from 'src/types/AuthError';
 import { AuthTokens } from 'src/types/AuthTokens';
 import { Response } from 'express';
 import * as cookie from 'cookie';
-import { AUTH_PROVIDER_NOT_SPECIFIED, COOKIES_NOT_FOUND } from 'src/errors';
-import { throwErr } from 'src/utils';
-import { ConfigService } from '@nestjs/config';
+import { COOKIES_NOT_FOUND } from 'src/errors';

 enum AuthTokenType {
  ACCESS_TOKEN = 'access_token',
@@ -18,13 +16,6 @@ export enum Origin {
  APP = 'app',
 }

-export enum AuthProvider {
-  GOOGLE = 'GOOGLE',
-  GITHUB = 'GITHUB',
-  MICROSOFT = 'MICROSOFT',
-  EMAIL = 'EMAIL',
-}
-
 /**
 * This function allows throw to be used as an expression
 * @param errMessage Message present in the error message
@@ -46,17 +37,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 +67,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);
 };
@@ -110,28 +97,3 @@ export const subscriptionContextCookieParser = (rawCookies: string) => {
    refresh_token: cookies[AuthTokenType.REFRESH_TOKEN],
  };
 };
-
-/**
- * Check to see if given auth provider is present in the VITE_ALLOWED_AUTH_PROVIDERS env variable
- *
- * @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,
-) {
-  if (!provider) {
-    throwErr(AUTH_PROVIDER_NOT_SPECIFIED);
-  }
-
-  const envVariables = VITE_ALLOWED_AUTH_PROVIDERS
-    ? VITE_ALLOWED_AUTH_PROVIDERS.split(',').map((provider) =>
-        provider.trim().toUpperCase(),
-      )
-    : [];
-
-  if (!envVariables.includes(provider.toUpperCase())) return false;
-
-  return true;
-}
--- a/packages/hoppscotch-backend/src/auth/strategies/github.strategy.ts
+++ b/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,
    });
  }
--- a/packages/hoppscotch-backend/src/auth/strategies/google.strategy.ts
+++ b/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,
    });
--- a/packages/hoppscotch-backend/src/auth/strategies/jwt.strategy.ts
+++ b/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,
    });
  }

--- a/packages/hoppscotch-backend/src/auth/strategies/microsoft.strategy.ts
+++ b/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],
+      passReqToCallback: true,
      store: true,
    });
  }
--- a/packages/hoppscotch-backend/src/auth/strategies/rt-jwt.strategy.ts
+++ b/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,
    });
  }

--- a/packages/hoppscotch-backend/src/errors.ts
+++ b/packages/hoppscotch-backend/src/errors.ts
@@ -23,38 +23,7 @@ export const AUTH_FAIL = 'auth/fail';
 export const JSON_INVALID = 'json_invalid';

 /**
- * Auth Provider not specified
- * (Auth)
- */
-export const AUTH_PROVIDER_NOT_SPECIFIED = 'auth/provider_not_specified';
-
-/**
- * Auth Provider not specified
- * (Auth)
- */
-export const AUTH_PROVIDER_NOT_CONFIGURED =
-  'auth/provider_not_configured_correctly';
-
-/**
- * Environment variable "VITE_ALLOWED_AUTH_PROVIDERS" is not present in .env file
- */
-export const ENV_NOT_FOUND_KEY_AUTH_PROVIDERS =
-  '"VITE_ALLOWED_AUTH_PROVIDERS" is not present in .env file';
-
-/**
- * Environment variable "VITE_ALLOWED_AUTH_PROVIDERS" is empty in .env file
- */
-export const ENV_EMPTY_AUTH_PROVIDERS =
-  '"VITE_ALLOWED_AUTH_PROVIDERS" is empty in .env file';
-
-/**
- * Environment variable "VITE_ALLOWED_AUTH_PROVIDERS" contains unsupported provider in .env file
- */
-export const ENV_NOT_SUPPORT_AUTH_PROVIDERS =
-  '"VITE_ALLOWED_AUTH_PROVIDERS" contains an unsupported auth provider in .env file';
-
-/**
- * Tried to delete a user data document from fb firestore but failed.
+ * Tried to delete an user data document from fb firestore but failed.
 * (FirebaseService)
 */
 export const USER_FB_DOCUMENT_DELETION_FAILED =
@@ -262,14 +231,7 @@ 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
+ * Tried to perform action on a request that doesn't accept their member role level
 * (GqlRequestTeamMemberGuard)
 */
 export const TEAM_REQ_NOT_REQUIRED_ROLE = 'team_req/not_required_role';
@@ -300,7 +262,7 @@ export const TEAM_REQ_REORDERING_FAILED = 'team_req/reordering_failed' as const;
 export const SENDER_EMAIL_INVALID = 'mailer/sender_email_invalid' as const;

 /**
- * Tried to perform an action on a request when the user is not even a member of the team
+ * Tried to perform action on a request when the user is not even member of the team
 * (GqlRequestTeamMemberGuard, GqlCollectionTeamMemberGuard)
 */
 export const TEAM_REQ_NOT_MEMBER = 'team_req/not_member';
@@ -333,18 +295,23 @@ export const TEAM_INVITATION_NOT_FOUND =
 export const SHORTCODE_NOT_FOUND = 'shortcode/not_found' as const;

 /**
- * Invalid or non-existent TEAM ENVIRONMENT ID
+ * Invalid ShortCode format
+ * (ShortcodeService)
+ */
+export const SHORTCODE_INVALID_JSON = 'shortcode/invalid_json' as const;
+
+/**
+ * ShortCode already exists in DB
+ * (ShortcodeService)
+ */
+export const SHORTCODE_ALREADY_EXISTS = 'shortcode/already_exists' as const;
+
+/**
+ * Invalid or non-existent TEAM ENVIRONMMENT ID
 * (TeamEnvironmentsService)
 */
 export const TEAM_ENVIRONMENT_NOT_FOUND = 'team_environment/not_found' as const;

-/**
- * Invalid TEAM ENVIRONMENT name
- * (TeamEnvironmentsService)
- */
-export const TEAM_ENVIRONMENT_SHORT_NAME =
-  'team_environment/short_name' as const;
-
 /**
 * The user is not a member of the team of the given environment
 * (GqlTeamEnvTeamGuard)
@@ -373,7 +340,7 @@ export const USER_SETTINGS_NULL_SETTINGS =
  'user_settings/null_settings' as const;

 /*
- * Global environment doesn't exist for the user
+ * Global environment doesnt exists for the user
 * (UserEnvironmentsService)
 */
 export const USER_ENVIRONMENT_GLOBAL_ENV_DOES_NOT_EXISTS =
@@ -599,13 +566,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)
@@ -630,69 +590,3 @@ export const MAILER_SMTP_URL_UNDEFINED = 'mailer/smtp_url_undefined' as const;
 */
 export const MAILER_FROM_ADDRESS_UNDEFINED =
  'mailer/from_address_undefined' as const;
-
-/**
- * SharedRequest invalid request JSON format
- * (ShortcodeService)
- */
-export const SHORTCODE_INVALID_REQUEST_JSON =
-  'shortcode/request_invalid_format' as const;
-
-/**
- * SharedRequest invalid properties JSON format
- * (ShortcodeService)
- */
-export const SHORTCODE_INVALID_PROPERTIES_JSON =
-  'shortcode/properties_invalid_format' as const;
-
-/**
- * SharedRequest invalid properties not found
- * (ShortcodeService)
- */
-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 found. Please check the documentation for assistance: https://docs.hoppscotch.io/documentation/self-host/community-edition/install-and-build#running-migrations';
--- a/packages/hoppscotch-backend/src/gql-schema.ts
+++ b/packages/hoppscotch-backend/src/gql-schema.ts
@@ -27,7 +27,6 @@ import { UserRequestUserCollectionResolver } from './user-request/resolvers/user
 import { UserEnvsUserResolver } from './user-environment/user.resolver';
 import { UserHistoryUserResolver } from './user-history/user.resolver';
 import { UserSettingsUserResolver } from './user-settings/user.resolver';
-import { InfraResolver } from './admin/infra.resolver';

 /**
 * All the resolvers present in the application.
@@ -35,7 +34,6 @@ import { InfraResolver } from './admin/infra.resolver';
 * NOTE: This needs to be KEPT UP-TO-DATE to keep the schema accurate
 */
 const RESOLVERS = [
-  InfraResolver,
  AdminResolver,
  ShortcodeResolver,
  TeamResolver,
@@ -95,7 +93,9 @@ export async function emitGQLSchemaFile() {
      numberScalarMode: 'integer',
    });

-    const schemaString = printSchema(schema);
+    const schemaString = printSchema(schema, {
+      commentDescriptions: true,
+    });

    logger.log(`Writing schema to GQL_SCHEMA_EMIT_LOCATION (${destination})`);

--- a/packages/hoppscotch-backend/src/guards/throttler-behind-proxy.guard.ts
+++ b/packages/hoppscotch-backend/src/guards/throttler-behind-proxy.guard.ts
@@ -3,7 +3,8 @@ import { Injectable } from '@nestjs/common';

@Injectable()
 export class ThrottlerBehindProxyGuard extends ThrottlerGuard {
-  protected async getTracker(req: Record<string, any>): Promise<string> {
+  protected getTracker(req: Record<string, any>): string {
    return req.ips.length ? req.ips[0] : req.ip; // individualize IP extraction to meet your own needs
+    // learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Forwarded-For#directives
  }
 }
--- a/packages/hoppscotch-backend/src/infra-config/helper.ts
+++ b/packages/hoppscotch-backend/src/infra-config/helper.ts
@@ -1,106 +0,0 @@
-import { AuthProvider } from 'src/auth/helper';
-import { AUTH_PROVIDER_NOT_CONFIGURED } from 'src/errors';
-import { PrismaService } from 'src/prisma/prisma.service';
-import { InfraConfigEnum } from 'src/types/InfraConfig';
-import { throwErr } from 'src/utils';
-
-export enum ServiceStatus {
-  ENABLE = 'ENABLE',
-  DISABLE = 'DISABLE',
-}
-
-const AuthProviderConfigurations = {
-  [AuthProvider.GOOGLE]: [
-    InfraConfigEnum.GOOGLE_CLIENT_ID,
-    InfraConfigEnum.GOOGLE_CLIENT_SECRET,
-  ],
-  [AuthProvider.GITHUB]: [
-    InfraConfigEnum.GITHUB_CLIENT_ID,
-    InfraConfigEnum.GITHUB_CLIENT_SECRET,
-  ],
-  [AuthProvider.MICROSOFT]: [
-    InfraConfigEnum.MICROSOFT_CLIENT_ID,
-    InfraConfigEnum.MICROSOFT_CLIENT_SECRET,
-  ],
-  [AuthProvider.EMAIL]: [
-    InfraConfigEnum.MAILER_SMTP_URL,
-    InfraConfigEnum.MAILER_ADDRESS_FROM,
-  ],
-};
-
-/**
- * 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);
-}
-
-/**
- * Get the configured SSO providers
- * @returns Array of configured SSO providers
- */
-export function getConfiguredSSOProviders() {
-  const allowedAuthProviders: string[] =
-    process.env.VITE_ALLOWED_AUTH_PROVIDERS.split(',');
-  let configuredAuthProviders: string[] = [];
-
-  const addProviderIfConfigured = (provider) => {
-    const configParameters: string[] = AuthProviderConfigurations[provider];
-
-    const isConfigured = configParameters.every((configParameter) => {
-      return process.env[configParameter];
-    });
-
-    if (isConfigured) configuredAuthProviders.push(provider);
-  };
-
-  allowedAuthProviders.forEach((provider) => addProviderIfConfigured(provider));
-
-  if (configuredAuthProviders.length === 0) {
-    throwErr(AUTH_PROVIDER_NOT_CONFIGURED);
-  } else if (allowedAuthProviders.length !== configuredAuthProviders.length) {
-    const unConfiguredAuthProviders = allowedAuthProviders.filter(
-      (provider) => {
-        return !configuredAuthProviders.includes(provider);
-      },
-    );
-    console.log(
-      `${unConfiguredAuthProviders.join(
-        ',',
-      )} SSO auth provider(s) are not configured properly. Do configure them from Admin Dashboard.`,
-    );
-  }
-
-  return configuredAuthProviders.join(',');
-}
--- a/packages/hoppscotch-backend/src/infra-config/infra-config.model.ts
+++ b/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',
-});
--- a/packages/hoppscotch-backend/src/infra-config/infra-config.module.ts
+++ b/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 {}
--- a/packages/hoppscotch-backend/src/infra-config/infra-config.service.spec.ts
+++ b/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);
-    });
-  });
-});
--- a/packages/hoppscotch-backend/src/infra-config/infra-config.service.ts
+++ b/packages/hoppscotch-backend/src/infra-config/infra-config.service.ts
@@ -1,380 +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, validateSMTPEmail, validateSMTPUrl } from 'src/utils';
-import { ConfigService } from '@nestjs/config';
-import { ServiceStatus, getConfiguredSSOProviders, 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: getConfiguredSSOProviders(),
-      },
-    ];
-
-    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 ?? '',
-    };
-  }
-
-  /**
-   * Get all the InfraConfigs as map
-   * @returns InfraConfig map
-   */
-  async getInfraConfigsMap() {
-    const infraConfigs = await this.prisma.infraConfig.findMany();
-    const infraConfigMap: Record<string, string> = {};
-    infraConfigs.forEach((config) => {
-      infraConfigMap[config.name] = config.value;
-    });
-    return infraConfigMap;
-  }
-
-  /**
-   * 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.
-   * @param configMap Map of all the infra configs
-   * @returns Either true or false
-   */
-  isServiceConfigured(
-    service: AuthProvider,
-    configMap: Record<string, string>,
-  ) {
-    switch (service) {
-      case AuthProvider.GOOGLE:
-        return configMap.GOOGLE_CLIENT_ID && configMap.GOOGLE_CLIENT_SECRET;
-      case AuthProvider.GITHUB:
-        return configMap.GITHUB_CLIENT_ID && configMap.GITHUB_CLIENT_SECRET;
-      case AuthProvider.MICROSOFT:
-        return (
-          configMap.MICROSOFT_CLIENT_ID && configMap.MICROSOFT_CLIENT_SECRET
-        );
-      case AuthProvider.EMAIL:
-        return configMap.MAILER_SMTP_URL && configMap.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;
-
-    const infraConfigMap = await this.getInfraConfigsMap();
-
-    providerInfo.forEach(({ provider, status }) => {
-      if (status === ServiceStatus.ENABLE) {
-        const isConfigured = this.isServiceConfigured(provider, infraConfigMap);
-        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 = validateSMTPEmail(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);
-  }
-}
--- a/packages/hoppscotch-backend/src/infra-config/input-args.ts
+++ b/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;
-}
--- a/packages/hoppscotch-backend/src/mailer/MailDescriptions.ts
+++ b/packages/hoppscotch-backend/src/mailer/MailDescriptions.ts
@@ -8,7 +8,7 @@ export type MailDescription = {
 };

 export type UserMagicLinkMailDescription = {
-  template: 'user-invitation';
+  template: 'code-your-own';
  variables: {
    inviteeEmail: string;
    magicLink: string;
@@ -16,7 +16,7 @@ export type UserMagicLinkMailDescription = {
 };

 export type AdminUserInvitationMailDescription = {
-  template: 'user-invitation';
+  template: 'code-your-own';
  variables: {
    inviteeEmail: string;
    magicLink: string;
--- a/packages/hoppscotch-backend/src/mailer/mailer.module.ts
+++ b/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 {}
--- a/packages/hoppscotch-backend/src/mailer/mailer.service.ts
+++ b/packages/hoppscotch-backend/src/mailer/mailer.service.ts
@@ -5,6 +5,7 @@ import {
  UserMagicLinkMailDescription,
 } from './MailDescriptions';
 import { throwErr } from 'src/utils';
+import * as TE from 'fp-ts/TaskEither';
 import { EMAIL_FAILED } from 'src/errors';
 import { MailerService as NestMailerService } from '@nestjs-modules/mailer';

@@ -27,21 +28,40 @@ export class MailerService {
      case 'team-invitation':
        return `${mailDesc.variables.invitee} invited you to join ${mailDesc.variables.invite_team_name} in Hoppscotch`;

-      case 'user-invitation':
+      case 'code-your-own':
        return 'Sign in to Hoppscotch';
    }
  }

  /**
   * Sends an email to the given email address given a mail description
-   * @param to Receiver's email id
+   * @param to The email address to be sent to (NOTE: this is not validated)
   * @param mailDesc Definition of what email to be sent
-   * @returns Response if email was send successfully or not
   */
-  async sendEmail(
+  sendMail(
    to: string,
    mailDesc: MailDescription | UserMagicLinkMailDescription,
  ) {
+    return TE.tryCatch(
+      async () => {
+        await this.nestMailerService.sendMail({
+          to,
+          template: mailDesc.template,
+          subject: this.resolveSubjectForMailDesc(mailDesc),
+          context: mailDesc.variables,
+        });
+      },
+      () => EMAIL_FAILED,
+    );
+  }
+
+  /**
+   *
+   * @param to Receiver's email id
+   * @param mailDesc Details of email to be sent for Magic-Link auth
+   * @returns Response if email was send successfully or not
+   */
+  async sendAuthEmail(to: string, mailDesc: UserMagicLinkMailDescription) {
    try {
      await this.nestMailerService.sendMail({
        to,
--- a/packages/hoppscotch-backend/src/mailer/templates/user-invitation.hbs
+++ b/packages/hoppscotch-backend/src/mailer/templates/user-invitation.hbs
--- a/packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs
+++ b/packages/hoppscotch-backend/src/mailer/templates/team-invitation.hbs
@@ -14,7 +14,7 @@
  -->
    <style type="text/css" rel="stylesheet" media="all">
    /* Base ------------------------------ */
-
+    
    @import url("https://fonts.googleapis.com/css?family=Nunito+Sans:400,700&display=swap");
    body {
      width: 100% !important;
@@ -22,19 +22,19 @@
      margin: 0;
      -webkit-text-size-adjust: none;
    }
-
+    
    a {
      color: #3869D4;
    }
-
+    
    a img {
      border: none;
    }
-
+    
    td {
      word-break: break-word;
    }
-
+    
    .preheader {
      display: none !important;
      visibility: hidden;
@@ -47,13 +47,13 @@
      overflow: hidden;
    }
    /* Type ------------------------------ */
-
+    
    body,
    td,
    th {
      font-family: "Nunito Sans", Helvetica, Arial, sans-serif;
    }
-
+    
    h1 {
      margin-top: 0;
      color: #333333;
@@ -61,7 +61,7 @@
      font-weight: bold;
      text-align: left;
    }
-
+    
    h2 {
      margin-top: 0;
      color: #333333;
@@ -69,7 +69,7 @@
      font-weight: bold;
      text-align: left;
    }
-
+    
    h3 {
      margin-top: 0;
      color: #333333;
@@ -77,12 +77,12 @@
      font-weight: bold;
      text-align: left;
    }
-
+    
    td,
    th {
      font-size: 16px;
    }
-
+    
    p,
    ul,
    ol,
@@ -91,25 +91,25 @@
      font-size: 16px;
      line-height: 1.625;
    }
-
+    
    p.sub {
      font-size: 13px;
    }
    /* Utilities ------------------------------ */
-
+    
    .align-right {
      text-align: right;
    }
-
+    
    .align-left {
      text-align: left;
    }
-
+    
    .align-center {
      text-align: center;
    }
    /* Buttons ------------------------------ */
-
+    
    .button {
      background-color: #3869D4;
      border-top: 10px solid #3869D4;
@@ -124,7 +124,7 @@
      -webkit-text-size-adjust: none;
      box-sizing: border-box;
    }
-
+    
    .button--green {
      background-color: #22BC66;
      border-top: 10px solid #22BC66;
@@ -132,7 +132,7 @@
      border-bottom: 10px solid #22BC66;
      border-left: 18px solid #22BC66;
    }
-
+    
    .button--red {
      background-color: #FF6136;
      border-top: 10px solid #FF6136;
@@ -140,7 +140,7 @@
      border-bottom: 10px solid #FF6136;
      border-left: 18px solid #FF6136;
    }
-
+    
    @media only screen and (max-width: 500px) {
      .button {
        width: 100% !important;
@@ -148,21 +148,21 @@
      }
    }
    /* Attribute list ------------------------------ */
-
+    
    .attributes {
      margin: 0 0 21px;
    }
-
+    
    .attributes_content {
      background-color: #F4F4F7;
      padding: 16px;
    }
-
+    
    .attributes_item {
      padding: 0;
    }
    /* Related Items ------------------------------ */
-
+    
    .related {
      width: 100%;
      margin: 0;
@@ -171,31 +171,31 @@
      -premailer-cellpadding: 0;
      -premailer-cellspacing: 0;
    }
-
+    
    .related_item {
      padding: 10px 0;
      color: #CBCCCF;
      font-size: 15px;
      line-height: 18px;
    }
-
+    
    .related_item-title {
      display: block;
      margin: .5em 0 0;
    }
-
+    
    .related_item-thumb {
      display: block;
      padding-bottom: 10px;
    }
-
+    
    .related_heading {
      border-top: 1px solid #CBCCCF;
      text-align: center;
      padding: 25px 0 10px;
    }
    /* Discount Code ------------------------------ */
-
+    
    .discount {
      width: 100%;
      margin: 0;
@@ -206,33 +206,33 @@
      background-color: #F4F4F7;
      border: 2px dashed #CBCCCF;
    }
-
+    
    .discount_heading {
      text-align: center;
    }
-
+    
    .discount_body {
      text-align: center;
      font-size: 15px;
    }
    /* Social Icons ------------------------------ */
-
+    
    .social {
      width: auto;
    }
-
+    
    .social td {
      padding: 0;
      width: auto;
    }
-
+    
    .social_icon {
      height: 20px;
      margin: 0 8px 10px 8px;
      padding: 0;
    }
    /* Data table ------------------------------ */
-
+    
    .purchase {
      width: 100%;
      margin: 0;
@@ -241,7 +241,7 @@
      -premailer-cellpadding: 0;
      -premailer-cellspacing: 0;
    }
-
+    
    .purchase_content {
      width: 100%;
      margin: 0;
@@ -250,50 +250,50 @@
      -premailer-cellpadding: 0;
      -premailer-cellspacing: 0;
    }
-
+    
    .purchase_item {
      padding: 10px 0;
      color: #51545E;
      font-size: 15px;
      line-height: 18px;
    }
-
+    
    .purchase_heading {
      padding-bottom: 8px;
      border-bottom: 1px solid #EAEAEC;
    }
-
+    
    .purchase_heading p {
      margin: 0;
      color: #85878E;
      font-size: 12px;
    }
-
+    
    .purchase_footer {
      padding-top: 15px;
      border-top: 1px solid #EAEAEC;
    }
-
+    
    .purchase_total {
      margin: 0;
      text-align: right;
      font-weight: bold;
      color: #333333;
    }
-
+    
    .purchase_total--label {
      padding: 0 15px 0 0;
    }
-
+    
    body {
      background-color: #F2F4F6;
      color: #51545E;
    }
-
+    
    p {
      color: #51545E;
    }
-
+    
    .email-wrapper {
      width: 100%;
      margin: 0;
@@ -303,7 +303,7 @@
      -premailer-cellspacing: 0;
      background-color: #F2F4F6;
    }
-
+    
    .email-content {
      width: 100%;
      margin: 0;
@@ -313,16 +313,16 @@
      -premailer-cellspacing: 0;
    }
    /* Masthead ----------------------- */
-
+    
    .email-masthead {
      padding: 25px 0;
      text-align: center;
    }
-
+    
    .email-masthead_logo {
      width: 94px;
    }
-
+    
    .email-masthead_name {
      font-size: 16px;
      font-weight: bold;
@@ -331,7 +331,7 @@
      text-shadow: 0 1px 0 white;
    }
    /* Body ------------------------------ */
-
+    
    .email-body {
      width: 100%;
      margin: 0;
@@ -340,7 +340,7 @@
      -premailer-cellpadding: 0;
      -premailer-cellspacing: 0;
    }
-
+    
    .email-body_inner {
      width: 570px;
      margin: 0 auto;
@@ -350,7 +350,7 @@
      -premailer-cellspacing: 0;
      background-color: #FFFFFF;
    }
-
+    
    .email-footer {
      width: 570px;
      margin: 0 auto;
@@ -360,11 +360,11 @@
      -premailer-cellspacing: 0;
      text-align: center;
    }
-
+    
    .email-footer p {
      color: #A8AAAF;
    }
-
+    
    .body-action {
      width: 100%;
      margin: 30px auto;
@@ -374,25 +374,25 @@
      -premailer-cellspacing: 0;
      text-align: center;
    }
-
+    
    .body-sub {
      margin-top: 25px;
      padding-top: 25px;
      border-top: 1px solid #EAEAEC;
    }
-
+    
    .content-cell {
      padding: 45px;
    }
    /*Media Queries ------------------------------ */
-
+    
    @media only screen and (max-width: 600px) {
      .email-body_inner,
      .email-footer {
        width: 100% !important;
      }
    }
-
+    
    @media (prefers-color-scheme: dark) {
      body,
      .email-body,
--- a/packages/hoppscotch-backend/src/main.ts
+++ b/packages/hoppscotch-backend/src/main.ts
@@ -5,25 +5,17 @@ import * as cookieParser from 'cookie-parser';
 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}`);
+  console.log(`Database: ${process.env.DATABASE_URL}`);
+
  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('INFRA.VITE_ALLOWED_AUTH_PROVIDERS') ??
-      configService.get('VITE_ALLOWED_AUTH_PROVIDERS'),
-  );
-
  app.use(
    session({
-      secret: configService.get('SESSION_SECRET'),
+      secret: process.env.SESSION_SECRET,
    }),
  );

@@ -34,18 +26,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,
    });
  }
@@ -53,13 +45,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) {
--- a/packages/hoppscotch-backend/src/plugins/GQLComplexityPlugin.ts
+++ b/packages/hoppscotch-backend/src/plugins/GQLComplexityPlugin.ts
@@ -1,9 +1,8 @@
 import { GraphQLSchemaHost } from '@nestjs/graphql';
 import {
  ApolloServerPlugin,
-  BaseContext,
  GraphQLRequestListener,
-} from '@apollo/server';
+} from 'apollo-server-plugin-base';
 import { Plugin } from '@nestjs/apollo';
 import { GraphQLError } from 'graphql';
 import {
@@ -18,7 +17,7 @@ const COMPLEXITY_LIMIT = 50;
 export class GQLComplexityPlugin implements ApolloServerPlugin {
  constructor(private gqlSchemaHost: GraphQLSchemaHost) {}

-  async requestDidStart(): Promise<GraphQLRequestListener<BaseContext>> {
+  async requestDidStart(): Promise<GraphQLRequestListener> {
    const { schema } = this.gqlSchemaHost;

    return {
--- a/packages/hoppscotch-backend/src/pubsub/topicsDefs.ts
+++ b/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';
@@ -69,7 +69,5 @@ export type TopicDef = {
  [topic: `team_req/${string}/req_deleted`]: string;
  [topic: `team/${string}/invite_added`]: TeamInvitation;
  [topic: `team/${string}/invite_removed`]: string;
-  [
-    topic: `shortcode/${string}/${'created' | 'revoked' | 'updated'}`
-  ]: Shortcode;
+  [topic: `shortcode/${string}/${'created' | 'revoked'}`]: Shortcode;
 };
--- a/packages/hoppscotch-backend/src/shortcode/shortcode.model.ts
+++ b/packages/hoppscotch-backend/src/shortcode/shortcode.model.ts
@@ -1,10 +1,9 @@
 import { Field, ID, ObjectType } from '@nestjs/graphql';
-import { User } from 'src/user/user.model';

@ObjectType()
 export class Shortcode {
  @Field(() => ID, {
-    description: 'The 12 digit alphanumeric code',
+    description: 'The shortcode. 12 digit alphanumeric.',
  })
  id: string;

@@ -13,57 +12,8 @@ export class Shortcode {
  })
  request: string;

-  @Field({
-    description: 'JSON string representing the properties for an embed',
-    nullable: true,
-  })
-  properties: string;
-
  @Field({
    description: 'Timestamp of when the Shortcode was created',
  })
  createdOn: Date;
 }
-
-@ObjectType()
-export class ShortcodeCreator {
-  @Field({
-    description: 'Uid of user who created the shortcode',
-  })
-  uid: string;
-
-  @Field({
-    description: 'Email of user who created the shortcode',
-  })
-  email: string;
-}
-
-@ObjectType()
-export class ShortcodeWithUserEmail {
-  @Field(() => ID, {
-    description: 'The 12 digit alphanumeric code',
-  })
-  id: string;
-
-  @Field({
-    description: 'JSON string representing the request data',
-  })
-  request: string;
-
-  @Field({
-    description: 'JSON string representing the properties for an embed',
-    nullable: true,
-  })
-  properties: string;
-
-  @Field({
-    description: 'Timestamp of when the Shortcode was created',
-  })
-  createdOn: Date;
-
-  @Field({
-    description: 'Details of user who created the shortcode',
-    nullable: true,
-  })
-  creator: ShortcodeCreator;
-}
--- a/packages/hoppscotch-backend/src/shortcode/shortcode.module.ts
+++ b/packages/hoppscotch-backend/src/shortcode/shortcode.module.ts
@@ -1,4 +1,5 @@
 import { Module } from '@nestjs/common';
+import { JwtModule } from '@nestjs/jwt';
 import { PrismaModule } from 'src/prisma/prisma.module';
 import { PubSubModule } from 'src/pubsub/pubsub.module';
 import { UserModule } from 'src/user/user.module';
@@ -6,7 +7,14 @@ import { ShortcodeResolver } from './shortcode.resolver';
 import { ShortcodeService } from './shortcode.service';

@Module({
-  imports: [PrismaModule, UserModule, PubSubModule],
+  imports: [
+    PrismaModule,
+    UserModule,
+    PubSubModule,
+    JwtModule.register({
+      secret: process.env.JWT_SECRET,
+    }),
+  ],
  providers: [ShortcodeService, ShortcodeResolver],
  exports: [ShortcodeService],
 })
--- a/packages/hoppscotch-backend/src/shortcode/shortcode.resolver.ts
+++ b/packages/hoppscotch-backend/src/shortcode/shortcode.resolver.ts
@@ -1,5 +1,6 @@
 import {
  Args,
+  Context,
  ID,
  Mutation,
  Query,
@@ -8,25 +9,28 @@ import {
 } from '@nestjs/graphql';
 import * as E from 'fp-ts/Either';
 import { UseGuards } from '@nestjs/common';
-import { Shortcode, ShortcodeWithUserEmail } from './shortcode.model';
+import { Shortcode } from './shortcode.model';
 import { ShortcodeService } from './shortcode.service';
+import { UserService } from 'src/user/user.service';
 import { throwErr } from 'src/utils';
 import { GqlUser } from 'src/decorators/gql-user.decorator';
 import { GqlAuthGuard } from 'src/guards/gql-auth.guard';
 import { User } from 'src/user/user.model';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { AuthUser } from '../types/AuthUser';
+import { JwtService } from '@nestjs/jwt';
 import { PaginationArgs } from 'src/types/input-types.args';
 import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
 import { SkipThrottle } from '@nestjs/throttler';
-import { GqlAdminGuard } from 'src/admin/guards/gql-admin.guard';

@UseGuards(GqlThrottlerGuard)
@Resolver(() => Shortcode)
 export class ShortcodeResolver {
  constructor(
    private readonly shortcodeService: ShortcodeService,
+    private readonly userService: UserService,
    private readonly pubsub: PubSubService,
+    private jwtService: JwtService,
  ) {}

  /* Queries */
@@ -60,53 +64,20 @@ export class ShortcodeResolver {
  @Mutation(() => Shortcode, {
    description: 'Create a shortcode for the given request.',
  })
-  @UseGuards(GqlAuthGuard)
  async createShortcode(
-    @GqlUser() user: AuthUser,
    @Args({
      name: 'request',
      description: 'JSON string of the request object',
    })
    request: string,
-    @Args({
-      name: 'properties',
-      description: 'JSON string of the properties of the embed',
-      nullable: true,
-    })
-    properties: string,
+    @Context() ctx: any,
  ) {
+    const decodedAccessToken = this.jwtService.verify(
+      ctx.req.cookies['access_token'],
+    );
    const result = await this.shortcodeService.createShortcode(
      request,
-      properties,
-      user,
-    );
-
-    if (E.isLeft(result)) throwErr(result.left);
-    return result.right;
-  }
-
-  @Mutation(() => Shortcode, {
-    description: 'Update a user generated Shortcode',
-  })
-  @UseGuards(GqlAuthGuard)
-  async updateEmbedProperties(
-    @GqlUser() user: AuthUser,
-    @Args({
-      name: 'code',
-      type: () => ID,
-      description: 'The Shortcode to update',
-    })
-    code: string,
-    @Args({
-      name: 'properties',
-      description: 'JSON string of the properties of the embed',
-    })
-    properties: string,
-  ) {
-    const result = await this.shortcodeService.updateEmbedProperties(
-      code,
-      user.uid,
-      properties,
+      decodedAccessToken?.sub,
    );

    if (E.isLeft(result)) throwErr(result.left);
@@ -122,7 +93,7 @@ export class ShortcodeResolver {
    @Args({
      name: 'code',
      type: () => ID,
-      description: 'The shortcode to remove',
+      description: 'The shortcode to resolve',
    })
    code: string,
  ) {
@@ -143,16 +114,6 @@ export class ShortcodeResolver {
    return this.pubsub.asyncIterator(`shortcode/${user.uid}/created`);
  }

-  @Subscription(() => Shortcode, {
-    description: 'Listen for Shortcode updates',
-    resolve: (value) => value,
-  })
-  @SkipThrottle()
-  @UseGuards(GqlAuthGuard)
-  myShortcodesUpdated(@GqlUser() user: AuthUser) {
-    return this.pubsub.asyncIterator(`shortcode/${user.uid}/updated`);
-  }
-
  @Subscription(() => Shortcode, {
    description: 'Listen for shortcode deletion',
    resolve: (value) => value,
--- a/packages/hoppscotch-backend/src/shortcode/shortcode.service.spec.ts
+++ b/packages/hoppscotch-backend/src/shortcode/shortcode.service.spec.ts
@@ -1,16 +1,13 @@
 import { mockDeep, mockReset } from 'jest-mock-extended';
 import { PrismaService } from '../prisma/prisma.service';
 import {
-  INVALID_EMAIL,
-  SHORTCODE_INVALID_PROPERTIES_JSON,
-  SHORTCODE_INVALID_REQUEST_JSON,
+  SHORTCODE_ALREADY_EXISTS,
+  SHORTCODE_INVALID_JSON,
  SHORTCODE_NOT_FOUND,
-  SHORTCODE_PROPERTIES_NOT_FOUND,
 } from 'src/errors';
-import { Shortcode, ShortcodeWithUserEmail } from './shortcode.model';
+import { Shortcode } from './shortcode.model';
 import { ShortcodeService } from './shortcode.service';
 import { UserService } from 'src/user/user.service';
-import { AuthUser } from 'src/types/AuthUser';

 const mockPrisma = mockDeep<PrismaService>();

@@ -25,7 +22,7 @@ const mockFB = {
    doc: mockDocFunc,
  },
 };
-const mockUserService = new UserService(mockPrisma as any, mockPubSub as any);
+const mockUserService = new UserService(mockFB as any, mockPubSub as any);

 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
@@ -41,34 +38,18 @@ beforeEach(() => {
 });
 const createdOn = new Date();

-const user: AuthUser = {
-  uid: '123344',
-  email: 'dwight@dundermifflin.com',
-  displayName: 'Dwight Schrute',
-  photoURL: 'https://en.wikipedia.org/wiki/Dwight_Schrute',
-  isAdmin: false,
-  refreshToken: 'hbfvdkhjbvkdvdfjvbnkhjb',
-  createdOn: createdOn,
-  currentGQLSession: {},
-  currentRESTSession: {},
-};
-
-const mockEmbed = {
+const shortCodeWithOutUser = {
  id: '123',
  request: '{}',
-  embedProperties: '{}',
  createdOn: createdOn,
-  creatorUid: user.uid,
-  updatedOn: createdOn,
+  creatorUid: null,
 };

-const mockShortcode = {
+const shortCodeWithUser = {
  id: '123',
  request: '{}',
-  embedProperties: null,
  createdOn: createdOn,
-  creatorUid: user.uid,
-  updatedOn: createdOn,
+  creatorUid: 'user_uid_1',
 };

 const shortcodes = [
@@ -77,67 +58,33 @@ const shortcodes = [
    request: {
      hello: 'there',
    },
-    embedProperties: {
-      foo: 'bar',
-    },
-    creatorUid: user.uid,
+    creatorUid: 'testuser',
    createdOn: new Date(),
-    updatedOn: createdOn,
  },
  {
    id: 'blablabla1',
    request: {
      hello: 'there',
    },
-    embedProperties: {
-      foo: 'bar',
-    },
-    creatorUid: user.uid,
+    creatorUid: 'testuser',
    createdOn: new Date(),
-    updatedOn: createdOn,
-  },
-];
-
-const shortcodesWithUserEmail = [
-  {
-    id: 'blablabla',
-    request: {
-      hello: 'there',
-    },
-    embedProperties: {
-      foo: 'bar',
-    },
-    creatorUid: user.uid,
-    createdOn: new Date(),
-    updatedOn: createdOn,
-    User: user,
-  },
-  {
-    id: 'blablabla1',
-    request: {
-      hello: 'there',
-    },
-    embedProperties: {
-      foo: 'bar',
-    },
-    creatorUid: user.uid,
-    createdOn: new Date(),
-    updatedOn: createdOn,
-    User: user,
  },
 ];

 describe('ShortcodeService', () => {
  describe('getShortCode', () => {
-    test('should return a valid Shortcode with valid Shortcode ID', async () => {
-      mockPrisma.shortcode.findFirstOrThrow.mockResolvedValueOnce(mockEmbed);
+    test('should return a valid shortcode with valid shortcode ID', async () => {
+      mockPrisma.shortcode.findFirstOrThrow.mockResolvedValueOnce(
+        shortCodeWithOutUser,
+      );

-      const result = await shortcodeService.getShortCode(mockEmbed.id);
+      const result = await shortcodeService.getShortCode(
+        shortCodeWithOutUser.id,
+      );
      expect(result).toEqualRight(<Shortcode>{
-        id: mockEmbed.id,
-        createdOn: mockEmbed.createdOn,
-        request: JSON.stringify(mockEmbed.request),
-        properties: JSON.stringify(mockEmbed.embedProperties),
+        id: shortCodeWithOutUser.id,
+        createdOn: shortCodeWithOutUser.createdOn,
+        request: JSON.stringify(shortCodeWithOutUser.request),
      });
    });

@@ -152,10 +99,10 @@ describe('ShortcodeService', () => {
  });

  describe('fetchUserShortCodes', () => {
-    test('should return list of Shortcode with valid inputs and no cursor', async () => {
+    test('should return list of shortcodes with valid inputs and no cursor', async () => {
      mockPrisma.shortcode.findMany.mockResolvedValueOnce(shortcodes);

-      const result = await shortcodeService.fetchUserShortCodes(user.uid, {
+      const result = await shortcodeService.fetchUserShortCodes('testuser', {
        cursor: null,
        take: 10,
      });
@@ -163,22 +110,20 @@ describe('ShortcodeService', () => {
        {
          id: shortcodes[0].id,
          request: JSON.stringify(shortcodes[0].request),
-          properties: JSON.stringify(shortcodes[0].embedProperties),
          createdOn: shortcodes[0].createdOn,
        },
        {
          id: shortcodes[1].id,
          request: JSON.stringify(shortcodes[1].request),
-          properties: JSON.stringify(shortcodes[1].embedProperties),
          createdOn: shortcodes[1].createdOn,
        },
      ]);
    });

-    test('should return list of Shortcode with valid inputs and cursor', async () => {
+    test('should return list of shortcodes with valid inputs and cursor', async () => {
      mockPrisma.shortcode.findMany.mockResolvedValue([shortcodes[1]]);

-      const result = await shortcodeService.fetchUserShortCodes(user.uid, {
+      const result = await shortcodeService.fetchUserShortCodes('testuser', {
        cursor: 'blablabla',
        take: 10,
      });
@@ -186,7 +131,6 @@ describe('ShortcodeService', () => {
        {
          id: shortcodes[1].id,
          request: JSON.stringify(shortcodes[1].request),
-          properties: JSON.stringify(shortcodes[1].embedProperties),
          createdOn: shortcodes[1].createdOn,
        },
      ]);
@@ -195,7 +139,7 @@ describe('ShortcodeService', () => {
    test('should return an empty array for an invalid cursor', async () => {
      mockPrisma.shortcode.findMany.mockResolvedValue([]);

-      const result = await shortcodeService.fetchUserShortCodes(user.uid, {
+      const result = await shortcodeService.fetchUserShortCodes('testuser', {
        cursor: 'invalidcursor',
        take: 10,
      });
@@ -227,111 +171,77 @@ describe('ShortcodeService', () => {
  });

  describe('createShortcode', () => {
-    test('should throw SHORTCODE_INVALID_REQUEST_JSON error if incoming request data is invalid', async () => {
+    test('should throw SHORTCODE_INVALID_JSON error if incoming request data is invalid', async () => {
      const result = await shortcodeService.createShortcode(
        'invalidRequest',
-        null,
-        user,
+        'user_uid_1',
      );
-      expect(result).toEqualLeft(SHORTCODE_INVALID_REQUEST_JSON);
+      expect(result).toEqualLeft(SHORTCODE_INVALID_JSON);
    });

-    test('should throw SHORTCODE_INVALID_PROPERTIES_JSON error if incoming properties data is invalid', async () => {
-      const result = await shortcodeService.createShortcode(
-        '{}',
-        'invalid_data',
-        user,
-      );
-      expect(result).toEqualLeft(SHORTCODE_INVALID_PROPERTIES_JSON);
-    });
-
-    test('should successfully create a new Embed with valid user uid', async () => {
-      // generateUniqueShortCodeID --> getShortcode
+    test('should successfully create a new shortcode with valid user uid', async () => {
+      // generateUniqueShortCodeID --> getShortCode
      mockPrisma.shortcode.findFirstOrThrow.mockRejectedValueOnce(
        'NotFoundError',
      );
-      mockPrisma.shortcode.create.mockResolvedValueOnce(mockEmbed);
+      mockPrisma.shortcode.create.mockResolvedValueOnce(shortCodeWithUser);

-      const result = await shortcodeService.createShortcode('{}', '{}', user);
-      expect(result).toEqualRight(<Shortcode>{
-        id: mockEmbed.id,
-        createdOn: mockEmbed.createdOn,
-        request: JSON.stringify(mockEmbed.request),
-        properties: JSON.stringify(mockEmbed.embedProperties),
+      const result = await shortcodeService.createShortcode('{}', 'user_uid_1');
+      expect(result).toEqualRight({
+        id: shortCodeWithUser.id,
+        createdOn: shortCodeWithUser.createdOn,
+        request: JSON.stringify(shortCodeWithUser.request),
      });
    });

-    test('should successfully create a new ShortCode with valid user uid', async () => {
-      // generateUniqueShortCodeID --> getShortcode
+    test('should successfully create a new shortcode with null user uid', async () => {
+      // generateUniqueShortCodeID --> getShortCode
      mockPrisma.shortcode.findFirstOrThrow.mockRejectedValueOnce(
        'NotFoundError',
      );
-      mockPrisma.shortcode.create.mockResolvedValueOnce(mockShortcode);
+      mockPrisma.shortcode.create.mockResolvedValueOnce(shortCodeWithUser);

-      const result = await shortcodeService.createShortcode('{}', null, user);
-      expect(result).toEqualRight(<Shortcode>{
-        id: mockShortcode.id,
-        createdOn: mockShortcode.createdOn,
-        request: JSON.stringify(mockShortcode.request),
-        properties: mockShortcode.embedProperties,
+      const result = await shortcodeService.createShortcode('{}', null);
+      expect(result).toEqualRight({
+        id: shortCodeWithUser.id,
+        createdOn: shortCodeWithUser.createdOn,
+        request: JSON.stringify(shortCodeWithOutUser.request),
      });
    });

-    test('should send pubsub message to `shortcode/{uid}/created` on successful creation of a Shortcode', async () => {
-      // generateUniqueShortCodeID --> getShortcode
+    test('should send pubsub message to `shortcode/{uid}/created` on successful creation of shortcode', async () => {
+      // generateUniqueShortCodeID --> getShortCode
      mockPrisma.shortcode.findFirstOrThrow.mockRejectedValueOnce(
        'NotFoundError',
      );
-      mockPrisma.shortcode.create.mockResolvedValueOnce(mockShortcode);
-
-      const result = await shortcodeService.createShortcode('{}', null, user);
+      mockPrisma.shortcode.create.mockResolvedValueOnce(shortCodeWithUser);

+      const result = await shortcodeService.createShortcode('{}', 'user_uid_1');
      expect(mockPubSub.publish).toHaveBeenCalledWith(
-        `shortcode/${mockShortcode.creatorUid}/created`,
-        <Shortcode>{
-          id: mockShortcode.id,
-          createdOn: mockShortcode.createdOn,
-          request: JSON.stringify(mockShortcode.request),
-          properties: mockShortcode.embedProperties,
-        },
-      );
-    });
-
-    test('should send pubsub message to `shortcode/{uid}/created` on successful creation of an Embed', async () => {
-      // generateUniqueShortCodeID --> getShortcode
-      mockPrisma.shortcode.findFirstOrThrow.mockRejectedValueOnce(
-        'NotFoundError',
-      );
-      mockPrisma.shortcode.create.mockResolvedValueOnce(mockEmbed);
-
-      const result = await shortcodeService.createShortcode('{}', '{}', user);
-
-      expect(mockPubSub.publish).toHaveBeenCalledWith(
-        `shortcode/${mockEmbed.creatorUid}/created`,
-        <Shortcode>{
-          id: mockEmbed.id,
-          createdOn: mockEmbed.createdOn,
-          request: JSON.stringify(mockEmbed.request),
-          properties: JSON.stringify(mockEmbed.embedProperties),
+        `shortcode/${shortCodeWithUser.creatorUid}/created`,
+        {
+          id: shortCodeWithUser.id,
+          createdOn: shortCodeWithUser.createdOn,
+          request: JSON.stringify(shortCodeWithUser.request),
        },
      );
    });
  });

  describe('revokeShortCode', () => {
-    test('should return true on successful deletion of Shortcode with valid inputs', async () => {
-      mockPrisma.shortcode.delete.mockResolvedValueOnce(mockEmbed);
+    test('should return true on successful deletion of shortcode with valid inputs', async () => {
+      mockPrisma.shortcode.delete.mockResolvedValueOnce(shortCodeWithUser);

      const result = await shortcodeService.revokeShortCode(
-        mockEmbed.id,
-        mockEmbed.creatorUid,
+        shortCodeWithUser.id,
+        shortCodeWithUser.creatorUid,
      );

      expect(mockPrisma.shortcode.delete).toHaveBeenCalledWith({
        where: {
          creator_uid_shortcode_unique: {
-            creatorUid: mockEmbed.creatorUid,
-            id: mockEmbed.id,
+            creatorUid: shortCodeWithUser.creatorUid,
+            id: shortCodeWithUser.id,
          },
        },
      });
@@ -339,53 +249,52 @@ describe('ShortcodeService', () => {
      expect(result).toEqualRight(true);
    });

-    test('should return SHORTCODE_NOT_FOUND error when Shortcode is invalid and user uid is valid', async () => {
+    test('should return SHORTCODE_NOT_FOUND error when shortcode is invalid and user uid is valid', async () => {
      mockPrisma.shortcode.delete.mockRejectedValue('RecordNotFound');
      expect(
        shortcodeService.revokeShortCode('invalid', 'testuser'),
      ).resolves.toEqualLeft(SHORTCODE_NOT_FOUND);
    });

-    test('should return SHORTCODE_NOT_FOUND error when Shortcode is valid and user uid is invalid', async () => {
+    test('should return SHORTCODE_NOT_FOUND error when shortcode is valid and user uid is invalid', async () => {
      mockPrisma.shortcode.delete.mockRejectedValue('RecordNotFound');
      expect(
        shortcodeService.revokeShortCode('blablablabla', 'invalidUser'),
      ).resolves.toEqualLeft(SHORTCODE_NOT_FOUND);
    });

-    test('should return SHORTCODE_NOT_FOUND error when both Shortcode and user uid are invalid', async () => {
+    test('should return SHORTCODE_NOT_FOUND error when both shortcode and user uid are invalid', async () => {
      mockPrisma.shortcode.delete.mockRejectedValue('RecordNotFound');
      expect(
        shortcodeService.revokeShortCode('invalid', 'invalid'),
      ).resolves.toEqualLeft(SHORTCODE_NOT_FOUND);
    });

-    test('should send pubsub message to `shortcode/{uid}/revoked` on successful deletion of Shortcode', async () => {
-      mockPrisma.shortcode.delete.mockResolvedValueOnce(mockEmbed);
+    test('should send pubsub message to `shortcode/{uid}/revoked` on successful deletion of shortcode', async () => {
+      mockPrisma.shortcode.delete.mockResolvedValueOnce(shortCodeWithUser);

      const result = await shortcodeService.revokeShortCode(
-        mockEmbed.id,
-        mockEmbed.creatorUid,
+        shortCodeWithUser.id,
+        shortCodeWithUser.creatorUid,
      );

      expect(mockPubSub.publish).toHaveBeenCalledWith(
-        `shortcode/${mockEmbed.creatorUid}/revoked`,
+        `shortcode/${shortCodeWithUser.creatorUid}/revoked`,
        {
-          id: mockEmbed.id,
-          createdOn: mockEmbed.createdOn,
-          request: JSON.stringify(mockEmbed.request),
-          properties: JSON.stringify(mockEmbed.embedProperties),
+          id: shortCodeWithUser.id,
+          createdOn: shortCodeWithUser.createdOn,
+          request: JSON.stringify(shortCodeWithUser.request),
        },
      );
    });
  });

  describe('deleteUserShortCodes', () => {
-    test('should successfully delete all users Shortcodes with valid user uid', async () => {
+    test('should successfully delete all users shortcodes with valid user uid', async () => {
      mockPrisma.shortcode.deleteMany.mockResolvedValueOnce({ count: 1 });

      const result = await shortcodeService.deleteUserShortCodes(
-        mockEmbed.creatorUid,
+        shortCodeWithUser.creatorUid,
      );
      expect(result).toEqual(1);
    });
@@ -394,180 +303,9 @@ describe('ShortcodeService', () => {
      mockPrisma.shortcode.deleteMany.mockResolvedValueOnce({ count: 0 });

      const result = await shortcodeService.deleteUserShortCodes(
-        mockEmbed.creatorUid,
+        shortCodeWithUser.creatorUid,
      );
      expect(result).toEqual(0);
    });
  });
-
-  describe('updateShortcode', () => {
-    test('should return SHORTCODE_PROPERTIES_NOT_FOUND error when updatedProps in invalid', async () => {
-      const result = await shortcodeService.updateEmbedProperties(
-        mockEmbed.id,
-        user.uid,
-        '',
-      );
-      expect(result).toEqualLeft(SHORTCODE_PROPERTIES_NOT_FOUND);
-    });
-
-    test('should return SHORTCODE_PROPERTIES_NOT_FOUND error when updatedProps in invalid JSON format', async () => {
-      const result = await shortcodeService.updateEmbedProperties(
-        mockEmbed.id,
-        user.uid,
-        '{kk',
-      );
-      expect(result).toEqualLeft(SHORTCODE_INVALID_PROPERTIES_JSON);
-    });
-
-    test('should return SHORTCODE_NOT_FOUND error when Shortcode ID is invalid', async () => {
-      mockPrisma.shortcode.update.mockRejectedValue('RecordNotFound');
-      const result = await shortcodeService.updateEmbedProperties(
-        'invalidID',
-        user.uid,
-        '{}',
-      );
-      expect(result).toEqualLeft(SHORTCODE_NOT_FOUND);
-    });
-
-    test('should successfully update a Shortcodes with valid inputs', async () => {
-      mockPrisma.shortcode.update.mockResolvedValueOnce({
-        ...mockEmbed,
-        embedProperties: '{"foo":"bar"}',
-      });
-
-      const result = await shortcodeService.updateEmbedProperties(
-        mockEmbed.id,
-        user.uid,
-        '{"foo":"bar"}',
-      );
-      expect(result).toEqualRight({
-        id: mockEmbed.id,
-        createdOn: mockEmbed.createdOn,
-        request: JSON.stringify(mockEmbed.request),
-        properties: JSON.stringify('{"foo":"bar"}'),
-      });
-    });
-
-    test('should send pubsub message to `shortcode/{uid}/updated` on successful Update of Shortcode', async () => {
-      mockPrisma.shortcode.update.mockResolvedValueOnce({
-        ...mockEmbed,
-        embedProperties: '{"foo":"bar"}',
-      });
-
-      const result = await shortcodeService.updateEmbedProperties(
-        mockEmbed.id,
-        user.uid,
-        '{"foo":"bar"}',
-      );
-
-      expect(mockPubSub.publish).toHaveBeenCalledWith(
-        `shortcode/${mockEmbed.creatorUid}/updated`,
-        {
-          id: mockEmbed.id,
-          createdOn: mockEmbed.createdOn,
-          request: JSON.stringify(mockEmbed.request),
-          properties: JSON.stringify('{"foo":"bar"}'),
-        },
-      );
-    });
-  });
-
-  describe('deleteShortcode', () => {
-    test('should return true on successful deletion of Shortcode with valid inputs', async () => {
-      mockPrisma.shortcode.delete.mockResolvedValueOnce(mockEmbed);
-
-      const result = await shortcodeService.deleteShortcode(mockEmbed.id);
-      expect(result).toEqualRight(true);
-    });
-
-    test('should return SHORTCODE_NOT_FOUND error when Shortcode is invalid', async () => {
-      mockPrisma.shortcode.delete.mockRejectedValue('RecordNotFound');
-
-      expect(shortcodeService.deleteShortcode('invalid')).resolves.toEqualLeft(
-        SHORTCODE_NOT_FOUND,
-      );
-    });
-  });
-
-  describe('fetchAllShortcodes', () => {
-    test('should return list of Shortcodes with valid inputs and no cursor', async () => {
-      mockPrisma.shortcode.findMany.mockResolvedValueOnce(
-        shortcodesWithUserEmail,
-      );
-
-      const result = await shortcodeService.fetchAllShortcodes(
-        {
-          cursor: null,
-          take: 10,
-        },
-        user.email,
-      );
-      expect(result).toEqual(<ShortcodeWithUserEmail[]>[
-        {
-          id: shortcodesWithUserEmail[0].id,
-          request: JSON.stringify(shortcodesWithUserEmail[0].request),
-          properties: JSON.stringify(
-            shortcodesWithUserEmail[0].embedProperties,
-          ),
-          createdOn: shortcodesWithUserEmail[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,
-          creator: {
-            uid: user.uid,
-            email: user.email,
-          },
-        },
-      ]);
-    });
-
-    test('should return list of Shortcode with valid inputs and cursor', async () => {
-      mockPrisma.shortcode.findMany.mockResolvedValue([
-        shortcodesWithUserEmail[1],
-      ]);
-
-      const result = await shortcodeService.fetchAllShortcodes(
-        {
-          cursor: 'blablabla',
-          take: 10,
-        },
-        user.email,
-      );
-      expect(result).toEqual(<ShortcodeWithUserEmail[]>[
-        {
-          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,
-          },
-        },
-      ]);
-    });
-
-    test('should return an empty array for an invalid cursor', async () => {
-      mockPrisma.shortcode.findMany.mockResolvedValue([]);
-
-      const result = await shortcodeService.fetchAllShortcodes(
-        {
-          cursor: 'invalidcursor',
-          take: 10,
-        },
-        user.email,
-      );
-
-      expect(result).toHaveLength(0);
-    });
-  });
 });
--- a/packages/hoppscotch-backend/src/shortcode/shortcode.service.ts
+++ b/packages/hoppscotch-backend/src/shortcode/shortcode.service.ts
@@ -1,16 +1,12 @@
 import { Injectable, OnModuleInit } from '@nestjs/common';
 import * as T from 'fp-ts/Task';
+import * as O from 'fp-ts/Option';
 import * as TO from 'fp-ts/TaskOption';
 import * as E from 'fp-ts/Either';
 import { PrismaService } from 'src/prisma/prisma.service';
-import {
-  SHORTCODE_INVALID_PROPERTIES_JSON,
-  SHORTCODE_INVALID_REQUEST_JSON,
-  SHORTCODE_NOT_FOUND,
-  SHORTCODE_PROPERTIES_NOT_FOUND,
-} from 'src/errors';
+import { SHORTCODE_INVALID_JSON, SHORTCODE_NOT_FOUND } from 'src/errors';
 import { UserDataHandler } from 'src/user/user.data.handler';
-import { Shortcode, ShortcodeWithUserEmail } from './shortcode.model';
+import { Shortcode } from './shortcode.model';
 import { Shortcode as DBShortCode } from '@prisma/client';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { UserService } from 'src/user/user.service';
@@ -50,14 +46,10 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
   * @param shortcodeInfo Prisma Shortcode type
   * @returns GQL Shortcode
   */
-  private cast(shortcodeInfo: DBShortCode): Shortcode {
+  private returnShortCode(shortcodeInfo: DBShortCode): Shortcode {
    return <Shortcode>{
      id: shortcodeInfo.id,
      request: JSON.stringify(shortcodeInfo.request),
-      properties:
-        shortcodeInfo.embedProperties != null
-          ? JSON.stringify(shortcodeInfo.embedProperties)
-          : null,
      createdOn: shortcodeInfo.createdOn,
    };
  }
@@ -102,7 +94,7 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
      const shortcodeInfo = await this.prisma.shortcode.findFirstOrThrow({
        where: { id: shortcode },
      });
-      return E.right(this.cast(shortcodeInfo));
+      return E.right(this.returnShortCode(shortcodeInfo));
    } catch (error) {
      return E.left(SHORTCODE_NOT_FOUND);
    }
@@ -112,22 +104,14 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
   * Create a new ShortCode
   *
   * @param request JSON string of request details
-   * @param userInfo user UI
-   * @param properties JSON string of embed properties, if present
+   * @param userUID user UID, if present
   * @returns Either of ShortCode or error
   */
-  async createShortcode(
-    request: string,
-    properties: string | null = null,
-    userInfo: AuthUser,
-  ) {
-    const requestData = stringToJson(request);
-    if (E.isLeft(requestData) || !requestData.right)
-      return E.left(SHORTCODE_INVALID_REQUEST_JSON);
+  async createShortcode(request: string, userUID: string | null) {
+    const shortcodeData = stringToJson(request);
+    if (E.isLeft(shortcodeData)) return E.left(SHORTCODE_INVALID_JSON);

-    const parsedProperties = stringToJson(properties);
-    if (E.isLeft(parsedProperties))
-      return E.left(SHORTCODE_INVALID_PROPERTIES_JSON);
+    const user = await this.userService.findUserById(userUID);

    const generatedShortCode = await this.generateUniqueShortCodeID();
    if (E.isLeft(generatedShortCode)) return E.left(generatedShortCode.left);
@@ -135,9 +119,8 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
    const createdShortCode = await this.prisma.shortcode.create({
      data: {
        id: generatedShortCode.right,
-        request: requestData.right,
-        embedProperties: parsedProperties.right ?? undefined,
-        creatorUid: userInfo.uid,
+        request: shortcodeData.right,
+        creatorUid: O.isNone(user) ? null : user.value.uid,
      },
    });

@@ -145,11 +128,11 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
    if (createdShortCode.creatorUid) {
      this.pubsub.publish(
        `shortcode/${createdShortCode.creatorUid}/created`,
-        this.cast(createdShortCode),
+        this.returnShortCode(createdShortCode),
      );
    }

-    return E.right(this.cast(createdShortCode));
+    return E.right(this.returnShortCode(createdShortCode));
  }

  /**
@@ -167,20 +150,20 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {
      orderBy: {
        createdOn: 'desc',
      },
-      skip: args.cursor ? 1 : 0,
+      skip: 1,
      take: args.take,
      cursor: args.cursor ? { id: args.cursor } : undefined,
    });

    const fetchedShortCodes: Shortcode[] = shortCodes.map((code) =>
-      this.cast(code),
+      this.returnShortCode(code),
    );

    return fetchedShortCodes;
  }

  /**
-   * Delete a ShortCode created by User of uid
+   * Delete a ShortCode
   *
   * @param shortcode ShortCode
   * @param uid User Uid
@@ -199,7 +182,7 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {

      this.pubsub.publish(
        `shortcode/${deletedShortCodes.creatorUid}/revoked`,
-        this.cast(deletedShortCodes),
+        this.returnShortCode(deletedShortCodes),
      );

      return E.right(true);
@@ -222,118 +205,4 @@ export class ShortcodeService implements UserDataHandler, OnModuleInit {

    return deletedShortCodes.count;
  }
-
-  /**
-   * Delete a Shortcode
-   *
-   * @param shortcodeID ID of Shortcode being deleted
-   * @returns Boolean on successful deletion
-   */
-  async deleteShortcode(shortcodeID: string) {
-    try {
-      await this.prisma.shortcode.delete({
-        where: {
-          id: shortcodeID,
-        },
-      });
-
-      return E.right(true);
-    } catch (error) {
-      return E.left(SHORTCODE_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Update a created Shortcode
-   * @param shortcodeID Shortcode ID
-   * @param uid User Uid
-   * @returns Updated Shortcode
-   */
-  async updateEmbedProperties(
-    shortcodeID: string,
-    uid: string,
-    updatedProps: string,
-  ) {
-    if (!updatedProps) return E.left(SHORTCODE_PROPERTIES_NOT_FOUND);
-
-    const parsedProperties = stringToJson(updatedProps);
-    if (E.isLeft(parsedProperties) || !parsedProperties.right)
-      return E.left(SHORTCODE_INVALID_PROPERTIES_JSON);
-
-    try {
-      const updatedShortcode = await this.prisma.shortcode.update({
-        where: {
-          creator_uid_shortcode_unique: {
-            creatorUid: uid,
-            id: shortcodeID,
-          },
-        },
-        data: {
-          embedProperties: parsedProperties.right,
-        },
-      });
-
-      this.pubsub.publish(
-        `shortcode/${updatedShortcode.creatorUid}/updated`,
-        this.cast(updatedShortcode),
-      );
-
-      return E.right(this.cast(updatedShortcode));
-    } catch (error) {
-      return E.left(SHORTCODE_NOT_FOUND);
-    }
-  }
-
-  /**
-   * Fetch all created ShortCodes
-   *
-   * @param args Pagination arguments
-   * @param userEmail User email
-   * @returns ShortcodeWithUserEmail
-   */
-  async fetchAllShortcodes(
-    args: PaginationArgs,
-    userEmail: string | null = null,
-  ) {
-    const shortCodes = await this.prisma.shortcode.findMany({
-      where: userEmail
-        ? {
-            User: {
-              email: userEmail,
-            },
-          }
-        : undefined,
-      orderBy: {
-        createdOn: 'desc',
-      },
-      skip: args.cursor ? 1 : 0,
-      take: args.take,
-      cursor: args.cursor ? { id: args.cursor } : undefined,
-      include: {
-        User: true,
-      },
-    });
-
-    const fetchedShortCodes: ShortcodeWithUserEmail[] = shortCodes.map(
-      (code) => {
-        return <ShortcodeWithUserEmail>{
-          id: code.id,
-          request: JSON.stringify(code.request),
-          properties:
-            code.embedProperties != null
-              ? JSON.stringify(code.embedProperties)
-              : null,
-          createdOn: code.createdOn,
-          creator: code.User
-            ? {
-                uid: code.User.uid,
-                email: code.User.email,
-              }
-            : null,
-        };
-      },
-    );
-
-    return fetchedShortCodes;
-  }
 }
--- a/packages/hoppscotch-backend/src/team-collection/input-type.args.ts
+++ b/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;
-}
--- a/packages/hoppscotch-backend/src/team-collection/team-collection.model.ts
+++ b/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()
--- a/packages/hoppscotch-backend/src/team-collection/team-collection.resolver.ts
+++ b/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, {
--- a/packages/hoppscotch-backend/src/team-collection/team-collection.service.spec.ts
+++ b/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 { mock, mockDeep, mockReset } from 'jest-mock-extended';
 import {
-  TEAM_COLL_DATA_INVALID,
  TEAM_COLL_DEST_SAME,
  TEAM_COLL_INVALID_JSON,
  TEAM_COLL_IS_PARENT_COLL,
@@ -19,6 +18,8 @@ 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';
+import { TeamCollectionModule } from './team-collection.module';
+import * as E from 'fp-ts/Either';

 const mockPrisma = mockDeep<PrismaService>();
 const mockPubSub = mockDeep<PubSubService>();
@@ -53,60 +54,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 +90,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 +105,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 2,
    parentID: null,
    title: 'Root Collection 1',
-    data: {},
-
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -149,8 +114,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 3,
    parentID: null,
    title: 'Root Collection 1',
-    data: {},
-
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -159,8 +122,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    id: 'bre3',
    orderIndex: 4,
    parentID: null,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -171,8 +132,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 5,
    parentID: null,
    title: 'Root Collection 1',
-    data: {},
-
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -183,8 +142,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    parentID: null,
    title: 'Root Collection 1',
    teamID: team.id,
-    data: {},
-
    createdOn: currentTime,
    updatedOn: currentTime,
  },
@@ -194,8 +151,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    parentID: null,
    title: 'Root Collection 1',
    teamID: team.id,
-    data: {},
-
    createdOn: currentTime,
    updatedOn: currentTime,
  },
@@ -204,7 +159,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 8,
    parentID: null,
    title: 'Root Collection 1',
-    data: {},
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -214,7 +168,6 @@ const rootTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 9,
    parentID: null,
    title: 'Root Collection 1',
-    data: {},
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -225,83 +178,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 +198,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 2,
    parentID: rootTeamCollection.id,
    title: 'Root Collection 1',
-    data: {},
-
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -322,8 +207,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    orderIndex: 3,
    parentID: rootTeamCollection.id,
    title: 'Root Collection 1',
-    data: {},
-
    teamID: team.id,
    createdOn: currentTime,
    updatedOn: currentTime,
@@ -332,8 +215,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '567',
    orderIndex: 4,
    parentID: rootTeamCollection.id,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -343,8 +224,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '123',
    orderIndex: 5,
    parentID: rootTeamCollection.id,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -354,8 +233,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '678',
    orderIndex: 6,
    parentID: rootTeamCollection.id,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -365,8 +242,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '789',
    orderIndex: 7,
    parentID: rootTeamCollection.id,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -376,8 +251,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '890',
    orderIndex: 8,
    parentID: rootTeamCollection.id,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -387,7 +260,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '012',
    orderIndex: 9,
    parentID: rootTeamCollection.id,
-    data: {},
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -397,8 +269,6 @@ const childTeamCollectionList: DBTeamCollection[] = [
    id: '0bhu',
    orderIndex: 10,
    parentID: rootTeamCollection.id,
-    data: {},
-
    title: 'Root Collection 1',
    teamID: team.id,
    createdOn: currentTime,
@@ -406,75 +276,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 +314,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 +350,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 +366,9 @@ describe('getChildrenOfCollection', () => {
      10,
    );
    expect(result).toEqual([
-      { ...childTeamCollectionListCasted[7] },
-      { ...childTeamCollectionListCasted[8] },
-      { ...childTeamCollectionListCasted[9] },
+      { ...childTeamCollectionList[7] },
+      { ...childTeamCollectionList[8] },
+      { ...childTeamCollectionList[9] },
    ]);
  });

@@ -594,7 +395,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 +411,9 @@ describe('getTeamRootCollections', () => {
      10,
    );
    expect(result).toEqual([
-      { ...rootTeamCollectionListCasted[7] },
-      { ...rootTeamCollectionListCasted[8] },
-      { ...rootTeamCollectionListCasted[9] },
+      { ...rootTeamCollectionList[7] },
+      { ...rootTeamCollectionList[8] },
+      { ...rootTeamCollectionList[9] },
    ]);
  });

@@ -666,7 +467,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 +481,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 +499,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 +517,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 +535,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 +556,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 +590,7 @@ describe('renameCollection', () => {
      'NewTitle',
    );
    expect(result).toEqualRight({
-      ...rootTeamCollectionsCasted,
+      ...rootTeamCollection,
      title: 'NewTitle',
    });
  });
@@ -850,7 +628,7 @@ describe('renameCollection', () => {
    expect(mockPubSub.publish).toHaveBeenCalledWith(
      `team_coll/${rootTeamCollection.teamID}/coll_updated`,
      {
-        ...rootTeamCollectionsCasted,
+        ...rootTeamCollection,
        title: 'NewTitle',
      },
    );
@@ -1057,8 +835,9 @@ describe('moveCollection', () => {
      null,
    );
    expect(result).toEqualRight({
-      ...childTeamCollectionCasted,
+      ...childTeamCollection,
      parentID: null,
+      orderIndex: 2,
    });
  });

@@ -1114,8 +893,9 @@ describe('moveCollection', () => {
    expect(mockPubSub.publish).toHaveBeenCalledWith(
      `team_coll/${childTeamCollection.teamID}/coll_moved`,
      {
-        ...childTeamCollectionCasted,
+        ...childTeamCollection,
        parentID: null,
+        orderIndex: 2,
      },
    );
  });
@@ -1154,8 +934,9 @@ describe('moveCollection', () => {
      childTeamCollection_2.id,
    );
    expect(result).toEqualRight({
-      ...rootTeamCollectionsCasted,
-      parentID: childTeamCollection_2Casted.id,
+      ...rootTeamCollection,
+      parentID: childTeamCollection_2.id,
+      orderIndex: 1,
    });
  });

@@ -1195,8 +976,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 +1017,9 @@ describe('moveCollection', () => {
      childTeamCollection_2.id,
    );
    expect(result).toEqualRight({
-      ...childTeamCollectionCasted,
-      parentID: childTeamCollection_2Casted.id,
+      ...childTeamCollection,
+      parentID: childTeamCollection_2.id,
+      orderIndex: 1,
    });
  });

@@ -1276,8 +1059,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 +1157,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 +1238,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 +1305,7 @@ describe('importCollectionsFromJSON', () => {
    );
    expect(mockPubSub.publish).toHaveBeenCalledWith(
      `team_coll/${rootTeamCollection.teamID}/coll_added`,
-      rootTeamCollectionsCasted,
+      rootTeamCollection,
    );
  });
 });
@@ -1640,7 +1424,7 @@ describe('replaceCollectionsWithJSON', () => {
    );
    expect(mockPubSub.publish).toHaveBeenCalledWith(
      `team_coll/${rootTeamCollection.teamID}/coll_added`,
-      rootTeamCollectionsCasted,
+      rootTeamCollection,
    );
  });
 });
@@ -1677,64 +1461,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
--- a/packages/hoppscotch-backend/src/team-collection/team-collection.service.ts
+++ b/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);
-    }
-  }
 }
--- a/packages/hoppscotch-backend/src/team-environments/gql-team-env-team.guard.ts
+++ b/packages/hoppscotch-backend/src/team-environments/gql-team-env-team.guard.ts
@@ -1,5 +1,15 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
+import * as TE from 'fp-ts/TaskEither';
+import * as O from 'fp-ts/Option';
+import * as S from 'fp-ts/string';
+import { pipe } from 'fp-ts/function';
+import {
+  getAnnotatedRequiredRoles,
+  getGqlArg,
+  getUserFromGQLContext,
+  throwErr,
+} from 'src/utils';
 import { TeamEnvironmentsService } from './team-environments.service';
 import {
  BUG_AUTH_NO_USER_CTX,
@@ -9,10 +19,6 @@ import {
  TEAM_ENVIRONMENT_NOT_FOUND,
 } from 'src/errors';
 import { TeamService } from 'src/team/team.service';
-import { GqlExecutionContext } from '@nestjs/graphql';
-import * as E from 'fp-ts/Either';
-import { TeamMemberRole } from '@prisma/client';
-import { throwErr } from 'src/utils';

 /**
 * A guard which checks whether the caller of a GQL Operation
@@ -27,31 +33,50 @@ export class GqlTeamEnvTeamGuard implements CanActivate {
    private readonly teamService: TeamService,
  ) {}

-  async canActivate(context: ExecutionContext): Promise<boolean> {
-    const requireRoles = this.reflector.get<TeamMemberRole[]>(
-      'requiresTeamRole',
-      context.getHandler(),
-    );
-    if (!requireRoles) throw new Error(BUG_TEAM_ENV_GUARD_NO_REQUIRE_ROLES);
+  canActivate(context: ExecutionContext): Promise<boolean> {
+    return pipe(
+      TE.Do,

-    const gqlExecCtx = GqlExecutionContext.create(context);
+      TE.bindW('requiredRoles', () =>
+        pipe(
+          getAnnotatedRequiredRoles(this.reflector, context),
+          TE.fromOption(() => BUG_TEAM_ENV_GUARD_NO_REQUIRE_ROLES),
+        ),
+      ),

-    const { user } = gqlExecCtx.getContext().req;
-    if (user == undefined) throw new Error(BUG_AUTH_NO_USER_CTX);
+      TE.bindW('user', () =>
+        pipe(
+          getUserFromGQLContext(context),
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),

-    const { id } = gqlExecCtx.getArgs<{ id: string }>();
-    if (!id) throwErr(BUG_TEAM_ENV_GUARD_NO_ENV_ID);
+      TE.bindW('envID', () =>
+        pipe(
+          getGqlArg('id', context),
+          O.fromPredicate(S.isString),
+          TE.fromOption(() => BUG_TEAM_ENV_GUARD_NO_ENV_ID),
+        ),
+      ),

-    const teamEnvironment =
-      await this.teamEnvironmentService.getTeamEnvironment(id);
-    if (E.isLeft(teamEnvironment)) throwErr(TEAM_ENVIRONMENT_NOT_FOUND);
+      TE.bindW('membership', ({ envID, user }) =>
+        pipe(
+          this.teamEnvironmentService.getTeamEnvironment(envID),
+          TE.fromTaskOption(() => TEAM_ENVIRONMENT_NOT_FOUND),
+          TE.chainW((env) =>
+            pipe(
+              this.teamService.getTeamMemberTE(env.teamID, user.uid),
+              TE.mapLeft(() => TEAM_ENVIRONMENT_NOT_TEAM_MEMBER),
+            ),
+          ),
+        ),
+      ),

-    const member = await this.teamService.getTeamMember(
-      teamEnvironment.right.teamID,
-      user.uid,
-    );
-    if (!member) throwErr(TEAM_ENVIRONMENT_NOT_TEAM_MEMBER);
+      TE.map(({ membership, requiredRoles }) =>
+        requiredRoles.includes(membership.role),
+      ),

-    return requireRoles.includes(member.role);
+      TE.getOrElse(throwErr),
+    )();
  }
 }
--- a/packages/hoppscotch-backend/src/team-environments/input-type.args.ts
+++ b/packages/hoppscotch-backend/src/team-environments/input-type.args.ts
@@ -1,41 +0,0 @@
-import { ArgsType, Field, ID } from '@nestjs/graphql';
-
-@ArgsType()
-export class CreateTeamEnvironmentArgs {
-  @Field({
-    name: 'name',
-    description: 'Name of the Team Environment',
-  })
-  name: string;
-
-  @Field(() => ID, {
-    name: 'teamID',
-    description: 'ID of the Team',
-  })
-  teamID: string;
-
-  @Field({
-    name: 'variables',
-    description: 'JSON string of the variables object',
-  })
-  variables: string;
-}
-
-@ArgsType()
-export class UpdateTeamEnvironmentArgs {
-  @Field(() => ID, {
-    name: 'id',
-    description: 'ID of the Team Environment',
-  })
-  id: string;
-  @Field({
-    name: 'name',
-    description: 'Name of the Team Environment',
-  })
-  name: string;
-  @Field({
-    name: 'variables',
-    description: 'JSON string of the variables object',
-  })
-  variables: string;
-}
--- a/packages/hoppscotch-backend/src/team-environments/team-environments.resolver.ts
+++ b/packages/hoppscotch-backend/src/team-environments/team-environments.resolver.ts
@@ -13,11 +13,6 @@ import { throwErr } from 'src/utils';
 import { GqlTeamEnvTeamGuard } from './gql-team-env-team.guard';
 import { TeamEnvironment } from './team-environments.model';
 import { TeamEnvironmentsService } from './team-environments.service';
-import * as E from 'fp-ts/Either';
-import {
-  CreateTeamEnvironmentArgs,
-  UpdateTeamEnvironmentArgs,
-} from './input-type.args';

@UseGuards(GqlThrottlerGuard)
@Resolver(() => 'TeamEnvironment')
@@ -34,18 +29,29 @@ export class TeamEnvironmentsResolver {
  })
  @UseGuards(GqlAuthGuard, GqlTeamMemberGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async createTeamEnvironment(
-    @Args() args: CreateTeamEnvironmentArgs,
+  createTeamEnvironment(
+    @Args({
+      name: 'name',
+      description: 'Name of the Team Environment',
+    })
+    name: string,
+    @Args({
+      name: 'teamID',
+      description: 'ID of the Team',
+      type: () => ID,
+    })
+    teamID: string,
+    @Args({
+      name: 'variables',
+      description: 'JSON string of the variables object',
+    })
+    variables: string,
  ): Promise<TeamEnvironment> {
-    const teamEnvironment =
-      await this.teamEnvironmentsService.createTeamEnvironment(
-        args.name,
-        args.teamID,
-        args.variables,
-      );
-
-    if (E.isLeft(teamEnvironment)) throwErr(teamEnvironment.left);
-    return teamEnvironment.right;
+    return this.teamEnvironmentsService.createTeamEnvironment(
+      name,
+      teamID,
+      variables,
+    )();
  }

  @Mutation(() => Boolean, {
@@ -53,7 +59,7 @@ export class TeamEnvironmentsResolver {
  })
  @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async deleteTeamEnvironment(
+  deleteTeamEnvironment(
    @Args({
      name: 'id',
      description: 'ID of the Team Environment',
@@ -61,12 +67,10 @@ export class TeamEnvironmentsResolver {
    })
    id: string,
  ): Promise<boolean> {
-    const isDeleted = await this.teamEnvironmentsService.deleteTeamEnvironment(
-      id,
-    );
-
-    if (E.isLeft(isDeleted)) throwErr(isDeleted.left);
-    return isDeleted.right;
+    return pipe(
+      this.teamEnvironmentsService.deleteTeamEnvironment(id),
+      TE.getOrElse(throwErr),
+    )();
  }

  @Mutation(() => TeamEnvironment, {
@@ -75,19 +79,28 @@ export class TeamEnvironmentsResolver {
  })
  @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async updateTeamEnvironment(
-    @Args()
-    args: UpdateTeamEnvironmentArgs,
+  updateTeamEnvironment(
+    @Args({
+      name: 'id',
+      description: 'ID of the Team Environment',
+      type: () => ID,
+    })
+    id: string,
+    @Args({
+      name: 'name',
+      description: 'Name of the Team Environment',
+    })
+    name: string,
+    @Args({
+      name: 'variables',
+      description: 'JSON string of the variables object',
+    })
+    variables: string,
  ): Promise<TeamEnvironment> {
-    const updatedTeamEnvironment =
-      await this.teamEnvironmentsService.updateTeamEnvironment(
-        args.id,
-        args.name,
-        args.variables,
-      );
-
-    if (E.isLeft(updatedTeamEnvironment)) throwErr(updatedTeamEnvironment.left);
-    return updatedTeamEnvironment.right;
+    return pipe(
+      this.teamEnvironmentsService.updateTeamEnvironment(id, name, variables),
+      TE.getOrElse(throwErr),
+    )();
  }

  @Mutation(() => TeamEnvironment, {
@@ -95,7 +108,7 @@ export class TeamEnvironmentsResolver {
  })
  @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async deleteAllVariablesFromTeamEnvironment(
+  deleteAllVariablesFromTeamEnvironment(
    @Args({
      name: 'id',
      description: 'ID of the Team Environment',
@@ -103,13 +116,10 @@ export class TeamEnvironmentsResolver {
    })
    id: string,
  ): Promise<TeamEnvironment> {
-    const teamEnvironment =
-      await this.teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
-        id,
-      );
-
-    if (E.isLeft(teamEnvironment)) throwErr(teamEnvironment.left);
-    return teamEnvironment.right;
+    return pipe(
+      this.teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(id),
+      TE.getOrElse(throwErr),
+    )();
  }

  @Mutation(() => TeamEnvironment, {
@@ -117,7 +127,7 @@ export class TeamEnvironmentsResolver {
  })
  @UseGuards(GqlAuthGuard, GqlTeamEnvTeamGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER, TeamMemberRole.EDITOR)
-  async createDuplicateEnvironment(
+  createDuplicateEnvironment(
    @Args({
      name: 'id',
      description: 'ID of the Team Environment',
@@ -125,12 +135,10 @@ export class TeamEnvironmentsResolver {
    })
    id: string,
  ): Promise<TeamEnvironment> {
-    const res = await this.teamEnvironmentsService.createDuplicateEnvironment(
-      id,
-    );
-
-    if (E.isLeft(res)) throwErr(res.left);
-    return res.right;
+    return pipe(
+      this.teamEnvironmentsService.createDuplicateEnvironment(id),
+      TE.getOrElse(throwErr),
+    )();
  }

  /* Subscriptions */
--- a/packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts
+++ b/packages/hoppscotch-backend/src/team-environments/team-environments.service.spec.ts
@@ -2,11 +2,7 @@ import { mockDeep, mockReset } from 'jest-mock-extended';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { TeamEnvironment } from './team-environments.model';
 import { TeamEnvironmentsService } from './team-environments.service';
-import {
-  JSON_INVALID,
-  TEAM_ENVIRONMENT_NOT_FOUND,
-  TEAM_ENVIRONMENT_SHORT_NAME,
-} from 'src/errors';
+import { TEAM_ENVIRONMENT_NOT_FOUND } from 'src/errors';

 const mockPrisma = mockDeep<PrismaService>();

@@ -35,81 +31,125 @@ beforeEach(() => {

 describe('TeamEnvironmentsService', () => {
  describe('getTeamEnvironment', () => {
-    test('should successfully return a TeamEnvironment with valid ID', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockResolvedValueOnce(
-        teamEnvironment,
-      );
+    test('queries the db with the id', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValue(teamEnvironment);

-      const result = await teamEnvironmentsService.getTeamEnvironment(
-        teamEnvironment.id,
+      await teamEnvironmentsService.getTeamEnvironment('123')();
+
+      expect(mockPrisma.teamEnvironment.findFirst).toHaveBeenCalledWith(
+        expect.objectContaining({
+          where: {
+            id: '123',
+          },
+        }),
      );
-      expect(result).toEqualRight(teamEnvironment);
    });

-    test('should throw TEAM_ENVIRONMENT_NOT_FOUND with invalid ID', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockRejectedValueOnce(
-        'RejectOnNotFound',
-      );
+    test('requests prisma to reject the query promise if not found', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValue(teamEnvironment);

-      const result = await teamEnvironmentsService.getTeamEnvironment(
-        teamEnvironment.id,
+      await teamEnvironmentsService.getTeamEnvironment('123')();
+
+      expect(mockPrisma.teamEnvironment.findFirst).toHaveBeenCalledWith(
+        expect.objectContaining({
+          rejectOnNotFound: true,
+        }),
      );
-      expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
+    });
+
+    test('should return a Some of the correct environment if exists', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValue(teamEnvironment);
+
+      const result = await teamEnvironmentsService.getTeamEnvironment('123')();
+
+      expect(result).toEqualSome(teamEnvironment);
+    });
+
+    test('should return a None if the environment does not exist', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockRejectedValue('NotFoundError');
+
+      const result = await teamEnvironmentsService.getTeamEnvironment('123')();
+
+      expect(result).toBeNone();
    });
  });
-
  describe('createTeamEnvironment', () => {
-    test('should successfully create and return a new team environment given valid inputs', async () => {
+    test('should create and return a new team environment given a valid name,variable and team ID', async () => {
      mockPrisma.teamEnvironment.create.mockResolvedValue(teamEnvironment);

      const result = await teamEnvironmentsService.createTeamEnvironment(
        teamEnvironment.name,
        teamEnvironment.teamID,
        JSON.stringify(teamEnvironment.variables),
-      );
+      )();

-      expect(result).toEqualRight({
-        ...teamEnvironment,
+      expect(result).toEqual(<TeamEnvironment>{
+        id: teamEnvironment.id,
+        name: teamEnvironment.name,
+        teamID: teamEnvironment.teamID,
        variables: JSON.stringify(teamEnvironment.variables),
      });
    });

-    test('should throw TEAM_ENVIRONMENT_SHORT_NAME if input TeamEnvironment name is invalid', async () => {
-      const result = await teamEnvironmentsService.createTeamEnvironment(
-        '12',
-        teamEnvironment.teamID,
-        JSON.stringify(teamEnvironment.variables),
-      );
+    test('should reject if given team ID is invalid', async () => {
+      mockPrisma.teamEnvironment.create.mockRejectedValue(null as any);

-      expect(result).toEqualLeft(TEAM_ENVIRONMENT_SHORT_NAME);
+      await expect(
+        teamEnvironmentsService.createTeamEnvironment(
+          teamEnvironment.name,
+          'invalidteamid',
+          JSON.stringify(teamEnvironment.variables),
+        ),
+      ).rejects.toBeDefined();
+    });
+
+    test('should reject if provided team environment name is not a string', async () => {
+      mockPrisma.teamEnvironment.create.mockRejectedValue(null as any);
+
+      await expect(
+        teamEnvironmentsService.createTeamEnvironment(
+          null as any,
+          teamEnvironment.teamID,
+          JSON.stringify(teamEnvironment.variables),
+        ),
+      ).rejects.toBeDefined();
+    });
+
+    test('should reject if provided variable is not a string', async () => {
+      mockPrisma.teamEnvironment.create.mockRejectedValue(null as any);
+
+      await expect(
+        teamEnvironmentsService.createTeamEnvironment(
+          teamEnvironment.name,
+          teamEnvironment.teamID,
+          null as any,
+        ),
+      ).rejects.toBeDefined();
    });

    test('should send pubsub message to "team_environment/<teamID>/created" if team environment is created successfully', async () => {
-      mockPrisma.teamEnvironment.create.mockResolvedValue(teamEnvironment);
+      mockPrisma.teamEnvironment.create.mockResolvedValueOnce(teamEnvironment);

      const result = await teamEnvironmentsService.createTeamEnvironment(
        teamEnvironment.name,
        teamEnvironment.teamID,
        JSON.stringify(teamEnvironment.variables),
-      );
+      )();

      expect(mockPubSub.publish).toHaveBeenCalledWith(
        `team_environment/${teamEnvironment.teamID}/created`,
-        {
-          ...teamEnvironment,
-          variables: JSON.stringify(teamEnvironment.variables),
-        },
+        result,
      );
    });
  });

  describe('deleteTeamEnvironment', () => {
-    test('should successfully delete a TeamEnvironment with a valid ID', async () => {
+    test('should resolve to true given a valid team environment ID', async () => {
      mockPrisma.teamEnvironment.delete.mockResolvedValueOnce(teamEnvironment);

      const result = await teamEnvironmentsService.deleteTeamEnvironment(
        teamEnvironment.id,
-      );
+      )();

      expect(result).toEqualRight(true);
    });
@@ -119,7 +159,7 @@ describe('TeamEnvironmentsService', () => {

      const result = await teamEnvironmentsService.deleteTeamEnvironment(
        'invalidid',
-      );
+      )();

      expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
    });
@@ -129,7 +169,7 @@ describe('TeamEnvironmentsService', () => {

      const result = await teamEnvironmentsService.deleteTeamEnvironment(
        teamEnvironment.id,
-      );
+      )();

      expect(mockPubSub.publish).toHaveBeenCalledWith(
        `team_environment/${teamEnvironment.teamID}/deleted`,
@@ -142,7 +182,7 @@ describe('TeamEnvironmentsService', () => {
  });

  describe('updateVariablesInTeamEnvironment', () => {
-    test('should successfully add new variable to a team environment', async () => {
+    test('should add new variable to a team environment', async () => {
      mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
        ...teamEnvironment,
        variables: [{ key: 'value' }],
@@ -152,7 +192,7 @@ describe('TeamEnvironmentsService', () => {
        teamEnvironment.id,
        teamEnvironment.name,
        JSON.stringify([{ key: 'value' }]),
-      );
+      )();

      expect(result).toEqualRight(<TeamEnvironment>{
        ...teamEnvironment,
@@ -160,7 +200,7 @@ describe('TeamEnvironmentsService', () => {
      });
    });

-    test('should successfully add new variable to already existing list of variables in a team environment', async () => {
+    test('should add new variable to already existing list of variables in a team environment', async () => {
      mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
        ...teamEnvironment,
        variables: [{ key: 'value' }, { key_2: 'value_2' }],
@@ -170,7 +210,7 @@ describe('TeamEnvironmentsService', () => {
        teamEnvironment.id,
        teamEnvironment.name,
        JSON.stringify([{ key: 'value' }, { key_2: 'value_2' }]),
-      );
+      )();

      expect(result).toEqualRight(<TeamEnvironment>{
        ...teamEnvironment,
@@ -178,7 +218,7 @@ describe('TeamEnvironmentsService', () => {
      });
    });

-    test('should successfully edit existing variables in a team environment', async () => {
+    test('should edit existing variables in a team environment', async () => {
      mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
        ...teamEnvironment,
        variables: [{ key: '1234' }],
@@ -188,7 +228,7 @@ describe('TeamEnvironmentsService', () => {
        teamEnvironment.id,
        teamEnvironment.name,
        JSON.stringify([{ key: '1234' }]),
-      );
+      )();

      expect(result).toEqualRight(<TeamEnvironment>{
        ...teamEnvironment,
@@ -196,7 +236,22 @@ describe('TeamEnvironmentsService', () => {
      });
    });

-    test('should successfully edit name of an existing team environment', async () => {
+    test('should delete existing variable in a team environment', async () => {
+      mockPrisma.teamEnvironment.update.mockResolvedValueOnce(teamEnvironment);
+
+      const result = await teamEnvironmentsService.updateTeamEnvironment(
+        teamEnvironment.id,
+        teamEnvironment.name,
+        JSON.stringify([{}]),
+      )();
+
+      expect(result).toEqualRight(<TeamEnvironment>{
+        ...teamEnvironment,
+        variables: JSON.stringify([{}]),
+      });
+    });
+
+    test('should edit name of an existing team environment', async () => {
      mockPrisma.teamEnvironment.update.mockResolvedValueOnce({
        ...teamEnvironment,
        variables: [{ key: '123' }],
@@ -206,7 +261,7 @@ describe('TeamEnvironmentsService', () => {
        teamEnvironment.id,
        teamEnvironment.name,
        JSON.stringify([{ key: '123' }]),
-      );
+      )();

      expect(result).toEqualRight(<TeamEnvironment>{
        ...teamEnvironment,
@@ -214,24 +269,14 @@ describe('TeamEnvironmentsService', () => {
      });
    });

-    test('should throw TEAM_ENVIRONMENT_SHORT_NAME if input TeamEnvironment name is invalid', async () => {
-      const result = await teamEnvironmentsService.updateTeamEnvironment(
-        teamEnvironment.id,
-        '12',
-        JSON.stringify([{ key: 'value' }]),
-      );
-
-      expect(result).toEqualLeft(TEAM_ENVIRONMENT_SHORT_NAME);
-    });
-
-    test('should throw TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
+    test('should reject to TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
      mockPrisma.teamEnvironment.update.mockRejectedValue('RecordNotFound');

      const result = await teamEnvironmentsService.updateTeamEnvironment(
        'invalidid',
        teamEnvironment.name,
        JSON.stringify(teamEnvironment.variables),
-      );
+      )();

      expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
    });
@@ -243,7 +288,7 @@ describe('TeamEnvironmentsService', () => {
        teamEnvironment.id,
        teamEnvironment.name,
        JSON.stringify([{ key: 'value' }]),
-      );
+      )();

      expect(mockPubSub.publish).toHaveBeenCalledWith(
        `team_environment/${teamEnvironment.teamID}/updated`,
@@ -256,13 +301,13 @@ describe('TeamEnvironmentsService', () => {
  });

  describe('deleteAllVariablesFromTeamEnvironment', () => {
-    test('should successfully delete all variables in a team environment', async () => {
+    test('should delete all variables in a team environment', async () => {
      mockPrisma.teamEnvironment.update.mockResolvedValueOnce(teamEnvironment);

      const result =
        await teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
          teamEnvironment.id,
-        );
+        )();

      expect(result).toEqualRight(<TeamEnvironment>{
        ...teamEnvironment,
@@ -270,13 +315,13 @@ describe('TeamEnvironmentsService', () => {
      });
    });

-    test('should throw TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
+    test('should reject to TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
      mockPrisma.teamEnvironment.update.mockRejectedValue('RecordNotFound');

      const result =
        await teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
          'invalidid',
-        );
+        )();

      expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
    });
@@ -287,7 +332,7 @@ describe('TeamEnvironmentsService', () => {
      const result =
        await teamEnvironmentsService.deleteAllVariablesFromTeamEnvironment(
          teamEnvironment.id,
-        );
+        )();

      expect(mockPubSub.publish).toHaveBeenCalledWith(
        `team_environment/${teamEnvironment.teamID}/updated`,
@@ -300,58 +345,56 @@ describe('TeamEnvironmentsService', () => {
  });

  describe('createDuplicateEnvironment', () => {
-    test('should successfully duplicate an existing team environment', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockResolvedValueOnce(
+    test('should duplicate an existing team environment', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValueOnce(
        teamEnvironment,
      );

      mockPrisma.teamEnvironment.create.mockResolvedValueOnce({
-        id: 'newid',
        ...teamEnvironment,
+        id: 'newid',
      });

      const result = await teamEnvironmentsService.createDuplicateEnvironment(
        teamEnvironment.id,
-      );
+      )();

      expect(result).toEqualRight(<TeamEnvironment>{
-        id: 'newid',
        ...teamEnvironment,
+        id: 'newid',
        variables: JSON.stringify(teamEnvironment.variables),
      });
    });

-    test('should throw TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockRejectedValue(
-        'NotFoundError',
-      );
+    test('should reject to TEAM_ENVIRONMMENT_NOT_FOUND if provided id is invalid', async () => {
+      mockPrisma.teamEnvironment.findFirst.mockRejectedValue('NotFoundError');

      const result = await teamEnvironmentsService.createDuplicateEnvironment(
        teamEnvironment.id,
-      );
+      )();

      expect(result).toEqualLeft(TEAM_ENVIRONMENT_NOT_FOUND);
    });

    test('should send pubsub message to "team_environment/<teamID>/created" if team environment is updated successfully', async () => {
-      mockPrisma.teamEnvironment.findFirstOrThrow.mockResolvedValueOnce(
+      mockPrisma.teamEnvironment.findFirst.mockResolvedValueOnce(
        teamEnvironment,
      );

      mockPrisma.teamEnvironment.create.mockResolvedValueOnce({
-        id: 'newid',
        ...teamEnvironment,
+        id: 'newid',
      });

      const result = await teamEnvironmentsService.createDuplicateEnvironment(
        teamEnvironment.id,
-      );
+      )();

      expect(mockPubSub.publish).toHaveBeenCalledWith(
        `team_environment/${teamEnvironment.teamID}/created`,
        {
-          id: 'newid',
          ...teamEnvironment,
+          id: 'newid',
          variables: JSON.stringify([{}]),
        },
      );
--- a/packages/hoppscotch-backend/src/team-environments/team-environments.service.ts
+++ b/packages/hoppscotch-backend/src/team-environments/team-environments.service.ts
@@ -1,14 +1,15 @@
 import { Injectable } from '@nestjs/common';
-import { TeamEnvironment as DBTeamEnvironment, Prisma } from '@prisma/client';
+import { pipe } from 'fp-ts/function';
+import * as T from 'fp-ts/Task';
+import * as TO from 'fp-ts/TaskOption';
+import * as TE from 'fp-ts/TaskEither';
+import * as A from 'fp-ts/Array';
+import { Prisma } from '@prisma/client';
 import { PrismaService } from 'src/prisma/prisma.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { TeamEnvironment } from './team-environments.model';
-import {
-  TEAM_ENVIRONMENT_NOT_FOUND,
-  TEAM_ENVIRONMENT_SHORT_NAME,
-} from 'src/errors';
-import * as E from 'fp-ts/Either';
-import { isValidLength } from 'src/utils';
+import { TEAM_ENVIRONMENT_NOT_FOUND } from 'src/errors';
+
@Injectable()
 export class TeamEnvironmentsService {
  constructor(
@@ -16,217 +17,219 @@ export class TeamEnvironmentsService {
    private readonly pubsub: PubSubService,
  ) {}

-  TITLE_LENGTH = 3;
-
-  /**
-   * TeamEnvironments are saved in the DB in the following way
-   * [{ key: value }, { key: value },....]
-   *
-   */
-
-  /**
-   * Typecast a database TeamEnvironment to a TeamEnvironment model
-   * @param teamEnvironment database TeamEnvironment
-   * @returns TeamEnvironment model
-   */
-  private cast(teamEnvironment: DBTeamEnvironment): TeamEnvironment {
-    return {
-      id: teamEnvironment.id,
-      name: teamEnvironment.name,
-      teamID: teamEnvironment.teamID,
-      variables: JSON.stringify(teamEnvironment.variables),
-    };
-  }
-
-  /**
-   * Get details of a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async getTeamEnvironment(id: string) {
-    try {
-      const teamEnvironment =
-        await this.prisma.teamEnvironment.findFirstOrThrow({
-          where: { id },
-        });
-      return E.right(teamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
-  }
-
-  /**
-   *  Create a new TeamEnvironment.
-   *
-   * @param name name of new TeamEnvironment
-   * @param teamID teamID of new TeamEnvironment
-   * @param variables JSONified string of contents of new TeamEnvironment
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async createTeamEnvironment(name: string, teamID: string, variables: string) {
-    const isTitleValid = isValidLength(name, this.TITLE_LENGTH);
-    if (!isTitleValid) return E.left(TEAM_ENVIRONMENT_SHORT_NAME);
-
-    const result = await this.prisma.teamEnvironment.create({
-      data: {
-        name: name,
-        teamID: teamID,
-        variables: JSON.parse(variables),
-      },
-    });
-
-    const createdTeamEnvironment = this.cast(result);
-
-    this.pubsub.publish(
-      `team_environment/${createdTeamEnvironment.teamID}/created`,
-      createdTeamEnvironment,
+  getTeamEnvironment(id: string) {
+    return TO.tryCatch(() =>
+      this.prisma.teamEnvironment.findFirst({
+        where: { id },
+        rejectOnNotFound: true,
+      }),
    );
-
-    return E.right(createdTeamEnvironment);
  }

-  /**
-   * Delete a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of boolean or error message
-   */
-  async deleteTeamEnvironment(id: string) {
-    try {
-      const result = await this.prisma.teamEnvironment.delete({
-        where: {
-          id: id,
-        },
-      });
-
-      const deletedTeamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${deletedTeamEnvironment.teamID}/deleted`,
-        deletedTeamEnvironment,
-      );
-
-      return E.right(true);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
+  createTeamEnvironment(name: string, teamID: string, variables: string) {
+    return pipe(
+      () =>
+        this.prisma.teamEnvironment.create({
+          data: {
+            name: name,
+            teamID: teamID,
+            variables: JSON.parse(variables),
+          },
+        }),
+      T.chainFirst(
+        (environment) => () =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/created`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+      ),
+      T.map((data) => {
+        return <TeamEnvironment>{
+          id: data.id,
+          name: data.name,
+          teamID: data.teamID,
+          variables: JSON.stringify(data.variables),
+        };
+      }),
+    );
  }

-  /**
-   * Update a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @param name TeamEnvironment name
-   * @param variables JSONified string of contents of new TeamEnvironment
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async updateTeamEnvironment(id: string, name: string, variables: string) {
-    try {
-      const isTitleValid = isValidLength(name, this.TITLE_LENGTH);
-      if (!isTitleValid) return E.left(TEAM_ENVIRONMENT_SHORT_NAME);
-
-      const result = await this.prisma.teamEnvironment.update({
-        where: { id: id },
-        data: {
-          name,
-          variables: JSON.parse(variables),
-        },
-      });
-
-      const updatedTeamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${updatedTeamEnvironment.teamID}/updated`,
-        updatedTeamEnvironment,
-      );
-
-      return E.right(updatedTeamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
+  deleteTeamEnvironment(id: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.delete({
+            where: {
+              id: id,
+            },
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/deleted`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map((data) => true),
+    );
  }

-  /**
-   * Clear contents of a TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async deleteAllVariablesFromTeamEnvironment(id: string) {
-    try {
-      const result = await this.prisma.teamEnvironment.update({
-        where: { id: id },
-        data: {
-          variables: [],
-        },
-      });
-
-      const teamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${teamEnvironment.teamID}/updated`,
-        teamEnvironment,
-      );
-
-      return E.right(teamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
+  updateTeamEnvironment(id: string, name: string, variables: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.update({
+            where: { id: id },
+            data: {
+              name,
+              variables: JSON.parse(variables),
+            },
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/updated`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map(
+        (environment) =>
+          <TeamEnvironment>{
+            id: environment.id,
+            name: environment.name,
+            teamID: environment.teamID,
+            variables: JSON.stringify(environment.variables),
+          },
+      ),
+    );
  }

-  /**
-   * Create a duplicate of a existing TeamEnvironment.
-   *
-   * @param id TeamEnvironment ID
-   * @returns Either of a TeamEnvironment or error message
-   */
-  async createDuplicateEnvironment(id: string) {
-    try {
-      const environment = await this.prisma.teamEnvironment.findFirstOrThrow({
-        where: {
-          id: id,
-        },
-      });
-
-      const result = await this.prisma.teamEnvironment.create({
-        data: {
-          name: environment.name,
-          teamID: environment.teamID,
-          variables: environment.variables as Prisma.JsonArray,
-        },
-      });
-
-      const duplicatedTeamEnvironment = this.cast(result);
-
-      this.pubsub.publish(
-        `team_environment/${duplicatedTeamEnvironment.teamID}/created`,
-        duplicatedTeamEnvironment,
-      );
-
-      return E.right(duplicatedTeamEnvironment);
-    } catch (error) {
-      return E.left(TEAM_ENVIRONMENT_NOT_FOUND);
-    }
+  deleteAllVariablesFromTeamEnvironment(id: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.update({
+            where: { id: id },
+            data: {
+              variables: [],
+            },
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/updated`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map(
+        (environment) =>
+          <TeamEnvironment>{
+            id: environment.id,
+            name: environment.name,
+            teamID: environment.teamID,
+            variables: JSON.stringify(environment.variables),
+          },
+      ),
+    );
  }

-  /**
-   * Fetch all TeamEnvironments of a team.
-   *
-   * @param teamID teamID of new TeamEnvironment
-   * @returns List of TeamEnvironments
-   */
-  async fetchAllTeamEnvironments(teamID: string) {
-    const result = await this.prisma.teamEnvironment.findMany({
-      where: {
-        teamID: teamID,
-      },
-    });
-    const teamEnvironments = result.map((item) => {
-      return this.cast(item);
-    });
+  createDuplicateEnvironment(id: string) {
+    return pipe(
+      TE.tryCatch(
+        () =>
+          this.prisma.teamEnvironment.findFirst({
+            where: {
+              id: id,
+            },
+            rejectOnNotFound: true,
+          }),
+        () => TEAM_ENVIRONMENT_NOT_FOUND,
+      ),
+      TE.chain((environment) =>
+        TE.fromTask(() =>
+          this.prisma.teamEnvironment.create({
+            data: {
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: environment.variables as Prisma.JsonArray,
+            },
+          }),
+        ),
+      ),
+      TE.chainFirst((environment) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team_environment/${environment.teamID}/created`,
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+          ),
+        ),
+      ),
+      TE.map(
+        (environment) =>
+          <TeamEnvironment>{
+            id: environment.id,
+            name: environment.name,
+            teamID: environment.teamID,
+            variables: JSON.stringify(environment.variables),
+          },
+      ),
+    );
+  }

-    return teamEnvironments;
+  fetchAllTeamEnvironments(teamID: string) {
+    return pipe(
+      () =>
+        this.prisma.teamEnvironment.findMany({
+          where: {
+            teamID: teamID,
+          },
+        }),
+      T.map(
+        A.map(
+          (environment) =>
+            <TeamEnvironment>{
+              id: environment.id,
+              name: environment.name,
+              teamID: environment.teamID,
+              variables: JSON.stringify(environment.variables),
+            },
+        ),
+      ),
+    );
  }

  /**
--- a/packages/hoppscotch-backend/src/team-environments/team.resolver.ts
+++ b/packages/hoppscotch-backend/src/team-environments/team.resolver.ts
@@ -11,6 +11,6 @@ export class TeamEnvsTeamResolver {
    description: 'Returns all Team Environments for the given Team',
  })
  teamEnvironments(@Parent() team: Team): Promise<TeamEnvironment[]> {
-    return this.teamEnvironmentService.fetchAllTeamEnvironments(team.id);
+    return this.teamEnvironmentService.fetchAllTeamEnvironments(team.id)();
  }
 }
--- a/packages/hoppscotch-backend/src/team-invitation/input-type.args.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/input-type.args.ts
@@ -1,20 +0,0 @@
-import { ArgsType, Field, ID } from '@nestjs/graphql';
-import { TeamMemberRole } from 'src/team/team.model';
-
-@ArgsType()
-export class CreateTeamInvitationArgs {
-  @Field(() => ID, {
-    name: 'teamID',
-    description: 'ID of the Team ID to invite from',
-  })
-  teamID: string;
-
-  @Field({ name: 'inviteeEmail', description: 'Email of the user to invite' })
-  inviteeEmail: string;
-
-  @Field(() => TeamMemberRole, {
-    name: 'inviteeRole',
-    description: 'Role to be given to the user',
-  })
-  inviteeRole: TeamMemberRole;
-}
--- a/packages/hoppscotch-backend/src/team-invitation/team-invitation.module.ts
+++ b/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,
--- a/packages/hoppscotch-backend/src/team-invitation/team-invitation.resolver.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invitation.resolver.ts
@@ -12,10 +12,15 @@ import { TeamInvitation } from './team-invitation.model';
 import { TeamInvitationService } from './team-invitation.service';
 import { pipe } from 'fp-ts/function';
 import * as TE from 'fp-ts/TaskEither';
-import * as E from 'fp-ts/Either';
 import * as O from 'fp-ts/Option';
 import { Team, TeamMember, TeamMemberRole } from 'src/team/team.model';
-import { TEAM_INVITE_NO_INVITE_FOUND, USER_NOT_FOUND } from 'src/errors';
+import { EmailCodec } from 'src/types/Email';
+import {
+  INVALID_EMAIL,
+  TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+  TEAM_INVITE_NO_INVITE_FOUND,
+  USER_NOT_FOUND,
+} from 'src/errors';
 import { GqlUser } from 'src/decorators/gql-user.decorator';
 import { User } from 'src/user/user.model';
 import { UseGuards } from '@nestjs/common';
@@ -31,8 +36,6 @@ import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
 import { GqlThrottlerGuard } from 'src/guards/gql-throttler.guard';
 import { SkipThrottle } from '@nestjs/throttler';
-import { AuthUser } from 'src/types/AuthUser';
-import { CreateTeamInvitationArgs } from './input-type.args';

@UseGuards(GqlThrottlerGuard)
@Resolver(() => TeamInvitation)
@@ -76,8 +79,8 @@ export class TeamInvitationResolver {
      'Gets the Team Invitation with the given ID, or null if not exists',
  })
  @UseGuards(GqlAuthGuard, TeamInviteViewerGuard)
-  async teamInvitation(
-    @GqlUser() user: AuthUser,
+  teamInvitation(
+    @GqlUser() user: User,
    @Args({
      name: 'inviteID',
      description: 'ID of the Team Invitation to lookup',
@@ -85,11 +88,17 @@ export class TeamInvitationResolver {
    })
    inviteID: string,
  ): Promise<TeamInvitation> {
-    const teamInvitation = await this.teamInvitationService.getInvitation(
-      inviteID,
-    );
-    if (O.isNone(teamInvitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
-    return teamInvitation.value;
+    return pipe(
+      this.teamInvitationService.getInvitation(inviteID),
+      TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+      TE.chainW(
+        TE.fromPredicate(
+          (a) => a.inviteeEmail.toLowerCase() === user.email?.toLowerCase(),
+          () => TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+        ),
+      ),
+      TE.getOrElse(throwErr),
+    )();
  }

  @Mutation(() => TeamInvitation, {
@@ -97,19 +106,56 @@ export class TeamInvitationResolver {
  })
  @UseGuards(GqlAuthGuard, GqlTeamMemberGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER)
-  async createTeamInvitation(
-    @GqlUser() user: AuthUser,
-    @Args() args: CreateTeamInvitationArgs,
-  ): Promise<TeamInvitation> {
-    const teamInvitation = await this.teamInvitationService.createInvitation(
-      user,
-      args.teamID,
-      args.inviteeEmail,
-      args.inviteeRole,
-    );
+  createTeamInvitation(
+    @GqlUser()
+    user: User,

-    if (E.isLeft(teamInvitation)) throwErr(teamInvitation.left);
-    return teamInvitation.right;
+    @Args({
+      name: 'teamID',
+      description: 'ID of the Team ID to invite from',
+      type: () => ID,
+    })
+    teamID: string,
+    @Args({
+      name: 'inviteeEmail',
+      description: 'Email of the user to invite',
+    })
+    inviteeEmail: string,
+    @Args({
+      name: 'inviteeRole',
+      type: () => TeamMemberRole,
+      description: 'Role to be given to the user',
+    })
+    inviteeRole: TeamMemberRole,
+  ): Promise<TeamInvitation> {
+    return pipe(
+      TE.Do,
+
+      // Validate email
+      TE.bindW('email', () =>
+        pipe(
+          EmailCodec.decode(inviteeEmail),
+          TE.fromEither,
+          TE.mapLeft(() => INVALID_EMAIL),
+        ),
+      ),
+
+      // Validate and get Team
+      TE.bindW('team', () => this.teamService.getTeamWithIDTE(teamID)),
+
+      // Create team
+      TE.chainW(({ email, team }) =>
+        this.teamInvitationService.createInvitation(
+          user,
+          team,
+          email,
+          inviteeRole,
+        ),
+      ),
+
+      // If failed, throw err (so the message is passed) else return value
+      TE.getOrElse(throwErr),
+    )();
  }

  @Mutation(() => Boolean, {
@@ -117,7 +163,7 @@ export class TeamInvitationResolver {
  })
  @UseGuards(GqlAuthGuard, TeamInviteTeamOwnerGuard)
  @RequiresTeamRole(TeamMemberRole.OWNER)
-  async revokeTeamInvitation(
+  revokeTeamInvitation(
    @Args({
      name: 'inviteID',
      type: () => ID,
@@ -125,19 +171,19 @@ export class TeamInvitationResolver {
    })
    inviteID: string,
  ): Promise<true> {
-    const isRevoked = await this.teamInvitationService.revokeInvitation(
-      inviteID,
-    );
-    if (E.isLeft(isRevoked)) throwErr(isRevoked.left);
-    return true;
+    return pipe(
+      this.teamInvitationService.revokeInvitation(inviteID),
+      TE.map(() => true as const),
+      TE.getOrElse(throwErr),
+    )();
  }

  @Mutation(() => TeamMember, {
    description: 'Accept an Invitation',
  })
  @UseGuards(GqlAuthGuard, TeamInviteeGuard)
-  async acceptTeamInvitation(
-    @GqlUser() user: AuthUser,
+  acceptTeamInvitation(
+    @GqlUser() user: User,
    @Args({
      name: 'inviteID',
      type: () => ID,
@@ -145,12 +191,10 @@ export class TeamInvitationResolver {
    })
    inviteID: string,
  ): Promise<TeamMember> {
-    const teamMember = await this.teamInvitationService.acceptInvitation(
-      inviteID,
-      user,
-    );
-    if (E.isLeft(teamMember)) throwErr(teamMember.left);
-    return teamMember.right;
+    return pipe(
+      this.teamInvitationService.acceptInvitation(inviteID, user),
+      TE.getOrElse(throwErr),
+    )();
  }

  // Subscriptions
--- a/packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invitation.service.ts
@@ -1,26 +1,24 @@
 import { Injectable } from '@nestjs/common';
+import * as T from 'fp-ts/Task';
 import * as O from 'fp-ts/Option';
-import * as E from 'fp-ts/Either';
+import * as TO from 'fp-ts/TaskOption';
+import * as TE from 'fp-ts/TaskEither';
+import { pipe, flow, constVoid } from 'fp-ts/function';
 import { PrismaService } from 'src/prisma/prisma.service';
-import { TeamInvitation as DBTeamInvitation } from '@prisma/client';
-import { TeamMember, TeamMemberRole } from 'src/team/team.model';
+import { Team, TeamMemberRole } from 'src/team/team.model';
+import { Email } from 'src/types/Email';
+import { User } from 'src/user/user.model';
 import { TeamService } from 'src/team/team.service';
 import {
-  INVALID_EMAIL,
-  TEAM_INVALID_ID,
  TEAM_INVITE_ALREADY_MEMBER,
  TEAM_INVITE_EMAIL_DO_NOT_MATCH,
  TEAM_INVITE_MEMBER_HAS_INVITE,
  TEAM_INVITE_NO_INVITE_FOUND,
-  TEAM_MEMBER_NOT_FOUND,
 } from 'src/errors';
 import { TeamInvitation } from './team-invitation.model';
 import { MailerService } from 'src/mailer/mailer.service';
 import { UserService } from 'src/user/user.service';
 import { PubSubService } from 'src/pubsub/pubsub.service';
-import { validateEmail } from '../utils';
-import { AuthUser } from 'src/types/AuthUser';
-import { ConfigService } from '@nestjs/config';

@Injectable()
 export class TeamInvitationService {
@@ -29,225 +27,247 @@ export class TeamInvitationService {
    private readonly userService: UserService,
    private readonly teamService: TeamService,
    private readonly mailerService: MailerService,
+
    private readonly pubsub: PubSubService,
-    private readonly configService: ConfigService,
-  ) {}
-
-  /**
-   * Cast a DBTeamInvitation to a TeamInvitation
-   * @param dbTeamInvitation database TeamInvitation
-   * @returns TeamInvitation model
-   */
-  cast(dbTeamInvitation: DBTeamInvitation): TeamInvitation {
-    return {
-      ...dbTeamInvitation,
-      inviteeRole: TeamMemberRole[dbTeamInvitation.inviteeRole],
-    };
+  ) {
+    this.getInvitation = this.getInvitation.bind(this);
  }

-  /**
-   * Get the team invite
-   * @param inviteID invite id
-   * @returns an Option of team invitation or none
-   */
-  async getInvitation(inviteID: string) {
-    try {
-      const dbInvitation = await this.prisma.teamInvitation.findUniqueOrThrow({
-        where: {
-          id: inviteID,
-        },
-      });
-
-      return O.some(this.cast(dbInvitation));
-    } catch (e) {
-      return O.none;
-    }
-  }
-
-  /**
-   * Get the team invite for an invitee with email and teamID.
-   * @param inviteeEmail invitee email
-   * @param teamID team id
-   * @returns an Either of team invitation for the invitee or error
-   */
-  async getTeamInviteByEmailAndTeamID(inviteeEmail: string, teamID: string) {
-    const isEmailValid = validateEmail(inviteeEmail);
-    if (!isEmailValid) return E.left(INVALID_EMAIL);
-
-    try {
-      const teamInvite = await this.prisma.teamInvitation.findUniqueOrThrow({
-        where: {
-          teamID_inviteeEmail: {
-            inviteeEmail: inviteeEmail,
-            teamID: teamID,
+  getInvitation(inviteID: string): TO.TaskOption<TeamInvitation> {
+    return pipe(
+      () =>
+        this.prisma.teamInvitation.findUnique({
+          where: {
+            id: inviteID,
          },
-        },
-      });
-
-      return E.right(teamInvite);
-    } catch (e) {
-      return E.left(TEAM_INVITE_NO_INVITE_FOUND);
-    }
+        }),
+      TO.fromTask,
+      TO.chain(flow(O.fromNullable, TO.fromOption)),
+      TO.map((x) => x as TeamInvitation),
+    );
  }

-  /**
-   * Create a team invitation
-   * @param creator creator of the invitation
-   * @param teamID team id
-   * @param inviteeEmail invitee email
-   * @param inviteeRole invitee role
-   * @returns an Either of team invitation or error message
-   */
-  async createInvitation(
-    creator: AuthUser,
-    teamID: string,
-    inviteeEmail: string,
+  getInvitationWithEmail(email: Email, team: Team) {
+    return pipe(
+      () =>
+        this.prisma.teamInvitation.findUnique({
+          where: {
+            teamID_inviteeEmail: {
+              inviteeEmail: email,
+              teamID: team.id,
+            },
+          },
+        }),
+      TO.fromTask,
+      TO.chain(flow(O.fromNullable, TO.fromOption)),
+    );
+  }
+
+  createInvitation(
+    creator: User,
+    team: Team,
+    inviteeEmail: Email,
    inviteeRole: TeamMemberRole,
  ) {
-    // validate email
-    const isEmailValid = validateEmail(inviteeEmail);
-    if (!isEmailValid) return E.left(INVALID_EMAIL);
+    return pipe(
+      // Perform all validation checks
+      TE.sequenceArray([
+        // creator should be a TeamMember
+        pipe(
+          this.teamService.getTeamMemberTE(team.id, creator.uid),
+          TE.map(constVoid),
+        ),

-    // team ID should valid
-    const team = await this.teamService.getTeamWithID(teamID);
-    if (!team) return E.left(TEAM_INVALID_ID);
+        // Invitee should not be a team member
+        pipe(
+          async () => await this.userService.findUserByEmail(inviteeEmail),
+          TO.foldW(
+            () => TE.right(undefined), // If no user, short circuit to completion
+            (user) =>
+              pipe(
+                // If user is found, check if team member
+                this.teamService.getTeamMemberTE(team.id, user.uid),
+                TE.foldW(
+                  () => TE.right(undefined), // Not team-member, this is good
+                  () => TE.left(TEAM_INVITE_ALREADY_MEMBER), // Is team member, not good
+                ),
+              ),
+          ),
+          TE.map(constVoid),
+        ),

-    // invitation creator should be a TeamMember
-    const isTeamMember = await this.teamService.getTeamMember(
-      team.id,
-      creator.uid,
+        // Should not have an existing invite
+        pipe(
+          this.getInvitationWithEmail(inviteeEmail, team),
+          TE.fromTaskOption(() => null),
+          TE.swap,
+          TE.map(constVoid),
+          TE.mapLeft(() => TEAM_INVITE_MEMBER_HAS_INVITE),
+        ),
+      ]),
+
+      // Create the invitation
+      TE.chainTaskK(
+        () => () =>
+          this.prisma.teamInvitation.create({
+            data: {
+              teamID: team.id,
+              inviteeEmail,
+              inviteeRole,
+              creatorUid: creator.uid,
+            },
+          }),
+      ),
+
+      // Send email, this is a side effect
+      TE.chainFirstTaskK((invitation) =>
+        pipe(
+          this.mailerService.sendMail(inviteeEmail, {
+            template: 'team-invitation',
+            variables: {
+              invitee: creator.displayName ?? 'A Hoppscotch User',
+              action_url: `https://hoppscotch.io/join-team?id=${invitation.id}`,
+              invite_team_name: team.name,
+            },
+          }),
+
+          TE.getOrElseW(() => T.of(undefined)), // This value doesn't matter as we don't mind the return value (chainFirst) as long as the task completes
+        ),
+      ),
+
+      // Send PubSub topic
+      TE.chainFirstTaskK((invitation) =>
+        TE.fromTask(async () => {
+          const inv: TeamInvitation = {
+            id: invitation.id,
+            teamID: invitation.teamID,
+            creatorUid: invitation.creatorUid,
+            inviteeEmail: invitation.inviteeEmail,
+            inviteeRole: TeamMemberRole[invitation.inviteeRole],
+          };
+
+          this.pubsub.publish(`team/${inv.teamID}/invite_added`, inv);
+        }),
+      ),
+
+      // Map to model type
+      TE.map((x) => x as TeamInvitation),
    );
-    if (!isTeamMember) return E.left(TEAM_MEMBER_NOT_FOUND);
+  }

-    // Checking to see if the invitee is already part of the team or not
-    const inviteeUser = await this.userService.findUserByEmail(inviteeEmail);
-    if (O.isSome(inviteeUser)) {
-      // invitee should not already a member
-      const isTeamMember = await this.teamService.getTeamMember(
-        team.id,
-        inviteeUser.value.uid,
-      );
-      if (isTeamMember) return E.left(TEAM_INVITE_ALREADY_MEMBER);
-    }
+  revokeInvitation(inviteID: string) {
+    return pipe(
+      // Make sure invite exists
+      this.getInvitation(inviteID),
+      TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),

-    // check invitee already invited earlier or not
-    const teamInvitation = await this.getTeamInviteByEmailAndTeamID(
-      inviteeEmail,
-      team.id,
+      // Delete team invitation
+      TE.chainTaskK(
+        () => () =>
+          this.prisma.teamInvitation.delete({
+            where: {
+              id: inviteID,
+            },
+          }),
+      ),
+
+      // Emit Pubsub Event
+      TE.chainFirst((invitation) =>
+        TE.fromTask(() =>
+          this.pubsub.publish(
+            `team/${invitation.teamID}/invite_removed`,
+            invitation.id,
+          ),
+        ),
+      ),
+
+      // We are not returning anything
+      TE.map(constVoid),
    );
-    if (E.isRight(teamInvitation)) return E.left(TEAM_INVITE_MEMBER_HAS_INVITE);
+  }

-    // create the invitation
-    const dbInvitation = await this.prisma.teamInvitation.create({
-      data: {
-        teamID: team.id,
-        inviteeEmail,
-        inviteeRole,
-        creatorUid: creator.uid,
-      },
-    });
+  getAllInvitationsInTeam(team: Team) {
+    return pipe(
+      () =>
+        this.prisma.teamInvitation.findMany({
+          where: {
+            teamID: team.id,
+          },
+        }),
+      T.map((x) => x as TeamInvitation[]),
+    );
+  }

-    await this.mailerService.sendEmail(inviteeEmail, {
-      template: 'team-invitation',
-      variables: {
-        invitee: creator.displayName ?? 'A Hoppscotch User',
-        action_url: `${this.configService.get('VITE_BASE_URL')}/join-team?id=${
-          dbInvitation.id
-        }`,
-        invite_team_name: team.name,
-      },
-    });
+  acceptInvitation(inviteID: string, acceptedBy: User) {
+    return pipe(
+      TE.Do,

-    const invitation = this.cast(dbInvitation);
-    this.pubsub.publish(`team/${invitation.teamID}/invite_added`, invitation);
+      // First get the invitation
+      TE.bindW('invitation', () =>
+        pipe(
+          this.getInvitation(inviteID),
+          TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+        ),
+      ),

-    return E.right(invitation);
+      // Validation checks
+      TE.chainFirstW(({ invitation }) =>
+        TE.sequenceArray([
+          // Make sure the invited user is not part of the team
+          pipe(
+            this.teamService.getTeamMemberTE(invitation.teamID, acceptedBy.uid),
+            TE.swap,
+            TE.bimap(
+              () => TEAM_INVITE_ALREADY_MEMBER,
+              constVoid, // The return type is ignored
+            ),
+          ),
+
+          // Make sure the invited user and accepting user has the same email
+          pipe(
+            undefined,
+            TE.fromPredicate(
+              (a) => acceptedBy.email === invitation.inviteeEmail,
+              () => TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+            ),
+          ),
+        ]),
+      ),
+
+      // Add the team member
+      // TODO: Somehow bring subscriptions to this ?
+      TE.bindW('teamMember', ({ invitation }) =>
+        pipe(
+          TE.tryCatch(
+            () =>
+              this.teamService.addMemberToTeam(
+                invitation.teamID,
+                acceptedBy.uid,
+                invitation.inviteeRole,
+              ),
+            () => TEAM_INVITE_ALREADY_MEMBER, // Can only fail if Team Member already exists, which we checked, but due to async lets assert that here too
+          ),
+        ),
+      ),
+
+      TE.chainFirstW(({ invitation }) => this.revokeInvitation(invitation.id)),
+
+      TE.map(({ teamMember }) => teamMember),
+    );
  }

  /**
-   * Revoke a team invitation
-   * @param inviteID invite id
-   * @returns an Either of true or error message
-   */
-  async revokeInvitation(inviteID: string) {
-    // check if the invite exists
-    const invitation = await this.getInvitation(inviteID);
-    if (O.isNone(invitation)) return E.left(TEAM_INVITE_NO_INVITE_FOUND);
-
-    // delete the invite
-    await this.prisma.teamInvitation.delete({
-      where: {
-        id: inviteID,
-      },
-    });
-
-    this.pubsub.publish(
-      `team/${invitation.value.teamID}/invite_removed`,
-      invitation.value.id,
-    );
-
-    return E.right(true);
-  }
-
-  /**
-   * Accept a team invitation
-   * @param inviteID invite id
-   * @param acceptedBy user who accepted the invitation
-   * @returns an Either of team member or error message
-   */
-  async acceptInvitation(inviteID: string, acceptedBy: AuthUser) {
-    // check if the invite exists
-    const invitation = await this.getInvitation(inviteID);
-    if (O.isNone(invitation)) return E.left(TEAM_INVITE_NO_INVITE_FOUND);
-
-    // make sure the user is not already a member of the team
-    const teamMemberInvitee = await this.teamService.getTeamMember(
-      invitation.value.teamID,
-      acceptedBy.uid,
-    );
-    if (teamMemberInvitee) return E.left(TEAM_INVITE_ALREADY_MEMBER);
-
-    // make sure the user is the same as the invitee
-    if (
-      acceptedBy.email.toLowerCase() !==
-      invitation.value.inviteeEmail.toLowerCase()
-    )
-      return E.left(TEAM_INVITE_EMAIL_DO_NOT_MATCH);
-
-    // add the user to the team
-    let teamMember: TeamMember;
-    try {
-      teamMember = await this.teamService.addMemberToTeam(
-        invitation.value.teamID,
-        acceptedBy.uid,
-        invitation.value.inviteeRole,
-      );
-    } catch (e) {
-      return E.left(TEAM_INVITE_ALREADY_MEMBER);
-    }
-
-    // delete the invite
-    await this.revokeInvitation(inviteID);
-
-    return E.right(teamMember);
-  }
-
-  /**
-   * Fetch all team invitations for a given team.
+   * Fetch the count invitations for a given team.
   * @param teamID team id
-   * @returns array of team invitations for a team
+   * @returns a count team invitations for a team
   */
-  async getTeamInvitations(teamID: string) {
-    const dbInvitations = await this.prisma.teamInvitation.findMany({
+  async getAllTeamInvitations(teamID: string) {
+    const invitations = await this.prisma.teamInvitation.findMany({
      where: {
        teamID: teamID,
      },
    });

-    const invitations: TeamInvitation[] = dbInvitations.map((dbInvitation) =>
-      this.cast(dbInvitation),
-    );
-
    return invitations;
  }
 }
--- a/packages/hoppscotch-backend/src/team-invitation/team-invite-team-owner.guard.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invite-team-owner.guard.ts
@@ -1,21 +1,21 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
+import { pipe } from 'fp-ts/function';
 import { TeamService } from 'src/team/team.service';
 import { TeamInvitationService } from './team-invitation.service';
 import * as O from 'fp-ts/Option';
+import * as T from 'fp-ts/Task';
+import * as TE from 'fp-ts/TaskEither';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import {
  BUG_AUTH_NO_USER_CTX,
  BUG_TEAM_INVITE_NO_INVITE_ID,
  TEAM_INVITE_NO_INVITE_FOUND,
-  TEAM_MEMBER_NOT_FOUND,
  TEAM_NOT_REQUIRED_ROLE,
 } from 'src/errors';
+import { User } from 'src/user/user.model';
 import { throwErr } from 'src/utils';
 import { TeamMemberRole } from 'src/team/team.model';

-/**
- * This guard only allows team owner to execute the resolver
- */
@Injectable()
 export class TeamInviteTeamOwnerGuard implements CanActivate {
  constructor(
@@ -24,30 +24,48 @@ export class TeamInviteTeamOwnerGuard implements CanActivate {
  ) {}

  async canActivate(context: ExecutionContext): Promise<boolean> {
-    // Get GQL context
-    const gqlExecCtx = GqlExecutionContext.create(context);
+    return pipe(
+      TE.Do,

-    // Get user
-    const { user } = gqlExecCtx.getContext().req;
-    if (!user) throwErr(BUG_AUTH_NO_USER_CTX);
+      TE.bindW('gqlCtx', () => TE.of(GqlExecutionContext.create(context))),

-    // Get the invite
-    const { inviteID } = gqlExecCtx.getArgs<{ inviteID: string }>();
-    if (!inviteID) throwErr(BUG_TEAM_INVITE_NO_INVITE_ID);
+      // Get the invite
+      TE.bindW('invite', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getArgs<{ inviteID?: string }>().inviteID),
+          TE.fromOption(() => BUG_TEAM_INVITE_NO_INVITE_ID),
+          TE.chainW((inviteID) =>
+            pipe(
+              this.teamInviteService.getInvitation(inviteID),
+              TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+            ),
+          ),
+        ),
+      ),

-    const invitation = await this.teamInviteService.getInvitation(inviteID);
-    if (O.isNone(invitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+      TE.bindW('user', ({ gqlCtx }) =>
+        pipe(
+          gqlCtx.getContext().req.user,
+          O.fromNullable,
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),

-    // Fetch team member details of this user
-    const teamMember = await this.teamService.getTeamMember(
-      invitation.value.teamID,
-      user.uid,
-    );
+      TE.bindW('userMember', ({ invite, user }) =>
+        this.teamService.getTeamMemberTE(invite.teamID, user.uid),
+      ),

-    if (!teamMember) throwErr(TEAM_MEMBER_NOT_FOUND);
-    if (teamMember.role !== TeamMemberRole.OWNER)
-      throwErr(TEAM_NOT_REQUIRED_ROLE);
+      TE.chainW(
+        TE.fromPredicate(
+          ({ userMember }) => userMember.role === TeamMemberRole.OWNER,
+          () => TEAM_NOT_REQUIRED_ROLE,
+        ),
+      ),

-    return true;
+      TE.fold(
+        (err) => throwErr(err),
+        () => T.of(true),
+      ),
+    )();
  }
 }
--- a/packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts
@@ -1,23 +1,20 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { TeamInvitationService } from './team-invitation.service';
+import { pipe, flow } from 'fp-ts/function';
+import * as TE from 'fp-ts/TaskEither';
+import * as T from 'fp-ts/Task';
 import * as O from 'fp-ts/Option';
 import { GqlExecutionContext } from '@nestjs/graphql';
 import {
  BUG_AUTH_NO_USER_CTX,
  BUG_TEAM_INVITE_NO_INVITE_ID,
+  TEAM_INVITE_NOT_VALID_VIEWER,
  TEAM_INVITE_NO_INVITE_FOUND,
-  TEAM_MEMBER_NOT_FOUND,
 } from 'src/errors';
+import { User } from 'src/user/user.model';
 import { throwErr } from 'src/utils';
 import { TeamService } from 'src/team/team.service';

-/**
- * This guard only allows user to execute the resolver
- * 1. If user is invitee, allow
- * 2. Or else, if user is team member, allow
- *
- * TLDR: Allow if user is invitee or team member
- */
@Injectable()
 export class TeamInviteViewerGuard implements CanActivate {
  constructor(
@@ -26,32 +23,50 @@ export class TeamInviteViewerGuard implements CanActivate {
  ) {}

  async canActivate(context: ExecutionContext): Promise<boolean> {
-    // Get GQL context
-    const gqlExecCtx = GqlExecutionContext.create(context);
+    return pipe(
+      TE.Do,

-    // Get user
-    const { user } = gqlExecCtx.getContext().req;
-    if (!user) throwErr(BUG_AUTH_NO_USER_CTX);
+      // Get GQL Context
+      TE.bindW('gqlCtx', () => TE.of(GqlExecutionContext.create(context))),

-    // Get the invite
-    const { inviteID } = gqlExecCtx.getArgs<{ inviteID: string }>();
-    if (!inviteID) throwErr(BUG_TEAM_INVITE_NO_INVITE_ID);
+      // Get user
+      TE.bindW('user', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),

-    const invitation = await this.teamInviteService.getInvitation(inviteID);
-    if (O.isNone(invitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+      // Get the invite
+      TE.bindW('invite', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getArgs<{ inviteID?: string }>().inviteID),
+          TE.fromOption(() => BUG_TEAM_INVITE_NO_INVITE_ID),
+          TE.chainW(
+            flow(
+              this.teamInviteService.getInvitation,
+              TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+            ),
+          ),
+        ),
+      ),

-    // Check if the user and the invite email match, else if user is a team member
-    if (
-      user.email?.toLowerCase() !== invitation.value.inviteeEmail.toLowerCase()
-    ) {
-      const teamMember = await this.teamService.getTeamMember(
-        invitation.value.teamID,
-        user.uid,
-      );
+      // Check if the user and the invite email match, else if we can resolver the user as a team member
+      // any better solution ?
+      TE.chainW(({ user, invite }) =>
+        user.email?.toLowerCase() === invite.inviteeEmail.toLowerCase()
+          ? TE.of(true)
+          : pipe(
+              this.teamService.getTeamMemberTE(invite.teamID, user.uid),
+              TE.map(() => true),
+            ),
+      ),

-      if (!teamMember) throwErr(TEAM_MEMBER_NOT_FOUND);
-    }
+      TE.mapLeft((e) =>
+        e === 'team/member_not_found' ? TEAM_INVITE_NOT_VALID_VIEWER : e,
+      ),

-    return true;
+      TE.fold(throwErr, () => T.of(true)),
+    )();
  }
 }
--- a/packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts
@@ -1,7 +1,11 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { TeamInvitationService } from './team-invitation.service';
+import { pipe, flow } from 'fp-ts/function';
 import * as O from 'fp-ts/Option';
+import * as T from 'fp-ts/Task';
+import * as TE from 'fp-ts/TaskEither';
 import { GqlExecutionContext } from '@nestjs/graphql';
+import { User } from 'src/user/user.model';
 import {
  BUG_AUTH_NO_USER_CTX,
  BUG_TEAM_INVITE_NO_INVITE_ID,
@@ -20,26 +24,44 @@ export class TeamInviteeGuard implements CanActivate {
  constructor(private readonly teamInviteService: TeamInvitationService) {}

  async canActivate(context: ExecutionContext): Promise<boolean> {
-    // Get GQL Context
-    const gqlExecCtx = GqlExecutionContext.create(context);
+    return pipe(
+      TE.Do,

-    // Get user
-    const { user } = gqlExecCtx.getContext().req;
-    if (!user) throwErr(BUG_AUTH_NO_USER_CTX);
+      // Get execution context
+      TE.bindW('gqlCtx', () => TE.of(GqlExecutionContext.create(context))),

-    // Get the invite
-    const { inviteID } = gqlExecCtx.getArgs<{ inviteID: string }>();
-    if (!inviteID) throwErr(BUG_TEAM_INVITE_NO_INVITE_ID);
+      // Get user
+      TE.bindW('user', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
+          TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
+        ),
+      ),

-    const invitation = await this.teamInviteService.getInvitation(inviteID);
-    if (O.isNone(invitation)) throwErr(TEAM_INVITE_NO_INVITE_FOUND);
+      // Get invite
+      TE.bindW('invite', ({ gqlCtx }) =>
+        pipe(
+          O.fromNullable(gqlCtx.getArgs<{ inviteID?: string }>().inviteID),
+          TE.fromOption(() => BUG_TEAM_INVITE_NO_INVITE_ID),
+          TE.chainW(
+            flow(
+              this.teamInviteService.getInvitation,
+              TE.fromTaskOption(() => TEAM_INVITE_NO_INVITE_FOUND),
+            ),
+          ),
+        ),
+      ),

-    if (
-      user.email.toLowerCase() !== invitation.value.inviteeEmail.toLowerCase()
-    ) {
-      throwErr(TEAM_INVITE_EMAIL_DO_NOT_MATCH);
-    }
+      // Check if the emails match
+      TE.chainW(
+        TE.fromPredicate(
+          ({ user, invite }) => user.email === invite.inviteeEmail,
+          () => TEAM_INVITE_EMAIL_DO_NOT_MATCH,
+        ),
+      ),

-    return true;
+      // Fold it to a promise
+      TE.fold(throwErr, () => T.of(true)),
+    )();
  }
 }
--- a/packages/hoppscotch-backend/src/team-invitation/team-teaminvite-ext.resolver.ts
+++ b/packages/hoppscotch-backend/src/team-invitation/team-teaminvite-ext.resolver.ts
@@ -12,6 +12,6 @@ export class TeamTeamInviteExtResolver {
    complexity: 10,
  })
  teamInvitations(@Parent() team: Team): Promise<TeamInvitation[]> {
-    return this.teamInviteService.getTeamInvitations(team.id);
+    return this.teamInviteService.getAllInvitationsInTeam(team)();
  }
 }
--- a/packages/hoppscotch-backend/src/team-request/team-request.service.spec.ts
+++ b/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(),
--- a/packages/hoppscotch-backend/src/types/AuthError.ts
+++ b/packages/hoppscotch-backend/src/types/AuthError.ts
@@ -2,7 +2,7 @@ import { HttpStatus } from '@nestjs/common';

 /**
 ** Custom interface to handle errors specific to Auth module
- ** Since its REST we need to return the HTTP status code along with the error message
+ ** Since its REST we need to return HTTP status code along with error message
 */
 export type AuthError = {
  message: string;
--- a/packages/hoppscotch-backend/src/types/CollectionFolder.ts
+++ b/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;
 }
--- a/packages/hoppscotch-backend/src/types/InfraConfig.ts
+++ b/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',
-}
--- a/packages/hoppscotch-backend/src/user-collection/input-type.args.ts
+++ b/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;
-}
--- a/packages/hoppscotch-backend/src/user-collection/user-collection.resolver.ts
+++ b/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',
--- a/packages/hoppscotch-backend/src/user-collection/user-collection.service.spec.ts
+++ b/packages/hoppscotch-backend/src/user-collection/user-collection.service.spec.ts
--- a/packages/hoppscotch-backend/src/user-collection/user-collection.service.ts
+++ b/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);
-    }
-  }
 }
--- a/packages/hoppscotch-backend/src/user-collection/user-collections.model.ts
+++ b/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',
  })
--- a/packages/hoppscotch-backend/src/user-history/user-history.service.spec.ts
+++ b/packages/hoppscotch-backend/src/user-history/user-history.service.spec.ts
@@ -24,8 +24,6 @@ beforeEach(() => {
  mockPubSub.publish.mockClear();
 });

-const date = new Date();
-
 describe('UserHistoryService', () => {
  describe('fetchUserHistory', () => {
    test('Should return a list of users REST history if exists', async () => {
@@ -142,15 +140,13 @@ describe('UserHistoryService', () => {
  });
  describe('createUserHistory', () => {
    test('Should resolve right and create a REST request to users history and return a `UserHistory` object', async () => {
-      const executedOn = new Date();
-
      mockPrisma.userHistory.create.mockResolvedValueOnce({
        userUid: 'abc',
        id: '1',
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -160,7 +156,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      };

@@ -174,15 +170,13 @@ describe('UserHistoryService', () => {
      ).toEqualRight(userHistory);
    });
    test('Should resolve right and create a GQL request to users history and return a `UserHistory` object', async () => {
-      const executedOn = new Date();
-
      mockPrisma.userHistory.create.mockResolvedValueOnce({
        userUid: 'abc',
        id: '1',
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.GQL,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -192,7 +186,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.GQL,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      };

@@ -216,15 +210,13 @@ describe('UserHistoryService', () => {
      ).toEqualLeft(USER_HISTORY_INVALID_REQ_TYPE);
    });
    test('Should create a GQL request to users history and publish a created subscription', async () => {
-      const executedOn = new Date();
-
      mockPrisma.userHistory.create.mockResolvedValueOnce({
        userUid: 'abc',
        id: '1',
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.GQL,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -234,7 +226,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.GQL,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      };

@@ -251,15 +243,13 @@ describe('UserHistoryService', () => {
      );
    });
    test('Should create a REST request to users history and publish a created subscription', async () => {
-      const executedOn = new Date();
-
      mockPrisma.userHistory.create.mockResolvedValueOnce({
        userUid: 'abc',
        id: '1',
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -269,7 +259,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      };

@@ -331,15 +321,13 @@ describe('UserHistoryService', () => {
      ).toEqualLeft(USER_HISTORY_NOT_FOUND);
    });
    test('Should star/unstar a request in the history and publish a updated subscription', async () => {
-      const executedOn = new Date();
-
      mockPrisma.userHistory.findFirst.mockResolvedValueOnce({
        userUid: 'abc',
        id: '1',
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -349,7 +337,7 @@ describe('UserHistoryService', () => {
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: true,
      });

@@ -359,7 +347,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.REST,
-        executedOn,
+        executedOn: new Date(),
        isStarred: true,
      };

@@ -372,15 +360,13 @@ describe('UserHistoryService', () => {
  });
  describe('removeRequestFromHistory', () => {
    test('Should resolve right and delete request from users history', async () => {
-      const executedOn = new Date();
-
      mockPrisma.userHistory.delete.mockResolvedValueOnce({
        userUid: 'abc',
        id: '1',
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.REST,
-        executedOn: executedOn,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -390,7 +376,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.REST,
-        executedOn: executedOn,
+        executedOn: new Date(),
        isStarred: false,
      };

@@ -398,7 +384,7 @@ describe('UserHistoryService', () => {
        await userHistoryService.removeRequestFromHistory('abc', '1'),
      ).toEqualRight(userHistory);
    });
-    test('Should resolve left and error out when req id is invalid', async () => {
+    test('Should resolve left and error out when req id is invalid ', async () => {
      mockPrisma.userHistory.delete.mockResolvedValueOnce(null);

      return expect(
@@ -412,7 +398,7 @@ describe('UserHistoryService', () => {
        request: [{}],
        responseMetadata: [{}],
        reqType: ReqType.REST,
-        executedOn: date,
+        executedOn: new Date(),
        isStarred: false,
      });

@@ -422,7 +408,7 @@ describe('UserHistoryService', () => {
        request: JSON.stringify([{}]),
        responseMetadata: JSON.stringify([{}]),
        reqType: ReqType.REST,
-        executedOn: date,
+        executedOn: new Date(),
        isStarred: false,
      };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Andrew Bastin	cdc8fc925e	chore: bump version to 2023.4.2	2023-05-11 13:53:28 +05:30
Nivedin	1395c934d5	fix: reset envs when user switches workspaces (#3039 ) Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>	2023-05-11 02:03:35 +05:30
Anwarul Islam	ed9f412c5c	fix: tab system breaks when a new tab is created while waiting for response in another tab (#3031 )	2023-05-10 19:16:28 +05:30
Akash K	8765c1a8ac	fix: invalid environment index can break the app (#3041 )	2023-05-10 19:14:16 +05:30
Akash K	b2693d6ba2	chore: add onCodemirrorInstanceMount hook to platform (#3043 )	2023-05-10 18:59:57 +05:30
Anwarul Islam	d9ed10bcca	feat: scroll to show the new active tab header (#3013 ) Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>	2023-05-09 15:58:44 +05:30
Mir Arif Hasan	87685b8cd9	fix: magic link URL (#3028 )	2023-05-09 15:55:38 +05:30
Mir Arif Hasan	00fcc78f85	fix: returning response from authCookieHandler (#3025 )	2023-05-09 15:55:01 +05:30
Anwarul Islam	81e090bbba	feat: picture component moved to hoppscotch-ui (#3032 )	2023-05-09 00:32:54 +05:30
Anwarul Islam	87ba02053b	Fix issue with disappearing tab when opening request tabs with long text in body/script (#3030 ) Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>	2023-05-09 00:30:27 +05:30
Akash K	fb08147c66	fix: update the hoppscotch-sh-admin magic link route to match hoppscotch-app (#3029 )	2023-05-03 23:12:50 +05:30
Nivedin	d129676cd6	fix: pane layout broken when wrap line is off (#3027 ) Co-authored-by: Liyas Thomas <liyascthomas@gmail.com>	2023-05-03 20:39:22 +05:30