mirror of
https://github.com/ToolJet/ToolJet
synced 2026-05-24 09:28:31 +00:00
fixed: archive workspace issue
This commit is contained in:
parent
f21fcaacbf
commit
f0cfeff4e7
1 changed files with 2 additions and 1 deletions
|
|
@ -68,7 +68,8 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
|
||||||
let user: User;
|
let user: User;
|
||||||
if (payload?.sub && organizationId && !isInviteSession) {
|
if (payload?.sub && organizationId && !isInviteSession) {
|
||||||
/* Usual JWT case: user with valid organization id */
|
/* 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) {
|
if (bypassOrganizationValidation) {
|
||||||
await this.sessionUtilService.findOrganization(organizationId);
|
await this.sessionUtilService.findOrganization(organizationId);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue