Features/rsb/26.2/423389 user object

org.eclipse.scout.rt.api/src/main/java/org/eclipse/scout/rt/api/uinotification/UiNotificationResource.java

@@ -30,8 +30,8 @@
 import org.eclipse.scout.rt.api.data.uinotification.UiNotificationRequest;
 import org.eclipse.scout.rt.api.data.uinotification.UiNotificationResponse;
 import org.eclipse.scout.rt.platform.BEANS;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.rest.IRestResource;
-import org.eclipse.scout.rt.security.IAccessControlService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -104,6 +104,6 @@ protected void logResponse(List<UiNotificationDo> notifications, List<TopicDo> t
   }
 
   protected String getUserId() {
-    return BEANS.get(IAccessControlService.class).getUserIdOfCurrentSubject();
+    return User.currentUserId();
   }
 }

org.eclipse.scout.rt.client.test/src/main/java/org/eclipse/scout/testing/client/ClientSessionProviderWithCache.java

@@ -149,7 +149,7 @@ protected CompositeObject newSessionCacheKey(final String sessionId, final Subje
       return new CompositeObject(BEANS.get(IClientSession.class).getClass(), sessionId);
     }
     else if (subject != null) {
-      return new CompositeObject(BEANS.get(IClientSession.class).getClass(), BEANS.get(IAccessControlService.class).getUserId(subject));
+      return new CompositeObject(BEANS.get(IClientSession.class).getClass(), BEANS.get(IAccessControlService.class).getUser(subject));
     }
     else {
       return null;

org.eclipse.scout.rt.client.test/src/test/java/org/eclipse/scout/rt/client/context/ClientRunContextChainTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2026 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -27,13 +27,13 @@
 import org.eclipse.scout.rt.platform.nls.NlsLocale;
 import org.eclipse.scout.rt.platform.opentelemetry.OpenTelemetryContextProcessor;
 import org.eclipse.scout.rt.platform.security.SubjectProcessor;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.platform.transaction.TransactionProcessor;
 import org.eclipse.scout.rt.platform.util.ThreadLocalProcessor;
-import org.eclipse.scout.rt.shared.session.ISession;
 import org.eclipse.scout.rt.shared.opentelemetry.OpenTelemetrySpanAttributeProcessor;
+import org.eclipse.scout.rt.shared.session.ISession;
 import org.eclipse.scout.rt.shared.session.SessionId;
 import org.eclipse.scout.rt.shared.ui.UserAgent;
-import org.eclipse.scout.rt.shared.user.UserId;
 import org.eclipse.scout.rt.testing.platform.runner.PlatformTestRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -84,46 +84,46 @@ protected <RESULT> CallableChain<RESULT> createCallableChain() { // overwrite to
     c = chainIterator.next();
     assertEquals(SubjectProcessor.class, c.getClass());
 
-    // 7. DiagnosticContextValueProcessor
+    // 7. ThreadLocalProcessor for User.CURRENT
+    c = chainIterator.next();
+    assertEquals(ThreadLocalProcessor.class, c.getClass());
+    assertSame(User.CURRENT, ((ThreadLocalProcessor) c).getThreadLocal());
+
+    // 8. DiagnosticContextValueProcessor
     c = chainIterator.next();
     assertEquals(DiagnosticContextValueProcessor.class, c.getClass());
     assertEquals("subject.principal.name", ((DiagnosticContextValueProcessor) c).getMdcKey());
 
-    // 8. DiagnosticContextValueProcessor
+    // 9. DiagnosticContextValueProcessor
     c = chainIterator.next();
     assertEquals(DiagnosticContextValueProcessor.class, c.getClass());
     assertEquals("opentelemetry.trace.id", ((DiagnosticContextValueProcessor) c).getMdcKey());
 
-    // 9. DiagnosticContextValueProcessor
+    // 10. DiagnosticContextValueProcessor
     c = chainIterator.next();
     assertEquals(DiagnosticContextValueProcessor.class, c.getClass());
     assertEquals("scout.correlation.id", ((DiagnosticContextValueProcessor) c).getMdcKey());
 
-    // 10. ThreadLocalProcessor for NlsLocale.CURRENT
+    // 11. ThreadLocalProcessor for NlsLocale.CURRENT
     c = chainIterator.next();
     assertEquals(ThreadLocalProcessor.class, c.getClass());
     assertSame(NlsLocale.CURRENT, ((ThreadLocalProcessor) c).getThreadLocal());
 
-    // 11. ThreadLocalProcessor for PropertyMap.CURRENT
+    // 12. ThreadLocalProcessor for PropertyMap.CURRENT
     c = chainIterator.next();
     assertEquals(ThreadLocalProcessor.class, c.getClass());
     assertSame(PropertyMap.CURRENT, ((ThreadLocalProcessor) c).getThreadLocal());
 
-    // 12. ThreadLocalProcessor for ISession.CURRENT
+    // 13. ThreadLocalProcessor for ISession.CURRENT
     c = chainIterator.next();
     assertEquals(ThreadLocalProcessor.class, c.getClass());
     assertSame(ISession.CURRENT, ((ThreadLocalProcessor) c).getThreadLocal());
 
-    // 13. ThreadLocalProcessor for SessionId.CURRENT
+    // 14. ThreadLocalProcessor for SessionId.CURRENT
     c = chainIterator.next();
     assertEquals(ThreadLocalProcessor.class, c.getClass());
     assertSame(SessionId.CURRENT, ((ThreadLocalProcessor) c).getThreadLocal());
 
-    // 14. ThreadLocalProcessor for Users.CURRENT
-    c = chainIterator.next();
-    assertEquals(ThreadLocalProcessor.class, c.getClass());
-    assertSame(UserId.CURRENT, ((ThreadLocalProcessor) c).getThreadLocal());
-
     // 15. DiagnosticContextValueProcessor
     c = chainIterator.next();
     assertEquals(DiagnosticContextValueProcessor.class, c.getClass());

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/AbstractClientSession.java

@@ -10,7 +10,6 @@
 package org.eclipse.scout.rt.client;
 
 import static java.util.Collections.*;
-import static org.eclipse.scout.rt.shared.ISessionVariable.SHARED_CONTEXT_USER_ID;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -44,11 +43,13 @@
 import org.eclipse.scout.rt.platform.job.Jobs;
 import org.eclipse.scout.rt.platform.nls.NlsLocale;
 import org.eclipse.scout.rt.platform.reflect.AbstractPropertyObserver;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.platform.util.Assertions;
 import org.eclipse.scout.rt.platform.util.CollectionUtility;
 import org.eclipse.scout.rt.platform.util.TypeCastUtility;
 import org.eclipse.scout.rt.platform.util.event.FastListenerList;
 import org.eclipse.scout.rt.platform.util.event.IFastListenerList;
+import org.eclipse.scout.rt.security.IAccessControlService;
 import org.eclipse.scout.rt.shared.extension.AbstractExtension;
 import org.eclipse.scout.rt.shared.extension.IExtensibleObject;
 import org.eclipse.scout.rt.shared.extension.IExtension;
@@ -91,6 +92,7 @@ public abstract class AbstractClientSession extends AbstractPropertyObserver imp
   private IDesktop m_desktop;
   private VirtualDesktop m_virtualDesktop;
   private volatile Subject m_subject;
+  private volatile User m_user;
 
   private final SharedVariableMap m_sharedVariableMap;
   private Set<String> m_exposedSharedVariables;
@@ -107,6 +109,7 @@ public AbstractClientSession(boolean autoInitConfig) {
     m_stateLock = new Object();
     m_userAgent = UserAgent.get();
     m_subject = Subject.current();
+    m_user = BEANS.get(IAccessControlService.class).getUser(m_subject);
     m_objectExtensions = new ObjectExtensions<>(this, true);
     m_sharedVariableMap = new SharedVariableMap();
     m_exposedSharedVariables = null;
@@ -166,7 +169,7 @@ public String getId() {
    */
   @Override
   public String getUserId() {
-    return getSharedContextVariable(SHARED_CONTEXT_USER_ID, String.class);
+    return m_user != null ? m_user.getUserId() : null;
   }
 
   @Override
@@ -501,6 +504,11 @@ public void setSubject(Subject subject) {
     m_subject = subject;
   }
 
+  @Override
+  public User getUser() {
+    return m_user;
+  }
+
   @Override
   public void setData(String key, Object value) {
     m_sessionData.set(key, value);

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/IClientSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2026 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -20,7 +20,7 @@
 import org.eclipse.scout.rt.platform.job.IExecutionSemaphore;
 import org.eclipse.scout.rt.platform.nls.NlsLocale;
 import org.eclipse.scout.rt.platform.reflect.IPropertyObserver;
-import org.eclipse.scout.rt.security.IAccessControlService;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.shared.session.ISession;
 import org.eclipse.scout.rt.shared.ui.UserAgent;
 
@@ -98,7 +98,14 @@ public interface IClientSession extends ISession, IPropertyObserver {
   void setSubject(Subject subject);
 
   /**
-   * Authenticated userId, extracted by {@link IAccessControlService#getUserIdOfCurrentSubject()} on server
+   * Consumers can query for the {@link User} of a {@link IClientSession}
+   * <p>
+   * The user is set when this object is created from {@link User#current()}
+   */
+  User getUser();
+
+  /**
+   * Authenticated userId, provided by {@link User#getUserId()}}
    */
   String getUserId();
 

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/clientnotification/ClientNotificationPoller.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2026 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -13,6 +13,8 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import javax.security.auth.Subject;
+
 import jakarta.annotation.PostConstruct;
 
 import org.eclipse.scout.rt.client.context.ClientRunContexts;
@@ -36,12 +38,14 @@
 import org.eclipse.scout.rt.platform.job.FixedDelayScheduleBuilder;
 import org.eclipse.scout.rt.platform.job.IFuture;
 import org.eclipse.scout.rt.platform.job.Jobs;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.platform.util.Assertions;
 import org.eclipse.scout.rt.platform.util.SleepUtil;
 import org.eclipse.scout.rt.platform.util.concurrent.FutureCancelledError;
 import org.eclipse.scout.rt.platform.util.concurrent.IRunnable;
 import org.eclipse.scout.rt.platform.util.concurrent.ThreadInterruptedError;
 import org.eclipse.scout.rt.platform.util.date.DateUtility;
+import org.eclipse.scout.rt.security.IAccessControlService;
 import org.eclipse.scout.rt.shared.SharedConfigProperties.NotificationSubjectProperty;
 import org.eclipse.scout.rt.shared.clientnotification.ClientNotificationMessage;
 import org.eclipse.scout.rt.shared.clientnotification.IClientNotificationService;
@@ -101,8 +105,10 @@ protected void stopPoller() {
   }
 
   protected RunContext createRunContext() {
+    final Subject subject = BEANS.get(NotificationSubjectProperty.class).getValue();
     return ClientRunContexts.empty()
-        .withSubject(BEANS.get(NotificationSubjectProperty.class).getValue())
+        .withSubject(subject)
+        .withUser(BEANS.get(User.class).withUserId(BEANS.get(IAccessControlService.class).extractUserId(subject)).setReadOnly())
         .withUserAgent(UserAgents.createDefault())
         .withSession(null, false);
   }

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/context/ClientRunContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2025 BSI Business Systems Integration AG
+ * Copyright (c) 2010, 2026 BSI Business Systems Integration AG
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -28,18 +28,18 @@
 import org.eclipse.scout.rt.platform.context.RunMonitor;
 import org.eclipse.scout.rt.platform.logger.DiagnosticContextValueProcessor;
 import org.eclipse.scout.rt.platform.logger.DiagnosticContextValueProcessor.IDiagnosticContextValueProvider;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.platform.transaction.ITransaction;
 import org.eclipse.scout.rt.platform.transaction.ITransactionMember;
 import org.eclipse.scout.rt.platform.transaction.TransactionScope;
 import org.eclipse.scout.rt.platform.util.ThreadLocalProcessor;
 import org.eclipse.scout.rt.platform.util.ToStringBuilder;
-import org.eclipse.scout.rt.shared.session.ISession;
 import org.eclipse.scout.rt.shared.logging.UserIdContextValueProvider;
 import org.eclipse.scout.rt.shared.opentelemetry.OpenTelemetrySpanAttributeProcessor;
+import org.eclipse.scout.rt.shared.session.ISession;
 import org.eclipse.scout.rt.shared.session.ScoutSessionIdContextValueProvider;
 import org.eclipse.scout.rt.shared.session.SessionId;
 import org.eclipse.scout.rt.shared.ui.UserAgent;
-import org.eclipse.scout.rt.shared.user.UserId;
 
 /**
  * Use this class to propagate client-side context.
@@ -65,7 +65,6 @@ protected <RESULT> void interceptCallableChain(final CallableChain<RESULT> calla
     callableChain
         .add(new ThreadLocalProcessor<>(ISession.CURRENT, m_session))
         .add(new ThreadLocalProcessor<>(SessionId.CURRENT, getSession() != null ? getSession().getId() : null))
-        .add(new ThreadLocalProcessor<>(UserId.CURRENT, getSession() != null ? getSession().getUserId() : null))
         .add(new DiagnosticContextValueProcessor(BEANS.get(UserIdContextValueProvider.class)))
         .add(new DiagnosticContextValueProcessor(BEANS.get(ScoutSessionIdContextValueProvider.class)))
         .add(new OpenTelemetrySpanAttributeProcessor())
@@ -87,6 +86,12 @@ public ClientRunContext withSubject(final Subject subject) {
     return this;
   }
 
+  @Override
+  public ClientRunContext withUser(final User user) {
+    super.withUser(user);
+    return this;
+  }
+
   @Override
   public ClientRunContext withLocale(final Locale locale) {
     super.withLocale(locale);
@@ -187,6 +192,7 @@ public ClientRunContext withSession(final IClientSession session, final boolean
       m_locale = (session != null ? session.getLocale() : null);
       m_userAgent = (session != null ? session.getUserAgent() : null);
       m_subject = (session != null ? session.getSubject() : null);
+      m_user = (session != null ? session.getUser() : null);
       m_desktop = (session != null ? session.getDesktopElseVirtualDesktop() : null);
     }
     return this;

org.eclipse.scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/form/useradmin/DefaultPasswordForm.java

@@ -29,8 +29,8 @@
 import org.eclipse.scout.rt.platform.Order;
 import org.eclipse.scout.rt.platform.classid.ClassId;
 import org.eclipse.scout.rt.platform.exception.VetoException;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.platform.text.TEXTS;
-import org.eclipse.scout.rt.security.IAccessControlService;
 import org.eclipse.scout.rt.shared.services.common.pwd.IPasswordManagementService;
 
 @ClassId("5bcb48f0-9b72-4f28-9c08-038cd5d9a1c4")
@@ -208,7 +208,7 @@ protected void execStore() {
   protected void resetSessionsIfCurrentUser(IPasswordManagementService svc) {
     //owasp: reset session
     if (isCurrentUser()) {
-      String currentUserId = BEANS.get(IAccessControlService.class).getUserIdOfCurrentSubject();
+      String currentUserId = User.currentUserId();
       IClientSession currentSession = ClientSessionProvider.currentSession();
 
       // for security reasons force stop all other of the user's sessions in case an attacker is controlling it
@@ -225,7 +225,7 @@ protected void resetSessionsIfCurrentUser(IPasswordManagementService svc) {
 
   protected boolean isCurrentUser() {
     String userName = BEANS.get(IPasswordManagementService.class).getUsernameFor(getUserId());
-    String currentUserId = BEANS.get(IAccessControlService.class).getUserIdOfCurrentSubject();
+    String currentUserId = User.currentUserId();
     return currentUserId.equals(userName);
   }
 }

org.eclipse.scout.rt.platform.test/src/main/java/org/eclipse/scout/rt/testing/platform/runner/statement/SubjectStatement.java

@@ -11,9 +11,11 @@
 
 import javax.security.auth.Subject;
 
+import org.eclipse.scout.rt.platform.BEANS;
 import org.eclipse.scout.rt.platform.context.RunContext;
 import org.eclipse.scout.rt.platform.context.RunContexts;
 import org.eclipse.scout.rt.platform.security.SimplePrincipal;
+import org.eclipse.scout.rt.platform.security.User;
 import org.eclipse.scout.rt.platform.util.Assertions;
 import org.eclipse.scout.rt.testing.platform.runner.RunWithSubject;
 import org.eclipse.scout.rt.testing.platform.runner.SafeStatementInvoker;
@@ -28,6 +30,7 @@
 public class SubjectStatement extends Statement {
 
   private final Statement m_next;
+  private final String m_principal;
   private final Subject m_subject;
 
   /**
@@ -43,11 +46,13 @@ public SubjectStatement(final Statement next, final RunWithSubject annotation) {
 
     final String principal = (annotation != null ? annotation.value() : null);
     if (principal != null) {
+      m_principal = principal;
       m_subject = new Subject();
       m_subject.getPrincipals().add(new SimplePrincipal(principal));
       m_subject.setReadOnly();
     }
     else {
+      m_principal = null;
       m_subject = null;
     }
   }
@@ -56,6 +61,10 @@ protected Statement getNext() {
     return m_next;
   }
 
+  protected String getPrincipal() {
+    return m_principal;
+  }
+
   protected Subject getSubject() {
     return m_subject;
   }
@@ -73,6 +82,12 @@ public void evaluate() throws Throwable {
   }
 
   protected RunContext createRunContext() {
-    return RunContexts.copyCurrent().withSubject(m_subject);
+    return RunContexts.copyCurrent()
+        .withSubject(m_subject)
+        .withUser(createUser());
+  }
+
+  protected User createUser() {
+    return BEANS.get(User.class).withUserId(m_principal).setReadOnly();
   }
 }