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

CB-1467 fix: manually serialize authConfiguration in ConfigurationUtils.

Browse Source
This commit is contained in:
Nikita Makarov
2021-12-13 13:08:41 +03:00
parent fe3bfef169
commit abe772a849
1 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/ConfigurationUtils.java
+42 -1
View File
@@ -48,7 +48,7 @@ public class ConfigurationUtils {
res.put(CBConstants.PARAM_RESOURCE_QUOTAS, resourceQuotas);
}
Map<String, AuthProviderConfig> authProviders = appConfig.getAuthProviderConfigurations();
Map<String, Object> authProviders = authConfigToMap(appConfig);
if (!CommonUtils.isEmpty(authProviders)) {
res.put(CBConstants.PARAM_AUTH_PROVIDERS, authProviders);
}
@@ -74,6 +74,47 @@ public class ConfigurationUtils {
return res;
}
public static Map<String, Object> authConfigToMap(@Nullable CBAppConfig appConfig) {
Map<String, Object> res = new LinkedHashMap<>();
if (appConfig == null) {
return res;
}
Map<String, AuthProviderConfig> authProviders = appConfig.getAuthProviderConfigurations();
if (!CommonUtils.isEmpty(authProviders)) {
authProviders.forEach((key, value) -> {
Map<String, Object> authProviderConfig = new LinkedHashMap<>();
authProviderConfig.computeIfAbsent(
"provider",
ignored -> value.getProvider()
);
authProviderConfig.computeIfAbsent(
"displayName",
ignored -> value.getDisplayName()
);
authProviderConfig.put(
"disabled",
value.isDisabled()
);
authProviderConfig.computeIfAbsent(
"iconURL",
ignored -> value.getIconURL()
);
authProviderConfig.computeIfAbsent(
"description",
ignored -> value.getDescription()
);
authProviderConfig.computeIfAbsent(
"parameters",
ignored -> value.getParameters()
);
res.put(key, authProviderConfig);
});
}
return res;
}
public static Map<String, Object> defaultNavigatorSettingsConfigToMap(@Nullable DBNBrowseSettings navSettings) {
Map<String, Object> res = new LinkedHashMap<>();
if (navSettings == null) {