opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Role management API fixes

Browse Source
This commit is contained in:
Serge Rider
2021-08-31 13:42:07 +03:00
parent 86521903b6
commit f2daf4607e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBSecurityController.java
+12 -3
View File
@@ -449,7 +449,8 @@ class CBSecurityController implements DBWSecurityController {
try (Connection dbCon = database.openConnection()) {
try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
createAuthSubject(dbCon, role.getRoleId(), SUBJECT_ROLE);
try (PreparedStatement dbStat = dbCon.prepareStatement("INSERT INTO CB_ROLE(ROLE_ID,ROLE_NAME,ROLE_DESCRIPTION,CREATE_TIME) VALUES(?,?,?,?)")) {
try (PreparedStatement dbStat = dbCon.prepareStatement(
"INSERT INTO CB_ROLE(ROLE_ID,ROLE_NAME,ROLE_DESCRIPTION,CREATE_TIME) VALUES(?,?,?,?)")) {
dbStat.setString(1, role.getRoleId());
dbStat.setString(2, CommonUtils.notEmpty(role.getName()));
dbStat.setString(3, CommonUtils.notEmpty(role.getDescription()));
@@ -476,7 +477,9 @@ class CBSecurityController implements DBWSecurityController {
dbStat.setString(1, CommonUtils.notEmpty(role.getName()));
dbStat.setString(2, CommonUtils.notEmpty(role.getDescription()));
dbStat.setString(3, role.getRoleId());
dbStat.execute();
if (dbStat.executeUpdate() <= 0) {
throw new DBCException("Role '" + role.getRoleId() + "' doesn't exist");
}
}
txn.commit();
}
@@ -490,7 +493,13 @@ class CBSecurityController implements DBWSecurityController {
try (Connection dbCon = database.openConnection()) {
try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
deleteAuthSubject(dbCon, roleId);
JDBCUtils.executeStatement(dbCon, "DELETE FROM CB_ROLE WHERE ROLE_ID=?", roleId);
try (PreparedStatement dbStat = dbCon.prepareStatement(
"DELETE FROM CB_ROLE WHERE ROLE_ID=?")) {
dbStat.setString(1, roleId);
if (dbStat.executeUpdate() <= 0) {
throw new DBCException("Role '" + roleId + "' doesn't exist");
}
}
txn.commit();
}
} catch (SQLException e) {
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class WebServiceBindingAdmin extends WebServiceBindingBase<DBWServiceAdmi
env.getArgument("roleName"),
env.getArgument("description")))
.dataFetcher("updateRole",
env -> getService(env).createRole(
env -> getService(env).updateRole(
getWebSession(env),
env.getArgument("roleId"),
env.getArgument("roleName"),