fixup! feat(settings): wire log and login/session services into admin settings

Author: ChristophWurst

tests/lib/ActiveConnectionsTest.php

@@ -22,7 +22,7 @@ class ActiveConnectionsTest extends TestCase {
 	private IDBConnection $db;
 	private ActiveConnections $instance;
 
-	private array $insertedTokenIds = [];
+	private array $insertedTokens = [];
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -36,35 +36,34 @@ protected function tearDown(): void {
 	}
 
 	private function cleanUp(): void {
-		if (empty($this->insertedTokenIds)) {
+		if ($this->insertedTokens === []) {
 			return;
 		}
 		$qb = $this->db->getQueryBuilder();
 		$qb->delete('authtoken')
-			->where($qb->expr()->in('id', $qb->createNamedParameter($this->insertedTokenIds, IQueryBuilder::PARAM_INT_ARRAY)));
+			->where($qb->expr()->in('token', $qb->createNamedParameter($this->insertedTokens, IQueryBuilder::PARAM_STR_ARRAY)));
 		$qb->executeStatement();
-		$this->insertedTokenIds = [];
+		$this->insertedTokens = [];
 	}
 
-	private function insertToken(int $lastActivity, int $type = 0): int {
+	private function insertToken(int $lastActivity, int $type = 0): void {
 		static $uid = 0;
 		$uid++;
+		$token = bin2hex(random_bytes(32));
+		$this->insertedTokens[] = $token;
 		$qb = $this->db->getQueryBuilder();
 		$qb->insert('authtoken')
 			->values([
 				'uid' => $qb->createNamedParameter('testuser' . $uid),
 				'login_name' => $qb->createNamedParameter('testuser' . $uid),
 				'password' => $qb->createNamedParameter(''),
 				'name' => $qb->createNamedParameter('Test token ' . $uid),
-				'token' => $qb->createNamedParameter(bin2hex(random_bytes(32))),
+				'token' => $qb->createNamedParameter($token),
 				'type' => $qb->createNamedParameter($type),
 				'last_activity' => $qb->createNamedParameter($lastActivity),
 				'last_check' => $qb->createNamedParameter(time()),
 			]);
 		$qb->executeStatement();
-		$id = $this->db->lastInsertId('authtoken');
-		$this->insertedTokenIds[] = $id;
-		return (int)$id;
 	}
 
 	public function testReturnShape(): void {

tests/lib/ActivityRateTest.php

@@ -11,7 +11,6 @@
 
 use OCA\ServerInfo\ActivityRate;
 use OCP\App\IAppManager;
-use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\IDBConnection;
 use OCP\Server;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -25,8 +24,6 @@ class ActivityRateTest extends TestCase {
 	private IAppManager&MockObject $appManager;
 	private ActivityRate $instance;
 	private bool $tableAvailable;
-	private array $insertedIds = [];
-
 	protected function setUp(): void {
 		parent::setUp();
 		$this->db = Server::get(IDBConnection::class);
@@ -36,10 +33,10 @@ protected function setUp(): void {
 	}
 
 	protected function tearDown(): void {
-		if ($this->tableAvailable && $this->insertedIds !== []) {
+		if ($this->tableAvailable) {
 			$qb = $this->db->getQueryBuilder();
 			$qb->delete('activity')
-				->where($qb->expr()->in('activity_id', $qb->createNamedParameter($this->insertedIds, IQueryBuilder::PARAM_INT_ARRAY)));
+				->where($qb->expr()->eq('app', $qb->createNamedParameter('serverinfo_test')));
 			$qb->executeStatement();
 		}
 		parent::tearDown();
@@ -74,7 +71,6 @@ private function insertActivity(string $type, int $timestamp): void {
 				'object_id' => $qb->createNamedParameter(0),
 			]);
 		$qb->executeStatement();
-		$this->insertedIds[] = (int)$this->db->lastInsertId('activity');
 	}
 
 	public function testNotInstalledReturnsInstalledFalse(): void {