Skip to content

Commit 30f8c2b

Browse files
committed
fix: Remove dead code and migration
Signed-off-by: Joas Schilling <coding@schilljs.com>
1 parent b8dd5c1 commit 30f8c2b

15 files changed

Lines changed: 64 additions & 482 deletions

apps/cloud_federation_api/composer/composer/autoload_classmap.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,13 @@
88
return array(
99
'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
1010
'OCA\\CloudFederationAPI\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
11-
'OCA\\CloudFederationAPI\\BackgroundJob\\CleanupExpiredOcmTokensJob' => $baseDir . '/../lib/BackgroundJob/CleanupExpiredOcmTokensJob.php',
1211
'OCA\\CloudFederationAPI\\Config' => $baseDir . '/../lib/Config.php',
1312
'OCA\\CloudFederationAPI\\Controller\\OCMRequestController' => $baseDir . '/../lib/Controller/OCMRequestController.php',
1413
'OCA\\CloudFederationAPI\\Controller\\RequestHandlerController' => $baseDir . '/../lib/Controller/RequestHandlerController.php',
1514
'OCA\\CloudFederationAPI\\Controller\\TokenController' => $baseDir . '/../lib/Controller/TokenController.php',
16-
'OCA\\CloudFederationAPI\\Db\\OcmTokenMap' => $baseDir . '/../lib/Db/OcmTokenMap.php',
17-
'OCA\\CloudFederationAPI\\Db\\OcmTokenMapMapper' => $baseDir . '/../lib/Db/OcmTokenMapMapper.php',
18-
'OCA\\CloudFederationAPI\\Listener\\ShareDeletedListener' => $baseDir . '/../lib/Listener/ShareDeletedListener.php',
1915
'OCA\\CloudFederationAPI\\Migration\\DropFederatedInvitesTable' => $baseDir . '/../lib/Migration/DropFederatedInvitesTable.php',
2016
'OCA\\CloudFederationAPI\\Migration\\Version1016Date202502262004' => $baseDir . '/../lib/Migration/Version1016Date202502262004.php',
2117
'OCA\\CloudFederationAPI\\Migration\\Version1017Date20260306120000' => $baseDir . '/../lib/Migration/Version1017Date20260306120000.php',
18+
'OCA\\CloudFederationAPI\\Migration\\Version2000Date20260919141251' => $baseDir . '/../lib/Migration/Version2000Date20260919141251.php',
2219
'OCA\\CloudFederationAPI\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
23-
'OCA\\CloudFederationAPI\\Service\\OcmTokenService' => $baseDir . '/../lib/Service/OcmTokenService.php',
2420
);

apps/cloud_federation_api/composer/composer/autoload_static.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,15 @@ class ComposerStaticInitCloudFederationAPI
2323
public static $classMap = array (
2424
'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
2525
'OCA\\CloudFederationAPI\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
26-
'OCA\\CloudFederationAPI\\BackgroundJob\\CleanupExpiredOcmTokensJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/CleanupExpiredOcmTokensJob.php',
2726
'OCA\\CloudFederationAPI\\Config' => __DIR__ . '/..' . '/../lib/Config.php',
2827
'OCA\\CloudFederationAPI\\Controller\\OCMRequestController' => __DIR__ . '/..' . '/../lib/Controller/OCMRequestController.php',
2928
'OCA\\CloudFederationAPI\\Controller\\RequestHandlerController' => __DIR__ . '/..' . '/../lib/Controller/RequestHandlerController.php',
3029
'OCA\\CloudFederationAPI\\Controller\\TokenController' => __DIR__ . '/..' . '/../lib/Controller/TokenController.php',
31-
'OCA\\CloudFederationAPI\\Db\\OcmTokenMap' => __DIR__ . '/..' . '/../lib/Db/OcmTokenMap.php',
32-
'OCA\\CloudFederationAPI\\Db\\OcmTokenMapMapper' => __DIR__ . '/..' . '/../lib/Db/OcmTokenMapMapper.php',
33-
'OCA\\CloudFederationAPI\\Listener\\ShareDeletedListener' => __DIR__ . '/..' . '/../lib/Listener/ShareDeletedListener.php',
3430
'OCA\\CloudFederationAPI\\Migration\\DropFederatedInvitesTable' => __DIR__ . '/..' . '/../lib/Migration/DropFederatedInvitesTable.php',
3531
'OCA\\CloudFederationAPI\\Migration\\Version1016Date202502262004' => __DIR__ . '/..' . '/../lib/Migration/Version1016Date202502262004.php',
3632
'OCA\\CloudFederationAPI\\Migration\\Version1017Date20260306120000' => __DIR__ . '/..' . '/../lib/Migration/Version1017Date20260306120000.php',
33+
'OCA\\CloudFederationAPI\\Migration\\Version2000Date20260919141251' => __DIR__ . '/..' . '/../lib/Migration/Version2000Date20260919141251.php',
3734
'OCA\\CloudFederationAPI\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
38-
'OCA\\CloudFederationAPI\\Service\\OcmTokenService' => __DIR__ . '/..' . '/../lib/Service/OcmTokenService.php',
3935
);
4036

4137
public static function getInitializer(ClassLoader $loader)

apps/cloud_federation_api/lib/AppInfo/Application.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ public function __construct() {
2525

2626
#[\Override]
2727
public function register(IRegistrationContext $context): void {
28-
$context->registerEventListener(ShareDeletedEvent::class, ShareDeletedListener::class);
2928
}
3029

3130
#[\Override]

apps/cloud_federation_api/lib/BackgroundJob/CleanupExpiredOcmTokensJob.php

Lines changed: 0 additions & 39 deletions
This file was deleted.

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ public function __construct(
7070
private ICloudFederationFactory $factory,
7171
private ICloudIdManager $cloudIdManager,
7272
private readonly IOCMDiscoveryService $ocmDiscoveryService,
73-
private ITimeFactory $timeFactory,
7473
) {
7574
parent::__construct($appName, $request);
7675
}

apps/cloud_federation_api/lib/Db/OcmTokenMap.php

Lines changed: 0 additions & 41 deletions
This file was deleted.

apps/cloud_federation_api/lib/Db/OcmTokenMapMapper.php

Lines changed: 0 additions & 65 deletions
This file was deleted.

apps/cloud_federation_api/lib/Listener/ShareDeletedListener.php

Lines changed: 0 additions & 56 deletions
This file was deleted.
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
/**
6+
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
7+
* SPDX-License-Identifier: AGPL-3.0-or-later
8+
*/
9+
10+
namespace OCA\CloudFederationAPI\Migration;
11+
12+
use Closure;
13+
use OCP\DB\ISchemaWrapper;
14+
use OCP\IDBConnection;
15+
use OCP\Migration\Attributes\DropTable;
16+
use OCP\Migration\IOutput;
17+
use OCP\Migration\SimpleMigrationStep;
18+
use Override;
19+
20+
#[DropTable(table: 'ocm_token_map', description: 'Remove table used by previous implementation')]
21+
class Version2000Date20260919141251 extends SimpleMigrationStep {
22+
public function __construct(
23+
private IDBConnection $connection,
24+
) {
25+
}
26+
27+
/**
28+
* @param IOutput $output
29+
* @param Closure(): ISchemaWrapper $schemaClosure
30+
* @param array $options
31+
*/
32+
#[Override]
33+
public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
34+
$query = $this->connection->getQueryBuilder();
35+
$query->select('access_token_id')
36+
->from('ocm_token_map');
37+
38+
$delete = $this->connection->getQueryBuilder();
39+
$delete->delete('authtoken')
40+
->where($delete->expr()->in('id', $query->createFunction($query->getSQL())));
41+
$delete->executeStatement();
42+
}
43+
44+
/**
45+
* @param IOutput $output
46+
* @param Closure(): ISchemaWrapper $schemaClosure
47+
* @param array $options
48+
* @return null|ISchemaWrapper
49+
*/
50+
#[Override]
51+
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
52+
/** @var ISchemaWrapper $schema */
53+
$schema = $schemaClosure();
54+
55+
if (!$schema->hasTable('ocm_token_map')) {
56+
return null;
57+
}
58+
59+
$schema->dropTable('ocm_token_map');
60+
}
61+
}

apps/cloud_federation_api/lib/Service/OcmTokenService.php

Lines changed: 0 additions & 70 deletions
This file was deleted.

0 commit comments

Comments
 (0)