refactor: Use UserSession::completeLogin in OC_User

Allow to get rid of more legacy code and make sure UserSessionTest is
also in psalm

Signed-off-by: Carl Schwan <carlschwan@kde.org>

Author: CarlSchwan

build/psalm-baseline.xml

@@ -30,6 +30,11 @@
       <code><![CDATA[getAppValue]]></code>
     </DeprecatedMethod>
   </file>
+  <file src="apps/cloud_federation_api/lib/Controller/RequestHandlerController.php">
+    <DeprecatedMethod>
+      <code><![CDATA[getFederationIdFromSharedSecret]]></code>
+    </DeprecatedMethod>
+  </file>
   <file src="apps/comments/lib/Activity/Listener.php">
     <DeprecatedConstant>
       <code><![CDATA[CommentsEvent::EVENT_ADD]]></code>
@@ -4078,11 +4083,6 @@
       <code><![CDATA[$value]]></code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="lib/private/Session/Memory.php">
-    <MoreSpecificImplementedParamType>
-      <code><![CDATA[$value]]></code>
-    </MoreSpecificImplementedParamType>
-  </file>
   <file src="lib/private/Setup.php">
     <RedundantCondition>
       <code><![CDATA[$type === 'pdo']]></code>
@@ -4188,11 +4188,6 @@
       <code><![CDATA[getQuota]]></code>
     </UndefinedInterfaceMethod>
   </file>
-  <file src="lib/private/legacy/OC_User.php">
-    <UndefinedClass>
-      <code><![CDATA[\Test\Util\User\Dummy]]></code>
-    </UndefinedClass>
-  </file>
   <file src="lib/public/AppFramework/Http/Response.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[array_merge($mergeWith, $this->headers)]]></code>

lib/private/Server.php

@@ -8,6 +8,7 @@
 namespace OC;
 
 use bantu\IniGetWrapper\IniGetWrapper;
+use lib\private\Files\Listeners\UserMountCacheListener;
 use OC\Accounts\AccountManager;
 use OC\Activity\EventMerger;
 use OC\App\AppManager;
@@ -529,6 +530,8 @@ public function __construct(
 				$c->get('LockdownManager'),
 				$c->get(LoggerInterface::class),
 				$c->get(IEventDispatcher::class),
+				$c,
+				$c->get(IRootFolder::class),
 			);
 			$dispatcher = $this->get(IEventDispatcher::class);
 			$dispatcher->addListener(UserLoggedInEvent::class, function (UserLoggedInEvent $event) {
@@ -749,11 +752,11 @@ public function __construct(
 
 			return new DateTimeFormatter(
 				$c->get(IDateTimeZone::class)->getTimeZone(),
-				$c->getL10N('lib', $language)
+				$c->get(IFactory::class)->get('lib', $language)
 			);
 		});
 
-		$this->registerService(IUserMountCache::class, function (ContainerInterface $c) {
+		$this->registerService(IUserMountCache::class, function (ContainerInterface $c): IUserMountCache {
 			$mountCache = $c->get(UserMountCache::class);
 			/** @var IEventDispatcher $eventDispatcher */
 			$eventDispatcher = $c->get(IEventDispatcher::class);

lib/private/Session/Memory.php

@@ -22,7 +22,7 @@ class Memory extends Session {
 
 	/**
 	 * @param string $key
-	 * @param integer $value
+	 * @param mixed $value
 	 */
 	#[\Override]
 	public function set(string $key, $value) {

lib/private/User/Session.php

@@ -27,6 +27,7 @@
 use OCP\Authentication\Exceptions\InvalidTokenException;
 use OCP\EventDispatcher\GenericEvent;
 use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Files\IRootFolder;
 use OCP\IConfig;
 use OCP\IDBConnection;
 use OCP\IRequest;
@@ -46,6 +47,7 @@
 use OCP\User\Events\UserLoggedInWithCookieEvent;
 use OCP\User\Events\UserLoggedOutEvent;
 use OCP\Util;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -65,8 +67,7 @@
 class Session implements IUserSession, Emitter {
 	use TTransactional;
 
-	/** @var User $activeUser */
-	protected $activeUser;
+	protected ?User $activeUser = null;
 
 	public function __construct(
 		private Manager $manager,
@@ -78,6 +79,8 @@ public function __construct(
 		private ILockdownManager $lockdownManager,
 		private LoggerInterface $logger,
 		private IEventDispatcher $dispatcher,
+		private ContainerInterface $container,
+		private IRootFolder $rootFolder,
 	) {
 	}
 
@@ -524,8 +527,8 @@ protected function prepareUserLogin($firstTimeLogin, $refreshCsrfToken = true) {
 
 		if ($firstTimeLogin) {
 			// trigger any other initialization
-			Server::get(IEventDispatcher::class)->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser()));
-			Server::get(IEventDispatcher::class)->dispatchTyped(new UserFirstTimeLoggedInEvent($this->getUser()));
+			$this->dispatcher->dispatch(IUser::class . '::firstLogin', new GenericEvent($this->getUser()));
+			$this->dispatcher->dispatchTyped(new UserFirstTimeLoggedInEvent($this->getUser()));
 		}
 	}
 

lib/private/legacy/OC_User.php

@@ -16,7 +16,6 @@
 use OCP\Authentication\IProvideUserSecretBackend;
 use OCP\Authentication\Token\IToken;
 use OCP\EventDispatcher\IEventDispatcher;
-use OCP\Files\IRootFolder;
 use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\ISession;
@@ -150,8 +149,6 @@ public static function loginWithApache(IApacheBackend $backend): bool {
 				self::setUserId($uid);
 				/** @var Session $userSession */
 				$userSession = Server::get(IUserSession::class);
-
-				/** @var IEventDispatcher $dispatcher */
 				$dispatcher = Server::get(IEventDispatcher::class);
 
 				if ($userSession->getUser() && !$userSession->getUser()->isEnabled()) {
@@ -165,11 +162,12 @@ public static function loginWithApache(IApacheBackend $backend): bool {
 					$password = $backend->getCurrentUserSecret();
 				}
 
-				/** @var IEventDispatcher $dispatcher */
 				$dispatcher->dispatchTyped(new BeforeUserLoggedInEvent($uid, $password, $backend));
 
+				$user = $userSession->getUser();
+				$userSession->completeLogin($user, ['loginName' => $uid, 'password' => $password]);
 				$userSession->createSessionToken($request, $uid, $uid, $password);
-				$userSession->createRememberMeToken($userSession->getUser());
+				$userSession->createRememberMeToken($user);
 
 				if (empty($password)) {
 					$tokenProvider = Server::get(IProvider::class);
@@ -186,11 +184,6 @@ public static function loginWithApache(IApacheBackend $backend): bool {
 					}
 				}
 
-				$user = Server::get(IUserManager::class)->get($uid);
-
-				// set up the filesystem
-				Server::get(\OCP\Files\ISetupManager::class)->setupForUser($user);
-
 				// first call the UserLoggedIn event, the login-process needs to be
 				// completed before we can safely create the user's folder.
 				// For example encryption needs to initialize the users keys first
@@ -201,9 +194,6 @@ public static function loginWithApache(IApacheBackend $backend): bool {
 					null,
 					false)
 				);
-
-				// trigger creation of user home and /files folder
-				Server::get(IRootFolder::class)->getUserFolder($uid);
 			}
 			return true;
 		}

psalm.xml

@@ -67,6 +67,8 @@
 		<file name="version.php"/>
 		<file name="tests/lib/TestCase.php"/>
 		<file name="tests/lib/Files/Template/*.php"/>
+		<file name="tests/lib/Util/User/Dummy.php"/>
+		<file name="tests/lib/User/SessionTest.php"/>
 		<ignoreFiles>
 			<directory name="apps/**/tests"/>
 			<directory name="apps/**/composer"/>
@@ -177,6 +179,7 @@
 		<DeprecatedClass>
 			<errorLevel type="suppress">
 				<directory name="lib" />
+				<directory name="tests" />
 				<directory name="apps/*/tests" />
 			</errorLevel>
 		</DeprecatedClass>