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

CB-2571 default auth role config

Browse Source
This commit is contained in:
Aleksandr Skoblikov
2022-10-18 12:38:56 +02:00
parent cfb9472369
commit f9ebb63f0f
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.security/src/io/cloudbeaver/service/security/CBEmbeddedSecurityController.java
+3 -4
View File
@@ -1301,7 +1301,6 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
permissions = getTokenPermissions(smTokens.getSmAccessToken());
}
String activeUserId = permissions == null ? null : permissions.getUserId();
String tokenAuthRole = updateUserAuthRoleIfNeeded(activeUserId, authInfo.getAuthRole());
Map<String, Object> storedUserData = new LinkedHashMap<>();
for (String authProviderId : authProviderIds) {
@@ -1313,7 +1312,7 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
finishAuthMonitor,
activeUserId,
activeUserId == null,
tokenAuthRole
authInfo.getAuthRole()
);
if (userIdFromCreds == null) {
@@ -1330,7 +1329,7 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
);
}
String tokenAuthRole = updateUserAuthRoleIfNeeded(activeUserId, authInfo.getAuthRole());
if (smTokens == null && permissions == null) {
try (Connection dbCon = database.openConnection()) {
try (JDBCTransaction txn = new JDBCTransaction(dbCon)) {
@@ -1462,7 +1461,7 @@ public class CBEmbeddedSecurityController implements SMAdminController, SMAuthen
createUser(userId,
Map.of(),
true,
authRole
resolveUserAuthRole(null, authRole)
);
String defaultTeamName = WebAppUtils.getWebApplication().getAppConfiguration().getDefaultUserTeam();
if (!CommonUtils.isEmpty(defaultTeamName)) {