opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-10-24 23:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1120 from dbeaver/CB-2408-create-disabled-users

Browse Source 
CB-2408 create disabled user api
This commit is contained in:
Alexander Skoblikov
2022-09-13 18:25:30 +03:00
committed by GitHub
parent 6c3d9e173e 2c0d1ddc7d
commit 37f1ecfcc8
9 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.admin/schema/service.admin.graphqls
+1 -1
View File
@@ -108,7 +108,7 @@ extend type Query {
listRoles(roleId: ID): [AdminRoleInfo!]!
listPermissions: [AdminPermissionInfo!]!
createUser(userId: ID!): AdminUserInfo!
createUser(userId: ID!, enabled: Boolean!): AdminUserInfo!
deleteUser(userId: ID!): Boolean
createRole(roleId: ID!, roleName: String, description: String): AdminRoleInfo!
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/DBWServiceAdmin.java
+1 -1
View File
@@ -53,7 +53,7 @@ public interface DBWServiceAdmin extends DBWService {
@WebAction(requirePermissions = DBWConstants.PERMISSION_ADMIN)
@NotNull
AdminUserInfo createUser(@NotNull WebSession webSession, String userName) throws DBWebException;
AdminUserInfo createUser(@NotNull WebSession webSession, String userName, @NotNull Boolean enabled) throws DBWebException;
@WebAction(requirePermissions = DBWConstants.PERMISSION_ADMIN)
boolean deleteUser(@NotNull WebSession webSession, String userName) throws DBWebException;
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/WebServiceBindingAdmin.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class WebServiceBindingAdmin extends WebServiceBindingBase<DBWServiceAdmi
.dataFetcher("listPermissions",
env -> getService(env).listPermissions(getWebSession(env)))
.dataFetcher("createUser",
env -> getService(env).createUser(getWebSession(env), env.getArgument("userId")))
env -> getService(env).createUser(getWebSession(env), env.getArgument("userId"), env.getArgument("enabled")))
.dataFetcher("deleteUser",
env -> getService(env).deleteUser(getWebSession(env), env.getArgument("userId")))
.dataFetcher("createRole",
server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+2 -2
View File
@@ -134,7 +134,7 @@ public class WebServiceAdmin implements DBWServiceAdmin {
@NotNull
@Override
public AdminUserInfo createUser(@NotNull WebSession webSession, String userName) throws DBWebException {
public AdminUserInfo createUser(@NotNull WebSession webSession, String userName, @NotNull Boolean enabled) throws DBWebException {
if (userName.isEmpty()) {
throw new DBWebException("Empty user name");
}
@@ -142,7 +142,7 @@ public class WebServiceAdmin implements DBWServiceAdmin {
try {
var securityController = webSession.getAdminSecurityController();
securityController.createUser(userName, Map.of());
securityController.createUser(userName, Map.of(), enabled);
var smUser = securityController.getUserById(userName);
return new AdminUserInfo(webSession, new WebUser(smUser));
} catch (Exception e) {
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
+3 -3
View File
@@ -107,7 +107,7 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
// Users
@Override
public void createUser(String userId, Map<String, String> metaParameters) throws DBException {
public void createUser(String userId, Map<String, String> metaParameters, boolean enabled) throws DBException {
if (isSubjectExists(userId)) {
throw new DBCException("User or role '" + userId + "' already exists");
}
@@ -116,7 +116,7 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
createAuthSubject(dbCon, userId, SUBJECT_USER);
try (PreparedStatement dbStat = dbCon.prepareStatement("INSERT INTO CB_USER(USER_ID,IS_ACTIVE,CREATE_TIME) VALUES(?,?,?)")) {
dbStat.setString(1, userId);
dbStat.setString(2, CHAR_BOOL_TRUE);
dbStat.setString(2, enabled ? CHAR_BOOL_TRUE : CHAR_BOOL_FALSE);
dbStat.setTimestamp(3, new Timestamp(System.currentTimeMillis()));
dbStat.execute();
}
@@ -1360,7 +1360,7 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
userId = userIdFromCredentials;
if (!isSubjectExists(userId)) {
var newUser = new SMUser(userId);
createUser(newUser.getUserId(), newUser.getMetaParameters());
createUser(newUser.getUserId(), newUser.getMetaParameters(), true);
String defaultRoleName = WebAppUtils.getWebApplication().getAppConfiguration().getDefaultUserRole();
if (!CommonUtils.isEmpty(defaultRoleName)) {
setUserRoles(userId, new String[]{defaultRoleName}, userId);
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/db/CBDatabase.java
+1 -1
View File
@@ -246,7 +246,7 @@ public class CBDatabase {
if (adminUser == null) {
adminUser = new SMUser(adminName);
adminSecurityController.createUser(adminUser.getUserId(), adminUser.getMetaParameters());
adminSecurityController.createUser(adminUser.getUserId(), adminUser.getMetaParameters(), true);
}
if (!CommonUtils.isEmpty(adminPassword)) {