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

Fixed: Public app preview 403 error (#10360)

Browse source 
Co-authored-by: Muhsin Shah <muhsinshah21@gmail.com>
This commit is contained in:
Midhun G S 2024-07-15 21:01:54 +05:30 committed by GitHub
parent 15813c4ed6
commit 05bc94d579
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
server/src/controllers/app.controller.ts
View file

@ -39,6 +39,7 @@ import { InvitedUserSessionDto } from '@dto/invited-user-session.dto';
import { ActivateAccountWithTokenDto } from '@dto/activate-account-with-token.dto';
import { OrganizationInviteAuthGuard } from 'src/modules/auth/organization-invite-auth.guard';
import { ResendInviteDto } from '@dto/resend-invite.dto';
import { OrganizationUsersService } from '@services/organization_users.service';
@Controller()
export class AppController {
@ -46,7 +47,8 @@ export class AppController {
private authService: AuthService,
private userService: UsersService,
private sessionService: SessionService,
private organizationService: OrganizationsService
private organizationService: OrganizationsService,
private organizationUsersService: OrganizationUsersService
) {}
@Post('authenticate')
@ -84,20 +86,29 @@ export class AppController {
@UseGuards(SessionAuthGuard)
@Get('session')
async getSessionDetails(@User() user, @Query('appId') appId: string, @Query('workspaceSlug') workspaceSlug: string) {
let appData: { organizationId: string; isPublic: boolean };
let currentOrganization: Organization;
let app: { organizationId: string; isPublic: boolean };
if (appId) {
app = await this.userService.returnOrgIdOfAnApp(appId);
appData = await this.userService.returnOrgIdOfAnApp(appId);
}
/* if the user has a session and the app is public, we don't need to authorize the app organization id */
if ((app && !app?.isPublic) || workspaceSlug) {
const organization = await this.organizationService.fetchOrganization(workspaceSlug || app.organizationId);
if (workspaceSlug || appData?.organizationId) {
const organization = await this.organizationService.fetchOrganization(workspaceSlug || appData.organizationId);
if (!organization) {
throw new NotFoundException("Coudn't found workspace. workspace id or slug is incorrect!.");
}
currentOrganization = organization;
const activeMemberOfOrganization = await this.organizationUsersService.isTheUserIsAnActiveMemberOfTheWorkspace(
user.id,
organization.id
);
if (activeMemberOfOrganization) currentOrganization = organization;
const alreadyWorkspaceSessionAvailable = user.organizationIds?.includes(appData?.organizationId);
const orgIdNeedsToBeUpdatedForApplicationSession =
appData && appData.organizationId !== user.defaultOrganizationId && alreadyWorkspaceSessionAvailable;
if (orgIdNeedsToBeUpdatedForApplicationSession) {
/* If the app's organization id is there in the JWT and user default organization id is different, then update it */
await this.userService.updateUser(user.id, { defaultOrganizationId: appData.organizationId });
}
}
return await this.authService.generateSessionPayload(user, currentOrganization);
}

10
server/src/services/organization_users.service.ts
View file

@ -117,6 +117,16 @@ export class OrganizationUsersService {
});
}
async isTheUserIsAnActiveMemberOfTheWorkspace(userId: string, organizationId: string) {
return await this.organizationUsersRepository.count({
where: {
userId,
organizationId,
status: WORKSPACE_USER_STATUS.ACTIVE,
},
});
}
async updateOrgUser(organizationUserId: string, updateUserDto) {
const organizationUser = await this.organizationUsersRepository.findOne({ where: { id: organizationUserId } });
return await this.usersService.update(