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-5695. Fixed npe when RP turned on, but not configured (#3077)

Browse Source 
* CB-5695. Fixed npe when RP turned on, but not configured

* CB-5695. Fixed checkstyle

---------

Co-authored-by: Evgenia <139753579+EvgeniaBzzz@users.noreply.github.com>
This commit is contained in:
DenisSinelnikov
2024-11-21 10:01:42 +01:00
committed by GitHub
co-authored by Evgenia
parent e56a298acc
commit b816a6d8a0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/RPSessionHandler.java
+7 -3
View File
@@ -98,9 +98,13 @@ public class RPSessionHandler implements DBWSessionHandler {
String firstName = request.getHeader(resolveParam(paramConfigMap.get(RPConstants.PARAM_FIRST_NAME), RPAuthProvider.X_FIRST_NAME));
String lastName = request.getHeader(resolveParam(paramConfigMap.get(RPConstants.PARAM_LAST_NAME), RPAuthProvider.X_LAST_NAME));
String fullName = request.getHeader(resolveParam(paramConfigMap.get(RPConstants.PARAM_FULL_NAME), RPAuthProvider.X_FULL_NAME));
String logoutUrl = Objects.requireNonNull(configuration).getParameter(RPConstants.PARAM_LOGOUT_URL);
String teamDelimiter = resolveParam(JSONUtils.getString(configuration.getParameters(),
RPConstants.PARAM_TEAM_DELIMITER), "\\|");
String logoutUrl = null;
String teamDelimiter = DEFAULT_TEAM_DELIMITER;
if (configuration != null) {
logoutUrl = configuration.getParameter(RPConstants.PARAM_LOGOUT_URL);
teamDelimiter = resolveParam(JSONUtils.getString(configuration.getParameters(),
RPConstants.PARAM_TEAM_DELIMITER), DEFAULT_TEAM_DELIMITER);
}
List<String> userTeams = teams == null ? null : (teams.isEmpty() ? List.of() : List.of(teams.split(teamDelimiter)));
if (userName != null) {
try {