Skip to content

The open alternative to Salesforce, designed for AI.

fix(onboarding): refresh stale workspace in currentWorkspace field resolver (#21839)

Félix Malfait705caab2b01c
diff --git a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
index 428bebecf14..0db5ee51c2a 100644
--- a/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/user.resolver.ts
@@ -577,7 +577,13 @@ export class UserResolver {
@AuthWorkspace({ allowUndefined: true })
workspace: WorkspaceEntity | undefined,
) {
- return workspace;
+ if (!isDefined(workspace)) {
+ return null;
+ }
+
+ return this.userService.refreshWorkspaceIfPendingOrOngoingCreation(
+ workspace,
+ );
}
@ResolveField(() => [UserWorkspaceEntity], {