From f0cfeff4e790b73f6eea2754329e2b58f298b2ee Mon Sep 17 00:00:00 2001 From: Muhsin Shah C P Date: Wed, 9 Apr 2025 21:55:24 +0530 Subject: [PATCH] fixed: archive workspace issue --- server/src/modules/session/jwt/jwt.strategy.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/modules/session/jwt/jwt.strategy.ts b/server/src/modules/session/jwt/jwt.strategy.ts index c56fc15d26..0a689380c3 100644 --- a/server/src/modules/session/jwt/jwt.strategy.ts +++ b/server/src/modules/session/jwt/jwt.strategy.ts @@ -68,7 +68,8 @@ export class JwtStrategy extends PassportStrategy(Strategy) { let user: User; if (payload?.sub && organizationId && !isInviteSession) { /* Usual JWT case: user with valid organization id */ - user = await this.userRepository.findByEmail(payload.sub, isGettingOrganizations ? null : organizationId, WORKSPACE_USER_STATUS.ACTIVE); + const archivedWorkspaceUser = isGettingOrganizations || req['isSwitchingOrganization']; + user = await this.userRepository.findByEmail(payload.sub, archivedWorkspaceUser ? null : organizationId, WORKSPACE_USER_STATUS.ACTIVE); if (bypassOrganizationValidation) { await this.sessionUtilService.findOrganization(organizationId); }