From b816a6d8a0b89e7425f2a030a0f4cd0441b9d6a6 Mon Sep 17 00:00:00 2001 From: DenisSinelnikov <142215442+DenisSinelnikov@users.noreply.github.com> Date: Thu, 21 Nov 2024 13:01:42 +0400 Subject: [PATCH] CB-5695. Fixed npe when RP turned on, but not configured (#3077) * 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> --- .../io/cloudbeaver/service/auth/RPSessionHandler.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/RPSessionHandler.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/RPSessionHandler.java index 64040e3a6f..767823b4c3 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/RPSessionHandler.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/RPSessionHandler.java @@ -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 userTeams = teams == null ? null : (teams.isEmpty() ? List.of() : List.of(teams.split(teamDelimiter))); if (userName != null) { try {