From 41c0472007e028cb0759fc285284d8e3eadf1dd9 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Fri, 14 Oct 2022 16:33:39 -0400
Subject: [PATCH] CB-2714 AD roles claim

---
 .../model/session/WebSessionAuthProcessor.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java
index c3abd76796..350d1f11e8 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/session/WebSessionAuthProcessor.java
@@ -104,7 +104,7 @@ public class WebSessionAuthProcessor {
             var newAuthInfos = new ArrayList<WebAuthInfo>();
             for (Map.Entry<String, Object> entry : authInfo.getAuthData().entrySet()) {
                 String providerId = entry.getKey();
-                Map<String, Object> userCredentials = (Map<String, Object>) entry.getValue();
+                Map<String, Object> authAttrs = (Map<String, Object>) entry.getValue();
 
                 var authProviderDescriptor = getAuthProvider(providerId);
                 SMAuthProvider<?> authProviderInstance = authProviderDescriptor.getInstance();
@@ -127,7 +127,7 @@ public class WebSessionAuthProcessor {
                 if (authProviderExternal != null && !configMode && !alreadyLoggedIn) {
                     // We may need to associate new credentials with active user
                     if (linkWithActiveUser) {
-                        securityController.setUserCredentials(userId, authProviderDescriptor.getId(), userCredentials);
+                        securityController.setUserCredentials(userId, authProviderDescriptor.getId(), authAttrs);
                     }
                 }
 
@@ -143,7 +143,7 @@ public class WebSessionAuthProcessor {
                             authProviderExternal.getUserIdentity(
                                 webSession.getProgressMonitor(),
                                 providerConfig,
-                                userCredentials);
+                                authAttrs);
                     } catch (DBException e) {
                         log.debug("Error reading auth display name from provider " + providerId, e);
                     }
@@ -159,7 +159,7 @@ public class WebSessionAuthProcessor {
                     webSession.getProgressMonitor(),
                     webSession,
                     providerConfig,
-                    userCredentials);
+                    authAttrs);
 
                 if (!configMode && securityController.getUserPermissions(userId, authInfo.getAuthRole()).isEmpty()) {
                     throw new DBWebException("Access denied (no permissions)");
@@ -177,7 +177,7 @@ public class WebSessionAuthProcessor {
                     OffsetDateTime.now());
                 webAuthInfo.setMessage("Authenticated with " + authProviderDescriptor.getLabel() + " provider");
                 if (configMode) {
-                    webAuthInfo.setUserCredentials(userCredentials);
+                    webAuthInfo.setUserCredentials(authAttrs);
                 }
 
                 webSession.addAuthInfo(webAuthInfo);