@@ -28,21 +28,21 @@ |
||
28 | 28 | use OCP\EventDispatcher\Event; |
29 | 29 | |
30 | 30 | class LoginFailed extends Event { |
31 | - private string $loginName; |
|
32 | - private ?string $password; |
|
31 | + private string $loginName; |
|
32 | + private ?string $password; |
|
33 | 33 | |
34 | - public function __construct(string $loginName, ?string $password) { |
|
35 | - parent::__construct(); |
|
34 | + public function __construct(string $loginName, ?string $password) { |
|
35 | + parent::__construct(); |
|
36 | 36 | |
37 | - $this->loginName = $loginName; |
|
38 | - $this->password = $password; |
|
39 | - } |
|
37 | + $this->loginName = $loginName; |
|
38 | + $this->password = $password; |
|
39 | + } |
|
40 | 40 | |
41 | - public function getLoginName(): string { |
|
42 | - return $this->loginName; |
|
43 | - } |
|
41 | + public function getLoginName(): string { |
|
42 | + return $this->loginName; |
|
43 | + } |
|
44 | 44 | |
45 | - public function getPassword(): ?string { |
|
46 | - return $this->password; |
|
47 | - } |
|
45 | + public function getPassword(): ?string { |
|
46 | + return $this->password; |
|
47 | + } |
|
48 | 48 | } |
@@ -34,47 +34,47 @@ |
||
34 | 34 | * @since 13.0.0 |
35 | 35 | */ |
36 | 36 | interface IMigrationStep { |
37 | - /** |
|
38 | - * Human-readable name of the migration step |
|
39 | - * |
|
40 | - * @return string |
|
41 | - * @since 14.0.0 |
|
42 | - */ |
|
43 | - public function name(): string; |
|
37 | + /** |
|
38 | + * Human-readable name of the migration step |
|
39 | + * |
|
40 | + * @return string |
|
41 | + * @since 14.0.0 |
|
42 | + */ |
|
43 | + public function name(): string; |
|
44 | 44 | |
45 | - /** |
|
46 | - * Human-readable description of the migration step |
|
47 | - * |
|
48 | - * @return string |
|
49 | - * @since 14.0.0 |
|
50 | - */ |
|
51 | - public function description(): string; |
|
45 | + /** |
|
46 | + * Human-readable description of the migration step |
|
47 | + * |
|
48 | + * @return string |
|
49 | + * @since 14.0.0 |
|
50 | + */ |
|
51 | + public function description(): string; |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param IOutput $output |
|
55 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
56 | - * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
57 | - * @param array $options |
|
58 | - * @since 13.0.0 |
|
59 | - */ |
|
60 | - public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options); |
|
53 | + /** |
|
54 | + * @param IOutput $output |
|
55 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
56 | + * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
57 | + * @param array $options |
|
58 | + * @since 13.0.0 |
|
59 | + */ |
|
60 | + public function preSchemaChange(IOutput $output, Closure $schemaClosure, array $options); |
|
61 | 61 | |
62 | - /** |
|
63 | - * @param IOutput $output |
|
64 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
65 | - * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
66 | - * @param array $options |
|
67 | - * @return null|ISchemaWrapper |
|
68 | - * @since 13.0.0 |
|
69 | - */ |
|
70 | - public function changeSchema(IOutput $output, Closure $schemaClosure, array $options); |
|
62 | + /** |
|
63 | + * @param IOutput $output |
|
64 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
65 | + * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
66 | + * @param array $options |
|
67 | + * @return null|ISchemaWrapper |
|
68 | + * @since 13.0.0 |
|
69 | + */ |
|
70 | + public function changeSchema(IOutput $output, Closure $schemaClosure, array $options); |
|
71 | 71 | |
72 | - /** |
|
73 | - * @param IOutput $output |
|
74 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
75 | - * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
76 | - * @param array $options |
|
77 | - * @since 13.0.0 |
|
78 | - */ |
|
79 | - public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options); |
|
72 | + /** |
|
73 | + * @param IOutput $output |
|
74 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
75 | + * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
76 | + * @param array $options |
|
77 | + * @since 13.0.0 |
|
78 | + */ |
|
79 | + public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options); |
|
80 | 80 | } |
@@ -35,55 +35,55 @@ |
||
35 | 35 | * @since 13.0.0 |
36 | 36 | */ |
37 | 37 | abstract class SimpleMigrationStep implements IMigrationStep { |
38 | - /** |
|
39 | - * Human-readable name of the migration step |
|
40 | - * |
|
41 | - * @return string |
|
42 | - * @since 14.0.0 |
|
43 | - */ |
|
44 | - public function name(): string { |
|
45 | - return ''; |
|
46 | - } |
|
38 | + /** |
|
39 | + * Human-readable name of the migration step |
|
40 | + * |
|
41 | + * @return string |
|
42 | + * @since 14.0.0 |
|
43 | + */ |
|
44 | + public function name(): string { |
|
45 | + return ''; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Human-readable description of the migration step |
|
50 | - * |
|
51 | - * @return string |
|
52 | - * @since 14.0.0 |
|
53 | - */ |
|
54 | - public function description(): string { |
|
55 | - return ''; |
|
56 | - } |
|
48 | + /** |
|
49 | + * Human-readable description of the migration step |
|
50 | + * |
|
51 | + * @return string |
|
52 | + * @since 14.0.0 |
|
53 | + */ |
|
54 | + public function description(): string { |
|
55 | + return ''; |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param IOutput $output |
|
60 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
61 | - * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
62 | - * @param array $options |
|
63 | - * @since 13.0.0 |
|
64 | - */ |
|
65 | - public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
66 | - } |
|
58 | + /** |
|
59 | + * @param IOutput $output |
|
60 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
61 | + * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
62 | + * @param array $options |
|
63 | + * @since 13.0.0 |
|
64 | + */ |
|
65 | + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * @param IOutput $output |
|
70 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
71 | - * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
72 | - * @param array $options |
|
73 | - * @return null|ISchemaWrapper |
|
74 | - * @since 13.0.0 |
|
75 | - */ |
|
76 | - public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
77 | - return null; |
|
78 | - } |
|
68 | + /** |
|
69 | + * @param IOutput $output |
|
70 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
71 | + * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
72 | + * @param array $options |
|
73 | + * @return null|ISchemaWrapper |
|
74 | + * @since 13.0.0 |
|
75 | + */ |
|
76 | + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { |
|
77 | + return null; |
|
78 | + } |
|
79 | 79 | |
80 | - /** |
|
81 | - * @param IOutput $output |
|
82 | - * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
83 | - * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
84 | - * @param array $options |
|
85 | - * @since 13.0.0 |
|
86 | - */ |
|
87 | - public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
88 | - } |
|
80 | + /** |
|
81 | + * @param IOutput $output |
|
82 | + * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper` |
|
83 | + * @psalm-param Closure():ISchemaWrapper $schemaClosure |
|
84 | + * @param array $options |
|
85 | + * @since 13.0.0 |
|
86 | + */ |
|
87 | + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { |
|
88 | + } |
|
89 | 89 | } |
@@ -28,12 +28,12 @@ |
||
28 | 28 | * @since 14.0.0 |
29 | 29 | */ |
30 | 30 | interface IWriter { |
31 | - /** |
|
32 | - * @since 14.0.0 |
|
33 | - * |
|
34 | - * @param string $app |
|
35 | - * @param string|array $message |
|
36 | - * @param int $level |
|
37 | - */ |
|
38 | - public function write(string $app, $message, int $level); |
|
31 | + /** |
|
32 | + * @since 14.0.0 |
|
33 | + * |
|
34 | + * @param string $app |
|
35 | + * @param string|array $message |
|
36 | + * @param int $level |
|
37 | + */ |
|
38 | + public function write(string $app, $message, int $level); |
|
39 | 39 | } |
@@ -32,37 +32,37 @@ |
||
32 | 32 | * checksum name. |
33 | 33 | */ |
34 | 34 | class ChecksumList implements XmlSerializable { |
35 | - public const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
35 | + public const NS_OWNCLOUD = 'http://owncloud.org/ns'; |
|
36 | 36 | |
37 | - /** @var string[] of TYPE:CHECKSUM */ |
|
38 | - private array $checksums; |
|
37 | + /** @var string[] of TYPE:CHECKSUM */ |
|
38 | + private array $checksums; |
|
39 | 39 | |
40 | - public function __construct(string $checksum) { |
|
41 | - $this->checksums = explode(' ', $checksum); |
|
42 | - } |
|
40 | + public function __construct(string $checksum) { |
|
41 | + $this->checksums = explode(' ', $checksum); |
|
42 | + } |
|
43 | 43 | |
44 | - /** |
|
45 | - * The xmlSerialize method is called during xml writing. |
|
46 | - * |
|
47 | - * Use the $writer argument to write its own xml serialization. |
|
48 | - * |
|
49 | - * An important note: do _not_ create a parent element. Any element |
|
50 | - * implementing XmlSerializble should only ever write what's considered |
|
51 | - * its 'inner xml'. |
|
52 | - * |
|
53 | - * The parent of the current element is responsible for writing a |
|
54 | - * containing element. |
|
55 | - * |
|
56 | - * This allows serializers to be re-used for different element names. |
|
57 | - * |
|
58 | - * If you are opening new elements, you must also close them again. |
|
59 | - * |
|
60 | - * @param Writer $writer |
|
61 | - * @return void |
|
62 | - */ |
|
63 | - public function xmlSerialize(Writer $writer) { |
|
64 | - foreach ($this->checksums as $checksum) { |
|
65 | - $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum); |
|
66 | - } |
|
67 | - } |
|
44 | + /** |
|
45 | + * The xmlSerialize method is called during xml writing. |
|
46 | + * |
|
47 | + * Use the $writer argument to write its own xml serialization. |
|
48 | + * |
|
49 | + * An important note: do _not_ create a parent element. Any element |
|
50 | + * implementing XmlSerializble should only ever write what's considered |
|
51 | + * its 'inner xml'. |
|
52 | + * |
|
53 | + * The parent of the current element is responsible for writing a |
|
54 | + * containing element. |
|
55 | + * |
|
56 | + * This allows serializers to be re-used for different element names. |
|
57 | + * |
|
58 | + * If you are opening new elements, you must also close them again. |
|
59 | + * |
|
60 | + * @param Writer $writer |
|
61 | + * @return void |
|
62 | + */ |
|
63 | + public function xmlSerialize(Writer $writer) { |
|
64 | + foreach ($this->checksums as $checksum) { |
|
65 | + $writer->writeElement('{' . self::NS_OWNCLOUD . '}checksum', $checksum); |
|
66 | + } |
|
67 | + } |
|
68 | 68 | } |
@@ -30,24 +30,24 @@ |
||
30 | 30 | use OCP\IL10N; |
31 | 31 | |
32 | 32 | class DAV extends Backend { |
33 | - use LegacyDependencyCheckPolyfill; |
|
33 | + use LegacyDependencyCheckPolyfill; |
|
34 | 34 | |
35 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
36 | - $this |
|
37 | - ->setIdentifier('dav') |
|
38 | - ->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat |
|
39 | - ->setStorageClass('\OC\Files\Storage\DAV') |
|
40 | - ->setText($l->t('WebDAV')) |
|
41 | - ->addParameters([ |
|
42 | - new DefinitionParameter('host', $l->t('URL')), |
|
43 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
44 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
45 | - (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
46 | - ->setType(DefinitionParameter::VALUE_BOOLEAN) |
|
47 | - ->setDefaultValue(true), |
|
48 | - ]) |
|
49 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
50 | - ->setLegacyAuthMechanism($legacyAuth) |
|
51 | - ; |
|
52 | - } |
|
35 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
36 | + $this |
|
37 | + ->setIdentifier('dav') |
|
38 | + ->addIdentifierAlias('\OC\Files\Storage\DAV') // legacy compat |
|
39 | + ->setStorageClass('\OC\Files\Storage\DAV') |
|
40 | + ->setText($l->t('WebDAV')) |
|
41 | + ->addParameters([ |
|
42 | + new DefinitionParameter('host', $l->t('URL')), |
|
43 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
44 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
45 | + (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
46 | + ->setType(DefinitionParameter::VALUE_BOOLEAN) |
|
47 | + ->setDefaultValue(true), |
|
48 | + ]) |
|
49 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
50 | + ->setLegacyAuthMechanism($legacyAuth) |
|
51 | + ; |
|
52 | + } |
|
53 | 53 | } |
@@ -30,22 +30,22 @@ |
||
30 | 30 | use OCP\IL10N; |
31 | 31 | |
32 | 32 | class OwnCloud extends Backend { |
33 | - public function __construct(IL10N $l, Password $legacyAuth) { |
|
34 | - $this |
|
35 | - ->setIdentifier('owncloud') |
|
36 | - ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat |
|
37 | - ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud') |
|
38 | - ->setText($l->t('Nextcloud')) |
|
39 | - ->addParameters([ |
|
40 | - new DefinitionParameter('host', $l->t('URL')), |
|
41 | - (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
42 | - ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
43 | - (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
44 | - ->setType(DefinitionParameter::VALUE_BOOLEAN) |
|
45 | - ->setDefaultValue(true), |
|
46 | - ]) |
|
47 | - ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
48 | - ->setLegacyAuthMechanism($legacyAuth) |
|
49 | - ; |
|
50 | - } |
|
33 | + public function __construct(IL10N $l, Password $legacyAuth) { |
|
34 | + $this |
|
35 | + ->setIdentifier('owncloud') |
|
36 | + ->addIdentifierAlias('\OC\Files\Storage\OwnCloud') // legacy compat |
|
37 | + ->setStorageClass('\OCA\Files_External\Lib\Storage\OwnCloud') |
|
38 | + ->setText($l->t('Nextcloud')) |
|
39 | + ->addParameters([ |
|
40 | + new DefinitionParameter('host', $l->t('URL')), |
|
41 | + (new DefinitionParameter('root', $l->t('Remote subfolder'))) |
|
42 | + ->setFlag(DefinitionParameter::FLAG_OPTIONAL), |
|
43 | + (new DefinitionParameter('secure', $l->t('Secure https://'))) |
|
44 | + ->setType(DefinitionParameter::VALUE_BOOLEAN) |
|
45 | + ->setDefaultValue(true), |
|
46 | + ]) |
|
47 | + ->addAuthScheme(AuthMechanism::SCHEME_PASSWORD) |
|
48 | + ->setLegacyAuthMechanism($legacyAuth) |
|
49 | + ; |
|
50 | + } |
|
51 | 51 | } |
@@ -34,14 +34,14 @@ |
||
34 | 34 | * @method string getKnownUser() |
35 | 35 | */ |
36 | 36 | class KnownUser extends Entity { |
37 | - /** @var string */ |
|
38 | - protected $knownTo; |
|
37 | + /** @var string */ |
|
38 | + protected $knownTo; |
|
39 | 39 | |
40 | - /** @var string */ |
|
41 | - protected $knownUser; |
|
40 | + /** @var string */ |
|
41 | + protected $knownUser; |
|
42 | 42 | |
43 | - public function __construct() { |
|
44 | - $this->addType('knownTo', 'string'); |
|
45 | - $this->addType('knownUser', 'string'); |
|
46 | - } |
|
43 | + public function __construct() { |
|
44 | + $this->addType('knownTo', 'string'); |
|
45 | + $this->addType('knownUser', 'string'); |
|
46 | + } |
|
47 | 47 | } |
@@ -39,123 +39,123 @@ |
||
39 | 39 | use OCP\IRequest; |
40 | 40 | |
41 | 41 | class OCSMiddleware extends Middleware { |
42 | - /** @var IRequest */ |
|
43 | - private $request; |
|
44 | - |
|
45 | - /** @var int */ |
|
46 | - private $ocsVersion; |
|
47 | - |
|
48 | - /** |
|
49 | - * @param IRequest $request |
|
50 | - */ |
|
51 | - public function __construct(IRequest $request) { |
|
52 | - $this->request = $request; |
|
53 | - } |
|
54 | - |
|
55 | - /** |
|
56 | - * @param Controller $controller |
|
57 | - * @param string $methodName |
|
58 | - */ |
|
59 | - public function beforeController($controller, $methodName) { |
|
60 | - if ($controller instanceof OCSController) { |
|
61 | - if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) { |
|
62 | - $this->ocsVersion = 2; |
|
63 | - } else { |
|
64 | - $this->ocsVersion = 1; |
|
65 | - } |
|
66 | - $controller->setOCSVersion($this->ocsVersion); |
|
67 | - } |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * @param Controller $controller |
|
72 | - * @param string $methodName |
|
73 | - * @param \Exception $exception |
|
74 | - * @throws \Exception |
|
75 | - * @return BaseResponse |
|
76 | - */ |
|
77 | - public function afterException($controller, $methodName, \Exception $exception) { |
|
78 | - if ($controller instanceof OCSController && $exception instanceof OCSException) { |
|
79 | - $code = $exception->getCode(); |
|
80 | - if ($code === 0) { |
|
81 | - $code = \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR; |
|
82 | - } |
|
83 | - |
|
84 | - return $this->buildNewResponse($controller, $code, $exception->getMessage()); |
|
85 | - } |
|
86 | - |
|
87 | - throw $exception; |
|
88 | - } |
|
89 | - |
|
90 | - /** |
|
91 | - * @param Controller $controller |
|
92 | - * @param string $methodName |
|
93 | - * @param Response $response |
|
94 | - * @return \OCP\AppFramework\Http\Response |
|
95 | - */ |
|
96 | - public function afterController($controller, $methodName, Response $response) { |
|
97 | - /* |
|
42 | + /** @var IRequest */ |
|
43 | + private $request; |
|
44 | + |
|
45 | + /** @var int */ |
|
46 | + private $ocsVersion; |
|
47 | + |
|
48 | + /** |
|
49 | + * @param IRequest $request |
|
50 | + */ |
|
51 | + public function __construct(IRequest $request) { |
|
52 | + $this->request = $request; |
|
53 | + } |
|
54 | + |
|
55 | + /** |
|
56 | + * @param Controller $controller |
|
57 | + * @param string $methodName |
|
58 | + */ |
|
59 | + public function beforeController($controller, $methodName) { |
|
60 | + if ($controller instanceof OCSController) { |
|
61 | + if (substr_compare($this->request->getScriptName(), '/ocs/v2.php', -strlen('/ocs/v2.php')) === 0) { |
|
62 | + $this->ocsVersion = 2; |
|
63 | + } else { |
|
64 | + $this->ocsVersion = 1; |
|
65 | + } |
|
66 | + $controller->setOCSVersion($this->ocsVersion); |
|
67 | + } |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * @param Controller $controller |
|
72 | + * @param string $methodName |
|
73 | + * @param \Exception $exception |
|
74 | + * @throws \Exception |
|
75 | + * @return BaseResponse |
|
76 | + */ |
|
77 | + public function afterException($controller, $methodName, \Exception $exception) { |
|
78 | + if ($controller instanceof OCSController && $exception instanceof OCSException) { |
|
79 | + $code = $exception->getCode(); |
|
80 | + if ($code === 0) { |
|
81 | + $code = \OCP\AppFramework\OCSController::RESPOND_UNKNOWN_ERROR; |
|
82 | + } |
|
83 | + |
|
84 | + return $this->buildNewResponse($controller, $code, $exception->getMessage()); |
|
85 | + } |
|
86 | + |
|
87 | + throw $exception; |
|
88 | + } |
|
89 | + |
|
90 | + /** |
|
91 | + * @param Controller $controller |
|
92 | + * @param string $methodName |
|
93 | + * @param Response $response |
|
94 | + * @return \OCP\AppFramework\Http\Response |
|
95 | + */ |
|
96 | + public function afterController($controller, $methodName, Response $response) { |
|
97 | + /* |
|
98 | 98 | * If a different middleware has detected that a request unauthorized or forbidden |
99 | 99 | * we need to catch the response and convert it to a proper OCS response. |
100 | 100 | */ |
101 | - if ($controller instanceof OCSController && !($response instanceof BaseResponse)) { |
|
102 | - if ($response->getStatus() === Http::STATUS_UNAUTHORIZED) { |
|
103 | - $message = ''; |
|
104 | - if ($response instanceof JSONResponse) { |
|
105 | - /** @var DataResponse $response */ |
|
106 | - $message = $response->getData()['message']; |
|
107 | - } |
|
108 | - |
|
109 | - return $this->buildNewResponse($controller, OCSController::RESPOND_UNAUTHORISED, $message); |
|
110 | - } |
|
111 | - if ($response->getStatus() === Http::STATUS_FORBIDDEN) { |
|
112 | - $message = ''; |
|
113 | - if ($response instanceof JSONResponse) { |
|
114 | - /** @var DataResponse $response */ |
|
115 | - $message = $response->getData()['message']; |
|
116 | - } |
|
117 | - |
|
118 | - return $this->buildNewResponse($controller, Http::STATUS_FORBIDDEN, $message); |
|
119 | - } |
|
120 | - } |
|
121 | - |
|
122 | - return $response; |
|
123 | - } |
|
124 | - |
|
125 | - /** |
|
126 | - * @param Controller $controller |
|
127 | - * @param int $code |
|
128 | - * @param string $message |
|
129 | - * @return V1Response|V2Response |
|
130 | - */ |
|
131 | - private function buildNewResponse(Controller $controller, $code, $message) { |
|
132 | - $format = $this->getFormat($controller); |
|
133 | - |
|
134 | - $data = new DataResponse(); |
|
135 | - $data->setStatus($code); |
|
136 | - if ($this->ocsVersion === 1) { |
|
137 | - $response = new V1Response($data, $format, $message); |
|
138 | - } else { |
|
139 | - $response = new V2Response($data, $format, $message); |
|
140 | - } |
|
141 | - |
|
142 | - return $response; |
|
143 | - } |
|
144 | - |
|
145 | - /** |
|
146 | - * @param Controller $controller |
|
147 | - * @return string |
|
148 | - */ |
|
149 | - private function getFormat(Controller $controller) { |
|
150 | - // get format from the url format or request format parameter |
|
151 | - $format = $this->request->getParam('format'); |
|
152 | - |
|
153 | - // if none is given try the first Accept header |
|
154 | - if ($format === null) { |
|
155 | - $headers = $this->request->getHeader('Accept'); |
|
156 | - $format = $controller->getResponderByHTTPHeader($headers, 'xml'); |
|
157 | - } |
|
158 | - |
|
159 | - return $format; |
|
160 | - } |
|
101 | + if ($controller instanceof OCSController && !($response instanceof BaseResponse)) { |
|
102 | + if ($response->getStatus() === Http::STATUS_UNAUTHORIZED) { |
|
103 | + $message = ''; |
|
104 | + if ($response instanceof JSONResponse) { |
|
105 | + /** @var DataResponse $response */ |
|
106 | + $message = $response->getData()['message']; |
|
107 | + } |
|
108 | + |
|
109 | + return $this->buildNewResponse($controller, OCSController::RESPOND_UNAUTHORISED, $message); |
|
110 | + } |
|
111 | + if ($response->getStatus() === Http::STATUS_FORBIDDEN) { |
|
112 | + $message = ''; |
|
113 | + if ($response instanceof JSONResponse) { |
|
114 | + /** @var DataResponse $response */ |
|
115 | + $message = $response->getData()['message']; |
|
116 | + } |
|
117 | + |
|
118 | + return $this->buildNewResponse($controller, Http::STATUS_FORBIDDEN, $message); |
|
119 | + } |
|
120 | + } |
|
121 | + |
|
122 | + return $response; |
|
123 | + } |
|
124 | + |
|
125 | + /** |
|
126 | + * @param Controller $controller |
|
127 | + * @param int $code |
|
128 | + * @param string $message |
|
129 | + * @return V1Response|V2Response |
|
130 | + */ |
|
131 | + private function buildNewResponse(Controller $controller, $code, $message) { |
|
132 | + $format = $this->getFormat($controller); |
|
133 | + |
|
134 | + $data = new DataResponse(); |
|
135 | + $data->setStatus($code); |
|
136 | + if ($this->ocsVersion === 1) { |
|
137 | + $response = new V1Response($data, $format, $message); |
|
138 | + } else { |
|
139 | + $response = new V2Response($data, $format, $message); |
|
140 | + } |
|
141 | + |
|
142 | + return $response; |
|
143 | + } |
|
144 | + |
|
145 | + /** |
|
146 | + * @param Controller $controller |
|
147 | + * @return string |
|
148 | + */ |
|
149 | + private function getFormat(Controller $controller) { |
|
150 | + // get format from the url format or request format parameter |
|
151 | + $format = $this->request->getParam('format'); |
|
152 | + |
|
153 | + // if none is given try the first Accept header |
|
154 | + if ($format === null) { |
|
155 | + $headers = $this->request->getHeader('Accept'); |
|
156 | + $format = $controller->getResponderByHTTPHeader($headers, 'xml'); |
|
157 | + } |
|
158 | + |
|
159 | + return $format; |
|
160 | + } |
|
161 | 161 | } |