chore: port fix to selfhost-desktop

Co-authored-by: jamesgeorge007 <jamesgeorge998001@gmail.com>

.npmrc

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

package.json

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

packages/codemirror-lang-graphql/package.json

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

packages/hoppscotch-backend/package.json

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

packages/hoppscotch-cli/package.json

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

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

@@ -17,7 +17,7 @@
                 "folders": [],
                 "requests": [
                   {
-                    "v": "1",
+                    "v": "2",
                     "endpoint": "https://echo.hoppscotch.io",
                     "name": "RequestD",
                     "params": [],
@@ -40,7 +40,8 @@
                     "body": {
                       "contentType": null,
                       "body": null
-                    }
+                    },
+                    "requestVariables": []
                   }
                 ],
                 "auth": {
@@ -52,7 +53,7 @@
             ],
             "requests": [
               {
-                "v": "1",
+                "v": "2",
                 "endpoint": "https://echo.hoppscotch.io",
                 "name": "RequestC",
                 "params": [],
@@ -67,7 +68,8 @@
                 "body": {
                   "contentType": null,
                   "body": null
-                }
+                },
+                "requestVariables": []
               }
             ],
             "auth": {
@@ -88,7 +90,7 @@
         ],
         "requests": [
           {
-            "v": "1",
+            "v": "2",
             "endpoint": "https://echo.hoppscotch.io",
             "name": "RequestB",
             "params": [],
@@ -104,6 +106,7 @@
               "contentType": null,
               "body": null
             },
+            "requestVariables": [],
             "id": "clpttpdq00003qp16kut6doqv"
           }
         ],
@@ -116,7 +119,7 @@
     ],
     "requests": [
       {
-        "v": "1",
+        "v": "2",
         "endpoint": "https://echo.hoppscotch.io",
         "name": "RequestA",
         "params": [],
@@ -132,6 +135,7 @@
           "contentType": null,
           "body": null
         },
+        "requestVariables": [],
         "id": "clpttpdq00003qp16kut6doqv"
       }
     ],
@@ -158,7 +162,7 @@
         "folders": [],
         "requests": [
           {
-            "v": "1",
+            "v": "2",
             "endpoint": "https://echo.hoppscotch.io",
             "name": "RequestB",
             "params": [],
@@ -174,6 +178,7 @@
               "contentType": null,
               "body": null
             },
+            "requestVariables": [],
             "id": "clpttpdq00003qp16kut6doqv"
           }
         ],
@@ -186,7 +191,7 @@
     ],
     "requests": [
       {
-        "v": "1",
+        "v": "2",
         "endpoint": "https://echo.hoppscotch.io",
         "name": "RequestA",
         "params": [],
@@ -202,6 +207,7 @@
           "contentType": null,
           "body": null
         },
+        "requestVariables": [],
         "id": "clpttpdq00003qp16kut6doqv"
       }
     ],
@@ -218,4 +224,4 @@
       "token": "BearerToken"
     }
   }
-]
+]

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

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

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

@@ -5,7 +5,7 @@
     "folders": [],
     "requests": [
       {
-        "v": "1",
+        "v": "2",
         "endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE1>>",
         "name": "",
         "params": [],
@@ -23,10 +23,11 @@
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE1>>\"\n}"
-        }
+        },
+        "requestVariables": [],
       },
       {
-        "v": "1",
+        "v": "2",
         "endpoint": "https://echo.hoppscotch.dio/<<HEADERS_TYPE2>>",
         "name": "success",
         "params": [],
@@ -44,7 +45,8 @@
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE2>>\"\n}"
-        }
+        },
+        "requestVariables": []
       }
     ]
   }

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

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

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

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

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

@@ -5,7 +5,7 @@
     "folders": [],
     "requests": [
       {
-        "v": "1",
+        "v": "2",
         "endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE1>>",
         "name": "",
         "params": [],
@@ -23,10 +23,11 @@
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE1>>\"\n}"
-        }
+        },
+        "requestVariables": []
       },
       {
-        "v": "1",
+        "v": "2",
         "endpoint": "https://echo.hoppscotch.io/<<HEADERS_TYPE2>>",
         "name": "success",
         "params": [],
@@ -44,7 +45,8 @@
         "body": {
           "contentType": "application/json",
           "body": "{\n\"test\": \"<<HEADERS_TYPE2>>\"\n}"
-        }
+        },
+        "requestVariables": []
       }
     ]
   }

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

@@ -4,7 +4,7 @@
   "folders": [],
   "requests": [
     {
-      "v": "1",
+      "v": "2",
       "auth": { "authType": "none", "authActive": true },
       "body": { "body": null, "contentType": null },
       "name": "sample-req",
@@ -13,7 +13,8 @@
       "headers": [],
       "endpoint": "https://echo.hoppscotch.io",
       "testScript": "pw.expect(pw.env.get(\"variable\")).toBe(\"value\")",
-      "preRequestScript": "pw.env.set(\"variable\", \"value\");"
+      "preRequestScript": "pw.env.set(\"variable\", \"value\");",
+      "requestVariables": []
     }
   ],
   "auth": { "authType": "inherit", "authActive": true },

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

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

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

@@ -4,7 +4,7 @@
   "folders": [],
   "requests": [
     {
-      "v": "1",
+      "v": "2",
       "auth": { "authType": "none", "authActive": true },
       "body": { "body": null, "contentType": null },
       "name": "test-secret-headers",
@@ -17,12 +17,13 @@
           "active": true
         }
       ],
+      "requestVariables": [],
       "endpoint": "<<baseURL>>/headers",
       "testScript": "pw.test(\"Successfully parses secret variable holding the header value\", () => {\n    const secretHeaderValue = pw.env.get(\"secretHeaderValue\")\n    pw.expect(secretHeaderValue).toBe(\"secret-header-value\")\n    \n    if (secretHeaderValue) {\n      pw.expect(pw.response.body.headers[\"Secret-Header-Key\"]).toBe(secretHeaderValue)\n    }\n\n    pw.expect(pw.env.get(\"secretHeaderValueFromPreReqScript\")).toBe(\"secret-header-value\")\n})",
       "preRequestScript": "const secretHeaderValueFromPreReqScript = pw.env.get(\"secretHeaderValue\")\npw.env.set(\"secretHeaderValueFromPreReqScript\", secretHeaderValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": { "authType": "none", "authActive": true },
       "body": {
         "body": "{\n  \"secretBodyKey\": \"<<secretBodyValue>>\"\n}",
@@ -32,12 +33,13 @@
       "method": "POST",
       "params": [],
       "headers": [],
+      "requestVariables": [],
       "endpoint": "<<baseURL>>/post",
       "testScript": "pw.test(\"Successfully parses secret variable holding the request body value\", () => {\n    const secretBodyValue = pw.env.get(\"secretBodyValue\")\n    pw.expect(secretBodyValue).toBe(\"secret-body-value\")\n  \n    if (secretBodyValue) {\n      pw.expect(pw.response.body.json.secretBodyKey).toBe(secretBodyValue)\n    }\n\n    pw.expect(pw.env.get(\"secretBodyValueFromPreReqScript\")).toBe(\"secret-body-value\")\n})",
       "preRequestScript": "const secretBodyValueFromPreReqScript = pw.env.get(\"secretBodyValue\")\npw.env.set(\"secretBodyValueFromPreReqScript\", secretBodyValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": { "authType": "none", "authActive": true },
       "body": { "body": null, "contentType": null },
       "name": "test-secret-query-params",
@@ -50,12 +52,13 @@
         }
       ],
       "headers": [],
+      "requestVariables": [],
       "endpoint": "<<baseURL>>/get",
       "testScript": "pw.test(\"Successfully parses secret variable holding the query param value\", () => {\n    const secretQueryParamValue = pw.env.get(\"secretQueryParamValue\")\n    pw.expect(secretQueryParamValue).toBe(\"secret-query-param-value\")\n    \n    if (secretQueryParamValue) {\n      pw.expect(pw.response.body.args.secretQueryParamKey).toBe(secretQueryParamValue)\n    }\n\n    pw.expect(pw.env.get(\"secretQueryParamValueFromPreReqScript\")).toBe(\"secret-query-param-value\")\n})",
       "preRequestScript": "const secretQueryParamValueFromPreReqScript = pw.env.get(\"secretQueryParamValue\")\npw.env.set(\"secretQueryParamValueFromPreReqScript\", secretQueryParamValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "authType": "basic",
         "password": "<<secretBasicAuthPassword>>",
@@ -67,12 +70,13 @@
       "method": "GET",
       "params": [],
       "headers": [],
+      "requestVariables": [],
       "endpoint": "<<baseURL>>/basic-auth/<<secretBasicAuthUsername>>/<<secretBasicAuthPassword>>",
       "testScript": "pw.test(\"Successfully parses secret variables holding basic auth credentials\", () => {\n\tconst secretBasicAuthUsername = pw.env.get(\"secretBasicAuthUsername\")\n  \tconst secretBasicAuthPassword = pw.env.get(\"secretBasicAuthPassword\")\n\n    pw.expect(secretBasicAuthUsername).toBe(\"test-user\")\n    pw.expect(secretBasicAuthPassword).toBe(\"test-pass\")\n\n    if (secretBasicAuthUsername && secretBasicAuthPassword) {\n      const { authenticated, user } = pw.response.body\n      pw.expect(authenticated).toBe(true)\n      pw.expect(user).toBe(secretBasicAuthUsername)\n    }\n});",
       "preRequestScript": ""
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "token": "<<secretBearerToken>>",
         "authType": "bearer",
@@ -85,18 +89,20 @@
       "method": "GET",
       "params": [],
       "headers": [],
+      "requestVariables": [],
       "endpoint": "<<baseURL>>/bearer",
       "testScript": "pw.test(\"Successfully parses secret variable holding the bearer token\", () => {\n    const secretBearerToken = pw.env.get(\"secretBearerToken\")\n  const preReqSecretBearerToken = pw.env.get(\"preReqSecretBearerToken\")\n\n    pw.expect(secretBearerToken).toBe(\"test-token\")\n\n    if (secretBearerToken) { \n      pw.expect(pw.response.body.token).toBe(secretBearerToken)\n      pw.expect(preReqSecretBearerToken).toBe(\"test-token\")\n    }\n});",
       "preRequestScript": "const secretBearerToken = pw.env.get(\"secretBearerToken\")\npw.env.set(\"preReqSecretBearerToken\", secretBearerToken)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": { "authType": "none", "authActive": true },
       "body": { "body": null, "contentType": null },
       "name": "test-secret-fallback",
       "method": "GET",
       "params": [],
       "headers": [],
+      "requestVariables": [],
       "endpoint": "<<baseURL>>",
       "testScript": "pw.test(\"Returns an empty string if the value for a secret environment variable is not found in the system environment\", () => {\n  pw.expect(pw.env.get(\"nonExistentValueInSystemEnv\")).toBe(\"\")\n})",
       "preRequestScript": ""

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

@@ -4,7 +4,7 @@
   "folders": [],
   "requests": [
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "authType": "none",
         "authActive": true
@@ -16,6 +16,7 @@
       "name": "test-secret-headers",
       "method": "GET",
       "params": [],
+      "requestVariables": [],
       "headers": [
         {
           "key": "Secret-Header-Key",
@@ -28,7 +29,7 @@
       "preRequestScript": "pw.env.set(\"secretHeaderValue\", \"secret-header-value\")\n\nconst secretHeaderValueFromPreReqScript = pw.env.getResolve(\"secretHeaderValue\")\npw.env.set(\"secretHeaderValueFromPreReqScript\", secretHeaderValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "authType": "none",
         "authActive": true
@@ -40,6 +41,7 @@
       "name": "test-secret-headers-overrides",
       "method": "GET",
       "params": [],
+      "requestVariables": [],
       "headers": [
         {
           "key": "Secret-Header-Key",
@@ -52,7 +54,7 @@
       "preRequestScript": "pw.env.set(\"secretHeaderValue\", \"secret-header-value-overriden\")\n\nconst secretHeaderValueFromPreReqScript = pw.env.getResolve(\"secretHeaderValue\")\npw.env.set(\"secretHeaderValueFromPreReqScript\", secretHeaderValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "authType": "none",
         "authActive": true
@@ -64,13 +66,14 @@
       "name": "test-secret-body",
       "method": "POST",
       "params": [],
+      "requestVariables": [],
       "headers": [],
       "endpoint": "<<baseURL>>/post",
       "testScript": "pw.test(\"Successfully parses secret variable holding the request body value\", () => {\n    const secretBodyValue = pw.env.get(\"secretBodyValue\")\n    pw.expect(secretBodyValue).toBe(\"secret-body-value\")\n  \n    if (secretBodyValue) {\n      pw.expect(pw.response.body.json.secretBodyKey).toBe(secretBodyValue)\n    }\n\n    pw.expect(pw.env.get(\"secretBodyValueFromPreReqScript\")).toBe(\"secret-body-value\")\n})",
       "preRequestScript": "const secretBodyValue = pw.env.get(\"secretBodyValue\")\n\nif (!secretBodyValue) { \n  pw.env.set(\"secretBodyValue\", \"secret-body-value\")\n}\n\nconst secretBodyValueFromPreReqScript = pw.env.get(\"secretBodyValue\")\npw.env.set(\"secretBodyValueFromPreReqScript\", secretBodyValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "authType": "none",
         "authActive": true
@@ -88,13 +91,14 @@
           "active": true
         }
       ],
+      "requestVariables": [],
       "headers": [],
       "endpoint": "<<baseURL>>/get",
       "testScript": "pw.test(\"Successfully parses secret variable holding the query param value\", () => {\n    const secretQueryParamValue = pw.env.get(\"secretQueryParamValue\")\n    pw.expect(secretQueryParamValue).toBe(\"secret-query-param-value\")\n    \n    if (secretQueryParamValue) {\n      pw.expect(pw.response.body.args.secretQueryParamKey).toBe(secretQueryParamValue)\n    }\n\n    pw.expect(pw.env.get(\"secretQueryParamValueFromPreReqScript\")).toBe(\"secret-query-param-value\")\n})",
       "preRequestScript": "const secretQueryParamValue = pw.env.get(\"secretQueryParamValue\")\n\nif (!secretQueryParamValue) {\n  pw.env.set(\"secretQueryParamValue\", \"secret-query-param-value\")\n}\n\nconst secretQueryParamValueFromPreReqScript = pw.env.get(\"secretQueryParamValue\")\npw.env.set(\"secretQueryParamValueFromPreReqScript\", secretQueryParamValueFromPreReqScript)"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "authType": "basic",
         "password": "<<secretBasicAuthPassword>>",
@@ -108,13 +112,14 @@
       "name": "test-secret-basic-auth",
       "method": "GET",
       "params": [],
+      "requestVariables": [],
       "headers": [],
       "endpoint": "<<baseURL>>/basic-auth/<<secretBasicAuthUsername>>/<<secretBasicAuthPassword>>",
       "testScript": "pw.test(\"Successfully parses secret variables holding basic auth credentials\", () => {\n\tconst secretBasicAuthUsername = pw.env.get(\"secretBasicAuthUsername\")\n  \tconst secretBasicAuthPassword = pw.env.get(\"secretBasicAuthPassword\")\n\n    pw.expect(secretBasicAuthUsername).toBe(\"test-user\")\n    pw.expect(secretBasicAuthPassword).toBe(\"test-pass\")\n\n    if (secretBasicAuthUsername && secretBasicAuthPassword) {\n      const { authenticated, user } = pw.response.body\n      pw.expect(authenticated).toBe(true)\n      pw.expect(user).toBe(secretBasicAuthUsername)\n    }\n});",
       "preRequestScript": "let secretBasicAuthUsername = pw.env.get(\"secretBasicAuthUsername\")\n\nlet secretBasicAuthPassword = pw.env.get(\"secretBasicAuthPassword\")\n\nif (!secretBasicAuthUsername) {\n  pw.env.set(\"secretBasicAuthUsername\", \"test-user\")\n}\n\nif (!secretBasicAuthPassword) {\n  pw.env.set(\"secretBasicAuthPassword\", \"test-pass\")\n}"
     },
     {
-      "v": "1",
+      "v": "2",
       "auth": {
         "token": "<<secretBearerToken>>",
         "authType": "bearer",
@@ -129,6 +134,7 @@
       "name": "test-secret-bearer-auth",
       "method": "GET",
       "params": [],
+      "requestVariables": [],
       "headers": [],
       "endpoint": "<<baseURL>>/bearer",
       "testScript": "pw.test(\"Successfully parses secret variable holding the bearer token\", () => {\n    const secretBearerToken = pw.env.resolve(\"<<secretBearerToken>>\")\n  const preReqSecretBearerToken = pw.env.resolve(\"<<preReqSecretBearerToken>>\")\n\n    pw.expect(secretBearerToken).toBe(\"test-token\")\n\n    if (secretBearerToken) { \n      pw.expect(pw.response.body.token).toBe(secretBearerToken)\n      pw.expect(preReqSecretBearerToken).toBe(\"test-token\")\n    }\n});",

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

@@ -4,7 +4,7 @@
   "folders": [],
   "requests": [
     {
-      "v": "1",
+      "v": "2",
       "endpoint": "https://httpbin.org/post",
       "name": "req",
       "params": [],
@@ -22,7 +22,8 @@
       "body": {
         "contentType": "application/json",
         "body": "{\n  \"key\": \"<<customBodyValue>>\"\n}"
-      }
+      },
+      "requestVariables": []
     }
   ],
   "auth": { "authType": "inherit", "authActive": false },

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

@@ -563,12 +563,22 @@ details[open] summary .indicator {
 .env-highlight {
   @apply text-accentContrast;
 
-  &.env-found {
+  &.request-variable-highlight {
-    @apply bg-accentDark;
+    @apply bg-amber-500;
-    @apply hover:bg-accent;
+    @apply hover:bg-amber-600;
   }
 
-  &.env-not-found {
+  &.environment-variable-highlight {
+    @apply bg-green-500;
+    @apply hover:bg-green-600;
+  }
+
+  &.global-variable-highlight {
+    @apply bg-blue-500;
+    @apply hover:bg-blue-600;
+  }
+
+  &.environment-not-found-highlight {
     @apply bg-red-500;
     @apply hover:bg-red-600;
   }

packages/hoppscotch-common/locales/en.json

@@ -154,7 +154,7 @@
     "invalid_name": "Please provide a name for the collection",
     "invalid_root_move": "Collection already in the root",
     "moved": "Moved Successfully",
-    "my_collections": "My Collections",
+    "my_collections": "Personal Collections",
     "name": "My New Collection",
     "name_length_insufficient": "Collection name should be at least 3 characters long",
     "new": "New Collection",
@@ -166,14 +166,12 @@
     "save_as": "Save as",
     "save_to_collection": "Save to Collection",
     "select": "Select a Collection",
-    "select_location": "Select location",
+    "select_location": "Select location"
-    "select_team": "Select a team",
-    "team_collections": "Team Collections"
   },
   "confirm": {
     "close_unsaved_tab": "Are you sure you want to close this tab?",
     "close_unsaved_tabs": "Are you sure you want to close all tabs? {count} unsaved tabs will be lost.",
-    "exit_team": "Are you sure you want to leave this team?",
+    "exit_team": "Are you sure you want to leave this workspace?",
     "logout": "Are you sure you want to logout?",
     "remove_collection": "Are you sure you want to permanently delete this collection?",
     "remove_environment": "Are you sure you want to permanently delete this environment?",
@@ -181,7 +179,7 @@
     "remove_history": "Are you sure you want to permanently delete all history?",
     "remove_request": "Are you sure you want to permanently delete this request?",
     "remove_shared_request": "Are you sure you want to permanently delete this shared request?",
-    "remove_team": "Are you sure you want to delete this team?",
+    "remove_team": "Are you sure you want to delete this workspace?",
     "remove_telemetry": "Are you sure you want to opt-out of Telemetry?",
     "request_change": "Are you sure you want to discard current request, unsaved changes will be lost.",
     "save_unsaved_tab": "Do you want to save changes made in this tab?",
@@ -234,18 +232,19 @@
     "headers": "This request does not have any headers",
     "history": "History is empty",
     "invites": "Invite list is empty",
-    "members": "Team is empty",
+    "members": "Workspace is empty",
     "parameters": "This request does not have any parameters",
-    "pending_invites": "There are no pending invites for this team",
+    "pending_invites": "There are no pending invites for this workspace",
     "profile": "Login to view your profile",
     "protocols": "Protocols are empty",
+    "request_variables": "This request does not have any request variables",
     "schema": "Connect to a GraphQL endpoint to view schema",
     "secret_environments": "Secrets are not synced to Hoppscotch",
     "shared_requests": "Shared requests are empty",
     "shared_requests_logout": "Login to view your shared requests or create a new one",
     "subscription": "Subscriptions are empty",
-    "team_name": "Team name empty",
+    "team_name": "Workspace name empty",
-    "teams": "You don't belong to any teams",
+    "teams": "You don't belong to any workspaces",
     "tests": "There are no tests for this request"
   },
   "environment": {
@@ -262,7 +261,7 @@
     "import_or_create": "Import or create a environment",
     "invalid_name": "Please provide a name for the environment",
     "list": "Environment variables",
-    "my_environments": "My Environments",
+    "my_environments": "Personal Environments",
     "name": "Name",
     "nested_overflow": "nested environment variables are limited to 10 levels",
     "new": "New Environment",
@@ -277,7 +276,7 @@
     "select": "Select environment",
     "set": "Set environment",
     "set_as_environment": "Set as environment",
-    "team_environments": "Team Environments",
+    "team_environments": "Workspace Environments",
     "title": "Environments",
     "updated": "Environment updated",
     "value": "Value",
@@ -292,8 +291,8 @@
     "check_how_to_add_origin": "Check how you can add an origin",
     "curl_invalid_format": "cURL is not formatted properly",
     "danger_zone": "Danger zone",
-    "delete_account": "Your account is currently an owner in these teams:",
+    "delete_account": "Your account is currently an owner in these workspaces:",
-    "delete_account_description": "You must either remove yourself, transfer ownership, or delete these teams before you can delete your account.",
+    "delete_account_description": "You must either remove yourself, transfer ownership, or delete these workspaces before you can delete your account.",
     "empty_req_name": "Empty Request Name",
     "f12_details": "(F12 for details)",
     "gql_prettify_invalid_query": "Couldn't prettify an invalid query, solve query syntax errors and try again",
@@ -395,8 +394,8 @@
     "from_insomnia_description": "Import from Insomnia collection",
     "from_json": "Import from Hoppscotch",
     "from_json_description": "Import from Hoppscotch collection file",
-    "from_my_collections": "Import from My Collections",
+    "from_my_collections": "Import from Personal Collections",
-    "from_my_collections_description": "Import from My Collections file",
+    "from_my_collections_description": "Import from Personal Collections file",
     "from_openapi": "Import from OpenAPI",
     "from_openapi_description": "Import from OpenAPI specification file (YML/JSON)",
     "from_postman": "Import from Postman",
@@ -513,7 +512,7 @@
     "email_verification_mail": "A verification email has been sent to your email address. Please click on the link to verify your email address.",
     "no_permission": "You do not have permission to perform this action.",
     "owner": "Owner",
-    "owner_description": "Owners can add, edit, and delete requests, collections and team members.",
+    "owner_description": "Owners can add, edit, and delete requests, collections and workspace members.",
     "roles": "Roles",
     "roles_description": "Roles are used to control access to the shared collections.",
     "updated": "Profile updated",
@@ -560,6 +559,7 @@
     "raw_body": "Raw Request Body",
     "rename": "Rename Request",
     "renamed": "Request renamed",
+    "request_variables": "Request variables",
     "run": "Run",
     "save": "Save",
     "save_as": "Save as",
@@ -817,12 +817,12 @@
       "title": "Tabs"
     },
     "workspace": {
-      "delete": "Delete current team",
+      "delete": "Delete current workspace",
-      "edit": "Edit current team",
+      "edit": "Edit current workspace",
-      "invite": "Invite people to team",
+      "invite": "Invite people to workspace",
-      "new": "Create new team",
+      "new": "Create new workspace",
       "switch_to_personal": "Switch to your personal workspace",
-      "title": "Teams"
+      "title": "Workspaces"
     }
   },
   "sse": {
@@ -879,7 +879,6 @@
     "forum": "Ask questions and get answers",
     "github": "Follow us on Github",
     "shortcuts": "Browse app faster",
-    "team": "Get in touch with the team",
     "title": "Support",
     "twitter": "Follow us on Twitter"
   },
@@ -910,60 +909,59 @@
     "websocket": "WebSocket"
   },
   "team": {
-    "already_member": "You are already a member of this team. Contact your team owner.",
+    "already_member": "You are already a member of this workspace. Contact your workspace owner.",
-    "create_new": "Create new team",
+    "create_new": "Create new workspace",
-    "deleted": "Team deleted",
+    "deleted": "Workspace deleted",
-    "edit": "Edit Team",
+    "edit": "Edit Workspace",
     "email": "E-mail",
-    "email_do_not_match": "Email doesn't match with your account details. Contact your team owner.",
+    "email_do_not_match": "Email doesn't match with your account details. Contact your workspace owner.",
-    "exit": "Exit Team",
+    "exit": "Exit Workspace",
-    "exit_disabled": "Only owner cannot exit the team",
+    "exit_disabled": "Only owner cannot exit the workspace",
     "failed_invites": "Failed invites",
     "invalid_coll_id": "Invalid collection ID",
     "invalid_email_format": "Email format is invalid",
-    "invalid_id": "Invalid team ID. Contact your team owner.",
+    "invalid_id": "Invalid workspace ID. Contact your workspace owner.",
     "invalid_invite_link": "Invalid invite link",
-    "invalid_invite_link_description": "The link you followed is invalid. Contact your team owner.",
+    "invalid_invite_link_description": "The link you followed is invalid. Contact your workspace owner.",
-    "invalid_member_permission": "Please provide a valid permission to the team member",
+    "invalid_member_permission": "Please provide a valid permission to the workspace member",
     "invite": "Invite",
     "invite_more": "Invite more",
     "invite_tooltip": "Invite people to this workspace",
-    "invited_to_team": "{owner} invited you to join {team}",
+    "invited_to_team": "{owner} invited you to join {workspace}",
     "join": "Invitation accepted",
-    "join_beta": "Join the beta program to access teams.",
+    "join_team": "Join {workspace}",
-    "join_team": "Join {team}",
+    "joined_team": "You have joined {workspace}",
-    "joined_team": "You have joined {team}",
+    "joined_team_description": "You are now a member of this workspace",
-    "joined_team_description": "You are now a member of this team",
+    "left": "You left the workspace",
-    "left": "You left the team",
     "login_to_continue": "Login to continue",
-    "login_to_continue_description": "You need to be logged in to join a team.",
+    "login_to_continue_description": "You need to be logged in to join a workspace.",
     "logout_and_try_again": "Logout and sign in with another account",
-    "member_has_invite": "This email ID already has an invite. Contact your team owner.",
+    "member_has_invite": "This email ID already has an invite. Contact your workspace owner.",
-    "member_not_found": "Member not found. Contact your team owner.",
+    "member_not_found": "Member not found. Contact your workspace owner.",
     "member_removed": "User removed",
     "member_role_updated": "User roles updated",
     "members": "Members",
     "more_members": "+{count} more",
-    "name_length_insufficient": "Team name should be at least 6 characters long",
+    "name_length_insufficient": "Workspace name should be at least 6 characters long",
-    "name_updated": "Team name updated",
+    "name_updated": "Workspace name updated",
-    "new": "New Team",
+    "new": "New Workspace",
-    "new_created": "New team created",
+    "new_created": "New workspace created",
-    "new_name": "My New Team",
+    "new_name": "My New Workspace",
-    "no_access": "You do not have edit access to this team",
+    "no_access": "You do not have edit access to this workspace",
-    "no_invite_found": "Invitation not found. Contact your team owner.",
+    "no_invite_found": "Invitation not found. Contact your workspace owner.",
     "no_request_found": "Request not found.",
-    "not_found": "Team not found. Contact your team owner.",
+    "not_found": "Workspace not found. Contact your workspace owner.",
-    "not_valid_viewer": "You are not a valid viewer. Contact your team owner.",
+    "not_valid_viewer": "You are not a valid viewer. Contact your workspace owner.",
     "parent_coll_move": "Cannot move collection to a child collection",
     "pending_invites": "Pending invites",
     "permissions": "Permissions",
     "same_target_destination": "Same target and destination",
-    "saved": "Team saved",
+    "saved": "Workspace saved",
-    "select_a_team": "Select a team",
+    "select_a_team": "Select a workspace",
     "success_invites": "Success invites",
-    "title": "Teams",
+    "title": "Workspaces",
     "we_sent_invite_link": "We sent an invite link to all invitees!",
-    "we_sent_invite_link_description": "Ask all invitees to check their inbox. Click on the link to join the team."
+    "we_sent_invite_link_description": "Ask all invitees to check their inbox. Click on the link to join the workspace."
   },
   "team_environment": {
     "deleted": "Environment Deleted",
@@ -989,8 +987,15 @@
   },
   "workspace": {
     "change": "Change workspace",
-    "personal": "My Workspace",
+    "personal": "Personal Workspace",
-    "team": "Team Workspace",
+    "personal_workspace": "{name}'s Workspace",
+    "other_workspaces": "My Workspaces",
+    "team": "Workspace",
     "title": "Workspaces"
+  },
+  "site_protection": {
+    "login_to_continue": "Login to continue",
+    "login_to_continue_description": "You need to be logged in to access this Hoppscotch Enterprise Instance.",
+    "error_fetching_site_protection_status": "Something Went Wrong While Fetching Site Protection Status"
   }
 }

packages/hoppscotch-common/package.json

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

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

@@ -1,11 +1,11 @@
-// generated by unplugin-vue-components
+/* eslint-disable */
-// We suggest you to commit this file into source control
+/* prettier-ignore */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
 export {}
 
-declare module '@vue/runtime-core' {
+declare module 'vue' {
   export interface GlobalComponents {
     AppActionHandler: typeof import('./components/app/ActionHandler.vue')['default']
     AppBanner: typeof import('./components/app/Banner.vue')['default']
@@ -145,6 +145,7 @@ declare module '@vue/runtime-core' {
     IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default']
     IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
     IconLucideArrowUpRight: typeof import('~icons/lucide/arrow-up-right')['default']
+    IconLucideBrush: typeof import('~icons/lucide/brush')['default']
     IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default']
     IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
     IconLucideGlobe: typeof import('~icons/lucide/globe')['default']
@@ -154,6 +155,7 @@ declare module '@vue/runtime-core' {
     IconLucideLayers: typeof import('~icons/lucide/layers')['default']
     IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']
     IconLucideMinus: typeof import('~icons/lucide/minus')['default']
+    IconLucideRss: typeof import('~icons/lucide/rss')['default']
     IconLucideSearch: typeof import('~icons/lucide/search')['default']
     IconLucideUsers: typeof import('~icons/lucide/users')['default']
     IconLucideX: typeof import('~icons/lucide/x')['default']
@@ -209,5 +211,4 @@ declare module '@vue/runtime-core' {
     WorkspaceCurrent: typeof import('./components/workspace/Current.vue')['default']
     WorkspaceSelector: typeof import('./components/workspace/Selector.vue')['default']
   }
-
 }

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

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

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

@@ -330,11 +330,16 @@ const myTeams = useReadonlyStream(teamListAdapter.teamList$, null)
 
 const workspace = workspaceService.currentWorkspace
 
-const workspaceName = computed(() =>
+const workspaceName = computed(() => {
-  workspace.value.type === "personal"
+  if (workspace.value.type === "personal") {
-    ? t("workspace.personal")
+    return currentUser.value?.displayName
-    : workspace.value.teamName
+      ? t("workspace.personal_workspace", {
-)
+          name: currentUser.value.displayName,
+        })
+      : t("workspace.personal")
+  }
+  return workspace.value.teamName
+})
 
 const refetchTeams = () => {
   teamListAdapter.fetchList()

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

@@ -32,9 +32,13 @@
             {{ tab.document.request.method }}
           </span>
           <div
-            class="flex items-center flex-1 flex-shrink-0 min-w-0 px-4 py-2 truncate rounded-r"
+            class="flex items-center flex-1 flex-shrink-0 min-w-0 truncate rounded-r"
           >
-            {{ tab.document.request.endpoint }}
+            <SmartEnvInput
+              v-model="tab.document.request.endpoint"
+              :readonly="true"
+              :envs="tabRequestVariables"
+            />
           </div>
         </div>
         <div class="flex mt-2 space-x-2 sm:mt-0">
@@ -69,6 +73,7 @@
       v-model="tab.document.request"
       v-model:option-tab="selectedOptionTab"
       :properties="properties"
+      :envs="tabRequestVariables"
     />
     <HttpResponse
       v-if="tab.document.response"
@@ -117,6 +122,15 @@ const sharedRequestURL = computed(() => {
   return `${shortcodeBaseURL}/r/${props.sharedRequestID}`
 })
 
+const tabRequestVariables = computed(() => {
+  return tab.value.document.request.requestVariables.map(({ key, value }) => ({
+    key,
+    value,
+    secret: false,
+    sourceEnv: "RequestVariable",
+  }))
+})
+
 const { subscribeToStream } = useStreamSubscriber()
 
 const newSendRequest = async () => {

packages/hoppscotch-common/src/components/http/Authorization.vue

@@ -150,7 +150,7 @@
     <div v-else class="flex flex-1 border-b border-dividerLight">
       <div class="w-2/3 border-r border-dividerLight">
         <div v-if="auth.authType === 'basic'">
-          <HttpAuthorizationBasic v-model="auth" />
+          <HttpAuthorizationBasic v-model="auth" :envs="envs" />
         </div>
         <div v-if="auth.authType === 'inherit'" class="p-4">
           <span v-if="inheritedProperties?.auth">
@@ -169,17 +169,26 @@
         </div>
         <div v-if="auth.authType === 'bearer'">
           <div class="flex flex-1 border-b border-dividerLight">
-            <SmartEnvInput v-model="auth.token" placeholder="Token" />
+            <SmartEnvInput
+              v-model="auth.token"
+              placeholder="Token"
+              :auto-complete-env="true"
+              :envs="envs"
+            />
           </div>
         </div>
         <div v-if="auth.authType === 'oauth-2'">
           <div class="flex flex-1 border-b border-dividerLight">
-            <SmartEnvInput v-model="auth.token" placeholder="Token" />
+            <SmartEnvInput
+              v-model="auth.token"
+              placeholder="Token"
+              :envs="envs"
+            />
           </div>
-          <HttpOAuth2Authorization v-model="auth" />
+          <HttpOAuth2Authorization v-model="auth" :envs="envs" />
         </div>
         <div v-if="auth.authType === 'api-key'">
-          <HttpAuthorizationApiKey v-model="auth" />
+          <HttpAuthorizationApiKey v-model="auth" :envs="envs" />
         </div>
       </div>
       <div
@@ -215,6 +224,7 @@ import { useColorMode } from "@composables/theming"
 import { useVModel } from "@vueuse/core"
 import { onMounted } from "vue"
 import { HoppInheritedProperty } from "~/helpers/types/HoppInheritedProperties"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 const t = useI18n()
 
@@ -225,6 +235,7 @@ const props = defineProps<{
   isCollectionProperty?: boolean
   isRootCollection?: boolean
   inheritedProperties?: HoppInheritedProperty
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/Body.vue

@@ -100,10 +100,12 @@
     <HttpBodyParameters
       v-if="body.contentType === 'multipart/form-data'"
       v-model="body"
+      :envs="envs"
     />
     <HttpURLEncodedParams
       v-else-if="body.contentType === 'application/x-www-form-urlencoded'"
       v-model="body"
+      :envs="envs"
     />
     <HttpRawBody v-else-if="body.contentType !== null" v-model="body" />
     <HoppSmartPlaceholder
@@ -141,6 +143,7 @@ import IconExternalLink from "~icons/lucide/external-link"
 import IconInfo from "~icons/lucide/info"
 import IconRefreshCW from "~icons/lucide/refresh-cw"
 import { RESTOptionTabs } from "./RequestOptions.vue"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 const colorMode = useColorMode()
 const t = useI18n()
@@ -148,6 +151,7 @@ const t = useI18n()
 const props = defineProps<{
   body: HoppRESTReqBody
   headers: HoppRESTHeader[]
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/BodyParameters.vue

@@ -65,6 +65,8 @@
           <SmartEnvInput
             v-model="entry.key"
             :placeholder="`${t('count.parameter', { count: index + 1 })}`"
+            :auto-complete-env="true"
+            :envs="envs"
             @change="
               updateBodyParam(index, {
                 key: $event,
@@ -87,6 +89,8 @@
             <SmartEnvInput
               v-model="entry.value"
               :placeholder="`${t('count.value', { count: index + 1 })}`"
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateBodyParam(index, {
                   key: entry.key,
@@ -190,11 +194,13 @@ import { useI18n } from "@composables/i18n"
 import { useToast } from "@composables/toast"
 import { useColorMode } from "@composables/theming"
 import { useVModel } from "@vueuse/core"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 type Body = HoppRESTReqBody & { contentType: "multipart/form-data" }
 
 const props = defineProps<{
   modelValue: Body
+  envs: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/CodegenModal.vue

@@ -188,11 +188,25 @@ const copyCodeIcon = refAutoReset<typeof IconCopy | typeof IconCheck>(
 
 const requestCode = computed(() => {
   const aggregateEnvs = getAggregateEnvs()
+  const requestVariables = request.value.requestVariables.map(
+    (requestVariable) => {
+      if (requestVariable.active)
+        return {
+          key: requestVariable.key,
+          value: requestVariable.value,
+          secret: false,
+        }
+      return {}
+    }
+  )
   const env: Environment = {
     v: 1,
     id: "env",
     name: "Env",
-    variables: aggregateEnvs,
+    variables: [
+      ...(requestVariables as Environment["variables"]),
+      ...aggregateEnvs,
+    ],
   }
   const effectiveRequest = getEffectiveRESTRequest(request.value, env)
 
@@ -212,6 +226,12 @@ const requestCode = computed(() => {
         active: true,
       })),
       endpoint: effectiveRequest.effectiveFinalURL,
+      requestVariables: effectiveRequest.effectiveFinalRequestVariables.map(
+        (requestVariable) => ({
+          ...requestVariable,
+          active: true,
+        })
+      ),
     })
   )
 

packages/hoppscotch-common/src/components/http/Headers.vue

@@ -26,7 +26,7 @@
           @click="clearContent()"
         />
         <HoppButtonSecondary
-          v-if="bulkMode"
+          v-if="bulkHeaders"
           v-tippy="{ theme: 'tooltip' }"
           :title="t('state.linewrap')"
           :class="{ '!text-accent': WRAP_LINES }"
@@ -92,6 +92,8 @@
               :auto-complete-source="commonHeaders"
               :env-index="index"
               :inspection-results="getInspectorResult(headerKeyResults, index)"
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateHeader(index, {
                   id: header.id,
@@ -108,6 +110,8 @@
                 getInspectorResult(headerValueResults, index)
               "
               :env-index="index"
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateHeader(index, {
                   id: header.id,
@@ -329,7 +333,11 @@ import {
   getComputedHeaders,
   getComputedAuthHeaders,
 } from "~/helpers/utils/EffectiveURL"
-import { aggregateEnvs$, getAggregateEnvs } from "~/newstore/environments"
+import {
+  AggregateEnvironment,
+  aggregateEnvs$,
+  getAggregateEnvs,
+} from "~/newstore/environments"
 import { useVModel } from "@vueuse/core"
 import { useService } from "dioc/vue"
 import { InspectionService, InspectorResult } from "~/services/inspection"
@@ -359,6 +367,7 @@ const props = defineProps<{
   modelValue: HoppRESTRequest
   isCollectionProperty?: boolean
   inheritedProperties?: HoppInheritedProperty
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/OAuth2Authorization.vue

@@ -6,31 +6,52 @@
         :styles="
           hasAccessTokenOrAuthURL ? 'pointer-events-none opacity-70' : ''
         "
+        :auto-complete-env="true"
         placeholder="OpenID Connect Discovery URL"
+        :envs="envs"
       />
     </div>
     <div class="flex flex-1 border-b border-dividerLight">
       <SmartEnvInput
         v-model="authURL"
         placeholder="Authorization URL"
+        :auto-complete-env="true"
         :styles="hasOIDCURL ? 'pointer-events-none opacity-70' : ''"
-      ></SmartEnvInput>
+        :envs="envs"
+      />
     </div>
     <div class="flex flex-1 border-b border-dividerLight">
       <SmartEnvInput
         v-model="accessTokenURL"
         placeholder="Access Token URL"
+        :auto-complete-env="true"
         :styles="hasOIDCURL ? 'pointer-events-none opacity-70' : ''"
+        :envs="envs"
       />
     </div>
     <div class="flex flex-1 border-b border-dividerLight">
-      <SmartEnvInput v-model="clientID" placeholder="Client ID" />
+      <SmartEnvInput
+        v-model="clientID"
+        :auto-complete-env="true"
+        placeholder="Client ID"
+        :envs="envs"
+      />
     </div>
     <div class="flex flex-1 border-b border-dividerLight">
-      <SmartEnvInput v-model="clientSecret" placeholder="Client Secret" />
+      <SmartEnvInput
+        v-model="clientSecret"
+        :auto-complete-env="true"
+        placeholder="Client Secret"
+        :envs="envs"
+      />
     </div>
     <div class="flex flex-1 border-b border-dividerLight">
-      <SmartEnvInput v-model="scope" placeholder="Scope" />
+      <SmartEnvInput
+        v-model="scope"
+        :auto-complete-env="true"
+        placeholder="Scope"
+        :envs="envs"
+      />
     </div>
     <div class="p-2">
       <HoppButtonSecondary
@@ -62,6 +83,7 @@ const toast = useToast()
 
 const props = defineProps<{
   modelValue: HoppRESTAuthOAuth2 | HoppGQLAuthOAuth2
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/Parameters.vue

@@ -87,6 +87,8 @@
               :inspection-results="
                 getInspectorResult(parameterKeyResults, index)
               "
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateParam(index, {
                   id: param.id,
@@ -102,6 +104,8 @@
               :inspection-results="
                 getInspectorResult(parameterValueResults, index)
               "
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateParam(index, {
                   id: param.id,
@@ -209,6 +213,7 @@ import { InspectionService, InspectorResult } from "~/services/inspection"
 import { RESTTabService } from "~/services/tab/rest"
 import { useNestedSetting } from "~/composables/settings"
 import { toggleNestedSetting } from "~/newstore/settings"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 const colorMode = useColorMode()
 
@@ -242,6 +247,7 @@ useCodemirror(
 
 const props = defineProps<{
   modelValue: HoppRESTParam[]
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/Request.vue

@@ -56,6 +56,7 @@
           v-model="tab.document.request.endpoint"
           :placeholder="`${t('request.url')}`"
           :auto-complete-source="userHistories"
+          :auto-complete-env="true"
           :inspection-results="tabResults"
           @paste="onPasteUrl($event)"
           @enter="newSendRequest"

packages/hoppscotch-common/src/components/http/RequestOptions.vue

@@ -5,48 +5,51 @@
     render-inactive-tabs
   >
     <HoppSmartTab
-      v-if="properties ? properties.includes('params') : true"
+      v-if="properties?.includes('params') ?? true"
       :id="'params'"
       :label="`${t('tab.parameters')}`"
-      :info="`${newActiveParamsCount$}`"
+      :info="`${newActiveParamsCount}`"
     >
-      <HttpParameters v-model="request.params" />
+      <HttpParameters v-model="request.params" :envs="envs" />
     </HoppSmartTab>
     <HoppSmartTab
-      v-if="properties ? properties.includes('bodyParams') : true"
+      v-if="properties?.includes('bodyParams') ?? true"
       :id="'bodyParams'"
       :label="`${t('tab.body')}`"
     >
       <HttpBody
         v-model:headers="request.headers"
         v-model:body="request.body"
+        :envs="envs"
         @change-tab="changeOptionTab"
       />
     </HoppSmartTab>
     <HoppSmartTab
-      v-if="properties ? properties.includes('headers') : true"
+      v-if="properties?.includes('headers') ?? true"
       :id="'headers'"
       :label="`${t('tab.headers')}`"
-      :info="`${newActiveHeadersCount$}`"
+      :info="`${newActiveHeadersCount}`"
     >
       <HttpHeaders
         v-model="request"
         :inherited-properties="inheritedProperties"
+        :envs="envs"
         @change-tab="changeOptionTab"
       />
     </HoppSmartTab>
     <HoppSmartTab
-      v-if="properties ? properties.includes('authorization') : true"
+      v-if="properties?.includes('authorization') ?? true"
       :id="'authorization'"
       :label="`${t('tab.authorization')}`"
     >
       <HttpAuthorization
         v-model="request.auth"
         :inherited-properties="inheritedProperties"
+        :envs="envs"
       />
     </HoppSmartTab>
     <HoppSmartTab
-      v-if="properties ? properties.includes('preRequestScript') : true"
+      v-if="properties?.includes('preRequestScript') ?? true"
       :id="'preRequestScript'"
       :label="`${t('tab.pre_request_script')}`"
       :indicator="
@@ -58,7 +61,7 @@
       <HttpPreRequestScript v-model="request.preRequestScript" />
     </HoppSmartTab>
     <HoppSmartTab
-      v-if="properties ? properties.includes('tests') : true"
+      v-if="properties?.includes('tests') ?? true"
       :id="'tests'"
       :label="`${t('tab.tests')}`"
       :indicator="
@@ -67,6 +70,15 @@
     >
       <HttpTests v-model="request.testScript" />
     </HoppSmartTab>
+    <HoppSmartTab
+      v-if="properties?.includes('requestVariables') ?? true"
+      :id="'requestVariables'"
+      :label="`${t('tab.variables')}`"
+      :info="`${newActiveRequestVariablesCount}`"
+      :align-last="true"
+    >
+      <HttpRequestVariables v-model="request.requestVariables" />
+    </HoppSmartTab>
   </HoppSmartTabs>
 </template>
 
@@ -77,6 +89,7 @@ import { useVModel } from "@vueuse/core"
 import { computed } from "vue"
 import { defineActionHandler } from "~/helpers/actions"
 import { HoppInheritedProperty } from "~/helpers/types/HoppInheritedProperties"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 const VALID_OPTION_TABS = [
   "params",
@@ -85,6 +98,7 @@ const VALID_OPTION_TABS = [
   "authorization",
   "preRequestScript",
   "tests",
+  "requestVariables",
 ] as const
 
 export type RESTOptionTabs = (typeof VALID_OPTION_TABS)[number]
@@ -98,6 +112,7 @@ const props = withDefaults(
     optionTab: RESTOptionTabs
     properties?: string[]
     inheritedProperties?: HoppInheritedProperty
+    envs?: AggregateEnvironment[]
   }>(),
   {
     optionTab: "params",
@@ -116,22 +131,27 @@ const changeOptionTab = (e: RESTOptionTabs) => {
   selectedOptionTab.value = e
 }
 
-const newActiveParamsCount$ = computed(() => {
+const newActiveParamsCount = computed(() => {
-  const e = request.value.params.filter(
+  const count = request.value.params.filter(
-    (x) => x.active && (x.key !== "" || x.value !== "")
+    (x) => x.active && (x.key || x.value)
   ).length
 
-  if (e === 0) return null
+  return count ? count : null
-  return `${e}`
 })
 
-const newActiveHeadersCount$ = computed(() => {
+const newActiveHeadersCount = computed(() => {
-  const e = request.value.headers.filter(
+  const count = request.value.headers.filter(
-    (x) => x.active && (x.key !== "" || x.value !== "")
+    (x) => x.active && (x.key || x.value)
   ).length
 
-  if (e === 0) return null
+  return count ? count : null
-  return `${e}`
+})
+
+const newActiveRequestVariablesCount = computed(() => {
+  const count = request.value.requestVariables.filter(
+    (x) => x.active && (x.key || x.value)
+  ).length
+  return count ? count : null
 })
 
 defineActionHandler("request.open-tab", ({ tab }) => {

packages/hoppscotch-common/src/components/http/RequestVariables.vue

@@ -0,0 +1,412 @@
+<template>
+  <div class="flex flex-1 flex-col">
+    <div
+      class="sticky top-upperMobileSecondaryStickyFold z-10 flex flex-shrink-0 items-center justify-between overflow-x-auto border-b border-dividerLight bg-primary pl-4 sm:top-upperSecondaryStickyFold"
+    >
+      <label class="truncate font-semibold text-secondaryLight">
+        {{ t("request.request_variables") }}
+      </label>
+      <div class="flex">
+        <HoppButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          to="https://docs.hoppscotch.io/documentation/features/rest-api-testing"
+          blank
+          :title="t('app.wiki')"
+          :icon="IconHelpCircle"
+        />
+        <HoppButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          :title="t('action.clear_all')"
+          :icon="IconTrash2"
+          @click="clearContent()"
+        />
+        <HoppButtonSecondary
+          v-if="bulkVariables"
+          v-tippy="{ theme: 'tooltip' }"
+          :title="t('state.linewrap')"
+          :class="{ '!text-accent': WRAP_LINES }"
+          :icon="IconWrapText"
+          @click.prevent="
+            toggleNestedSetting('WRAP_LINES', 'httpRequestVariables')
+          "
+        />
+        <HoppButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          :title="t('state.bulk_mode')"
+          :icon="IconEdit"
+          :class="{ '!text-accent': bulkMode }"
+          @click="bulkMode = !bulkMode"
+        />
+        <HoppButtonSecondary
+          v-tippy="{ theme: 'tooltip' }"
+          :title="t('add.new')"
+          :icon="IconPlus"
+          :disabled="bulkMode"
+          @click="addVariable"
+        />
+      </div>
+    </div>
+    <div v-if="bulkMode" class="h-full relative">
+      <div ref="bulkEditor" class="absolute inset-0"></div>
+    </div>
+    <div v-else>
+      <draggable
+        v-model="workingRequestVariables"
+        item-key="id"
+        animation="250"
+        handle=".draggable-handle"
+        draggable=".draggable-content"
+        ghost-class="cursor-move"
+        chosen-class="bg-primaryLight"
+        drag-class="cursor-grabbing"
+      >
+        <template #item="{ element: variable, index }">
+          <div
+            class="draggable-content group flex divide-x divide-dividerLight border-b border-dividerLight"
+          >
+            <HoppButtonSecondary
+              v-tippy="{
+                theme: 'tooltip',
+                delay: [500, 20],
+                content:
+                  index !== workingRequestVariables?.length - 1
+                    ? t('action.drag_to_reorder')
+                    : null,
+              }"
+              :icon="IconGripVertical"
+              class="opacity-0"
+              :class="{
+                'draggable-handle cursor-grab group-hover:opacity-100':
+                  index !== workingRequestVariables?.length - 1,
+              }"
+              tabindex="-1"
+            />
+            <SmartEnvInput
+              v-model="variable.key"
+              :placeholder="`${t('count.variable', { count: index + 1 })}`"
+              @change="
+                updateVariable(index, {
+                  id: variable.id,
+                  key: $event,
+                  value: variable.value,
+                  active: variable.active,
+                })
+              "
+            />
+            <SmartEnvInput
+              v-model="variable.value"
+              :placeholder="`${t('count.value', { count: index + 1 })}`"
+              @change="
+                updateVariable(index, {
+                  id: variable.id,
+                  key: variable.key,
+                  value: $event,
+                  active: variable.active,
+                })
+              "
+            />
+            <HoppButtonSecondary
+              v-tippy="{ theme: 'tooltip' }"
+              :title="
+                variable.hasOwnProperty('active')
+                  ? variable.active
+                    ? t('action.turn_off')
+                    : t('action.turn_on')
+                  : t('action.turn_off')
+              "
+              :icon="
+                variable.hasOwnProperty('active')
+                  ? variable.active
+                    ? IconCheckCircle
+                    : IconCircle
+                  : IconCheckCircle
+              "
+              color="green"
+              @click="
+                updateVariable(index, {
+                  id: variable.id,
+                  key: variable.key,
+                  value: variable.value,
+                  active: variable.hasOwnProperty('active')
+                    ? !variable.active
+                    : false,
+                })
+              "
+            />
+            <HoppButtonSecondary
+              v-tippy="{ theme: 'tooltip' }"
+              :title="t('action.remove')"
+              :icon="IconTrash"
+              color="red"
+              @click="deleteVariable(index)"
+            />
+          </div>
+        </template>
+      </draggable>
+      <HoppSmartPlaceholder
+        v-if="workingRequestVariables.length === 0"
+        :src="`/images/states/${colorMode.value}/add_files.svg`"
+        :alt="`${t('empty.request_variables')}`"
+        :text="t('empty.request_variables')"
+      >
+        <template #body>
+          <HoppButtonSecondary
+            :label="`${t('add.new')}`"
+            :icon="IconPlus"
+            filled
+            @click="addVariable"
+          />
+        </template>
+      </HoppSmartPlaceholder>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { throwError } from "@functional/error"
+import {
+  HoppRESTRequestVariable,
+  RawKeyValueEntry,
+  parseRawKeyValueEntriesE,
+  rawKeyValueEntriesToString,
+} from "@hoppscotch/data"
+import { useVModel } from "@vueuse/core"
+import * as A from "fp-ts/Array"
+import * as E from "fp-ts/Either"
+import * as O from "fp-ts/Option"
+import * as RA from "fp-ts/ReadonlyArray"
+import { flow, pipe } from "fp-ts/function"
+import { cloneDeep, isEqual } from "lodash-es"
+import { reactive, ref, watch } from "vue"
+import draggable from "vuedraggable-es"
+
+import { useCodemirror } from "~/composables/codemirror"
+import { useI18n } from "~/composables/i18n"
+import { useNestedSetting } from "~/composables/settings"
+import { useColorMode } from "~/composables/theming"
+import { useToast } from "~/composables/toast"
+import linter from "~/helpers/editor/linting/rawKeyValue"
+import { objRemoveKey } from "~/helpers/functional/object"
+import { toggleNestedSetting } from "~/newstore/settings"
+import IconCheckCircle from "~icons/lucide/check-circle"
+import IconCircle from "~icons/lucide/circle"
+import IconEdit from "~icons/lucide/edit"
+import IconGripVertical from "~icons/lucide/grip-vertical"
+import IconHelpCircle from "~icons/lucide/help-circle"
+import IconPlus from "~icons/lucide/plus"
+import IconTrash from "~icons/lucide/trash"
+import IconTrash2 from "~icons/lucide/trash-2"
+import IconWrapText from "~icons/lucide/wrap-text"
+
+const colorMode = useColorMode()
+
+const t = useI18n()
+const toast = useToast()
+
+const bulkMode = ref(false)
+const bulkEditor = ref<any | null>(null)
+const bulkVariables = ref("")
+
+const WRAP_LINES = useNestedSetting("WRAP_LINES", "httpRequestVariables")
+
+const deletionToast = ref<{ goAway: (delay: number) => void } | null>(null)
+
+const props = defineProps<{
+  modelValue: HoppRESTRequestVariable[]
+}>()
+
+const emit = defineEmits<{
+  (e: "update:modelValue", value: Array<HoppRESTRequestVariable>): void
+}>()
+
+// The functional requestVariable list (the requestVariable actually applied to the session)
+const requestVariables = useVModel(props, "modelValue", emit)
+
+useCodemirror(
+  bulkEditor,
+  bulkVariables,
+  reactive({
+    extendedEditorConfig: {
+      mode: "text/x-yaml",
+      placeholder: `${t("state.bulk_mode_placeholder")}`,
+      lineWrapping: WRAP_LINES,
+    },
+    linter,
+    completer: null,
+    environmentHighlights: true,
+  })
+)
+
+const idTicker = ref(0)
+
+const workingRequestVariables = ref<
+  Array<HoppRESTRequestVariable & { id: number }>
+>([
+  {
+    id: idTicker.value++,
+    key: "",
+    value: "",
+    active: true,
+  },
+])
+
+// Sync logic between params and working/bulk params
+watch(
+  requestVariables,
+  (newRequestVariableList) => {
+    // Sync should overwrite working params
+    const filteredWorkingRequestVariables: HoppRESTRequestVariable[] = pipe(
+      workingRequestVariables.value,
+      A.filterMap(
+        flow(
+          O.fromPredicate((e) => e.key !== ""),
+          O.map(objRemoveKey("id"))
+        )
+      )
+    )
+
+    const filteredBulkRequestVariables = pipe(
+      parseRawKeyValueEntriesE(bulkVariables.value),
+      E.map(
+        flow(
+          RA.filter((e) => e.key !== ""),
+          RA.toArray
+        )
+      ),
+      E.getOrElse(() => [] as RawKeyValueEntry[])
+    )
+
+    if (!isEqual(newRequestVariableList, filteredWorkingRequestVariables)) {
+      workingRequestVariables.value = pipe(
+        newRequestVariableList,
+        A.map((x) => ({ id: idTicker.value++, ...x }))
+      )
+    }
+
+    if (!isEqual(newRequestVariableList, filteredBulkRequestVariables)) {
+      bulkVariables.value = rawKeyValueEntriesToString(newRequestVariableList)
+    }
+  },
+  { immediate: true }
+)
+
+watch(workingRequestVariables, (newWorkingRequestVariables) => {
+  const fixedRequestVariables = pipe(
+    newWorkingRequestVariables,
+    A.filterMap(
+      flow(
+        O.fromPredicate((e) => e.key !== ""),
+        O.map(objRemoveKey("id"))
+      )
+    )
+  )
+
+  if (!isEqual(requestVariables.value, fixedRequestVariables)) {
+    requestVariables.value = cloneDeep(fixedRequestVariables)
+  }
+})
+
+watch(bulkVariables, (newBulkParams) => {
+  const filteredBulkRequestVariables = pipe(
+    parseRawKeyValueEntriesE(newBulkParams),
+    E.map(
+      flow(
+        RA.filter((e) => e.key !== ""),
+        RA.toArray
+      )
+    ),
+    E.getOrElse(() => [] as RawKeyValueEntry[])
+  )
+
+  if (!isEqual(requestVariables.value, filteredBulkRequestVariables)) {
+    requestVariables.value = filteredBulkRequestVariables
+  }
+})
+
+// Rule: Working Request variable always have last element is always an empty param
+watch(workingRequestVariables, (variableList) => {
+  if (
+    variableList.length > 0 &&
+    variableList[variableList.length - 1].key !== ""
+  ) {
+    workingRequestVariables.value.push({
+      id: idTicker.value++,
+      key: "",
+      value: "",
+      active: true,
+    })
+  }
+})
+
+const addVariable = () => {
+  workingRequestVariables.value.push({
+    id: idTicker.value++,
+    key: "",
+    value: "",
+    active: true,
+  })
+}
+
+const updateVariable = (index: number, variable: any & { id: number }) => {
+  workingRequestVariables.value = workingRequestVariables.value.map((h, i) =>
+    i === index ? variable : h
+  )
+}
+
+const deleteVariable = (index: number) => {
+  const requestVariablesBeforeDeletion = cloneDeep(
+    workingRequestVariables.value
+  )
+
+  if (
+    !(
+      requestVariablesBeforeDeletion.length > 0 &&
+      index === requestVariablesBeforeDeletion.length - 1
+    )
+  ) {
+    if (deletionToast.value) {
+      deletionToast.value.goAway(0)
+      deletionToast.value = null
+    }
+
+    deletionToast.value = toast.success(`${t("state.deleted")}`, {
+      action: [
+        {
+          text: `${t("action.undo")}`,
+          onClick: (_, toastObject) => {
+            workingRequestVariables.value = requestVariablesBeforeDeletion
+            toastObject.goAway(0)
+            deletionToast.value = null
+          },
+        },
+      ],
+
+      onComplete: () => {
+        deletionToast.value = null
+      },
+    })
+  }
+
+  workingRequestVariables.value = pipe(
+    workingRequestVariables.value,
+    A.deleteAt(index),
+    O.getOrElseW(() =>
+      throwError("Working Request Variable Deletion Out of Bounds")
+    )
+  )
+}
+
+const clearContent = () => {
+  // set params list to the initial state
+  workingRequestVariables.value = [
+    {
+      id: idTicker.value++,
+      key: "",
+      value: "",
+      active: true,
+    },
+  ]
+
+  bulkVariables.value = ""
+}
+</script>

packages/hoppscotch-common/src/components/http/URLEncodedParams.vue

@@ -21,7 +21,7 @@
           @click="clearContent()"
         />
         <HoppButtonSecondary
-          v-if="bulkMode"
+          v-if="bulkUrlEncodedParams"
           v-tippy="{ theme: 'tooltip' }"
           :title="t('state.linewrap')"
           :class="{ '!text-accent': WRAP_LINES }"
@@ -84,6 +84,8 @@
             <SmartEnvInput
               v-model="param.key"
               :placeholder="`${t('count.parameter', { count: index + 1 })}`"
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateUrlEncodedParam(index, {
                   id: param.id,
@@ -96,6 +98,8 @@
             <SmartEnvInput
               v-model="param.value"
               :placeholder="`${t('count.value', { count: index + 1 })}`"
+              :auto-complete-env="true"
+              :envs="envs"
               @change="
                 updateUrlEncodedParam(index, {
                   id: param.id,
@@ -200,6 +204,7 @@ import { throwError } from "~/helpers/functional/error"
 import { useVModel } from "@vueuse/core"
 import { useNestedSetting } from "~/composables/settings"
 import { toggleNestedSetting } from "~/newstore/settings"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 type Body = HoppRESTReqBody & {
   contentType: "application/x-www-form-urlencoded"
@@ -207,6 +212,7 @@ type Body = HoppRESTReqBody & {
 
 const props = defineProps<{
   modelValue: Body
+  envs: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/authorization/ApiKey.vue

@@ -1,9 +1,19 @@
 <template>
   <div class="flex flex-1 border-b border-dividerLight">
-    <SmartEnvInput v-model="auth.key" placeholder="Key" />
+    <SmartEnvInput
+      v-model="auth.key"
+      :auto-complete-env="true"
+      placeholder="Key"
+      :envs="envs"
+    />
   </div>
   <div class="flex flex-1 border-b border-dividerLight">
-    <SmartEnvInput v-model="auth.value" placeholder="Value" />
+    <SmartEnvInput
+      v-model="auth.value"
+      :auto-complete-env="true"
+      placeholder="Value"
+      :envs="envs"
+    />
   </div>
   <div class="flex items-center border-b border-dividerLight">
     <span class="flex items-center">
@@ -65,11 +75,13 @@ import { useI18n } from "@composables/i18n"
 import { HoppRESTAuthAPIKey } from "@hoppscotch/data"
 import { useVModel } from "@vueuse/core"
 import { ref } from "vue"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 const t = useI18n()
 
 const props = defineProps<{
   modelValue: HoppRESTAuthAPIKey
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/http/authorization/Basic.vue

@@ -3,12 +3,16 @@
     <SmartEnvInput
       v-model="auth.username"
       :placeholder="t('authorization.username')"
+      :auto-complete-env="true"
+      :envs="envs"
     />
   </div>
   <div class="flex flex-1 border-b border-dividerLight">
     <SmartEnvInput
       v-model="auth.password"
       :placeholder="t('authorization.password')"
+      :auto-complete-env="true"
+      :envs="envs"
     />
   </div>
 </template>
@@ -17,11 +21,13 @@
 import { useI18n } from "@composables/i18n"
 import { HoppRESTAuthBasic } from "@hoppscotch/data"
 import { useVModel } from "@vueuse/core"
+import { AggregateEnvironment } from "~/newstore/environments"
 
 const t = useI18n()
 
 const props = defineProps<{
   modelValue: HoppRESTAuthBasic
+  envs?: AggregateEnvironment[]
 }>()
 
 const emit = defineEmits<{

packages/hoppscotch-common/src/components/interceptors/ErrorPlaceholder.vue

@@ -21,28 +21,24 @@
         </span>
       </div>
       <div class="flex flex-col space-y-2 py-4">
-        <span>
+        <HoppSmartItem
-          <HoppSmartItem
+          to="https://chrome.google.com/webstore/detail/hoppscotch-browser-extens/amknoiejhlmhancpahfcfcfhllgkpbld"
-            to="https://chrome.google.com/webstore/detail/hoppscotch-browser-extens/amknoiejhlmhancpahfcfcfhllgkpbld"
+          blank
-            blank
+          :icon="IconChrome"
-            :icon="IconChrome"
+          label="Chrome"
-            label="Chrome"
+          :info-icon="hasChromeExtInstalled ? IconCheckCircle : null"
-            :info-icon="hasChromeExtInstalled ? IconCheckCircle : null"
+          :active-info-icon="hasChromeExtInstalled"
-            :active-info-icon="hasChromeExtInstalled"
+          outline
-            outline
+        />
-          />
+        <HoppSmartItem
-        </span>
+          to="https://addons.mozilla.org/en-US/firefox/addon/hoppscotch"
-        <span>
+          blank
-          <HoppSmartItem
+          :icon="IconFirefox"
-            to="https://addons.mozilla.org/en-US/firefox/addon/hoppscotch"
+          label="Firefox"
-            blank
+          :info-icon="hasFirefoxExtInstalled ? IconCheckCircle : null"
-            :icon="IconFirefox"
+          :active-info-icon="hasFirefoxExtInstalled"
-            label="Firefox"
+          outline
-            :info-icon="hasFirefoxExtInstalled ? IconCheckCircle : null"
+        />
-            :active-info-icon="hasFirefoxExtInstalled"
-            outline
-          />
-        </span>
       </div>
       <div class="space-y-4 py-4">
         <div class="flex items-center">

packages/hoppscotch-common/src/components/share/CustomizeModal.vue

@@ -290,7 +290,12 @@ const widgets: Widget[] = [
   },
 ]
 
-type EmbedTabs = "params" | "bodyParams" | "headers" | "authorization"
+type EmbedTabs =
+  | "params"
+  | "bodyParams"
+  | "headers"
+  | "authorization"
+  | "requestVariables"
 
 type EmbedOption = {
   selectedTab: EmbedTabs

packages/hoppscotch-common/src/components/share/Modal.vue

@@ -56,7 +56,12 @@ import { useI18n } from "~/composables/i18n"
 
 const t = useI18n()
 
-type EmbedTabs = "params" | "bodyParams" | "headers" | "authorization"
+type EmbedTabs =
+  | "params"
+  | "bodyParams"
+  | "headers"
+  | "authorization"
+  | "requestVariables"
 
 type EmbedOption = {
   selectedTab: EmbedTabs

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

@@ -173,6 +173,11 @@ const embedOptions = ref<EmbedOption>({
       label: t("tab.authorization"),
       enabled: false,
     },
+    {
+      value: "requestVariables",
+      label: t("tab.variables"),
+      enabled: false,
+    },
   ],
   theme: "system",
 })
@@ -223,7 +228,12 @@ const currentUser = useReadonlyStream(
 
 const step = ref(1)
 
-type EmbedTabs = "params" | "bodyParams" | "headers" | "authorization"
+type EmbedTabs =
+  | "params"
+  | "bodyParams"
+  | "headers"
+  | "authorization"
+  | "requestVariables"
 
 type EmbedOption = {
   selectedTab: EmbedTabs
@@ -369,6 +379,11 @@ const displayCustomizeRequestModal = (
           label: t("tab.authorization"),
           enabled: false,
         },
+        {
+          value: "requestVariables",
+          label: t("tab.variables"),
+          enabled: false,
+        },
       ],
       theme: "system",
     }

packages/hoppscotch-common/src/components/share/templates/Embeds.vue

@@ -28,7 +28,7 @@
       </button>
     </div>
     <div
-      class="flex"
+      class="flex overflow-x-scroll"
       :class="[{ 'border-b pt-2 ': !noActiveTab }, embedColours]"
     >
       <span
@@ -57,7 +57,12 @@ import { computed } from "vue"
 
 import { useI18n } from "~/composables/i18n"
 
-type Tabs = "params" | "bodyParams" | "headers" | "authorization"
+type Tabs =
+  | "params"
+  | "bodyParams"
+  | "headers"
+  | "authorization"
+  | "requestVariables"
 
 type EmbedOption = {
   selectedTab: Tabs

packages/hoppscotch-common/src/components/smart/EnvInput.vue

@@ -79,29 +79,27 @@ import { history, historyKeymap } from "@codemirror/commands"
 import { inputTheme } from "~/helpers/editor/themes/baseTheme"
 import { HoppReactiveEnvPlugin } from "~/helpers/editor/extensions/HoppEnvironment"
 import { useReadonlyStream } from "@composables/stream"
-import {
+import { AggregateEnvironment, aggregateEnvs$ } from "~/newstore/environments"
-  AggregateEnvironment,
-  aggregateEnvsWithSecrets$,
-} from "~/newstore/environments"
 import { platform } from "~/platform"
 import { onClickOutside, useDebounceFn } from "@vueuse/core"
 import { InspectorResult } from "~/services/inspection"
 import { invokeAction } from "~/helpers/actions"
-import { Environment } from "@hoppscotch/data"
 import { useI18n } from "~/composables/i18n"
 import IconEye from "~icons/lucide/eye"
 import IconEyeoff from "~icons/lucide/eye-off"
+import { CompletionContext, autocompletion } from "@codemirror/autocomplete"
+import { useService } from "dioc/vue"
+import { RESTTabService } from "~/services/tab/rest"
+import { syntaxTree } from "@codemirror/language"
 
 const t = useI18n()
 
-type Env = Environment["variables"][number] & { source: string }
-
 const props = withDefaults(
   defineProps<{
     modelValue?: string
     placeholder?: string
     styles?: string
-    envs?: Env[] | null
+    envs?: AggregateEnvironment[] | null
     focus?: boolean
     selectTextOnMount?: boolean
     environmentHighlights?: boolean
@@ -110,6 +108,7 @@ const props = withDefaults(
     inspectionResults?: InspectorResult[] | undefined
     contextMenuEnabled?: boolean
     secret?: boolean
+    autoCompleteEnv?: boolean
   }>(),
   {
     modelValue: "",
@@ -124,6 +123,7 @@ const props = withDefaults(
     inspectionResults: undefined,
     contextMenuEnabled: true,
     secret: false,
+    autoCompleteEnvSource: false,
   }
 )
 
@@ -353,29 +353,62 @@ watch(
 let clipboardEv: ClipboardEvent | null = null
 let pastedValue: string | null = null
 
-const aggregateEnvs = useReadonlyStream(aggregateEnvsWithSecrets$, []) as Ref<
+const aggregateEnvs = useReadonlyStream(aggregateEnvs$, []) as Ref<
   AggregateEnvironment[]
 >
 
+const tabs = useService(RESTTabService)
+
 const envVars = computed(() => {
-  return props.envs
+  if (props.envs) {
-    ? props.envs.map((x) => {
+    return props.envs.map((x) => {
-        if (x.secret) {
+      const { key, secret } = x
-          return {
+      const value = secret ? "********" : x.value
-            key: x.key,
+      const sourceEnv = "sourceEnv" in x ? x.sourceEnv : null
-            sourceEnv: "source" in x ? x.source : null,
+      return {
-            value: "********",
+        key,
-          }
+        value,
-        }
+        sourceEnv,
-        return {
+        secret,
-          key: x.key,
+      }
-          value: x.value,
+    })
-          sourceEnv: "source" in x ? x.source : null,
+  }
-        }
+  return [
-      })
+    ...tabs.currentActiveTab.value.document.request.requestVariables.map(
-    : aggregateEnvs.value
+      ({ active, key, value }) =>
+        active
+          ? {
+              key,
+              value,
+              sourceEnv: "RequestVariable",
+              secret: false,
+            }
+          : ({} as AggregateEnvironment)
+    ),
+    ...aggregateEnvs.value,
+  ]
 })
 
+function envAutoCompletion(context: CompletionContext) {
+  const options = (envVars.value ?? [])
+    .map((env) => ({
+      label: env?.key ? `<<${env.key}>>` : "",
+      info: env?.value ?? "",
+      apply: env?.key ? `<<${env.key}>>` : "",
+    }))
+    .filter((x) => x)
+
+  const nodeBefore = syntaxTree(context.state).resolveInner(context.pos, -1)
+  const textBefore = context.state.sliceDoc(nodeBefore.from, context.pos)
+  const tagBefore = /<<\w*$/.exec(textBefore)
+  if (!tagBefore && !context.explicit) return null
+  return {
+    from: tagBefore ? nodeBefore.from + tagBefore.index : context.pos,
+    options: options,
+    validFor: /^(<<\w*)?$/,
+  }
+}
+
 const envTooltipPlugin = new HoppReactiveEnvPlugin(envVars, view)
 
 function handleTextSelection() {
@@ -384,7 +417,9 @@ function handleTextSelection() {
     const { from, to } = selection
     if (from === to) return
     const text = view.value?.state.doc.sliceString(from, to)
-    const { top, left } = view.value?.coordsAtPos(from)
+    const coords = view.value?.coordsAtPos(from)
+    const top = coords?.top ?? 0
+    const left = coords?.left ?? 0
     if (text) {
       invokeAction("contextmenu.open", {
         position: {
@@ -406,16 +441,17 @@ function handleTextSelection() {
   }
 }
 
-const initView = (el: any) => {
+// Debounce to prevent double click from selecting the word
-  // Debounce to prevent double click from selecting the word
+const debouncedTextSelection = (time: number) =>
-  const debounceFn = useDebounceFn(() => {
+  useDebounceFn(() => {
     handleTextSelection()
-  }, 140)
+  }, time)
 
+const initView = (el: any) => {
   // Only add event listeners if context menu is enabled in the component
   if (props.contextMenuEnabled) {
-    el.addEventListener("mouseup", debounceFn)
+    el.addEventListener("mouseup", debouncedTextSelection(140))
-    el.addEventListener("keyup", debounceFn)
+    el.addEventListener("keyup", debouncedTextSelection(140))
   }
 
   const extensions: Extension = getExtensions(props.readonly || isSecret.value)
@@ -465,10 +501,17 @@ const getExtensions = (readonly: boolean): Extension => {
       },
       scroll(event) {
         if (event.target && props.contextMenuEnabled) {
-          handleTextSelection()
+          // Debounce to make the performance better
+          debouncedTextSelection(30)()
         }
       },
     }),
+    props.autoCompleteEnv
+      ? autocompletion({
+          activateOnTyping: true,
+          override: [envAutoCompletion],
+        })
+      : [],
     ViewPlugin.fromClass(
       class {
         update(update: ViewUpdate) {

packages/hoppscotch-common/src/components/workspace/Current.vue

@@ -15,6 +15,8 @@ import { computed } from "vue"
 import { useI18n } from "~/composables/i18n"
 import { useService } from "dioc/vue"
 import { WorkspaceService } from "~/services/workspace.service"
+import { useReadonlyStream } from "~/composables/stream"
+import { platform } from "~/platform"
 
 const props = defineProps<{
   section?: string
@@ -26,14 +28,23 @@ const t = useI18n()
 const workspaceService = useService(WorkspaceService)
 const workspace = workspaceService.currentWorkspace
 
+const currentUser = useReadonlyStream(
+  platform.auth.getProbableUserStream(),
+  platform.auth.getProbableUser()
+)
+
 const currentWorkspace = computed(() => {
+  const personalWorkspaceName = currentUser.value?.displayName
+    ? t("workspace.personal_workspace", { name: currentUser.value.displayName })
+    : t("workspace.personal")
+
   if (props.isOnlyPersonal) {
-    return `${t("workspace.personal")}`
+    return personalWorkspaceName
   }
   if (workspace.value.type === "team") {
     return teamWorkspaceName.value
   }
-  return `${t("workspace.personal")}`
+  return personalWorkspaceName
 })
 
 const teamWorkspaceName = computed(() => {

packages/hoppscotch-common/src/components/workspace/Selector.vue

@@ -3,7 +3,7 @@
     <div class="flex flex-col">
       <div class="flex flex-col">
         <HoppSmartItem
-          label="My Workspace"
+          :label="personalWorkspaceName"
           :icon="IconUser"
           :info-icon="workspace.type === 'personal' ? IconDone : undefined"
           :active-info-icon="workspace.type === 'personal'"
@@ -36,7 +36,7 @@
           class="sticky top-0 z-10 mb-2 flex items-center justify-between bg-popover py-2 pl-2"
         >
           <div class="flex items-center px-2 font-semibold text-secondaryLight">
-            {{ t("team.title") }}
+            {{ t("workspace.other_workspaces") }}
           </div>
           <HoppButtonSecondary
             v-tippy="{ theme: 'tooltip' }"
@@ -96,6 +96,12 @@ const currentUser = useReadonlyStream(
   platform.auth.getProbableUser()
 )
 
+const personalWorkspaceName = computed(() =>
+  currentUser.value?.displayName
+    ? t("workspace.personal_workspace", { name: currentUser.value.displayName })
+    : t("workspace.personal")
+)
+
 const workspaceService = useService(WorkspaceService)
 const teamListadapter = workspaceService.acquireTeamListAdapter(null)
 const myTeams = useReadonlyStream(teamListadapter.teamList$, [])

packages/hoppscotch-common/src/composables/codemirror.ts

@@ -242,8 +242,10 @@ export function useCodemirror(
       const { from, to } = selection
       if (from === to) return
       const text = view.value?.state.doc.sliceString(from, to)
-      const { top, left } = view.value?.coordsAtPos(from)
+      const coords = view.value?.coordsAtPos(from)
-      if (text) {
+      const top = coords?.top ?? 0
+      const left = coords?.left ?? 0
+      if (text?.trim()) {
         invokeAction("contextmenu.open", {
           position: {
             top,
@@ -263,6 +265,12 @@ export function useCodemirror(
     }
   }
 
+  // Debounce to prevent double click from selecting the word
+  const debouncedTextSelection = (time: number) =>
+    useDebounceFn(() => {
+      handleTextSelection()
+    }, time)
+
   const initView = (el: any) => {
     if (el) platform.ui?.onCodemirrorInstanceMount?.(el)
 
@@ -274,15 +282,10 @@ export function useCodemirror(
       ViewPlugin.fromClass(
         class {
           update(update: ViewUpdate) {
-            // Debounce to prevent double click from selecting the word
-            const debounceFn = useDebounceFn(() => {
-              handleTextSelection()
-            }, 140)
-
             // Only add event listeners if context menu is enabled in the editor
             if (options.contextMenuEnabled) {
-              el.addEventListener("mouseup", debounceFn)
+              el.addEventListener("mouseup", debouncedTextSelection(140))
-              el.addEventListener("keyup", debounceFn)
+              el.addEventListener("keyup", debouncedTextSelection(140))
             }
 
             if (options.onUpdate) {
@@ -324,7 +327,8 @@ export function useCodemirror(
       EditorView.domEventHandlers({
         scroll(event) {
           if (event.target && options.contextMenuEnabled) {
-            handleTextSelection()
+            // Debounce to make the performance better
+            debouncedTextSelection(30)()
           }
         },
       }),

packages/hoppscotch-common/src/helpers/RESTRequest.ts

@@ -1,293 +0,0 @@
-import {
-  FormDataKeyValue,
-  HoppRESTAuth,
-  HoppRESTHeader,
-  HoppRESTParam,
-  HoppRESTReqBody,
-  HoppRESTRequest,
-  RESTReqSchemaVersion,
-  ValidContentTypes,
-} from "@hoppscotch/data"
-import { BehaviorSubject, combineLatest, map } from "rxjs"
-import { applyBodyTransition } from "~/helpers/rules/BodyTransition"
-import { HoppRESTResponse } from "./types/HoppRESTResponse"
-
-export class RESTRequest {
-  public v$ = new BehaviorSubject<typeof RESTReqSchemaVersion>(
-    RESTReqSchemaVersion
-  )
-  public name$ = new BehaviorSubject("Untitled")
-  public endpoint$ = new BehaviorSubject("https://echo.hoppscotch.io/")
-  public params$ = new BehaviorSubject<HoppRESTParam[]>([])
-  public headers$ = new BehaviorSubject<HoppRESTHeader[]>([])
-  public method$ = new BehaviorSubject("GET")
-  public auth$ = new BehaviorSubject<HoppRESTAuth>({
-    authType: "none",
-    authActive: true,
-  })
-  public preRequestScript$ = new BehaviorSubject("")
-  public testScript$ = new BehaviorSubject("")
-  public body$ = new BehaviorSubject<HoppRESTReqBody>({
-    contentType: null,
-    body: null,
-  })
-
-  public response$ = new BehaviorSubject<HoppRESTResponse | null>(null)
-
-  get request$() {
-    // any of above changes construct requests
-    return combineLatest([
-      this.v$,
-      this.name$,
-      this.endpoint$,
-      this.params$,
-      this.headers$,
-      this.method$,
-      this.auth$,
-      this.preRequestScript$,
-      this.testScript$,
-      this.body$,
-    ]).pipe(
-      map(
-        ([
-          v,
-          name,
-          endpoint,
-          params,
-          headers,
-          method,
-          auth,
-          preRequestScript,
-          testScript,
-          body,
-        ]) => ({
-          v,
-          name,
-          endpoint,
-          params,
-          headers,
-          method,
-          auth,
-          preRequestScript,
-          testScript,
-          body,
-        })
-      )
-    )
-  }
-
-  get contentType$() {
-    return this.body$.pipe(map((body) => body.contentType))
-  }
-
-  get bodyContent$() {
-    return this.body$.pipe(map((body) => body.body))
-  }
-
-  get headersCount$() {
-    return this.headers$.pipe(
-      map(
-        (params) =>
-          params.filter((x) => x.active && (x.key !== "" || x.value !== ""))
-            .length
-      )
-    )
-  }
-
-  get paramsCount$() {
-    return this.params$.pipe(
-      map(
-        (params) =>
-          params.filter((x) => x.active && (x.key !== "" || x.value !== ""))
-            .length
-      )
-    )
-  }
-
-  setName(name: string) {
-    this.name$.next(name)
-  }
-
-  setEndpoint(newURL: string) {
-    this.endpoint$.next(newURL)
-  }
-
-  setMethod(newMethod: string) {
-    this.method$.next(newMethod)
-  }
-
-  setParams(entries: HoppRESTParam[]) {
-    this.params$.next(entries)
-  }
-
-  addParam(newParam: HoppRESTParam) {
-    const newParams = this.params$.value.concat(newParam)
-    this.params$.next(newParams)
-  }
-
-  updateParam(index: number, updatedParam: HoppRESTParam) {
-    const newParams = this.params$.value.map((param, i) =>
-      i === index ? updatedParam : param
-    )
-    this.params$.next(newParams)
-  }
-
-  deleteParam(index: number) {
-    const newParams = this.params$.value.filter((_, i) => i !== index)
-    this.params$.next(newParams)
-  }
-
-  deleteAllParams() {
-    this.params$.next([])
-  }
-
-  setHeaders(entries: HoppRESTHeader[]) {
-    this.headers$.next(entries)
-  }
-
-  addHeader(newHeader: HoppRESTHeader) {
-    const newHeaders = this.headers$.value.concat(newHeader)
-    this.headers$.next(newHeaders)
-  }
-
-  updateHeader(index: number, updatedHeader: HoppRESTHeader) {
-    const newHeaders = this.headers$.value.map((header, i) =>
-      i === index ? updatedHeader : header
-    )
-    this.headers$.next(newHeaders)
-  }
-
-  deleteHeader(index: number) {
-    const newHeaders = this.headers$.value.filter((_, i) => i !== index)
-    this.headers$.next(newHeaders)
-  }
-
-  deleteAllHeaders() {
-    this.headers$.next([])
-  }
-
-  setContentType(newContentType: ValidContentTypes | null) {
-    // TODO: persist body evenafter switching content typees
-    this.body$.next(applyBodyTransition(this.body$.value, newContentType))
-  }
-
-  setBody(newBody: string | FormDataKeyValue[] | null) {
-    const body = { ...this.body$.value }
-    body.body = newBody
-    this.body$.next({ ...body })
-  }
-
-  addFormDataEntry(entry: FormDataKeyValue) {
-    if (this.body$.value.contentType !== "multipart/form-data") return {}
-    const body: HoppRESTReqBody = {
-      contentType: "multipart/form-data",
-      body: [...this.body$.value.body, entry],
-    }
-    this.body$.next(body)
-  }
-
-  deleteFormDataEntry(index: number) {
-    // Only perform update if the current content-type is formdata
-    if (this.body$.value.contentType !== "multipart/form-data") return {}
-
-    const body: HoppRESTReqBody = {
-      contentType: "multipart/form-data",
-      body: [...this.body$.value.body.filter((_, i) => i !== index)],
-    }
-
-    this.body$.next(body)
-  }
-
-  updateFormDataEntry(index: number, entry: FormDataKeyValue) {
-    // Only perform update if the current content-type is formdata
-    if (this.body$.value.contentType !== "multipart/form-data") return {}
-
-    const body: HoppRESTReqBody = {
-      contentType: "multipart/form-data",
-      body: [
-        ...this.body$.value.body.map((oldEntry, i) =>
-          i === index ? entry : oldEntry
-        ),
-      ],
-    }
-    this.body$.next(body)
-  }
-
-  deleteAllFormDataEntries() {
-    // Only perform update if the current content-type is formdata
-    if (this.body$.value.contentType !== "multipart/form-data") return {}
-
-    const body: HoppRESTReqBody = {
-      contentType: "multipart/form-data",
-      body: [],
-    }
-    this.body$.next(body)
-  }
-
-  setRequestBody(newBody: HoppRESTReqBody) {
-    this.body$.next(newBody)
-  }
-
-  setAuth(newAuth: HoppRESTAuth) {
-    this.auth$.next(newAuth)
-  }
-
-  setPreRequestScript(newScript: string) {
-    this.preRequestScript$.next(newScript)
-  }
-
-  setTestScript(newScript: string) {
-    this.testScript$.next(newScript)
-  }
-
-  updateResponse(response: HoppRESTResponse | null) {
-    this.response$.next(response)
-  }
-
-  setRequest(request: HoppRESTRequest) {
-    this.v$.next(RESTReqSchemaVersion)
-    this.name$.next(request.name)
-    this.endpoint$.next(request.endpoint)
-    this.params$.next(request.params)
-    this.headers$.next(request.headers)
-    this.method$.next(request.method)
-    this.auth$.next(request.auth)
-    this.preRequestScript$.next(request.preRequestScript)
-    this.testScript$.next(request.testScript)
-    this.body$.next(request.body)
-  }
-
-  getRequest() {
-    return {
-      v: this.v$.value,
-      name: this.name$.value,
-      endpoint: this.endpoint$.value,
-      params: this.params$.value,
-      headers: this.headers$.value,
-      method: this.method$.value,
-      auth: this.auth$.value,
-      preRequestScript: this.preRequestScript$.value,
-      testScript: this.testScript$.value,
-      body: this.body$.value,
-    }
-  }
-
-  resetRequest() {
-    this.v$.next(RESTReqSchemaVersion)
-    this.name$.next("")
-    this.endpoint$.next("")
-    this.params$.next([])
-    this.headers$.next([])
-    this.method$.next("GET")
-    this.auth$.next({
-      authType: "none",
-      authActive: false,
-    })
-    this.preRequestScript$.next("")
-    this.testScript$.next("")
-    this.body$.next({
-      contentType: null,
-      body: null,
-    })
-  }
-}

packages/hoppscotch-common/src/helpers/RequestRunner.ts

@@ -1,4 +1,8 @@
-import { Environment } from "@hoppscotch/data"
+import {
+  Environment,
+  HoppRESTHeaders,
+  HoppRESTRequestVariable,
+} from "@hoppscotch/data"
 import { SandboxTestResult, TestDescriptor } from "@hoppscotch/js-sandbox"
 import { runTestScript } from "@hoppscotch/js-sandbox/web"
 import * as A from "fp-ts/Array"
@@ -65,10 +69,17 @@ const getTestableBody = (
   return x
 }
 
-const combineEnvVariables = (envs: {
+const combineEnvVariables = (variables: {
-  global: Environment["variables"]
+  environments: {
-  selected: Environment["variables"]
+    selected: Environment["variables"]
-}) => [...envs.selected, ...envs.global]
+    global: Environment["variables"]
+  }
+  requestVariables: Environment["variables"]
+}) => [
+  ...variables.requestVariables,
+  ...variables.environments.selected,
+  ...variables.environments.global,
+]
 
 export const executedResponses$ = new Subject<
   HoppRESTResponse & { type: "success" | "fail " }
@@ -122,6 +133,38 @@ const updateEnvironmentsWithSecret = (
   return updatedEnv
 }
 
+/**
+ * Transforms the environment list to a list with unique keys with value
+ * @param envs The environment list to be transformed
+ * @returns The transformed environment list with keys with value
+ */
+const filterNonEmptyEnvironmentVariables = (
+  envs: Environment["variables"]
+): Environment["variables"] => {
+  const envsMap = new Map<string, Environment["variables"][number]>()
+
+  envs.forEach((env) => {
+    if (env.secret) {
+      envsMap.set(env.key, env)
+    } else if (envsMap.has(env.key)) {
+      const existingEnv = envsMap.get(env.key)
+
+      if (
+        existingEnv &&
+        "value" in existingEnv &&
+        existingEnv.value === "" &&
+        env.value !== ""
+      ) {
+        envsMap.set(env.key, env)
+      }
+    } else {
+      envsMap.set(env.key, env)
+    }
+  })
+
+  return Array.from(envsMap.values())
+}
+
 export function runRESTRequest$(
   tab: Ref<HoppTab<HoppRESTDocument>>
 ): [
@@ -175,15 +218,40 @@ export function runRESTRequest$(
       requestHeaders = [...tab.value.document.request.headers]
     }
 
+    const finalRequestVariables =
+      tab.value.document.request.requestVariables.map(
+        (v: HoppRESTRequestVariable) => {
+          if (v.active) {
+            return {
+              key: v.key,
+              value: v.value,
+              secret: false,
+            }
+          }
+          return []
+        }
+      )
+
     const finalRequest = {
       ...tab.value.document.request,
       auth: requestAuth ?? { authType: "none", authActive: false },
-      headers: requestHeaders,
+      headers: requestHeaders as HoppRESTHeaders,
     }
 
+    const finalEnvs = {
+      requestVariables: finalRequestVariables as Environment["variables"],
+      environments: envs.right,
+    }
+
+    const finalEnvsWithNonEmptyValues = filterNonEmptyEnvironmentVariables(
+      combineEnvVariables(finalEnvs)
+    )
+
     const effectiveRequest = getEffectiveRESTRequest(finalRequest, {
+      id: "env-id",
+      v: 1,
       name: "Env",
-      variables: combineEnvVariables(envs.right),
+      variables: finalEnvsWithNonEmptyValues,
     })
 
     const [stream, cancelRun] = createRESTNetworkRequestStream(effectiveRequest)

packages/hoppscotch-common/src/helpers/curl/__tests__/curlparser.spec.js

@@ -38,6 +38,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -141,6 +142,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -158,6 +160,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -181,6 +184,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -209,6 +213,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -239,6 +244,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -268,6 +274,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -291,6 +298,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -312,6 +320,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -335,6 +344,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -366,6 +376,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -430,6 +441,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -458,6 +470,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -515,6 +528,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -560,6 +574,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -607,6 +622,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -621,6 +637,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -645,6 +662,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -662,6 +680,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -685,6 +704,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -702,6 +722,7 @@ const samples = [
       params: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -725,6 +746,7 @@ const samples = [
       ],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -747,6 +769,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -767,6 +790,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -788,6 +812,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -808,6 +833,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
   {
@@ -839,6 +865,7 @@ const samples = [
       headers: [],
       preRequestScript: "",
       testScript: "",
+      requestVariables: [],
     }),
   },
 ]

packages/hoppscotch-common/src/helpers/curl/curlparser.ts

@@ -181,5 +181,6 @@ export const parseCurlCommand = (curlCommand: string) => {
     testScript: defaultRESTReq.testScript,
     auth,
     body: finalBody,
+    requestVariables: defaultRESTReq.requestVariables,
   })
 }

packages/hoppscotch-common/src/helpers/editor/extensions/HoppEnvironment.ts

@@ -13,7 +13,7 @@ import { StreamSubscriberFunc } from "@composables/stream"
 import {
   AggregateEnvironment,
   aggregateEnvsWithSecrets$,
-  getAggregateEnvsWithSecrets,
+  getAggregateEnvs,
   getCurrentEnvironment,
   getSelectedEnvironmentType,
 } from "~/newstore/environments"
@@ -23,15 +23,45 @@ import IconUsers from "~icons/lucide/users?raw"
 import IconEdit from "~icons/lucide/edit?raw"
 import { SecretEnvironmentService } from "~/services/secret-environment.service"
 import { getService } from "~/modules/dioc"
+import { RESTTabService } from "~/services/tab/rest"
 
 const HOPP_ENVIRONMENT_REGEX = /(<<[a-zA-Z0-9-_]+>>)/g
 
 const HOPP_ENV_HIGHLIGHT =
   "cursor-help transition rounded px-1 focus:outline-none mx-0.5 env-highlight"
-const HOPP_ENV_HIGHLIGHT_FOUND = "env-found"
+
-const HOPP_ENV_HIGHLIGHT_NOT_FOUND = "env-not-found"
+const HOPP_REQUEST_VARIABLE_HIGHLIGHT = "request-variable-highlight"
+const HOPP_ENVIRONMENT_HIGHLIGHT = "environment-variable-highlight"
+const HOPP_GLOBAL_ENVIRONMENT_HIGHLIGHT = "global-variable-highlight"
+const HOPP_ENV_HIGHLIGHT_NOT_FOUND = "environment-not-found-highlight"
 
 const secretEnvironmentService = getService(SecretEnvironmentService)
+const restTabs = getService(RESTTabService)
+
+/**
+ * Transforms the environment list to a list with unique keys with value
+ * @param envs The environment list to be transformed
+ * @returns The transformed environment list with keys with value
+ */
+const filterNonEmptyEnvironmentVariables = (
+  envs: AggregateEnvironment[]
+): AggregateEnvironment[] => {
+  const envsMap = new Map<string, AggregateEnvironment>()
+
+  envs.forEach((env) => {
+    if (envsMap.has(env.key)) {
+      const existingEnv = envsMap.get(env.key)
+
+      if (existingEnv?.value === "" && env.value !== "") {
+        envsMap.set(env.key, env)
+      }
+    } else {
+      envsMap.set(env.key, env)
+    }
+  })
+
+  return Array.from(envsMap.values())
+}
 
 const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
   hoverTooltip(
@@ -67,7 +97,12 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
 
       const parsedEnvKey = text.slice(start - from, end - from)
 
-      const tooltipEnv = aggregateEnvs.find((env) => env.key === parsedEnvKey)
+      const envsWithNoEmptyValues =
+        filterNonEmptyEnvironmentVariables(aggregateEnvs)
+
+      const tooltipEnv = envsWithNoEmptyValues.find(
+        (env) => env.key === parsedEnvKey
+      )
 
       const envName = tooltipEnv?.sourceEnv ?? "Choose an Environment"
 
@@ -95,7 +130,12 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
 
       const result = parseTemplateStringE(envValue, aggregateEnvs)
 
-      const finalEnv = E.isLeft(result) ? "error" : result.right
+      let finalEnv = E.isLeft(result) ? "error" : result.right
+
+      // If the request variable has an secret variable
+      // parseTemplateStringE is passed the secret value which has value undefined
+      // So, we need to check if the result is undefined and then set the finalEnv to ******
+      if (finalEnv === "undefined") finalEnv = "******"
 
       const selectedEnvType = getSelectedEnvironmentType()
 
@@ -123,11 +163,16 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
             invokeActionType = "modals.my.environment.edit"
           }
 
-          invokeAction(invokeActionType, {
+          if (tooltipEnv?.sourceEnv === "RequestVariable") {
-            envName: tooltipEnv?.sourceEnv !== "Global" ? envName : "Global",
+            restTabs.currentActiveTab.value.document.optionTabPreference =
-            variableName: parsedEnvKey,
+              "requestVariables"
-            isSecret: tooltipEnv?.secret,
+          } else {
-          })
+            invokeAction(invokeActionType, {
+              envName: tooltipEnv?.sourceEnv === "Global" ? "Global" : envName,
+              variableName: parsedEnvKey,
+              isSecret: tooltipEnv?.secret,
+            })
+          }
         })
         editIcon.innerHTML = `<span class="inline-flex items-center justify-center my-1">${IconEdit}</span>`
         tooltip.appendChild(editIcon)
@@ -165,11 +210,16 @@ const cursorTooltipField = (aggregateEnvs: AggregateEnvironment[]) =>
   )
 
 function checkEnv(env: string, aggregateEnvs: AggregateEnvironment[]) {
-  const className = aggregateEnvs.find(
+  let className = HOPP_ENV_HIGHLIGHT_NOT_FOUND
+
+  const envSource = aggregateEnvs.find(
     (k: { key: string }) => k.key === env.slice(2, -2)
-  )
+  )?.sourceEnv
-    ? HOPP_ENV_HIGHLIGHT_FOUND
+
-    : HOPP_ENV_HIGHLIGHT_NOT_FOUND
+  if (envSource === "RequestVariable")
+    className = HOPP_REQUEST_VARIABLE_HIGHLIGHT
+  else if (envSource === "Global") className = HOPP_GLOBAL_ENVIRONMENT_HIGHLIGHT
+  else if (envSource !== undefined) className = HOPP_ENVIRONMENT_HIGHLIGHT
 
   return Decoration.mark({
     class: `${HOPP_ENV_HIGHLIGHT} ${className}`,
@@ -185,7 +235,10 @@ const getMatchDecorator = (aggregateEnvs: AggregateEnvironment[]) =>
 export const environmentHighlightStyle = (
   aggregateEnvs: AggregateEnvironment[]
 ) => {
-  const decorator = getMatchDecorator(aggregateEnvs)
+  const envsWithNoEmptyValues =
+    filterNonEmptyEnvironmentVariables(aggregateEnvs)
+
+  const decorator = getMatchDecorator(envsWithNoEmptyValues)
 
   return ViewPlugin.define(
     (view) => ({
@@ -209,10 +262,45 @@ export class HoppEnvironmentPlugin {
     subscribeToStream: StreamSubscriberFunc,
     private editorView: Ref<EditorView | undefined>
   ) {
-    this.envs = getAggregateEnvsWithSecrets()
+    const aggregateEnvs = getAggregateEnvs()
+    const currentTab = restTabs.currentActiveTab.value
+
+    watch(
+      currentTab.document.request,
+      (reqVariables) => {
+        this.envs = [
+          ...reqVariables.requestVariables.map(({ key, value }) => ({
+            key,
+            value,
+            sourceEnv: "RequestVariable",
+            secret: false,
+          })),
+          ...aggregateEnvs,
+        ]
+
+        this.editorView.value?.dispatch({
+          effects: this.compartment.reconfigure([
+            cursorTooltipField(this.envs),
+            environmentHighlightStyle(this.envs),
+          ]),
+        })
+      },
+      { immediate: true, deep: true }
+    )
 
     subscribeToStream(aggregateEnvsWithSecrets$, (envs) => {
-      this.envs = envs
+      this.envs = [
+        ...currentTab.document.request.requestVariables.map(
+          ({ key, value }) => ({
+            key,
+            value,
+            sourceEnv: "RequestVariable",
+            secret: false,
+          })
+        ),
+        ...envs,
+      ]
+
       this.editorView.value?.dispatch({
         effects: this.compartment.reconfigure([
           cursorTooltipField(this.envs),
@@ -251,7 +339,7 @@ export class HoppReactiveEnvPlugin {
           ]),
         })
       },
-      { immediate: true }
+      { immediate: true, deep: true }
     )
   }
 

packages/hoppscotch-common/src/helpers/import-export/import/hopp.ts

@@ -4,11 +4,12 @@ import * as O from "fp-ts/Option"
 import * as RA from "fp-ts/ReadonlyArray"
 import * as A from "fp-ts/Array"
 import { translateToNewRESTCollection, HoppCollection } from "@hoppscotch/data"
-import { isPlainObject as _isPlainObject } from "lodash-es"
 
 import { IMPORTER_INVALID_FILE_FORMAT } from "."
 import { safeParseJSON } from "~/helpers/functional/json"
 import { translateToNewGQLCollection } from "@hoppscotch/data"
+import { entityReference } from "verzod"
+import { z } from "zod"
 
 export const hoppRESTImporter = (content: string[]) =>
   pipe(
@@ -26,26 +27,14 @@ export const hoppRESTImporter = (content: string[]) =>
     TE.fromOption(() => IMPORTER_INVALID_FILE_FORMAT)
   )
 
-/**
- * checks if a value is a plain object
- */
-const isPlainObject = (value: any): value is object => _isPlainObject(value)
-
-/**
- * checks if a collection matches the schema for a hoppscotch collection.
- * here 2 is the latest version of the schema.
- */
-const isValidCollection = (collection: unknown): collection is HoppCollection =>
-  isPlainObject(collection) && "v" in collection && collection.v === 2
-
 /**
  * checks if a collection is a valid hoppscotch collection.
  * else translate it into one.
  */
 const validateCollection = (collection: unknown) => {
-  if (isValidCollection(collection)) {
+  const result = entityReference(HoppCollection).safeParse(collection)
-    return O.some(collection)
+  if (result.success) return O.some(result.data)
-  }
+
   return O.some(translateToNewRESTCollection(collection))
 }
 
@@ -75,8 +64,9 @@ export const hoppGQLImporter = (content: string) =>
  * @returns the collection if it is valid, else a translated version of the collection
  */
 export const validateGQLCollection = (collection: unknown) => {
-  if (isValidCollection(collection)) {
+  const result = z.array(entityReference(HoppCollection)).safeParse(collection)
-    return O.some(collection)
+
-  }
+  if (result.success) return O.some(result.data)
+
   return O.some(translateToNewGQLCollection(collection))
 }

packages/hoppscotch-common/src/helpers/import-export/import/insomnia.ts

@@ -8,6 +8,7 @@ import {
   knownContentTypes,
   makeCollection,
   makeRESTRequest,
+  HoppRESTRequestVariable,
 } from "@hoppscotch/data"
 
 import * as A from "fp-ts/Array"
@@ -28,14 +29,27 @@ type UnwrapPromise<T extends Promise<any>> = T extends Promise<infer Y>
 type InsomniaDoc = UnwrapPromise<ReturnType<typeof convert>>
 type InsomniaResource = ImportRequest
 
+// insomnia-importers v3.6.0 doesn't provide a type for path parameters and they have deprecated the library
+type InsomniaPathParameter = {
+  name: string
+  value: string
+}
+
 type InsomniaFolderResource = ImportRequest & { _type: "request_group" }
-type InsomniaRequestResource = ImportRequest & { _type: "request" }
+type InsomniaRequestResource = ImportRequest & {
+  _type: "request"
+} & {
+  pathParameters?: InsomniaPathParameter[]
+}
 
 const parseInsomniaDoc = (content: string) =>
   TO.tryCatch(() => convert(content))
 
+const replacePathVarTemplating = (expression: string) =>
+  expression.replaceAll(/:([^/]+)/g, "<<$1>>")
+
 const replaceVarTemplating = (expression: string) =>
-  replaceInsomniaTemplating(expression)
+  pipe(expression, replacePathVarTemplating, replaceInsomniaTemplating)
 
 const getFoldersIn = (
   folder: InsomniaFolderResource | null,
@@ -177,6 +191,15 @@ const getHoppReqParams = (req: InsomniaRequestResource): HoppRESTParam[] =>
     active: !(param.disabled ?? false),
   })) ?? []
 
+const getHoppReqVariables = (
+  req: InsomniaRequestResource
+): HoppRESTRequestVariable[] =>
+  req.pathParameters?.map((variable) => ({
+    key: replaceVarTemplating(variable.name),
+    value: replaceVarTemplating(variable.value ?? ""),
+    active: true,
+  })) ?? []
+
 const getHoppRequest = (req: InsomniaRequestResource): HoppRESTRequest =>
   makeRESTRequest({
     name: req.name ?? "Untitled Request",
@@ -189,6 +212,8 @@ const getHoppRequest = (req: InsomniaRequestResource): HoppRESTRequest =>
 
     preRequestScript: "",
     testScript: "",
+
+    requestVariables: getHoppReqVariables(req),
   })
 
 const getHoppFolder = (

packages/hoppscotch-common/src/helpers/import-export/import/openapi.ts

@@ -16,6 +16,8 @@ import {
   makeRESTRequest,
   HoppCollection,
   makeCollection,
+  HoppRESTRequestVariable,
+  HoppRESTRequest,
 } from "@hoppscotch/data"
 import { pipe, flow } from "fp-ts/function"
 import * as A from "fp-ts/Array"
@@ -24,6 +26,7 @@ import * as O from "fp-ts/Option"
 import * as TE from "fp-ts/TaskEither"
 import * as RA from "fp-ts/ReadonlyArray"
 import { IMPORTER_INVALID_FILE_FORMAT } from "."
+import { cloneDeep } from "lodash-es"
 
 export const OPENAPI_DEREF_ERROR = "openapi/deref_error" as const
 
@@ -82,6 +85,27 @@ const parseOpenAPIParams = (params: OpenAPIParamsType[]): HoppRESTParam[] =>
     )
   )
 
+const parseOpenAPIVariables = (
+  variables: OpenAPIParamsType[]
+): HoppRESTRequestVariable[] =>
+  pipe(
+    variables,
+
+    A.filterMap(
+      flow(
+        O.fromPredicate((param) => param.in === "path"),
+        O.map(
+          (param) =>
+            <HoppRESTRequestVariable>{
+              key: param.name,
+              value: "", // TODO: Can we do anything more ? (parse default values maybe)
+              active: true,
+            }
+        )
+      )
+    )
+  )
+
 const parseOpenAPIHeaders = (params: OpenAPIParamsType[]): HoppRESTHeader[] =>
   pipe(
     params,
@@ -558,26 +582,42 @@ const convertPathToHoppReqs = (
           ? openAPIUrl + openAPIPath.slice(1)
           : openAPIUrl + openAPIPath
 
-      return makeRESTRequest({
+      const res: {
-        name: info.operationId ?? info.summary ?? "Untitled Request",
+        request: HoppRESTRequest
-        method: method.toUpperCase(),
+        metadata: {
-        endpoint,
+          tags: string[]
+        }
+      } = {
+        request: makeRESTRequest({
+          name: info.operationId ?? info.summary ?? "Untitled Request",
+          method: method.toUpperCase(),
+          endpoint,
 
-        // We don't need to worry about reference types as the Dereferencing pass should remove them
+          // We don't need to worry about reference types as the Dereferencing pass should remove them
-        params: parseOpenAPIParams(
+          params: parseOpenAPIParams(
-          (info.parameters as OpenAPIParamsType[] | undefined) ?? []
+            (info.parameters as OpenAPIParamsType[] | undefined) ?? []
-        ),
+          ),
-        headers: parseOpenAPIHeaders(
+          headers: parseOpenAPIHeaders(
-          (info.parameters as OpenAPIParamsType[] | undefined) ?? []
+            (info.parameters as OpenAPIParamsType[] | undefined) ?? []
-        ),
+          ),
 
-        auth: parseOpenAPIAuth(doc, info),
+          auth: parseOpenAPIAuth(doc, info),
 
-        body: parseOpenAPIBody(doc, info),
+          body: parseOpenAPIBody(doc, info),
 
-        preRequestScript: "",
+          preRequestScript: "",
-        testScript: "",
+          testScript: "",
-      })
+
+          requestVariables: parseOpenAPIVariables(
+            (info.parameters as OpenAPIParamsType[] | undefined) ?? []
+          ),
+        }),
+        metadata: {
+          tags: info.tags ?? [],
+        },
+      }
+
+      return res
     }),
 
     // Disable Readonly
@@ -596,10 +636,38 @@ const convertOpenApiDocsToHopp = (
       )
       .flat()
 
+    const requestsByTags: Record<string, Array<HoppRESTRequest>> = {}
+    const requestsWithoutTags: Array<HoppRESTRequest> = []
+
+    paths.forEach(({ metadata, request }) => {
+      const tags = metadata.tags
+
+      if (tags.length === 0) {
+        requestsWithoutTags.push(request)
+        return
+      }
+
+      for (const tag of tags) {
+        if (!requestsByTags[tag]) {
+          requestsByTags[tag] = []
+        }
+
+        requestsByTags[tag].push(cloneDeep(request))
+      }
+    })
+
     return makeCollection({
       name,
-      folders: [],
+      folders: Object.entries(requestsByTags).map(([name, paths]) =>
-      requests: paths,
+        makeCollection({
+          name,
+          requests: paths,
+          folders: [],
+          auth: { authType: "inherit", authActive: true },
+          headers: [],
+        })
+      ),
+      requests: requestsWithoutTags,
       auth: { authType: "inherit", authActive: true },
       headers: [],
     })

packages/hoppscotch-common/src/helpers/import-export/import/postman.ts

@@ -5,6 +5,7 @@ import {
   QueryParam,
   RequestAuthDefinition,
   VariableDefinition,
+  Variable,
 } from "postman-collection"
 import {
   HoppRESTAuth,
@@ -18,6 +19,7 @@ import {
   ValidContentTypes,
   knownContentTypes,
   FormDataKeyValue,
+  HoppRESTRequestVariable,
 } from "@hoppscotch/data"
 import { pipe, flow } from "fp-ts/function"
 import * as S from "fp-ts/string"
@@ -91,6 +93,25 @@ const getHoppReqParams = (item: Item): HoppRESTParam[] => {
   )
 }
 
+const getHoppReqVariables = (item: Item) => {
+  return pipe(
+    item.request.url.variables.all(),
+    A.filter(
+      (variable): variable is Variable =>
+        variable.key !== undefined &&
+        variable.key !== null &&
+        variable.key.length > 0
+    ),
+    A.map((variable) => {
+      return <HoppRESTRequestVariable>{
+        key: replacePMVarTemplating(variable.key ?? ""),
+        value: replacePMVarTemplating(variable.value ?? ""),
+        active: !variable.disabled,
+      }
+    })
+  )
+}
+
 type PMRequestAuthDef<
   AuthType extends
     RequestAuthDefinition["type"] = RequestAuthDefinition["type"],
@@ -280,6 +301,7 @@ const getHoppRequest = (item: Item): HoppRESTRequest => {
     params: getHoppReqParams(item),
     auth: getHoppReqAuth(item),
     body: getHoppReqBody(item),
+    requestVariables: getHoppReqVariables(item),
 
     // TODO: Decide about this
     preRequestScript: "",

packages/hoppscotch-common/src/helpers/preRequest.ts

@@ -14,8 +14,8 @@ import { SecretEnvironmentService } from "~/services/secret-environment.service"
 const secretEnvironmentService = getService(SecretEnvironmentService)
 
 const unsecretEnvironments = (
-  global: Environment["variables"],
+  selected: Environment,
-  selected: Environment
+  global: Environment["variables"]
 ) => {
   const resolvedGlobalWithSecrets = global.map((globalVar, index) => {
     const secretVar = secretEnvironmentService.getSecretEnvironmentVariable(
@@ -65,8 +65,8 @@ const unsecretEnvironments = (
 
 export const getCombinedEnvVariables = () => {
   const reformedVars = unsecretEnvironments(
-    getGlobalVariables(),
+    getCurrentEnvironment(),
-    getCurrentEnvironment()
+    getGlobalVariables()
   )
   return {
     global: cloneDeep(reformedVars.global),

packages/hoppscotch-common/src/helpers/rest/default.ts

@@ -17,4 +17,5 @@ export const getDefaultRESTRequest = (): HoppRESTRequest => ({
     contentType: null,
     body: null,
   },
+  requestVariables: [],
 })

packages/hoppscotch-common/src/helpers/utils/EffectiveURL.ts

@@ -22,7 +22,6 @@ import {
 import { arrayFlatMap, arraySort } from "../functional/array"
 import { toFormData } from "../functional/formData"
 import { tupleWithSameKeysToRecord } from "../functional/record"
-import { getGlobalVariables } from "~/newstore/environments"
 
 export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
   /**
@@ -34,6 +33,7 @@ export interface EffectiveHoppRESTRequest extends HoppRESTRequest {
   effectiveFinalHeaders: { key: string; value: string }[]
   effectiveFinalParams: { key: string; value: string }[]
   effectiveFinalBody: FormData | string | null
+  effectiveFinalRequestVariables: { key: string; value: string }[]
 }
 
 /**
@@ -313,38 +313,53 @@ export function getEffectiveRESTRequest(
   request: HoppRESTRequest,
   environment: Environment
 ): EffectiveHoppRESTRequest {
-  const envVariables = [...environment.variables, ...getGlobalVariables()]
-
   const effectiveFinalHeaders = pipe(
-    getComputedHeaders(request, envVariables).map((h) => h.header),
+    getComputedHeaders(request, environment.variables).map((h) => h.header),
     A.concat(request.headers),
     A.filter((x) => x.active && x.key !== ""),
     A.map((x) => ({
       active: true,
-      key: parseTemplateString(x.key, envVariables),
+      key: parseTemplateString(x.key, environment.variables),
-      value: parseTemplateString(x.value, envVariables),
+      value: parseTemplateString(x.value, environment.variables),
     }))
   )
 
   const effectiveFinalParams = pipe(
-    getComputedParams(request, envVariables).map((p) => p.param),
+    getComputedParams(request, environment.variables).map((p) => p.param),
     A.concat(request.params),
     A.filter((x) => x.active && x.key !== ""),
     A.map((x) => ({
       active: true,
-      key: parseTemplateString(x.key, envVariables),
+      key: parseTemplateString(x.key, environment.variables),
-      value: parseTemplateString(x.value, envVariables),
+      value: parseTemplateString(x.value, environment.variables),
     }))
   )
 
-  const effectiveFinalBody = getFinalBodyFromRequest(request, envVariables)
+  const effectiveFinalRequestVariables = pipe(
+    request.requestVariables,
+    A.filter((x) => x.active && x.key !== ""),
+    A.map((x) => ({
+      active: true,
+      key: parseTemplateString(x.key, environment.variables),
+      value: parseTemplateString(x.value, environment.variables),
+    }))
+  )
+
+  const effectiveFinalBody = getFinalBodyFromRequest(
+    request,
+    environment.variables
+  )
 
   return {
     ...request,
-    effectiveFinalURL: parseTemplateString(request.endpoint, envVariables),
+    effectiveFinalURL: parseTemplateString(
+      request.endpoint,
+      environment.variables
+    ),
     effectiveFinalHeaders,
     effectiveFinalParams,
     effectiveFinalBody,
+    effectiveFinalRequestVariables,
   }
 }
 

packages/hoppscotch-common/src/modules/index.ts

@@ -34,7 +34,7 @@ export type HoppModule = {
     to: RouteLocationNormalized,
     from: RouteLocationNormalized,
     router: Router
-  ) => void
+  ) => void | Promise<void>
 
   /**
    * Called by the router to tell all the modules that a route navigation has completed

packages/hoppscotch-common/src/modules/router.ts

@@ -47,15 +47,21 @@ export default <HoppModule>{
       routes,
     })
 
-    router.beforeEach((to, from) => {
+    router.beforeEach(async (to, from) => {
       _isLoadingInitialRoute.value = isInitialRoute(from)
 
+      const onBeforeRouteChangePromises: Promise<any>[] = []
+
       HOPP_MODULES.forEach((mod) => {
-        mod.onBeforeRouteChange?.(to, from, router)
+        const res = mod.onBeforeRouteChange?.(to, from, router)
+        if (res) onBeforeRouteChangePromises.push(res)
       })
       platform.addedHoppModules?.forEach((mod) => {
-        mod.onBeforeRouteChange?.(to, from, router)
+        const res = mod.onBeforeRouteChange?.(to, from, router)
+        if (res) onBeforeRouteChangePromises.push(res)
       })
+
+      await Promise.all(onBeforeRouteChangePromises)
     })
 
     // Instead of this a better architecture is for the router

packages/hoppscotch-common/src/newstore/history.ts

@@ -353,6 +353,7 @@ executedResponses$.subscribe((res) => {
         params: res.req.params,
         preRequestScript: res.req.preRequestScript,
         testScript: res.req.testScript,
+        requestVariables: res.req.requestVariables,
         v: res.req.v,
       },
       responseMeta: {

packages/hoppscotch-common/src/newstore/settings.ts

@@ -38,6 +38,7 @@ export type SettingsDef = {
     httpUrlEncoded: boolean
     httpPreRequest: boolean
     httpTest: boolean
+    httpRequestVariables: boolean
     graphqlQuery: boolean
     graphqlResponseBody: boolean
     graphqlHeaders: boolean
@@ -79,6 +80,7 @@ export const getDefaultSettings = (): SettingsDef => ({
     httpUrlEncoded: true,
     httpPreRequest: true,
     httpTest: true,
+    httpRequestVariables: true,
     graphqlQuery: true,
     graphqlResponseBody: true,
     graphqlHeaders: false,

packages/hoppscotch-common/src/pages/enter.vue

@@ -44,4 +44,5 @@ export default defineComponent({
 <route lang="yaml">
 meta:
   layout: empty
+  onlyGuest: true
 </route>

packages/hoppscotch-common/src/pages/join-team.vue

@@ -71,7 +71,7 @@
           <h1 class="heading">
             {{
               t("team.join_team", {
-                team: inviteDetails.data.right.teamInvitation.team.name,
+                workspace: inviteDetails.data.right.teamInvitation.team.name,
               })
             }}
           </h1>
@@ -81,7 +81,7 @@
                 owner:
                   inviteDetails.data.right.teamInvitation.creator.displayName ??
                   inviteDetails.data.right.teamInvitation.creator.email,
-                team: inviteDetails.data.right.teamInvitation.team.name,
+                workspace: inviteDetails.data.right.teamInvitation.team.name,
               })
             }}
           </p>
@@ -89,7 +89,7 @@
             <HoppButtonPrimary
               :label="
                 t('team.join_team', {
-                  team: inviteDetails.data.right.teamInvitation.team.name,
+                  workspace: inviteDetails.data.right.teamInvitation.team.name,
                 })
               "
               :loading="loading"
@@ -109,14 +109,14 @@
           <h1 class="heading">
             {{
               t("team.joined_team", {
-                team: inviteDetails.data.right.teamInvitation.team.name,
+                workspace: inviteDetails.data.right.teamInvitation.team.name,
               })
             }}
           </h1>
           <p class="mt-2 text-secondaryLight">
             {{
               t("team.joined_team_description", {
-                team: inviteDetails.data.right.teamInvitation.team.name,
+                workspace: inviteDetails.data.right.teamInvitation.team.name,
               })
             }}
           </p>

packages/hoppscotch-common/src/services/inspection/inspectors/environment.inspector.ts

@@ -10,6 +10,7 @@ import { Ref, markRaw } from "vue"
 import IconPlusCircle from "~icons/lucide/plus-circle"
 import { HoppRESTRequest } from "@hoppscotch/data"
 import {
+  AggregateEnvironment,
   aggregateEnvsWithSecrets$,
   getCurrentEnvironment,
   getSelectedEnvironmentType,
@@ -18,6 +19,7 @@ import { invokeAction } from "~/helpers/actions"
 import { computed } from "vue"
 import { useStreamStatic } from "~/composables/stream"
 import { SecretEnvironmentService } from "~/services/secret-environment.service"
+import { RESTTabService } from "~/services/tab/rest"
 
 const HOPP_ENVIRONMENT_REGEX = /(<<[a-zA-Z0-9-_]+>>)/g
 
@@ -41,6 +43,7 @@ export class EnvironmentInspectorService extends Service implements Inspector {
 
   private readonly inspection = this.bind(InspectionService)
   private readonly secretEnvs = this.bind(SecretEnvironmentService)
+  private readonly restTabs = this.bind(RESTTabService)
 
   private aggregateEnvsWithSecrets = useStreamStatic(
     aggregateEnvsWithSecrets$,
@@ -68,7 +71,14 @@ export class EnvironmentInspectorService extends Service implements Inspector {
   ) => {
     const newErrors: InspectorResult[] = []
 
-    const envKeys = this.aggregateEnvsWithSecrets.value.map((e) => e.key)
+    const currentTab = this.restTabs.currentActiveTab.value
+
+    const environmentVariables = [
+      ...currentTab.document.request.requestVariables,
+      ...this.aggregateEnvsWithSecrets.value,
+    ]
+
+    const envKeys = environmentVariables.map((e) => e.key)
 
     target.forEach((element, index) => {
       if (isENVInString(element)) {
@@ -124,6 +134,31 @@ export class EnvironmentInspectorService extends Service implements Inspector {
     return newErrors
   }
 
+  /**
+   * Transforms the environment list to a list with unique keys with value
+   * @param envs The environment list to be transformed
+   * @returns The transformed environment list with keys with value
+   */
+  private filterNonEmptyEnvironmentVariables = (
+    envs: AggregateEnvironment[]
+  ): AggregateEnvironment[] => {
+    const envsMap = new Map<string, AggregateEnvironment>()
+
+    envs.forEach((env) => {
+      if (envsMap.has(env.key)) {
+        const existingEnv = envsMap.get(env.key)
+
+        if (existingEnv?.value === "" && env.value !== "") {
+          envsMap.set(env.key, env)
+        }
+      } else {
+        envsMap.set(env.key, env)
+      }
+    })
+
+    return Array.from(envsMap.values())
+  }
+
   /**
    * Checks if the environment variables in the target array are empty
    * @param target The target array to validate
@@ -145,7 +180,19 @@ export class EnvironmentInspectorService extends Service implements Inspector {
             const formattedExEnv = exEnv.slice(2, -2)
             const currentSelectedEnvironment = getCurrentEnvironment()
 
-            this.aggregateEnvsWithSecrets.value.forEach((env) => {
+            const currentTab = this.restTabs.currentActiveTab.value
+
+            const environmentVariables =
+              this.filterNonEmptyEnvironmentVariables([
+                ...currentTab.document.request.requestVariables.map((env) => ({
+                  ...env,
+                  secret: false,
+                  sourceEnv: "RequestVariable",
+                })),
+                ...this.aggregateEnvsWithSecrets.value,
+              ])
+
+            environmentVariables.forEach((env) => {
               const hasSecretEnv = this.secretEnvs.hasSecretValue(
                 env.sourceEnv !== "Global"
                   ? currentSelectedEnvironment.id
@@ -199,14 +246,19 @@ export class EnvironmentInspectorService extends Service implements Inspector {
                         "inspections.environment.add_environment_value"
                       ),
                       apply: () => {
-                        invokeAction(invokeActionType, {
+                        if (env.sourceEnv === "RequestVariable") {
-                          envName:
+                          currentTab.document.optionTabPreference =
-                            env.sourceEnv !== "Global"
+                            "requestVariables"
-                              ? currentSelectedEnvironment.name
+                        } else {
-                              : "Global",
+                          invokeAction(invokeActionType, {
-                          variableName: formattedExEnv,
+                            envName:
-                          isSecret: env.secret,
+                              env.sourceEnv === "Global"
-                        })
+                                ? "Global"
+                                : currentSelectedEnvironment.name,
+                            variableName: formattedExEnv,
+                            isSecret: env.secret,
+                          })
+                        }
                       },
                     },
                     severity: 2,

packages/hoppscotch-common/src/services/persistence/__tests__/__mocks__/index.ts

@@ -25,7 +25,7 @@ export const REST_COLLECTIONS_MOCK: HoppCollection[] = [
     folders: [],
     requests: [
       {
-        v: "1",
+        v: "2",
         endpoint: "https://echo.hoppscotch.io",
         name: "Echo test",
         params: [],
@@ -35,6 +35,7 @@ export const REST_COLLECTIONS_MOCK: HoppCollection[] = [
         preRequestScript: "",
         testScript: "",
         body: { contentType: null, body: null },
+        requestVariables: [],
       },
     ],
     auth: { authType: "none", authActive: true },
@@ -136,7 +137,8 @@ export const REST_HISTORY_MOCK: RESTHistoryEntry[] = [
       params: [],
       preRequestScript: "",
       testScript: "",
-      v: "1",
+      requestVariables: [],
+      v: "2",
     },
     responseMeta: { duration: 807, statusCode: 200 },
     star: false,
@@ -192,7 +194,7 @@ export const REST_TAB_STATE_MOCK: PersistableTabState<HoppRESTDocument> = {
       tabID: "e6e8d800-caa8-44a2-a6a6-b4765a3167aa",
       doc: {
         request: {
-          v: "1",
+          v: "2",
           endpoint: "https://echo.hoppscotch.io",
           name: "Echo test",
           params: [],
@@ -202,6 +204,7 @@ export const REST_TAB_STATE_MOCK: PersistableTabState<HoppRESTDocument> = {
           preRequestScript: "",
           testScript: "",
           body: { contentType: null, body: null },
+          requestVariables: [],
         },
         isDirty: false,
         saveContext: {

packages/hoppscotch-common/src/services/persistence/validation-schemas/index.ts

@@ -48,21 +48,22 @@ const SettingsDefSchema = z.object({
 
   WRAP_LINES: z.optional(
     z.object({
-      httpRequestBody: z.boolean(),
+      httpRequestBody: z.boolean().catch(true),
-      httpResponseBody: z.boolean(),
+      httpResponseBody: z.boolean().catch(true),
-      httpHeaders: z.boolean(),
+      httpHeaders: z.boolean().catch(true),
-      httpParams: z.boolean(),
+      httpParams: z.boolean().catch(true),
-      httpUrlEncoded: z.boolean(),
+      httpUrlEncoded: z.boolean().catch(true),
-      httpPreRequest: z.boolean(),
+      httpPreRequest: z.boolean().catch(true),
-      httpTest: z.boolean(),
+      httpTest: z.boolean().catch(true),
-      graphqlQuery: z.boolean(),
+      httpRequestVariables: z.boolean().catch(true),
-      graphqlResponseBody: z.boolean(),
+      graphqlQuery: z.boolean().catch(true),
-      graphqlHeaders: z.boolean(),
+      graphqlResponseBody: z.boolean().catch(true),
-      graphqlVariables: z.boolean(),
+      graphqlHeaders: z.boolean().catch(false),
-      graphqlSchema: z.boolean(),
+      graphqlVariables: z.boolean().catch(false),
-      importCurl: z.boolean(),
+      graphqlSchema: z.boolean().catch(true),
-      codeGen: z.boolean(),
+      importCurl: z.boolean().catch(true),
-      cookie: z.boolean(),
+      codeGen: z.boolean().catch(true),
+      cookie: z.boolean().catch(true),
     })
   ),
 })
@@ -514,6 +515,7 @@ const validRestOperations = [
   "authorization",
   "preRequestScript",
   "tests",
+  "requestVariables",
 ] as const
 
 export const REST_TAB_STATE_SCHEMA = z

packages/hoppscotch-data/package.json

@@ -34,16 +34,16 @@
   },
   "homepage": "https://github.com/hoppscotch/hoppscotch#readme",
   "devDependencies": {
-    "@types/lodash": "^4.14.200",
+    "@types/lodash": "4.14.200",
-    "typescript": "^5.2.2",
+    "typescript": "5.2.2",
-    "vite": "^4.5.0"
+    "vite": "4.5.0"
   },
   "dependencies": {
-    "fp-ts": "^2.16.1",
+    "fp-ts": "2.16.1",
-    "io-ts": "^2.2.20",
+    "io-ts": "2.2.20",
-    "lodash": "^4.17.21",
+    "lodash": "4.17.21",
-    "parser-ts": "^0.7.0",
+    "parser-ts": "0.7.0",
-    "verzod": "^0.2.2",
+    "verzod": "0.2.2",
-    "zod": "^3.22.4"
+    "zod": "3.22.4"
   }
-}
+}

packages/hoppscotch-data/src/collection/index.ts

@@ -52,8 +52,6 @@ export function makeCollection(x: Omit<HoppCollection, "v">): HoppCollection {
  * @returns The proper new collection format
  */
 export function translateToNewRESTCollection(x: any): HoppCollection {
-  if (x.v && x.v === CollectionSchemaVersion) return x
-
   // Legacy
   const name = x.name ?? "Untitled"
   const folders = (x.folders ?? []).map(translateToNewRESTCollection)
@@ -81,8 +79,6 @@ export function translateToNewRESTCollection(x: any): HoppCollection {
  * @returns The proper new collection format
  */
 export function translateToNewGQLCollection(x: any): HoppCollection {
-  if (x.v && x.v === CollectionSchemaVersion) return x
-
   // Legacy
   const name = x.name ?? "Untitled"
   const folders = (x.folders ?? []).map(translateToNewGQLCollection)

packages/hoppscotch-data/src/rest/index.ts

@@ -3,6 +3,7 @@ import * as S from "fp-ts/string"
 import cloneDeep from "lodash/cloneDeep"
 import V0_VERSION from "./v/0"
 import V1_VERSION from "./v/1"
+import V2_VERSION from "./v/2"
 import { createVersionedEntity, InferredEntity } from "verzod"
 import { lodashIsEqualEq, mapThenEq, undefinedEq } from "../utils/eq"
 import {
@@ -11,6 +12,7 @@ import {
   HoppRESTHeaders,
   HoppRESTParams,
 } from "./v/1"
+import { HoppRESTRequestVariables } from "./v/2"
 import { z } from "zod"
 
 export * from "./content-types"
@@ -28,16 +30,19 @@ export {
   HoppRESTHeaders,
 } from "./v/1"
 
+export { HoppRESTRequestVariables } from "./v/2"
+
 const versionedObject = z.object({
   // v is a stringified number
   v: z.string().regex(/^\d+$/).transform(Number),
 })
 
 export const HoppRESTRequest = createVersionedEntity({
-  latestVersion: 1,
+  latestVersion: 2,
   versionMap: {
     0: V0_VERSION,
     1: V1_VERSION,
+    2: V2_VERSION,
   },
   getVersion(data) {
     // For V1 onwards we have the v string storing the number
@@ -73,12 +78,18 @@ const HoppRESTRequestEq = Eq.struct<HoppRESTRequest>({
   name: S.Eq,
   preRequestScript: S.Eq,
   testScript: S.Eq,
+  requestVariables: mapThenEq(
+    (arr) => arr.filter((v: any) => v.key !== "" && v.value !== ""),
+    lodashIsEqualEq
+  ),
 })
 
-export const RESTReqSchemaVersion = "1"
+export const RESTReqSchemaVersion = "2"
 
 export type HoppRESTParam = HoppRESTRequest["params"][number]
 export type HoppRESTHeader = HoppRESTRequest["headers"][number]
+export type HoppRESTRequestVariable =
+  HoppRESTRequest["requestVariables"][number]
 
 export const isEqualHoppRESTRequest = HoppRESTRequestEq.equals
 
@@ -144,6 +155,14 @@ export function safelyExtractRESTRequest(
         req.headers = result.data
       }
     }
+
+    if ("requestVariables" in x) {
+      const result = HoppRESTRequestVariables.safeParse(x.requestVariables)
+
+      if (result.success) {
+        req.requestVariables = result.data
+      }
+    }
   }
 
   return req
@@ -160,7 +179,7 @@ export function makeRESTRequest(
 
 export function getDefaultRESTRequest(): HoppRESTRequest {
   return {
-    v: "1",
+    v: "2",
     endpoint: "https://echo.hoppscotch.io",
     name: "Untitled",
     params: [],
@@ -176,6 +195,7 @@ export function getDefaultRESTRequest(): HoppRESTRequest {
       contentType: null,
       body: null,
     },
+    requestVariables: [],
   }
 }
 

packages/hoppscotch-data/src/rest/v/1.ts

@@ -141,7 +141,7 @@ export const HoppRESTHeaders = z.array(
 
 export type HoppRESTHeaders = z.infer<typeof HoppRESTHeaders>
 
-const V1_SCHEMA = z.object({
+export const V1_SCHEMA = z.object({
   v: z.literal("1"),
   id: z.optional(z.string()), // Firebase Firestore ID
 
@@ -158,7 +158,7 @@ const V1_SCHEMA = z.object({
   body: HoppRESTReqBody,
 })
 
-function parseRequestBody(
+export function parseRequestBody(
   x: z.infer<typeof V0_SCHEMA>
 ): z.infer<typeof V1_SCHEMA>["body"] {
   return {

packages/hoppscotch-data/src/rest/v/2.ts

@@ -0,0 +1,36 @@
+import { defineVersion } from "verzod"
+import { z } from "zod"
+import {
+  HoppRESTAuth,
+  HoppRESTHeaders,
+  HoppRESTParams,
+  HoppRESTReqBody,
+} from "./1"
+import { V1_SCHEMA } from "./1"
+
+export const HoppRESTRequestVariables = z.array(
+  z.object({
+    key: z.string().catch(""),
+    value: z.string().catch(""),
+    active: z.boolean().catch(true),
+  })
+)
+
+export type HoppRESTRequestVariables = z.infer<typeof HoppRESTRequestVariables>
+
+const V2_SCHEMA = V1_SCHEMA.extend({
+  v: z.literal("2"),
+  requestVariables: HoppRESTRequestVariables,
+})
+
+export default defineVersion({
+  initial: false,
+  schema: V2_SCHEMA,
+  up(old: z.infer<typeof V1_SCHEMA>) {
+    return {
+      ...old,
+      v: "2",
+      requestVariables: [],
+    } as z.infer<typeof V2_SCHEMA>
+  },
+})

packages/hoppscotch-js-sandbox/package.json

@@ -52,27 +52,27 @@
   "license": "MIT",
   "dependencies": {
     "@hoppscotch/data": "workspace:^",
-    "@types/lodash-es": "^4.17.12",
+    "@types/lodash-es": "4.17.12",
-    "fp-ts": "^2.11.10",
+    "fp-ts": "2.12.1",
-    "lodash": "^4.17.21",
+    "lodash": "4.17.21",
-    "lodash-es": "^4.17.21"
+    "lodash-es": "4.17.21"
   },
   "devDependencies": {
-    "@digitak/esrun": "^3.1.2",
+    "@digitak/esrun": "3.2.8",
-    "@relmify/jest-fp-ts": "^2.0.1",
+    "@relmify/jest-fp-ts": "2.0.2",
-    "@types/jest": "^27.4.1",
+    "@types/jest": "27.5.2",
-    "@types/lodash": "^4.14.181",
+    "@types/lodash": "4.14.182",
-    "@types/node": "^17.0.24",
+    "@types/node": "17.0.45",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/eslint-plugin": "5.30.6",
-    "@typescript-eslint/parser": "^5.19.0",
+    "@typescript-eslint/parser": "5.30.6",
-    "eslint": "^8.13.0",
+    "eslint": "8.19.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "8.6.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "4.2.1",
-    "io-ts": "^2.2.16",
+    "io-ts": "2.2.16",
-    "jest": "^27.5.1",
+    "jest": "27.5.1",
-    "prettier": "^2.8.4",
+    "prettier": "2.8.4",
-    "ts-jest": "^27.1.4",
+    "ts-jest": "27.1.5",
-    "typescript": "^4.6.3",
+    "typescript": "4.9.5",
-    "vite": "^5.0.4"
+    "vite": "5.0.5"
   }
-}
+}

packages/hoppscotch-selfhost-desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-desktop",
   "private": true,
-  "version": "2023.12.6",
+  "version": "2024.3.0",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",
@@ -13,69 +13,69 @@
     "gql-codegen": "graphql-codegen --require dotenv/config --config gql-codegen.yml dotenv_config_path=\"../../.env\""
   },
   "dependencies": {
-    "@fontsource-variable/inter": "^5.0.5",
+    "@fontsource-variable/inter": "5.0.15",
-    "@fontsource-variable/material-symbols-rounded": "^5.0.5",
+    "@fontsource-variable/material-symbols-rounded": "5.0.16",
-    "@fontsource-variable/roboto-mono": "^5.0.6",
+    "@fontsource-variable/roboto-mono": "5.0.16",
     "@hoppscotch/common": "workspace:^",
-    "@platform/auth": "^0.1.106",
+    "@platform/auth": "0.1.106",
-    "@tauri-apps/api": "^1.3.0",
+    "@tauri-apps/api": "1.5.1",
-    "@tauri-apps/cli": "^1.3.0",
+    "@tauri-apps/cli": "1.5.6",
-    "@vueuse/core": "^10.4.1",
+    "@vueuse/core": "10.5.0",
-    "axios": "^0.21.4",
+    "axios": "0.21.4",
-    "buffer": "^6.0.3",
+    "buffer": "6.0.3",
-    "dioc": "^1.0.1",
+    "dioc": "1.0.1",
     "environments.api": "link:@platform/environments/environments.api",
     "event": "link:@tauri-apps/api/event",
-    "fp-ts": "^2.16.0",
+    "fp-ts": "2.16.1",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "4.17.21",
-    "process": "^0.11.10",
+    "process": "0.11.10",
-    "rxjs": "^7.8.1",
+    "rxjs": "7.8.1",
     "shell": "link:@tauri-apps/api/shell",
-    "stream-browserify": "^3.0.0",
+    "stream-browserify": "3.0.0",
     "tauri": "link:@tauri-apps/api/tauri",
-    "tauri-plugin-store-api": "github:tauri-apps/tauri-plugin-store#v1",
+    "tauri-plugin-store-api": "0.0.0",
-    "util": "^0.12.4",
+    "util": "0.12.5",
-    "vue": "^3.2.45",
+    "vue": "3.3.9",
-    "workbox-window": "^6.5.4"
+    "workbox-window": "6.6.0"
   },
   "devDependencies": {
-    "@graphql-codegen/add": "^5.0.0",
+    "@graphql-codegen/add": "5.0.0",
-    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/cli": "5.0.0",
-    "@graphql-codegen/typed-document-node": "^5.0.1",
+    "@graphql-codegen/typed-document-node": "5.0.1",
-    "@graphql-codegen/typescript": "^4.0.1",
+    "@graphql-codegen/typescript": "4.0.1",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
+    "@graphql-codegen/typescript-operations": "4.0.1",
-    "@graphql-codegen/typescript-urql-graphcache": "^2.4.5",
+    "@graphql-codegen/typescript-urql-graphcache": "2.4.5",
-    "@graphql-codegen/urql-introspection": "^2.2.1",
+    "@graphql-codegen/urql-introspection": "2.2.1",
-    "@graphql-typed-document-node/core": "^3.2.0",
+    "@graphql-typed-document-node/core": "3.2.0",
-    "@intlify/vite-plugin-vue-i18n": "^6.0.1",
+    "@intlify/vite-plugin-vue-i18n": "6.0.1",
-    "@rushstack/eslint-patch": "^1.1.4",
+    "@rushstack/eslint-patch": "1.3.3",
-    "@types/lodash-es": "^4.17.9",
+    "@types/lodash-es": "4.17.10",
-    "@types/node": "^18.7.10",
+    "@types/node": "18.18.8",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "^5.19.0",
+    "@typescript-eslint/parser": "5.62.0",
-    "@vitejs/plugin-legacy": "^2.3.0",
+    "@vitejs/plugin-legacy": "2.3.0",
-    "@vitejs/plugin-vue": "^4.0.0",
+    "@vitejs/plugin-vue": "4.3.1",
-    "@vue/eslint-config-typescript": "^11.0.1",
+    "@vue/eslint-config-typescript": "11.0.3",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "10.4.16",
-    "cross-env": "^7.0.3",
+    "cross-env": "7.0.3",
-    "eslint": "^8.28.0",
+    "eslint": "8.47.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-vue": "^9.5.1",
+    "eslint-plugin-vue": "9.17.0",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all": "4.1.5",
-    "postcss": "^8.4.23",
+    "postcss": "8.4.32",
-    "tailwindcss": "^3.3.6",
+    "tailwindcss": "3.3.6",
-    "typescript": "^4.9.5",
+    "typescript": "4.9.5",
-    "unplugin-fonts": "^1.1.1",
+    "unplugin-fonts": "1.1.1",
-    "unplugin-icons": "^0.14.9",
+    "unplugin-icons": "0.14.9",
-    "unplugin-vue-components": "^0.21.0",
+    "unplugin-vue-components": "0.21.0",
-    "vite": "^4.2.1",
+    "vite": "4.5.0",
-    "vite-plugin-html-config": "^1.0.10",
+    "vite-plugin-html-config": "1.0.11",
-    "vite-plugin-inspect": "^0.7.4",
+    "vite-plugin-inspect": "0.7.38",
-    "vite-plugin-pages": "^0.26.0",
+    "vite-plugin-pages": "0.26.0",
-    "vite-plugin-pages-sitemap": "^1.4.0",
+    "vite-plugin-pages-sitemap": "1.6.1",
-    "vite-plugin-pwa": "^0.13.1",
+    "vite-plugin-pwa": "0.13.1",
-    "vite-plugin-static-copy": "^0.12.0",
+    "vite-plugin-static-copy": "0.12.0",
-    "vite-plugin-vue-layouts": "^0.7.0",
+    "vite-plugin-vue-layouts": "0.7.0",
-    "vue-tsc": "^1.0.11"
+    "vue-tsc": "1.8.8"
   }
-}
+}

packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock

@@ -1260,7 +1260,7 @@ dependencies = [
 
 [[package]]
 name = "hoppscotch-desktop"
-version = "23.12.6"
+version = "24.3.0"
 dependencies = [
  "cocoa 0.25.0",
  "hex_color",

packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoppscotch-desktop"
-version = "23.12.6"
+version = "24.3.0"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

packages/hoppscotch-selfhost-desktop/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Hoppscotch",
-    "version": "23.12.6"
+    "version": "24.3.0"
   },
   "tauri": {
     "allowlist": {

packages/hoppscotch-selfhost-desktop/src/platform/collections/collections.platform.ts

@@ -112,10 +112,15 @@ function exportedCollectionToHoppCollection(
       folders: restCollection.folders.map((folder) =>
         exportedCollectionToHoppCollection(folder, collectionType)
       ),
-      requests: restCollection.requests.map(
+      requests: restCollection.requests.map((request) => {
-        ({
+        const requestParsedResult = HoppRESTRequest.safeParse(request)
-          id,
+        if (requestParsedResult.type === "ok") {
+          return requestParsedResult.value
+        }
+
+        const {
           v,
+          id,
           auth,
           body,
           endpoint,
@@ -125,20 +130,23 @@ function exportedCollectionToHoppCollection(
           params,
           preRequestScript,
           testScript,
-        }) => ({
+          requestVariables,
-          id,
+        } = request
+        return {
           v,
-          auth,
+          id,
-          body,
-          endpoint,
-          headers,
-          method,
           name,
+          endpoint,
+          method,
           params,
+          requestVariables: requestVariables,
+          auth,
+          headers,
+          body,
           preRequestScript,
           testScript,
-        })
+        }
-      ),
+      }),
     }
   } else {
     const gqlCollection = collection as ExportedUserCollectionGQL

packages/hoppscotch-selfhost-web/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hoppscotch/selfhost-web",
   "private": true,
-  "version": "2023.12.6",
+  "version": "2024.3.0",
   "type": "module",
   "scripts": {
     "dev:vite": "vite",
@@ -23,62 +23,62 @@
     "postinstall": "pnpm run gql-codegen"
   },
   "dependencies": {
-    "@fontsource-variable/inter": "^5.0.15",
+    "@fontsource-variable/inter": "5.0.15",
-    "@fontsource-variable/material-symbols-rounded": "^5.0.16",
+    "@fontsource-variable/material-symbols-rounded": "5.0.16",
-    "@fontsource-variable/roboto-mono": "^5.0.16",
+    "@fontsource-variable/roboto-mono": "5.0.16",
     "@hoppscotch/common": "workspace:^",
     "@hoppscotch/data": "workspace:^",
-    "@hoppscotch/ui": "^0.1.0",
+    "@hoppscotch/ui": "0.1.0",
-    "@import-meta-env/unplugin": "^0.4.10",
+    "@import-meta-env/unplugin": "0.4.10",
-    "axios": "^1.6.2",
+    "axios": "1.6.2",
-    "buffer": "^6.0.3",
+    "buffer": "6.0.3",
-    "fp-ts": "^2.16.1",
+    "fp-ts": "2.16.1",
-    "process": "^0.11.10",
+    "process": "0.11.10",
-    "rxjs": "^7.8.1",
+    "rxjs": "7.8.1",
-    "stream-browserify": "^3.0.0",
+    "stream-browserify": "3.0.0",
-    "util": "^0.12.5",
+    "util": "0.12.5",
-    "vue": "^3.3.8",
+    "vue": "3.3.9",
-    "workbox-window": "^7.0.0",
+    "workbox-window": "7.0.0",
-    "zod": "^3.22.4"
+    "zod": "3.22.4"
   },
   "devDependencies": {
-    "@graphql-codegen/add": "^5.0.0",
+    "@graphql-codegen/add": "5.0.0",
-    "@graphql-codegen/cli": "^5.0.0",
+    "@graphql-codegen/cli": "5.0.0",
-    "@graphql-codegen/typed-document-node": "^5.0.1",
+    "@graphql-codegen/typed-document-node": "5.0.1",
-    "@graphql-codegen/typescript": "^4.0.1",
+    "@graphql-codegen/typescript": "4.0.1",
-    "@graphql-codegen/typescript-operations": "^4.0.1",
+    "@graphql-codegen/typescript-operations": "4.0.1",
-    "@graphql-codegen/typescript-urql-graphcache": "^3.0.0",
+    "@graphql-codegen/typescript-urql-graphcache": "3.0.0",
-    "@graphql-codegen/urql-introspection": "^3.0.0",
+    "@graphql-codegen/urql-introspection": "3.0.0",
-    "@graphql-typed-document-node/core": "^3.2.0",
+    "@graphql-typed-document-node/core": "3.2.0",
-    "@intlify/vite-plugin-vue-i18n": "^7.0.0",
+    "@intlify/vite-plugin-vue-i18n": "7.0.0",
-    "@rushstack/eslint-patch": "^1.6.0",
+    "@rushstack/eslint-patch": "1.6.0",
-    "@typescript-eslint/eslint-plugin": "^6.12.0",
+    "@typescript-eslint/eslint-plugin": "6.13.2",
-    "@typescript-eslint/parser": "^6.12.0",
+    "@typescript-eslint/parser": "6.13.2",
-    "@vitejs/plugin-legacy": "^4.1.1",
+    "@vitejs/plugin-legacy": "4.1.1",
-    "@vitejs/plugin-vue": "^4.5.0",
+    "@vitejs/plugin-vue": "4.5.1",
-    "@vue/eslint-config-typescript": "^12.0.0",
+    "@vue/eslint-config-typescript": "12.0.0",
-    "autoprefixer": "^10.4.14",
+    "autoprefixer": "10.4.16",
-    "cross-env": "^7.0.3",
+    "cross-env": "7.0.3",
-    "eslint": "^8.54.0",
+    "eslint": "8.55.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-prettier": "5.0.1",
-    "eslint-plugin-vue": "^9.18.1",
+    "eslint-plugin-vue": "9.19.2",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all": "4.1.5",
-    "postcss": "^8.4.23",
+    "postcss": "8.4.31",
-    "prettier-plugin-tailwindcss": "^0.5.7",
+    "prettier-plugin-tailwindcss": "0.5.7",
-    "tailwindcss": "^3.3.2",
+    "tailwindcss": "3.3.5",
-    "typescript": "^5.3.2",
+    "typescript": "5.3.2",
-    "unplugin-fonts": "^1.1.1",
+    "unplugin-fonts": "1.1.1",
-    "unplugin-icons": "^0.17.4",
+    "unplugin-icons": "0.17.4",
-    "unplugin-vue-components": "^0.25.2",
+    "unplugin-vue-components": "0.25.2",
-    "vite": "^4.5.0",
+    "vite": "4.5.0",
-    "vite-plugin-fonts": "^0.7.0",
+    "vite-plugin-fonts": "0.7.0",
-    "vite-plugin-html-config": "^1.0.11",
+    "vite-plugin-html-config": "1.0.11",
-    "vite-plugin-inspect": "^0.7.42",
+    "vite-plugin-inspect": "0.7.42",
-    "vite-plugin-pages": "^0.31.0",
+    "vite-plugin-pages": "0.31.0",
-    "vite-plugin-pages-sitemap": "^1.6.1",
+    "vite-plugin-pages-sitemap": "1.6.1",
-    "vite-plugin-pwa": "^0.17.0",
+    "vite-plugin-pwa": "0.17.3",
-    "vite-plugin-static-copy": "^0.17.1",
+    "vite-plugin-static-copy": "0.17.1",
-    "vite-plugin-vue-layouts": "^0.8.0",
+    "vite-plugin-vue-layouts": "0.8.0",
-    "vue-tsc": "^1.8.22"
+    "vue-tsc": "1.8.24"
   }
-}
+}

packages/hoppscotch-selfhost-web/src/platform/collections/collections.platform.ts

@@ -120,10 +120,15 @@ function exportedCollectionToHoppCollection(
       folders: restCollection.folders.map((folder) =>
         exportedCollectionToHoppCollection(folder, collectionType)
       ),
-      requests: restCollection.requests.map(
+      requests: restCollection.requests.map((request) => {
-        ({
+        const requestParsedResult = HoppRESTRequest.safeParse(request)
-          id,
+        if (requestParsedResult.type === "ok") {
+          return requestParsedResult.value
+        }
+
+        const {
           v,
+          id,
           auth,
           body,
           endpoint,
@@ -133,20 +138,23 @@ function exportedCollectionToHoppCollection(
           params,
           preRequestScript,
           testScript,
-        }) => ({
+          requestVariables,
-          id,
+        } = request
+        return {
           v,
-          auth,
+          id,
-          body,
-          endpoint,
-          headers,
-          method,
           name,
+          endpoint,
+          method,
           params,
+          requestVariables: requestVariables,
+          auth,
+          headers,
+          body,
           preRequestScript,
           testScript,
-        })
+        }
-      ),
+      }),
       auth: data.auth,
       headers: data.headers,
     }

packages/hoppscotch-sh-admin/locales/en.json

@@ -10,9 +10,12 @@
   },
   "configs": {
     "auth_providers": {
+      "callback_url": "CALLBACK URL",
       "client_id": "CLIENT ID",
       "client_secret": "CLIENT SECRET",
       "description": "Configure authentication providers for your server",
+      "scope": "SCOPE",
+      "tenant": "TENANT",
       "title": "Authentication Providers",
       "update_failure": "Failed to update authentication provider configurations!!"
     },

packages/hoppscotch-sh-admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hoppscotch-sh-admin",
   "private": true,
-  "version": "2023.12.6",
+  "version": "2024.3.0",
   "type": "module",
   "scripts": {
     "dev": "pnpm exec npm-run-all -p -l dev:*",
@@ -13,69 +13,69 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@fontsource-variable/inter": "^5.0.5",
+    "@fontsource-variable/inter": "5.0.5",
-    "@fontsource-variable/material-symbols-rounded": "^5.0.5",
+    "@fontsource-variable/material-symbols-rounded": "5.0.5",
-    "@fontsource-variable/roboto-mono": "^5.0.6",
+    "@fontsource-variable/roboto-mono": "5.0.6",
-    "@graphql-typed-document-node/core": "^3.1.1",
+    "@graphql-typed-document-node/core": "3.1.1",
-    "@hoppscotch/ui": "^0.1.0",
+    "@hoppscotch/ui": "0.1.0",
-    "@hoppscotch/vue-toasted": "^0.1.0",
+    "@hoppscotch/vue-toasted": "0.1.0",
-    "@intlify/unplugin-vue-i18n": "^1.2.0",
+    "@intlify/unplugin-vue-i18n": "1.2.0",
-    "@types/cors": "^2.8.13",
+    "@types/cors": "2.8.13",
-    "@types/express": "^4.17.15",
+    "@types/express": "4.17.16",
-    "@urql/exchange-auth": "^2.1.6",
+    "@urql/exchange-auth": "2.1.6",
-    "@urql/vue": "^1.1.2",
+    "@urql/vue": "1.1.2",
-    "@vueuse/core": "^9.10.0",
+    "@vueuse/core": "9.12.0",
-    "axios": "^0.21.4",
+    "axios": "0.21.4",
-    "cors": "^2.8.5",
+    "cors": "2.8.5",
-    "date-fns": "^2.29.3",
+    "date-fns": "2.29.3",
-    "express": "^4.18.2",
+    "express": "4.18.2",
-    "express-graphql": "^0.12.0",
+    "express-graphql": "0.12.0",
-    "fp-ts": "^2.13.1",
+    "fp-ts": "2.13.1",
-    "graphql": "^16.6.0",
+    "graphql": "16.6.0",
-    "io-ts": "^2.2.16",
+    "io-ts": "2.2.16",
-    "lodash-es": "^4.17.21",
+    "lodash-es": "4.17.21",
-    "postcss": "^8.4.23",
+    "postcss": "8.4.31",
-    "prettier-plugin-tailwindcss": "^0.5.6",
+    "prettier-plugin-tailwindcss": "0.5.7",
-    "rxjs": "^7.8.0",
+    "rxjs": "7.8.0",
-    "tailwindcss": "^3.3.5",
+    "tailwindcss": "3.3.5",
-    "tippy.js": "^6.3.7",
+    "tippy.js": "6.3.7",
-    "ts-node-dev": "^2.0.0",
+    "ts-node-dev": "2.0.0",
-    "unplugin-icons": "^0.14.9",
+    "unplugin-icons": "0.14.9",
-    "unplugin-vue-components": "^0.21.0",
+    "unplugin-vue-components": "0.21.0",
-    "vue": "^3.2.6",
+    "vue": "3.3.9",
-    "vue-i18n": "^9.2.2",
+    "vue-i18n": "9.2.2",
-    "vue-router": "4",
+    "vue-router": "4.1.0",
     "vue-tippy": "6.0.0-alpha.58"
   },
   "devDependencies": {
     "hoppscotch-backend": "workspace:^",
     "@graphql-codegen/cli": "3.0.0",
-    "@graphql-codegen/client-preset": "^2.0.0",
+    "@graphql-codegen/client-preset": "2.1.0",
     "@graphql-codegen/introspection": "3.0.0",
-    "@graphql-codegen/typed-document-node": "^2.3.1",
+    "@graphql-codegen/typed-document-node": "2.3.1",
     "@graphql-codegen/typescript": "3.0.0",
     "@graphql-codegen/typescript-document-nodes": "3.0.0",
     "@graphql-codegen/typescript-operations": "3.0.0",
     "@graphql-codegen/urql-introspection": "2.2.1",
-    "@import-meta-env/cli": "^0.6.3",
+    "@import-meta-env/cli": "0.6.3",
-    "@import-meta-env/unplugin": "^0.4.8",
+    "@import-meta-env/unplugin": "0.4.8",
-    "@types/lodash-es": "^4.17.12",
+    "@types/lodash-es": "4.17.12",
-    "@vitejs/plugin-vue": "^3.1.0",
+    "@vitejs/plugin-vue": "3.2.0",
-    "@vue/compiler-sfc": "^3.2.6",
+    "@vue/compiler-sfc": "3.2.45",
-    "dotenv": "^16.0.3",
+    "dotenv": "16.3.1",
-    "graphql-tag": "^2.12.6",
+    "graphql-tag": "2.12.6",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all": "4.1.5",
-    "sass": "^1.57.1",
+    "sass": "1.58.0",
-    "ts-node": "^10.9.1",
+    "ts-node": "10.9.1",
-    "typescript": "^4.9.3",
+    "typescript": "4.9.3",
-    "unplugin-fonts": "^1.0.3",
+    "unplugin-fonts": "1.0.3",
-    "vite": "^3.1.4",
+    "vite": "3.2.4",
-    "vite-plugin-pages": "^0.26.0",
+    "vite-plugin-pages": "0.26.0",
-    "vite-plugin-vue-layouts": "^0.7.0",
+    "vite-plugin-vue-layouts": "0.7.0",
-    "vue-tsc": "^0.3.0"
+    "vue-tsc": "0.3.0"
   },
   "prettier": {
     "singleQuote": true,
     "semi": true
   }
-}
+}

packages/hoppscotch-sh-admin/src/components.d.ts

@@ -17,13 +17,19 @@ declare module '@vue/runtime-core' {
     HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
     HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
     HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
+    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
     HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
     HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
     HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
     HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
+    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
     HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
+    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
+    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
+    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
     HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
+    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
     SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']
     SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default']

packages/hoppscotch-sh-admin/src/components/settings/AuthProvider.vue

@@ -35,25 +35,29 @@
               :key="field.key"
               class="mt-5"
             >
-              <label>{{ field.name }}</label>
+              <template
-              <span class="flex">
+                v-if="field.applicableProviders.includes(provider.name)"
-                <HoppSmartInput
+              >
-                  v-model="provider.fields[field.key]"
+                <label>{{ field.name }}</label>
-                  :type="
+                <span class="flex max-w-lg">
-                    isMasked(provider.name, field.key) ? 'password' : 'text'
+                  <HoppSmartInput
-                  "
+                    v-model="provider.fields[field.key as keyof typeof provider['fields']]"
-                  :disabled="isMasked(provider.name, field.key)"
+                    :type="
-                  :autofocus="false"
+                      isMasked(provider.name, field.key) ? 'password' : 'text'
-                  class="!my-2 !bg-primaryLight"
+                    "
-                />
+                    :disabled="isMasked(provider.name, field.key)"
-                <HoppButtonSecondary
+                    :autofocus="false"
-                  :icon="
+                    class="!my-2 !bg-primaryLight flex-1"
-                    isMasked(provider.name, field.key) ? IconEye : IconEyeOff
+                  />
-                  "
+                  <HoppButtonSecondary
-                  class="bg-primaryLight h-9 mt-2"
+                    :icon="
-                  @click="toggleMask(provider.name, field.key)"
+                      isMasked(provider.name, field.key) ? IconEye : IconEyeOff
-                />
+                    "
-              </span>
+                    class="bg-primaryLight h-9 mt-2"
+                    @click="toggleMask(provider.name, field.key)"
+                  />
+                </span>
+              </template>
             </div>
           </div>
         </div>
@@ -86,47 +90,76 @@ const workingConfigs = useVModel(props, 'config', emit);
 const capitalize = (text: string) =>
   text.charAt(0).toUpperCase() + text.slice(1);
 
-// Masking sensitive fields
+// Union type for all possible field keys
-type Field = {
+type ProviderFieldKeys = keyof ProviderFields;
+
+type ProviderFields = {
+  [Field in keyof Config['providers'][SsoAuthProviders]['fields']]: boolean;
+} & Partial<{ tenant: boolean }>;
+
+type ProviderFieldMetadata = {
   name: string;
-  key: keyof Config['providers']['google' | 'github' | 'microsoft']['fields'];
+  key: ProviderFieldKeys;
+  applicableProviders: SsoAuthProviders[];
 };
 
-const providerConfigFields = reactive<Field[]>([
+const providerConfigFields = <ProviderFieldMetadata[]>[
-  { name: t('configs.auth_providers.client_id'), key: 'client_id' },
+  {
-  { name: t('configs.auth_providers.client_secret'), key: 'client_secret' },
+    name: t('configs.auth_providers.client_id'),
-]);
+    key: 'client_id',
+    applicableProviders: ['google', 'github', 'microsoft'],
+  },
+  {
+    name: t('configs.auth_providers.client_secret'),
+    key: 'client_secret',
+    applicableProviders: ['google', 'github', 'microsoft'],
+  },
+  {
+    name: t('configs.auth_providers.callback_url'),
+    key: 'callback_url',
+    applicableProviders: ['google', 'github', 'microsoft'],
+  },
+  {
+    name: t('configs.auth_providers.scope'),
+    key: 'scope',
+    applicableProviders: ['google', 'github', 'microsoft'],
+  },
+  {
+    name: t('configs.auth_providers.tenant'),
+    key: 'tenant',
+    applicableProviders: ['microsoft'],
+  },
+];
 
-const maskState = reactive({
+const maskState = reactive<Record<SsoAuthProviders, ProviderFields>>({
   google: {
     client_id: true,
     client_secret: true,
+    callback_url: true,
+    scope: true,
   },
   github: {
     client_id: true,
     client_secret: true,
+    callback_url: true,
+    scope: true,
   },
   microsoft: {
     client_id: true,
     client_secret: true,
+    callback_url: true,
+    scope: true,
+    tenant: true,
   },
 });
 
 const toggleMask = (
   provider: SsoAuthProviders,
-  fieldKey: keyof Config['providers'][
+  fieldKey: ProviderFieldKeys
-    | 'google'
-    | 'github'
-    | 'microsoft']['fields']
 ) => {
   maskState[provider][fieldKey] = !maskState[provider][fieldKey];
 };
 
-const isMasked = (
+const isMasked = (provider: SsoAuthProviders, fieldKey: ProviderFieldKeys) =>
-  provider: SsoAuthProviders,
+  maskState[provider][fieldKey];
-  fieldKey: keyof Config['providers'][
-    | 'google'
-    | 'github'
-    | 'microsoft']['fields']
-) => maskState[provider][fieldKey];
 </script>

packages/hoppscotch-sh-admin/src/components/settings/SmtpConfiguration.vue

@@ -33,13 +33,13 @@
               class="mt-5"
             >
               <label>{{ field.name }}</label>
-              <span class="flex">
+              <span class="flex max-w-lg">
                 <HoppSmartInput
                   v-model="smtpConfigs.fields[field.key]"
                   :type="isMasked(field.key) ? 'password' : 'text'"
                   :disabled="isMasked(field.key)"
                   :autofocus="false"
-                  class="!my-2 !bg-primaryLight"
+                  class="!my-2 !bg-primaryLight flex-1"
                 />
                 <HoppButtonSecondary
                   :icon="isMasked(field.key) ? IconEye : IconEyeOff"

packages/hoppscotch-sh-admin/src/composables/useConfigHandler.ts

@@ -27,6 +27,8 @@ export type Config = {
       fields: {
         client_id: string;
         client_secret: string;
+        callback_url: string;
+        scope: string;
       };
     };
     github: {
@@ -35,6 +37,8 @@ export type Config = {
       fields: {
         client_id: string;
         client_secret: string;
+        callback_url: string;
+        scope: string;
       };
     };
     microsoft: {
@@ -43,6 +47,9 @@ export type Config = {
       fields: {
         client_id: string;
         client_secret: string;
+        callback_url: string;
+        scope: string;
+        tenant: string;
       };
     };
   };
@@ -86,10 +93,17 @@ export function useConfigHandler(updatedConfigs?: Config) {
       configNames: [
         'GOOGLE_CLIENT_ID',
         'GOOGLE_CLIENT_SECRET',
+        'GOOGLE_CALLBACK_URL',
+        'GOOGLE_SCOPE',
         'MICROSOFT_CLIENT_ID',
         'MICROSOFT_CLIENT_SECRET',
+        'MICROSOFT_CALLBACK_URL',
+        'MICROSOFT_SCOPE',
+        'MICROSOFT_TENANT',
         'GITHUB_CLIENT_ID',
         'GITHUB_CLIENT_SECRET',
+        'GITHUB_CALLBACK_URL',
+        'GITHUB_SCOPE',
         'MAILER_SMTP_URL',
         'MAILER_ADDRESS_FROM',
         'ALLOW_ANALYTICS_COLLECTION',
@@ -118,6 +132,9 @@ export function useConfigHandler(updatedConfigs?: Config) {
     await fetchInfraConfigs();
     await fetchAllowedAuthProviders();
 
+    const getFieldValue = (name: string) =>
+      infraConfigs.value.find((x) => x.name === name)?.value ?? '';
+
     // Transforming the fetched data into a Configs object
     currentConfigs.value = {
       providers: {
@@ -125,37 +142,31 @@ export function useConfigHandler(updatedConfigs?: Config) {
           name: 'google',
           enabled: allowedAuthProviders.value.includes('GOOGLE'),
           fields: {
-            client_id:
+            client_id: getFieldValue('GOOGLE_CLIENT_ID'),
-              infraConfigs.value.find((x) => x.name === 'GOOGLE_CLIENT_ID')
+            client_secret: getFieldValue('GOOGLE_CLIENT_SECRET'),
-                ?.value ?? '',
+            callback_url: getFieldValue('GOOGLE_CALLBACK_URL'),
-            client_secret:
+            scope: getFieldValue('GOOGLE_SCOPE'),
-              infraConfigs.value.find((x) => x.name === 'GOOGLE_CLIENT_SECRET')
-                ?.value ?? '',
           },
         },
         github: {
           name: 'github',
           enabled: allowedAuthProviders.value.includes('GITHUB'),
           fields: {
-            client_id:
+            client_id: getFieldValue('GITHUB_CLIENT_ID'),
-              infraConfigs.value.find((x) => x.name === 'GITHUB_CLIENT_ID')
+            client_secret: getFieldValue('GITHUB_CLIENT_SECRET'),
-                ?.value ?? '',
+            callback_url: getFieldValue('GITHUB_CALLBACK_URL'),
-            client_secret:
+            scope: getFieldValue('GITHUB_SCOPE'),
-              infraConfigs.value.find((x) => x.name === 'GITHUB_CLIENT_SECRET')
-                ?.value ?? '',
           },
         },
         microsoft: {
           name: 'microsoft',
           enabled: allowedAuthProviders.value.includes('MICROSOFT'),
           fields: {
-            client_id:
+            client_id: getFieldValue('MICROSOFT_CLIENT_ID'),
-              infraConfigs.value.find((x) => x.name === 'MICROSOFT_CLIENT_ID')
+            client_secret: getFieldValue('MICROSOFT_CLIENT_SECRET'),
-                ?.value ?? '',
+            callback_url: getFieldValue('MICROSOFT_CALLBACK_URL'),
-            client_secret:
+            scope: getFieldValue('MICROSOFT_SCOPE'),
-              infraConfigs.value.find(
+            tenant: getFieldValue('MICROSOFT_TENANT'),
-                (x) => x.name === 'MICROSOFT_CLIENT_SECRET'
-              )?.value ?? '',
           },
         },
       },
@@ -163,12 +174,8 @@ export function useConfigHandler(updatedConfigs?: Config) {
         name: 'email',
         enabled: allowedAuthProviders.value.includes('EMAIL'),
         fields: {
-          mailer_smtp_url:
+          mailer_smtp_url: getFieldValue('MAILER_SMTP_URL'),
-            infraConfigs.value.find((x) => x.name === 'MAILER_SMTP_URL')
+          mailer_from_address: getFieldValue('MAILER_ADDRESS_FROM'),
-              ?.value ?? '',
-          mailer_from_address:
-            infraConfigs.value.find((x) => x.name === 'MAILER_ADDRESS_FROM')
-              ?.value ?? '',
         },
       },
       dataSharingConfigs: {
@@ -184,7 +191,7 @@ export function useConfigHandler(updatedConfigs?: Config) {
     workingConfigs.value = cloneDeep(currentConfigs.value);
   });
 
-  // Trasforming the working configs back into the format required by the mutations
+  // Transforming the working configs back into the format required by the mutations
   const updatedInfraConfigs = computed(() => {
     let config: UpdatedConfigs[] = [
       {
@@ -202,13 +209,23 @@ export function useConfigHandler(updatedConfigs?: Config) {
         {
           name: 'GOOGLE_CLIENT_SECRET',
           value: updatedConfigs?.providers.google.fields.client_secret ?? '',
+        },
+        {
+          name: 'GOOGLE_CALLBACK_URL',
+          value: updatedConfigs?.providers.google.fields.callback_url ?? '',
+        },
+        {
+          name: 'GOOGLE_SCOPE',
+          value: updatedConfigs?.providers.google.fields.scope ?? '',
         }
       );
     } else {
       config = config.filter(
         (item) =>
           item.name !== 'GOOGLE_CLIENT_ID' &&
-          item.name !== 'GOOGLE_CLIENT_SECRET'
+          item.name !== 'GOOGLE_CLIENT_SECRET' &&
+          item.name !== 'GOOGLE_CALLBACK_URL' &&
+          item.name !== 'GOOGLE_SCOPE'
       );
     }
     if (updatedConfigs?.providers.microsoft.enabled) {
@@ -220,13 +237,28 @@ export function useConfigHandler(updatedConfigs?: Config) {
         {
           name: 'MICROSOFT_CLIENT_SECRET',
           value: updatedConfigs?.providers.microsoft.fields.client_secret ?? '',
+        },
+        {
+          name: 'MICROSOFT_CALLBACK_URL',
+          value: updatedConfigs?.providers.microsoft.fields.callback_url ?? '',
+        },
+        {
+          name: 'MICROSOFT_SCOPE',
+          value: updatedConfigs?.providers.microsoft.fields.scope ?? '',
+        },
+        {
+          name: 'MICROSOFT_TENANT',
+          value: updatedConfigs?.providers.microsoft.fields.tenant ?? '',
         }
       );
     } else {
       config = config.filter(
         (item) =>
           item.name !== 'MICROSOFT_CLIENT_ID' &&
-          item.name !== 'MICROSOFT_CLIENT_SECRET'
+          item.name !== 'MICROSOFT_CLIENT_SECRET' &&
+          item.name !== 'MICROSOFT_CALLBACK_URL' &&
+          item.name !== 'MICROSOFT_SCOPE' &&
+          item.name !== 'MICROSOFT_TENANT'
       );
     }
 
@@ -239,13 +271,23 @@ export function useConfigHandler(updatedConfigs?: Config) {
         {
           name: 'GITHUB_CLIENT_SECRET',
           value: updatedConfigs?.providers.github.fields.client_secret ?? '',
+        },
+        {
+          name: 'GITHUB_CALLBACK_URL',
+          value: updatedConfigs?.providers.github.fields.callback_url ?? '',
+        },
+        {
+          name: 'GITHUB_SCOPE',
+          value: updatedConfigs?.providers.github.fields.scope ?? '',
         }
       );
     } else {
       config = config.filter(
         (item) =>
           item.name !== 'GITHUB_CLIENT_ID' &&
-          item.name !== 'GITHUB_CLIENT_SECRET'
+          item.name !== 'GITHUB_CLIENT_SECRET' &&
+          item.name !== 'GITHUB_CALLBACK_URL' &&
+          item.name !== 'GITHUB_SCOPE'
       );
     }