CB-4389. Fix logout redirect and npe for logout parameter

dbeaver · Jan 23, 2024 · b43f639 · b43f639
1 parent 0bdb8f3
commit b43f639
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.../io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java b/.../io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/impl/WebServiceAuthImpl.java
@@ -149,7 +149,7 @@ public WebLogoutInfo authLogout(
             var cbApp = CBApplication.getInstance();
             for (WebAuthInfo removedInfo : removedInfos) {
                 if (removedInfo.getAuthProviderDescriptor()
-                    .getInstance() instanceof SMSignOutLinkProvider federatedProvider
+                    .getInstance() instanceof SMSignOutLinkProvider provider
                     && removedInfo.getAuthSession() != null
                 ) {
                     var providerConfig =
@@ -160,10 +160,10 @@ public WebLogoutInfo authLogout(
                     }
                     String logoutUrl;
                     if (removedInfo.getAuthSession() instanceof SMSessionExternal externalSession) {
-                        logoutUrl = federatedProvider.getUserSignOutLink(providerConfig,
+                        logoutUrl = provider.getUserSignOutLink(providerConfig,
                             externalSession.getAuthParameters());
                     } else {
-                        logoutUrl = federatedProvider.getUserSignOutLink(providerConfig,
+                        logoutUrl = provider.getUserSignOutLink(providerConfig,
                             Map.of());
                     }
                     if (CommonUtils.isNotEmpty(logoutUrl)) {