chore: resolved all merge conflicts

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

@@ -1,12 +1,19 @@
-import { Resolver, Query } from '@nestjs/graphql';
-import { User } from './user.model';
+import { Resolver, Query, Mutation, Args, Subscription } from '@nestjs/graphql';
+import { SessionType, User } from './user.model';
 import { UseGuards } from '@nestjs/common';
 import { GqlAuthGuard } from '../guards/gql-auth.guard';
 import { GqlUser } from '../decorators/gql-user.decorator';
+import { UserService } from './user.service';
+import { throwErr } from 'src/utils';
+import * as E from 'fp-ts/lib/Either';
+import { PubSubService } from 'src/pubsub/pubsub.service';
 
 @Resolver(() => User)
 export class UserResolver {
-  constructor() {}
+  constructor(
+    private readonly userService: UserService,
+    private readonly pubsub: PubSubService,
+  ) {}
 
   @Query(() => User, {
     description:
@@ -16,4 +23,43 @@ export class UserResolver {
   me(@GqlUser() user) {
     return user;
   }
+
+  /* Mutations */
+
+  @Mutation(() => User, {
+    description: 'Update user sessions',
+  })
+  @UseGuards(GqlAuthGuard)
+  async updateUserSessions(
+    @GqlUser() user: User,
+    @Args({
+      name: 'currentSession',
+      description: 'JSON string of the saved REST/GQL session',
+    })
+    currentSession: string,
+    @Args({
+      name: 'sessionType',
+      description: 'Type of the session',
+    })
+    sessionType: SessionType,
+  ): Promise<User> {
+    const updatedUser = await this.userService.updateUserSessions(
+      user,
+      currentSession,
+      sessionType,
+    );
+    if (E.isLeft(updatedUser)) throwErr(updatedUser.left);
+    return updatedUser.right;
+  }
+
+  /* Subscriptions */
+
+  @Subscription(() => User, {
+    description: 'Listen for user updates',
+    resolve: (value) => value,
+  })
+  @UseGuards(GqlAuthGuard)
+  userUpdated(@GqlUser() user: User) {
+    return this.pubsub.asyncIterator(`user/${user.uid}/updated`);
+  }
 }