Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 00:48:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #12531 from ToolJet/fixes/archive-user

Browse source
This commit is contained in:
Adish M 2025-04-09 22:04:13 +05:30 committed by GitHub
commit 89bb340999
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/src/modules/session/jwt/jwt.strategy.ts
View file

@ -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);
}