Merge remote-tracking branch 'origin/main' into feat/user-history

# Conflicts:
#	packages/hoppscotch-backend/prisma/schema.prisma
#	packages/hoppscotch-backend/src/app.module.ts

packages/hoppscotch-backend/prisma/schema.prisma

@@ -84,6 +84,7 @@ model User {
   email       String?
   photoURL    String?
   UserHistory UserHistory[]
+  UserEnvironments UserEnvironment[]
 }
 
 model UserHistory {
@@ -100,6 +101,20 @@ model UserHistory {
 enum ReqType {
   REST
   GQL
+  uid              String            @id @default(cuid())
+  displayName      String?
+  email            String?
+  photoURL         String?
+  UserEnvironments UserEnvironment[]
+}
+
+model UserEnvironment {
+  id        String  @id @default(cuid())
+  userUid   String
+  user      User    @relation(fields: [userUid], references: [uid], onDelete: Cascade)
+  name      String?
+  variables Json
+  isGlobal  Boolean
 }
 
 enum TeamMemberRole {