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

[release-fix] Archived user SSO signup and login (#10787)

Browse source 
* fix: release branch syntax errors & onboarding app issue

* fix: organization id undefined error
This commit is contained in:
Muhsin Shah C P 2024-09-19 22:01:28 +05:30 committed by GitHub
parent 4a71d40abd
commit e38eb34470
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/src/modules/auth/jwt.strategy.ts
View file

@ -66,7 +66,7 @@ export class JwtStrategy extends PassportStrategy(Strategy) {
let user: User;
if (payload?.sub && organizationId && !isInviteSession) {
user = await this.usersService.findByEmail(payload.sub, organizationId, WORKSPACE_USER_STATUS.ACTIVE);
user.organizationId = organizationId;
if (user) user.organizationId = organizationId;
} else if (payload?.sub && isInviteSession) {
/* Fetch user details for organization-invite and accept-invite route */
user = await this.usersService.findOne({ email: payload?.sub, status: USER_STATUS.ACTIVE });