Skip to content

Commit 117d8de

Browse files
authored
Merge pull request #54328 from nextcloud/jtr-refactor-files-external-oauth1
refactor(files_external): Drop unused oauth1 code
2 parents 1518ded + 9c4aaef commit 117d8de

File tree

7 files changed

+0
-137
lines changed

7 files changed

+0
-137
lines changed

apps/files_external/appinfo/routes.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,9 @@
77
*/
88

99

10-
$this->create('files_external_oauth1', 'apps/files_external/ajax/oauth1.php')
11-
->actionInclude('files_external/ajax/oauth1.php');
1210
$this->create('files_external_oauth2', 'apps/files_external/ajax/oauth2.php')
1311
->actionInclude('files_external/ajax/oauth2.php');
1412

15-
1613
$this->create('files_external_list_applicable', '/apps/files_external/applicable')
1714
->actionInclude('files_external/ajax/applicable.php');
1815

apps/files_external/composer/composer/autoload_classmap.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
'OCA\\Files_External\\Lib\\Auth\\IUserProvided' => $baseDir . '/../lib/Lib/Auth/IUserProvided.php',
4444
'OCA\\Files_External\\Lib\\Auth\\InvalidAuth' => $baseDir . '/../lib/Lib/Auth/InvalidAuth.php',
4545
'OCA\\Files_External\\Lib\\Auth\\NullMechanism' => $baseDir . '/../lib/Lib/Auth/NullMechanism.php',
46-
'OCA\\Files_External\\Lib\\Auth\\OAuth1\\OAuth1' => $baseDir . '/../lib/Lib/Auth/OAuth1/OAuth1.php',
4746
'OCA\\Files_External\\Lib\\Auth\\OAuth2\\OAuth2' => $baseDir . '/../lib/Lib/Auth/OAuth2/OAuth2.php',
4847
'OCA\\Files_External\\Lib\\Auth\\OpenStack\\OpenStackV2' => $baseDir . '/../lib/Lib/Auth/OpenStack/OpenStackV2.php',
4948
'OCA\\Files_External\\Lib\\Auth\\OpenStack\\OpenStackV3' => $baseDir . '/../lib/Lib/Auth/OpenStack/OpenStackV3.php',

apps/files_external/composer/composer/autoload_static.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class ComposerStaticInitFiles_External
5858
'OCA\\Files_External\\Lib\\Auth\\IUserProvided' => __DIR__ . '/..' . '/../lib/Lib/Auth/IUserProvided.php',
5959
'OCA\\Files_External\\Lib\\Auth\\InvalidAuth' => __DIR__ . '/..' . '/../lib/Lib/Auth/InvalidAuth.php',
6060
'OCA\\Files_External\\Lib\\Auth\\NullMechanism' => __DIR__ . '/..' . '/../lib/Lib/Auth/NullMechanism.php',
61-
'OCA\\Files_External\\Lib\\Auth\\OAuth1\\OAuth1' => __DIR__ . '/..' . '/../lib/Lib/Auth/OAuth1/OAuth1.php',
6261
'OCA\\Files_External\\Lib\\Auth\\OAuth2\\OAuth2' => __DIR__ . '/..' . '/../lib/Lib/Auth/OAuth2/OAuth2.php',
6362
'OCA\\Files_External\\Lib\\Auth\\OpenStack\\OpenStackV2' => __DIR__ . '/..' . '/../lib/Lib/Auth/OpenStack/OpenStackV2.php',
6463
'OCA\\Files_External\\Lib\\Auth\\OpenStack\\OpenStackV3' => __DIR__ . '/..' . '/../lib/Lib/Auth/OpenStack/OpenStackV3.php',

apps/files_external/js/oauth1.js

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

apps/files_external/lib/AppInfo/Application.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use OCA\Files_External\Lib\Auth\AmazonS3\AccessKey;
1515
use OCA\Files_External\Lib\Auth\Builtin;
1616
use OCA\Files_External\Lib\Auth\NullMechanism;
17-
use OCA\Files_External\Lib\Auth\OAuth1\OAuth1;
1817
use OCA\Files_External\Lib\Auth\OAuth2\OAuth2;
1918
use OCA\Files_External\Lib\Auth\OpenStack\OpenStackV2;
2019
use OCA\Files_External\Lib\Auth\OpenStack\OpenStackV3;
@@ -136,9 +135,6 @@ public function getAuthMechanisms() {
136135
$container->get(GlobalAuth::class),
137136
$container->get(UserGlobalAuth::class),
138137

139-
// AuthMechanism::SCHEME_OAUTH1 mechanisms
140-
$container->get(OAuth1::class),
141-
142138
// AuthMechanism::SCHEME_OAUTH2 mechanisms
143139
$container->get(OAuth2::class),
144140

apps/files_external/lib/Lib/Auth/AuthMechanism.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ class AuthMechanism implements \JsonSerializable, IIdentifier, IFrontendDefiniti
4040
public const SCHEME_NULL = 'null';
4141
public const SCHEME_BUILTIN = 'builtin';
4242
public const SCHEME_PASSWORD = 'password';
43-
public const SCHEME_OAUTH1 = 'oauth1';
4443
public const SCHEME_OAUTH2 = 'oauth2';
4544
public const SCHEME_PUBLICKEY = 'publickey';
4645
public const SCHEME_OPENSTACK = 'openstack';

apps/files_external/lib/Lib/Auth/OAuth1/OAuth1.php

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

0 commit comments

Comments
 (0)