Skip to content

chore: refactor the creation of workspace and application on signup #39935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nsarupr merged 2 commits into from
Mar 27, 2025
Merged

chore: refactor the creation of workspace and application on signup #39935

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d76a65
refactor the creation of workspace and application on signup
nsarupr Mar 26, 2025
b9aa70c
Merge branch 'release' into chore/code-split-create-application-on-si…
nsarupr Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions ...n/java/com/appsmith/server/authentication/handlers/ce/AuthenticationSuccessHandlerCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,15 @@ public Mono<Void> onAuthenticationSuccess(
}

protected Mono<Application> createDefaultApplication(String defaultWorkspaceId, Authentication authentication) {

// need to create default application
Application application = new Application();
application.setWorkspaceId(defaultWorkspaceId);
application.setName("My first application");
Mono<Application> applicationMono = Mono.just(application);
if (defaultWorkspaceId == null) {
return createWorkspaceIfNotExistsAndGetId(defaultWorkspaceId, authentication)
.flatMap(this::createFirstApplication);
}

applicationMono = workspaceRepository
protected Mono<String> createWorkspaceIfNotExistsAndGetId(
String defaultWorkspaceId, Authentication authentication) {
if (defaultWorkspaceId == null) {
return workspaceRepository
.findAll(workspacePermission.getEditPermission())
.take(1, true)
.collectList()
Expand All @@ -366,8 +366,7 @@ protected Mono<Application> createDefaultApplication(String defaultWorkspaceId,
// workspace user has access to, and would be user's default workspace. Hence, we use this
// workspace to create the application.
if (workspaces.size() == 1) {
application.setWorkspaceId(workspaces.get(0).getId());
return Mono.just(application);
return Mono.just(workspaces.get(0));
}

// In case no workspaces are found for the user, create a new default workspace
Expand All @@ -376,15 +375,20 @@ protected Mono<Application> createDefaultApplication(String defaultWorkspaceId,
return organizationService
.getCurrentUserOrganizationId()
.flatMap(orgId -> userRepository.findByEmailAndOrganizationId(email, orgId))
.flatMap(user -> workspaceService.createDefault(new Workspace(), user))
.map(workspace -> {
application.setWorkspaceId(workspace.getId());
return application;
});
});
.flatMap(user -> workspaceService.createDefault(new Workspace(), user));
})
.map(Workspace::getId);
}

return applicationMono.flatMap(applicationPageService::createApplication);
return Mono.just(defaultWorkspaceId);
}

protected Mono<Application> createFirstApplication(String workspaceId) {
// need to create default application
Application application = new Application();
application.setWorkspaceId(workspaceId);
application.setName("My first application");
return applicationPageService.createApplication(application);
}

/**
Expand Down