@@ -32,7 +32,7 @@ |
||
32 | 32 | * @package OC\AppFramework\Middleware\Security\Exceptions |
33 | 33 | */ |
34 | 34 | class LaxSameSiteCookieFailedException extends SecurityException { |
35 | - public function __construct() { |
|
36 | - parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | - } |
|
35 | + public function __construct() { |
|
36 | + parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | + } |
|
38 | 38 | } |
@@ -25,31 +25,31 @@ |
||
25 | 25 | use OCP\Remote\ICredentials; |
26 | 26 | |
27 | 27 | class Credentials implements ICredentials { |
28 | - /** @var string */ |
|
29 | - private $user; |
|
30 | - /** @var string */ |
|
31 | - private $password; |
|
28 | + /** @var string */ |
|
29 | + private $user; |
|
30 | + /** @var string */ |
|
31 | + private $password; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param string $user |
|
35 | - * @param string $password |
|
36 | - */ |
|
37 | - public function __construct($user, $password) { |
|
38 | - $this->user = $user; |
|
39 | - $this->password = $password; |
|
40 | - } |
|
33 | + /** |
|
34 | + * @param string $user |
|
35 | + * @param string $password |
|
36 | + */ |
|
37 | + public function __construct($user, $password) { |
|
38 | + $this->user = $user; |
|
39 | + $this->password = $password; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function getUsername() { |
|
46 | - return $this->user; |
|
47 | - } |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function getUsername() { |
|
46 | + return $this->user; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @return string |
|
51 | - */ |
|
52 | - public function getPassword() { |
|
53 | - return $this->password; |
|
54 | - } |
|
49 | + /** |
|
50 | + * @return string |
|
51 | + */ |
|
52 | + public function getPassword() { |
|
53 | + return $this->password; |
|
54 | + } |
|
55 | 55 | } |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\Files_Sharing\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\Files_Sharing\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\AdminAudit\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\AdminAudit\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\DAV\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\DAV\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\Comments\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\Comments\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -28,14 +28,14 @@ |
||
28 | 28 | use OCP\Remote\IInstance; |
29 | 29 | |
30 | 30 | class ApiFactory implements IApiFactory { |
31 | - /** @var IClientService */ |
|
32 | - private $clientService; |
|
31 | + /** @var IClientService */ |
|
32 | + private $clientService; |
|
33 | 33 | |
34 | - public function __construct(IClientService $clientService) { |
|
35 | - $this->clientService = $clientService; |
|
36 | - } |
|
34 | + public function __construct(IClientService $clientService) { |
|
35 | + $this->clientService = $clientService; |
|
36 | + } |
|
37 | 37 | |
38 | - public function getApiCollection(IInstance $instance, ICredentials $credentials) { |
|
39 | - return new ApiCollection($instance, $credentials, $this->clientService); |
|
40 | - } |
|
38 | + public function getApiCollection(IInstance $instance, ICredentials $credentials) { |
|
39 | + return new ApiCollection($instance, $credentials, $this->clientService); |
|
40 | + } |
|
41 | 41 | } |
@@ -28,24 +28,24 @@ |
||
28 | 28 | use OCP\Remote\IInstance; |
29 | 29 | |
30 | 30 | class ApiCollection implements IApiCollection { |
31 | - /** @var IInstance */ |
|
32 | - private $instance; |
|
33 | - /** @var ICredentials */ |
|
34 | - private $credentials; |
|
35 | - /** @var IClientService */ |
|
36 | - private $clientService; |
|
31 | + /** @var IInstance */ |
|
32 | + private $instance; |
|
33 | + /** @var ICredentials */ |
|
34 | + private $credentials; |
|
35 | + /** @var IClientService */ |
|
36 | + private $clientService; |
|
37 | 37 | |
38 | - public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
39 | - $this->instance = $instance; |
|
40 | - $this->credentials = $credentials; |
|
41 | - $this->clientService = $clientService; |
|
42 | - } |
|
38 | + public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
39 | + $this->instance = $instance; |
|
40 | + $this->credentials = $credentials; |
|
41 | + $this->clientService = $clientService; |
|
42 | + } |
|
43 | 43 | |
44 | - public function getCapabilitiesApi() { |
|
45 | - return new OCS($this->instance, $this->credentials, $this->clientService); |
|
46 | - } |
|
44 | + public function getCapabilitiesApi() { |
|
45 | + return new OCS($this->instance, $this->credentials, $this->clientService); |
|
46 | + } |
|
47 | 47 | |
48 | - public function getUserApi() { |
|
49 | - return new OCS($this->instance, $this->credentials, $this->clientService); |
|
50 | - } |
|
48 | + public function getUserApi() { |
|
49 | + return new OCS($this->instance, $this->credentials, $this->clientService); |
|
50 | + } |
|
51 | 51 | } |
@@ -26,72 +26,72 @@ |
||
26 | 26 | use OCP\Remote\IInstance; |
27 | 27 | |
28 | 28 | class ApiBase { |
29 | - /** @var IInstance */ |
|
30 | - private $instance; |
|
31 | - /** @var ICredentials */ |
|
32 | - private $credentials; |
|
33 | - /** @var IClientService */ |
|
34 | - private $clientService; |
|
29 | + /** @var IInstance */ |
|
30 | + private $instance; |
|
31 | + /** @var ICredentials */ |
|
32 | + private $credentials; |
|
33 | + /** @var IClientService */ |
|
34 | + private $clientService; |
|
35 | 35 | |
36 | - public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
37 | - $this->instance = $instance; |
|
38 | - $this->credentials = $credentials; |
|
39 | - $this->clientService = $clientService; |
|
40 | - } |
|
36 | + public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
37 | + $this->instance = $instance; |
|
38 | + $this->credentials = $credentials; |
|
39 | + $this->clientService = $clientService; |
|
40 | + } |
|
41 | 41 | |
42 | - protected function getHttpClient() { |
|
43 | - return $this->clientService->newClient(); |
|
44 | - } |
|
42 | + protected function getHttpClient() { |
|
43 | + return $this->clientService->newClient(); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function addDefaultHeaders(array $headers) { |
|
47 | - return array_merge([ |
|
48 | - 'OCS-APIREQUEST' => 'true', |
|
49 | - 'Accept' => 'application/json' |
|
50 | - ], $headers); |
|
51 | - } |
|
46 | + protected function addDefaultHeaders(array $headers) { |
|
47 | + return array_merge([ |
|
48 | + 'OCS-APIREQUEST' => 'true', |
|
49 | + 'Accept' => 'application/json' |
|
50 | + ], $headers); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param string $method |
|
55 | - * @param string $url |
|
56 | - * @param array $body |
|
57 | - * @param array $query |
|
58 | - * @param array $headers |
|
59 | - * @return resource|string |
|
60 | - * @throws \InvalidArgumentException |
|
61 | - */ |
|
62 | - protected function request($method, $url, array $body = [], array $query = [], array $headers = []) { |
|
63 | - $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url; |
|
64 | - $options = [ |
|
65 | - 'query' => $query, |
|
66 | - 'headers' => $this->addDefaultHeaders($headers), |
|
67 | - 'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()] |
|
68 | - ]; |
|
69 | - if ($body) { |
|
70 | - $options['body'] = $body; |
|
71 | - } |
|
53 | + /** |
|
54 | + * @param string $method |
|
55 | + * @param string $url |
|
56 | + * @param array $body |
|
57 | + * @param array $query |
|
58 | + * @param array $headers |
|
59 | + * @return resource|string |
|
60 | + * @throws \InvalidArgumentException |
|
61 | + */ |
|
62 | + protected function request($method, $url, array $body = [], array $query = [], array $headers = []) { |
|
63 | + $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url; |
|
64 | + $options = [ |
|
65 | + 'query' => $query, |
|
66 | + 'headers' => $this->addDefaultHeaders($headers), |
|
67 | + 'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()] |
|
68 | + ]; |
|
69 | + if ($body) { |
|
70 | + $options['body'] = $body; |
|
71 | + } |
|
72 | 72 | |
73 | - $client = $this->getHttpClient(); |
|
73 | + $client = $this->getHttpClient(); |
|
74 | 74 | |
75 | - switch ($method) { |
|
76 | - case 'get': |
|
77 | - $response = $client->get($fullUrl, $options); |
|
78 | - break; |
|
79 | - case 'post': |
|
80 | - $response = $client->post($fullUrl, $options); |
|
81 | - break; |
|
82 | - case 'put': |
|
83 | - $response = $client->put($fullUrl, $options); |
|
84 | - break; |
|
85 | - case 'delete': |
|
86 | - $response = $client->delete($fullUrl, $options); |
|
87 | - break; |
|
88 | - case 'options': |
|
89 | - $response = $client->options($fullUrl, $options); |
|
90 | - break; |
|
91 | - default: |
|
92 | - throw new \InvalidArgumentException('Invalid method ' . $method); |
|
93 | - } |
|
75 | + switch ($method) { |
|
76 | + case 'get': |
|
77 | + $response = $client->get($fullUrl, $options); |
|
78 | + break; |
|
79 | + case 'post': |
|
80 | + $response = $client->post($fullUrl, $options); |
|
81 | + break; |
|
82 | + case 'put': |
|
83 | + $response = $client->put($fullUrl, $options); |
|
84 | + break; |
|
85 | + case 'delete': |
|
86 | + $response = $client->delete($fullUrl, $options); |
|
87 | + break; |
|
88 | + case 'options': |
|
89 | + $response = $client->options($fullUrl, $options); |
|
90 | + break; |
|
91 | + default: |
|
92 | + throw new \InvalidArgumentException('Invalid method ' . $method); |
|
93 | + } |
|
94 | 94 | |
95 | - return $response->getBody(); |
|
96 | - } |
|
95 | + return $response->getBody(); |
|
96 | + } |
|
97 | 97 | } |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * @throws \InvalidArgumentException |
61 | 61 | */ |
62 | 62 | protected function request($method, $url, array $body = [], array $query = [], array $headers = []) { |
63 | - $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url; |
|
63 | + $fullUrl = trim($this->instance->getFullUrl(), '/').'/'.$url; |
|
64 | 64 | $options = [ |
65 | 65 | 'query' => $query, |
66 | 66 | 'headers' => $this->addDefaultHeaders($headers), |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $response = $client->options($fullUrl, $options); |
90 | 90 | break; |
91 | 91 | default: |
92 | - throw new \InvalidArgumentException('Invalid method ' . $method); |
|
92 | + throw new \InvalidArgumentException('Invalid method '.$method); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | return $response->getBody(); |