Skip to content

Commit e524120

Browse files
committed
chore!: remove legacy v1 API
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent 05f22ad commit e524120

12 files changed

Lines changed: 12 additions & 2840 deletions

appinfo/routes.php

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,19 @@
99

1010
return [
1111
'ocs' => [
12-
# v1
13-
['name' => 'Key#setPrivateKey', 'url' => '/api/v{apiVersion}/private-key', 'verb' => 'POST', 'requirements' => ['apiVersion' => '(1|2)']],
14-
['name' => 'Key#getPrivateKey', 'url' => '/api/v{apiVersion}/private-key', 'verb' => 'GET', 'requirements' => ['apiVersion' => '(1|2)']],
15-
['name' => 'Key#deletePrivateKey', 'url' => '/api/v{apiVersion}/private-key', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(1|2)']],
16-
['name' => 'Key#setPublicKey', 'url' => '/api/v{apiVersion}/public-key', 'verb' => 'PUT', 'requirements' => ['apiVersion' => '(1|2)']],
17-
['name' => 'Key#createPublicKey', 'url' => '/api/v{apiVersion}/public-key', 'verb' => 'POST', 'requirements' => ['apiVersion' => '(1|2)']],
18-
['name' => 'Key#getPublicKeys', 'url' => '/api/v{apiVersion}/public-key', 'verb' => 'GET', 'requirements' => ['apiVersion' => '(1|2)']],
19-
['name' => 'Key#deletePublicKey', 'url' => '/api/v{apiVersion}/public-key', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(1|2)']],
20-
['name' => 'Key#getPublicServerKey', 'url' => '/api/v{apiVersion}/server-key', 'verb' => 'GET', 'requirements' => ['apiVersion' => '(1|2)']],
21-
['name' => 'V1\MetaData#setMetaData', 'url' => '/api/v1/meta-data/{id}', 'verb' => 'POST'],
22-
['name' => 'V1\MetaData#getMetaData', 'url' => '/api/v1/meta-data/{id}', 'verb' => 'GET'],
23-
['name' => 'V1\MetaData#updateMetaData', 'url' => '/api/v1/meta-data/{id}', 'verb' => 'PUT'],
24-
['name' => 'V1\MetaData#deleteMetaData', 'url' => '/api/v1/meta-data/{id}', 'verb' => 'DELETE'],
25-
['name' => 'V1\MetaData#addMetadataFileDrop', 'url' => '/api/v1/meta-data/{id}/filedrop', 'verb' => 'PUT'],
26-
['name' => 'Encryption#removeEncryptedFolders', 'url' => '/api/v{apiVersion}/encrypted-files', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(1|2)']],
27-
['name' => 'Encryption#setEncryptionFlag', 'url' => '/api/v{apiVersion}/encrypted/{id}', 'verb' => 'PUT', 'requirements' => ['apiVersion' => '(1|2)']],
28-
['name' => 'Encryption#removeEncryptionFlag', 'url' => '/api/v{apiVersion}/encrypted/{id}', 'verb' => 'DELETE', 'requirements' => ['apiVersion' => '(1|2)']],
29-
['name' => 'V1\Locking#lockFolder', 'url' => '/api/v1/lock/{id}', 'verb' => 'POST'],
30-
['name' => 'V1\Locking#unlockFolder', 'url' => '/api/v1/lock/{id}', 'verb' => 'DELETE'],
31-
# v2
32-
['name' => 'MetaData#setMetaData', 'url' => '/api/v2/meta-data/{id}', 'verb' => 'POST'],
12+
['name' => 'Key#getPrivateKey', 'url' => '/api/v2/private-key', 'verb' => 'GET'],
13+
['name' => 'Key#setPrivateKey', 'url' => '/api/v2/private-key', 'verb' => 'POST'],
14+
['name' => 'Key#deletePrivateKey', 'url' => '/api/v2/private-key', 'verb' => 'DELETE'],
15+
['name' => 'Key#getPublicKeys', 'url' => '/api/v2/public-key', 'verb' => 'GET'],
16+
['name' => 'Key#setPublicKey', 'url' => '/api/v2/public-key', 'verb' => 'PUT'],
17+
['name' => 'Key#createPublicKey', 'url' => '/api/v2/public-key', 'verb' => 'POST'],
18+
['name' => 'Key#deletePublicKey', 'url' => '/api/v2/public-key', 'verb' => 'DELETE'],
19+
['name' => 'Key#getPublicServerKey', 'url' => '/api/v2/server-key', 'verb' => 'GET'],
20+
['name' => 'Encryption#removeEncryptedFolders', 'url' => '/api/v2/encrypted-files', 'verb' => 'DELETE'],
21+
['name' => 'Encryption#setEncryptionFlag', 'url' => '/api/v2/encrypted/{id}', 'verb' => 'PUT'],
22+
['name' => 'Encryption#removeEncryptionFlag', 'url' => '/api/v2/encrypted/{id}', 'verb' => 'DELETE'],
3323
['name' => 'MetaData#getMetaData', 'url' => '/api/v2/meta-data/{id}', 'verb' => 'GET'],
24+
['name' => 'MetaData#setMetaData', 'url' => '/api/v2/meta-data/{id}', 'verb' => 'POST'],
3425
['name' => 'MetaData#updateMetaData', 'url' => '/api/v2/meta-data/{id}', 'verb' => 'PUT'],
3526
['name' => 'MetaData#deleteMetaData', 'url' => '/api/v2/meta-data/{id}', 'verb' => 'DELETE'],
3627
['name' => 'MetaData#addMetadataFileDrop', 'url' => '/api/v2/meta-data/{id}/filedrop', 'verb' => 'PUT'],

lib/AppInfo/Application.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717
use OCA\EndToEndEncryption\EncryptionManager;
1818
use OCA\EndToEndEncryption\IKeyStorage;
1919
use OCA\EndToEndEncryption\IMetaDataStorage;
20-
use OCA\EndToEndEncryption\IMetaDataStorageV1;
2120
use OCA\EndToEndEncryption\KeyStorage;
2221
use OCA\EndToEndEncryption\Listener\AllowBlobMediaInCSPListener;
2322
use OCA\EndToEndEncryption\Listener\LoadAdditionalListener;
2423
use OCA\EndToEndEncryption\Listener\ShareDeletedListener;
2524
use OCA\EndToEndEncryption\Listener\UserDeletedListener;
2625
use OCA\EndToEndEncryption\MetaDataStorage;
27-
use OCA\EndToEndEncryption\MetaDataStorageV1;
2826
use OCA\EndToEndEncryption\Middleware\CanUseAppMiddleware;
2927
use OCA\EndToEndEncryption\Middleware\ClientHasCapabilityMiddleware;
3028
use OCA\EndToEndEncryption\Middleware\UserAgentCheckMiddleware;
@@ -61,7 +59,6 @@ public function register(IRegistrationContext $context): void {
6159
$context->registerMiddleware(CanUseAppMiddleware::class);
6260
$context->registerMiddleware(ClientHasCapabilityMiddleware::class);
6361
$context->registerServiceAlias(IKeyStorage::class, KeyStorage::class);
64-
$context->registerServiceAlias(IMetaDataStorageV1::class, MetaDataStorageV1::class);
6562
$context->registerServiceAlias(IMetaDataStorage::class, MetaDataStorage::class);
6663
$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
6764
$context->registerEventListener(ShareDeletedEvent::class, ShareDeletedListener::class);

lib/Controller/V1/LockingController.php

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

0 commit comments

Comments
 (0)