fix: fixed issue with team-invitations and new user accounts (hoppsco…

…tch#3137)
nick-lai · Jun 15, 2023 · 84b0c30 · 84b0c30
1 parent e3dd9e9
commit 84b0c30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts b/packages/hoppscotch-backend/src/team-invitation/team-invite-viewer.guard.ts
@@ -32,7 +32,7 @@ export class TeamInviteViewerGuard implements CanActivate {
       // Get user
       TE.bindW('user', ({ gqlCtx }) =>
         pipe(
-          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
+          O.fromNullable(gqlCtx.getContext().req.user),
           TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
         ),
       ),

diff --git a/packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts b/packages/hoppscotch-backend/src/team-invitation/team-invitee.guard.ts
@@ -33,7 +33,7 @@ export class TeamInviteeGuard implements CanActivate {
       // Get user
       TE.bindW('user', ({ gqlCtx }) =>
         pipe(
-          O.fromNullable(gqlCtx.getContext<{ user?: User }>().user),
+          O.fromNullable(gqlCtx.getContext().req.user),
           TE.fromOption(() => BUG_AUTH_NO_USER_CTX),
         ),
       ),