Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

fix: serialize user sessions properly (#62)

Akash Kc49573db6510
diff --git a/packages/hoppscotch-backend/src/user/user.resolver.ts b/packages/hoppscotch-backend/src/user/user.resolver.ts
index b8cdaa0d8..080592c81 100644
--- a/packages/hoppscotch-backend/src/user/user.resolver.ts
+++ b/packages/hoppscotch-backend/src/user/user.resolver.ts
@@ -26,8 +26,8 @@ export class UserResolver {
"Gives details of the user executing this query (pass Authorization 'Bearer' header)",
})
@UseGuards(GqlAuthGuard)
- me(@GqlUser() user) {
- return user;
+ me(@GqlUser() user: AuthUser) {
+ return this.userService.convertDbUserToUser(user);
}
/* Mutations */
diff --git a/packages/hoppscotch-backend/src/user/user.service.ts b/packages/hoppscotch-backend/src/user/user.service.ts
index 93da14e54..196c47182 100644
--- a/packages/hoppscotch-backend/src/user/user.service.ts
+++ b/packages/hoppscotch-backend/src/user/user.service.ts
@@ -14,6 +14,7 @@ import { USER_UPDATE_FAILED } from 'src/errors';
import { PubSubService } from 'src/pubsub/pubsub.service';
import { stringToJson, taskEitherValidateArraySeq } from 'src/utils';
import { UserDataHandler } from './user.data.handler';
+import { User as DbUser } from '@prisma/client';
@Injectable()
export class UserService {
@@ -28,6 +29,27 @@ export class UserService {
this.userDataHandlers.push(handler);
}
+ /**
+ * Converts a prisma user object to a user object
+ *
+ * @param dbUser Prisma User object
+ * @returns User object
+ */
+ convertDbUserToUser(dbUser: DbUser): User {
+ const dbCurrentRESTSession = dbUser.currentRESTSession;
+ const dbCurrentGQLSession = dbUser.currentGQLSession;
+
+ return {
+ ...dbUser,
+ currentRESTSession: dbCurrentRESTSession
+ ? JSON.stringify(dbCurrentRESTSession)
+ : null,
+ currentGQLSession: dbCurrentGQLSession
+ ? JSON.stringify(dbCurrentGQLSession)
+ : null,
+ };
+ }
+
/**
* Find User with given email id
*
@@ -236,15 +258,7 @@ export class UserService {
data: sessionObj,
});
- const updatedUser: User = {
- ...dbUpdatedUser,
- currentGQLSession: dbUpdatedUser.currentGQLSession
- ? JSON.stringify(dbUpdatedUser.currentGQLSession)
- : null,
- currentRESTSession: dbUpdatedUser.currentRESTSession
- ? JSON.stringify(dbUpdatedUser.currentRESTSession)
- : null,
- };
+ const updatedUser = this.convertDbUserToUser(dbUpdatedUser);
// Publish subscription for user updates
await this.pubsub.publish(`user/${updatedUser.uid}/updated`, updatedUser);