Skip to content
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

CB-6059 create team with uppercase fix #3142

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
+26 −7
Open

CB-6059 create team with uppercase fix #3142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60e1d32
CB-6059 create team with uppercase fix
yagudin10 Dec 20, 2024
8bdbd5e
CB-6069 fixes error with team creation with teamId in upper case
sergeyteleshev Dec 20, 2024
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
15 changes: 12 additions & 3 deletions ...s/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,14 +210,23 @@ public boolean deleteUser(@NotNull WebSession webSession, String userName) throw

@NotNull
@Override
public AdminTeamInfo createTeam(@NotNull WebSession webSession, String teamId, String teamName, String description) throws DBWebException {
public AdminTeamInfo createTeam(
@NotNull WebSession webSession,
@NotNull String teamId,
@Nullable String teamName,
@Nullable String description
) throws DBWebException {
if (teamId.isEmpty()) {
throw new DBWebException("Empty team ID");
}
webSession.addInfoMessage("Create new team - " + teamId);
try {
webSession.getAdminSecurityController().createTeam(teamId, teamName, description, webSession.getUser().getUserId());
SMTeam newTeam = webSession.getAdminSecurityController().findTeam(teamId);
SMTeam newTeam = webSession.getAdminSecurityController().createTeam(
teamId,
teamName,
description,
webSession.getUser().getUserId()
);
return new AdminTeamInfo(webSession, newTeam);
} catch (Exception e) {
throw new DBWebException("Error creating new team", e);
Expand Down
14 changes: 12 additions & 2 deletions ...er.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ WHERE AP.SUBJECT_ID IN (R.TEAM_ID,?)
}

@Override
public SMTeam findTeam(String teamId) throws DBCException {
public SMTeam findTeam(@NotNull String teamId) throws DBCException {
return Arrays.stream(readAllTeams())
.filter(r -> r.getTeamId().equals(teamId))
.findFirst().orElse(null);
Expand Down Expand Up @@ -1219,7 +1219,12 @@ private SMUser fetchUser(ResultSet dbResult) throws SQLException {
}

@Override
public void createTeam(String teamId, String name, String description, String grantor) throws DBCException {
public SMTeam createTeam(
@NotNull String teamId,
@Nullable String name,
@Nullable String description,
@NotNull String grantor
) throws DBCException {
if (CommonUtils.isEmpty(teamId)) {
throw new DBCException("Empty team name is not allowed");
}
Expand Down Expand Up @@ -1251,6 +1256,11 @@ public void createTeam(String teamId, String name, String description, String gr
} catch (SQLException e) {
throw new DBCException("Error saving team in database", e);
}
SMTeam smTeam = new SMTeam(teamId, name, description, true);
for (String permission : getDefaultTeamPermissions()) {
smTeam.addPermission(permission);
}
return smTeam;
}

protected String[] getDefaultTeamPermissions() {
Expand Down
4 changes: 2 additions & 2 deletions webapp/packages/core-authentication/src/TeamsResource.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class TeamsResource extends CachedMapResource<string, TeamInfo, TeamResou

await this.setSubjectPermissions(newTeam.teamId, teamPermissions);

return this.get(teamId)!;
return this.get(newTeam.teamId)!;
}

async updateTeam({ teamId, teamPermissions, teamName, description }: TeamInfo): Promise<TeamInfo> {
Expand All @@ -73,7 +73,7 @@ export class TeamsResource extends CachedMapResource<string, TeamInfo, TeamResou

this.markOutdated(team.teamId);

return this.get(teamId)!;
return this.get(team.teamId)!;
}

async deleteTeam(key: ResourceKeySimple<string>, options?: { force: boolean }): Promise<Map<string, TeamInfo>> {
Expand Down
Loading