Fix permission errors for watching prebuild logs (#20026)

filiptronicek · web-flow · commit ecd52dc533d0 · 2024-07-11T12:12:56.000+02:00
* Revert "Prebuild issues roundup (#20000)" This reverts commit fbc0d76. * Reapply "Prebuild issues roundup (#20000)" This reverts commit bb45446. * Fix permission check for watching prebuild logs
diff --git a/components/server/src/prebuilds/prebuild-manager.ts b/components/server/src/prebuilds/prebuild-manager.ts
@@ -660,7 +660,9 @@ export class PrebuildManager {
         }
         await this.auth.checkPermissionOnOrganization(userId, "read_prebuild", organizationId);
 
-        const instance = await this.workspaceService.getCurrentInstance(userId, prebuild.workspace.id);
+        const instance = await this.workspaceService.getCurrentInstance(userId, prebuild.workspace.id, {
+            skipPermissionCheck: true,
+        });
         const urls = await this.workspaceService.getHeadlessLog(userId, instance.id, async () => {});
 
         const taskUrl = urls.streams[taskId];

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,9 @@ export class PrebuildManager {`
`660`	`660`	`}`
`661`	`661`	`await this.auth.checkPermissionOnOrganization(userId, "read_prebuild", organizationId);`
`662`	`662`
`663`		`- const instance = await this.workspaceService.getCurrentInstance(userId, prebuild.workspace.id);`
	`663`	`+ const instance = await this.workspaceService.getCurrentInstance(userId, prebuild.workspace.id, {`
	`664`	`+ skipPermissionCheck: true,`
	`665`	`+ });`
`664`	`666`	`const urls = await this.workspaceService.getHeadlessLog(userId, instance.id, async () => {});`
`665`	`667`
`666`	`668`	`const taskUrl = urls.streams[taskId];`