@@ -37,108 +37,108 @@ |
||
37 | 37 | use Symfony\Component\Console\Output\OutputInterface; |
38 | 38 | |
39 | 39 | class Verify extends Base { |
40 | - /** |
|
41 | - * @var GlobalStoragesService |
|
42 | - */ |
|
43 | - protected $globalService; |
|
40 | + /** |
|
41 | + * @var GlobalStoragesService |
|
42 | + */ |
|
43 | + protected $globalService; |
|
44 | 44 | |
45 | - function __construct(GlobalStoragesService $globalService) { |
|
46 | - parent::__construct(); |
|
47 | - $this->globalService = $globalService; |
|
48 | - } |
|
45 | + function __construct(GlobalStoragesService $globalService) { |
|
46 | + parent::__construct(); |
|
47 | + $this->globalService = $globalService; |
|
48 | + } |
|
49 | 49 | |
50 | - protected function configure() { |
|
51 | - $this |
|
52 | - ->setName('files_external:verify') |
|
53 | - ->setDescription('Verify mount configuration') |
|
54 | - ->addArgument( |
|
55 | - 'mount_id', |
|
56 | - InputArgument::REQUIRED, |
|
57 | - 'The id of the mount to check' |
|
58 | - )->addOption( |
|
59 | - 'config', |
|
60 | - 'c', |
|
61 | - InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, |
|
62 | - 'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails' |
|
63 | - ); |
|
64 | - parent::configure(); |
|
65 | - } |
|
50 | + protected function configure() { |
|
51 | + $this |
|
52 | + ->setName('files_external:verify') |
|
53 | + ->setDescription('Verify mount configuration') |
|
54 | + ->addArgument( |
|
55 | + 'mount_id', |
|
56 | + InputArgument::REQUIRED, |
|
57 | + 'The id of the mount to check' |
|
58 | + )->addOption( |
|
59 | + 'config', |
|
60 | + 'c', |
|
61 | + InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY, |
|
62 | + 'Additional config option to set before checking in key=value pairs, required for certain auth backends such as login credentails' |
|
63 | + ); |
|
64 | + parent::configure(); |
|
65 | + } |
|
66 | 66 | |
67 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
68 | - $mountId = $input->getArgument('mount_id'); |
|
69 | - $configInput = $input->getOption('config'); |
|
67 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
68 | + $mountId = $input->getArgument('mount_id'); |
|
69 | + $configInput = $input->getOption('config'); |
|
70 | 70 | |
71 | - try { |
|
72 | - $mount = $this->globalService->getStorage($mountId); |
|
73 | - } catch (NotFoundException $e) { |
|
74 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
75 | - return 404; |
|
76 | - } |
|
71 | + try { |
|
72 | + $mount = $this->globalService->getStorage($mountId); |
|
73 | + } catch (NotFoundException $e) { |
|
74 | + $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
75 | + return 404; |
|
76 | + } |
|
77 | 77 | |
78 | - $this->updateStorageStatus($mount, $configInput, $output); |
|
78 | + $this->updateStorageStatus($mount, $configInput, $output); |
|
79 | 79 | |
80 | - $this->writeArrayInOutputFormat($input, $output, [ |
|
81 | - 'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()), |
|
82 | - 'code' => $mount->getStatus(), |
|
83 | - 'message' => $mount->getStatusMessage() |
|
84 | - ]); |
|
85 | - } |
|
80 | + $this->writeArrayInOutputFormat($input, $output, [ |
|
81 | + 'status' => StorageNotAvailableException::getStateCodeName($mount->getStatus()), |
|
82 | + 'code' => $mount->getStatus(), |
|
83 | + 'message' => $mount->getStatusMessage() |
|
84 | + ]); |
|
85 | + } |
|
86 | 86 | |
87 | - private function manipulateStorageConfig(StorageConfig $storage) { |
|
88 | - /** @var AuthMechanism */ |
|
89 | - $authMechanism = $storage->getAuthMechanism(); |
|
90 | - $authMechanism->manipulateStorageConfig($storage); |
|
91 | - /** @var Backend */ |
|
92 | - $backend = $storage->getBackend(); |
|
93 | - $backend->manipulateStorageConfig($storage); |
|
94 | - } |
|
87 | + private function manipulateStorageConfig(StorageConfig $storage) { |
|
88 | + /** @var AuthMechanism */ |
|
89 | + $authMechanism = $storage->getAuthMechanism(); |
|
90 | + $authMechanism->manipulateStorageConfig($storage); |
|
91 | + /** @var Backend */ |
|
92 | + $backend = $storage->getBackend(); |
|
93 | + $backend->manipulateStorageConfig($storage); |
|
94 | + } |
|
95 | 95 | |
96 | - private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) { |
|
97 | - try { |
|
98 | - try { |
|
99 | - $this->manipulateStorageConfig($storage); |
|
100 | - } catch (InsufficientDataForMeaningfulAnswerException $e) { |
|
101 | - if (count($configInput) === 0) { // extra config options might solve the error |
|
102 | - throw $e; |
|
103 | - } |
|
104 | - } |
|
96 | + private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) { |
|
97 | + try { |
|
98 | + try { |
|
99 | + $this->manipulateStorageConfig($storage); |
|
100 | + } catch (InsufficientDataForMeaningfulAnswerException $e) { |
|
101 | + if (count($configInput) === 0) { // extra config options might solve the error |
|
102 | + throw $e; |
|
103 | + } |
|
104 | + } |
|
105 | 105 | |
106 | - foreach ($configInput as $configOption) { |
|
107 | - if (!strpos($configOption, '=')) { |
|
108 | - $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>'); |
|
109 | - return; |
|
110 | - } |
|
111 | - list($key, $value) = explode('=', $configOption, 2); |
|
112 | - $storage->setBackendOption($key, $value); |
|
113 | - } |
|
106 | + foreach ($configInput as $configOption) { |
|
107 | + if (!strpos($configOption, '=')) { |
|
108 | + $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>'); |
|
109 | + return; |
|
110 | + } |
|
111 | + list($key, $value) = explode('=', $configOption, 2); |
|
112 | + $storage->setBackendOption($key, $value); |
|
113 | + } |
|
114 | 114 | |
115 | - /** @var Backend */ |
|
116 | - $backend = $storage->getBackend(); |
|
117 | - // update status (can be time-consuming) |
|
118 | - $storage->setStatus( |
|
119 | - \OC_Mount_Config::getBackendStatus( |
|
120 | - $backend->getStorageClass(), |
|
121 | - $storage->getBackendOptions(), |
|
122 | - false |
|
123 | - ) |
|
124 | - ); |
|
125 | - } catch (InsufficientDataForMeaningfulAnswerException $e) { |
|
126 | - $status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE; |
|
127 | - $storage->setStatus( |
|
128 | - $status, |
|
129 | - $e->getMessage() |
|
130 | - ); |
|
131 | - } catch (StorageNotAvailableException $e) { |
|
132 | - $storage->setStatus( |
|
133 | - $e->getCode(), |
|
134 | - $e->getMessage() |
|
135 | - ); |
|
136 | - } catch (\Exception $e) { |
|
137 | - // FIXME: convert storage exceptions to StorageNotAvailableException |
|
138 | - $storage->setStatus( |
|
139 | - StorageNotAvailableException::STATUS_ERROR, |
|
140 | - get_class($e) . ': ' . $e->getMessage() |
|
141 | - ); |
|
142 | - } |
|
143 | - } |
|
115 | + /** @var Backend */ |
|
116 | + $backend = $storage->getBackend(); |
|
117 | + // update status (can be time-consuming) |
|
118 | + $storage->setStatus( |
|
119 | + \OC_Mount_Config::getBackendStatus( |
|
120 | + $backend->getStorageClass(), |
|
121 | + $storage->getBackendOptions(), |
|
122 | + false |
|
123 | + ) |
|
124 | + ); |
|
125 | + } catch (InsufficientDataForMeaningfulAnswerException $e) { |
|
126 | + $status = $e->getCode() ? $e->getCode() : StorageNotAvailableException::STATUS_INDETERMINATE; |
|
127 | + $storage->setStatus( |
|
128 | + $status, |
|
129 | + $e->getMessage() |
|
130 | + ); |
|
131 | + } catch (StorageNotAvailableException $e) { |
|
132 | + $storage->setStatus( |
|
133 | + $e->getCode(), |
|
134 | + $e->getMessage() |
|
135 | + ); |
|
136 | + } catch (\Exception $e) { |
|
137 | + // FIXME: convert storage exceptions to StorageNotAvailableException |
|
138 | + $storage->setStatus( |
|
139 | + StorageNotAvailableException::STATUS_ERROR, |
|
140 | + get_class($e) . ': ' . $e->getMessage() |
|
141 | + ); |
|
142 | + } |
|
143 | + } |
|
144 | 144 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | try { |
72 | 72 | $mount = $this->globalService->getStorage($mountId); |
73 | 73 | } catch (NotFoundException $e) { |
74 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
74 | + $output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
75 | 75 | return 404; |
76 | 76 | } |
77 | 77 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | foreach ($configInput as $configOption) { |
107 | 107 | if (!strpos($configOption, '=')) { |
108 | - $output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>'); |
|
108 | + $output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>'); |
|
109 | 109 | return; |
110 | 110 | } |
111 | 111 | list($key, $value) = explode('=', $configOption, 2); |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | // FIXME: convert storage exceptions to StorageNotAvailableException |
138 | 138 | $storage->setStatus( |
139 | 139 | StorageNotAvailableException::STATUS_ERROR, |
140 | - get_class($e) . ': ' . $e->getMessage() |
|
140 | + get_class($e).': '.$e->getMessage() |
|
141 | 141 | ); |
142 | 142 | } |
143 | 143 | } |
@@ -28,50 +28,50 @@ |
||
28 | 28 | use Symfony\Component\Console\Output\OutputInterface; |
29 | 29 | |
30 | 30 | class Option extends Config { |
31 | - protected function configure() { |
|
32 | - $this |
|
33 | - ->setName('files_external:option') |
|
34 | - ->setDescription('Manage mount options for a mount') |
|
35 | - ->addArgument( |
|
36 | - 'mount_id', |
|
37 | - InputArgument::REQUIRED, |
|
38 | - 'The id of the mount to edit' |
|
39 | - )->addArgument( |
|
40 | - 'key', |
|
41 | - InputArgument::REQUIRED, |
|
42 | - 'key of the mount option to set/get' |
|
43 | - )->addArgument( |
|
44 | - 'value', |
|
45 | - InputArgument::OPTIONAL, |
|
46 | - 'value to set the mount option to, when no value is provided the existing value will be printed' |
|
47 | - ); |
|
48 | - } |
|
31 | + protected function configure() { |
|
32 | + $this |
|
33 | + ->setName('files_external:option') |
|
34 | + ->setDescription('Manage mount options for a mount') |
|
35 | + ->addArgument( |
|
36 | + 'mount_id', |
|
37 | + InputArgument::REQUIRED, |
|
38 | + 'The id of the mount to edit' |
|
39 | + )->addArgument( |
|
40 | + 'key', |
|
41 | + InputArgument::REQUIRED, |
|
42 | + 'key of the mount option to set/get' |
|
43 | + )->addArgument( |
|
44 | + 'value', |
|
45 | + InputArgument::OPTIONAL, |
|
46 | + 'value to set the mount option to, when no value is provided the existing value will be printed' |
|
47 | + ); |
|
48 | + } |
|
49 | 49 | |
50 | - /** |
|
51 | - * @param StorageConfig $mount |
|
52 | - * @param string $key |
|
53 | - * @param OutputInterface $output |
|
54 | - */ |
|
55 | - protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
56 | - $value = $mount->getMountOption($key); |
|
57 | - if (!is_string($value)) { // show bools and objects correctly |
|
58 | - $value = json_encode($value); |
|
59 | - } |
|
60 | - $output->writeln($value); |
|
61 | - } |
|
50 | + /** |
|
51 | + * @param StorageConfig $mount |
|
52 | + * @param string $key |
|
53 | + * @param OutputInterface $output |
|
54 | + */ |
|
55 | + protected function getOption(StorageConfig $mount, $key, OutputInterface $output) { |
|
56 | + $value = $mount->getMountOption($key); |
|
57 | + if (!is_string($value)) { // show bools and objects correctly |
|
58 | + $value = json_encode($value); |
|
59 | + } |
|
60 | + $output->writeln($value); |
|
61 | + } |
|
62 | 62 | |
63 | - /** |
|
64 | - * @param StorageConfig $mount |
|
65 | - * @param string $key |
|
66 | - * @param string $value |
|
67 | - * @param OutputInterface $output |
|
68 | - */ |
|
69 | - protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
70 | - $decoded = json_decode($value, true); |
|
71 | - if (!is_null($decoded)) { |
|
72 | - $value = $decoded; |
|
73 | - } |
|
74 | - $mount->setMountOption($key, $value); |
|
75 | - $this->globalService->updateStorage($mount); |
|
76 | - } |
|
63 | + /** |
|
64 | + * @param StorageConfig $mount |
|
65 | + * @param string $key |
|
66 | + * @param string $value |
|
67 | + * @param OutputInterface $output |
|
68 | + */ |
|
69 | + protected function setOption(StorageConfig $mount, $key, $value, OutputInterface $output) { |
|
70 | + $decoded = json_decode($value, true); |
|
71 | + if (!is_null($decoded)) { |
|
72 | + $value = $decoded; |
|
73 | + } |
|
74 | + $mount->setMountOption($key, $value); |
|
75 | + $this->globalService->updateStorage($mount); |
|
76 | + } |
|
77 | 77 | } |
@@ -32,91 +32,91 @@ |
||
32 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 33 | |
34 | 34 | class Backends extends Base { |
35 | - /** @var BackendService */ |
|
36 | - private $backendService; |
|
35 | + /** @var BackendService */ |
|
36 | + private $backendService; |
|
37 | 37 | |
38 | - function __construct(BackendService $backendService |
|
39 | - ) { |
|
40 | - parent::__construct(); |
|
38 | + function __construct(BackendService $backendService |
|
39 | + ) { |
|
40 | + parent::__construct(); |
|
41 | 41 | |
42 | - $this->backendService = $backendService; |
|
43 | - } |
|
42 | + $this->backendService = $backendService; |
|
43 | + } |
|
44 | 44 | |
45 | - protected function configure() { |
|
46 | - $this |
|
47 | - ->setName('files_external:backends') |
|
48 | - ->setDescription('Show available authentication and storage backends') |
|
49 | - ->addArgument( |
|
50 | - 'type', |
|
51 | - InputArgument::OPTIONAL, |
|
52 | - 'only show backends of a certain type. Possible values are "authentication" or "storage"' |
|
53 | - )->addArgument( |
|
54 | - 'backend', |
|
55 | - InputArgument::OPTIONAL, |
|
56 | - 'only show information of a specific backend' |
|
57 | - ); |
|
58 | - parent::configure(); |
|
59 | - } |
|
45 | + protected function configure() { |
|
46 | + $this |
|
47 | + ->setName('files_external:backends') |
|
48 | + ->setDescription('Show available authentication and storage backends') |
|
49 | + ->addArgument( |
|
50 | + 'type', |
|
51 | + InputArgument::OPTIONAL, |
|
52 | + 'only show backends of a certain type. Possible values are "authentication" or "storage"' |
|
53 | + )->addArgument( |
|
54 | + 'backend', |
|
55 | + InputArgument::OPTIONAL, |
|
56 | + 'only show information of a specific backend' |
|
57 | + ); |
|
58 | + parent::configure(); |
|
59 | + } |
|
60 | 60 | |
61 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
62 | - $authBackends = $this->backendService->getAuthMechanisms(); |
|
63 | - $storageBackends = $this->backendService->getBackends(); |
|
61 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
62 | + $authBackends = $this->backendService->getAuthMechanisms(); |
|
63 | + $storageBackends = $this->backendService->getBackends(); |
|
64 | 64 | |
65 | - $data = [ |
|
66 | - 'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends), |
|
67 | - 'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends) |
|
68 | - ]; |
|
65 | + $data = [ |
|
66 | + 'authentication' => array_map([$this, 'serializeAuthBackend'], $authBackends), |
|
67 | + 'storage' => array_map([$this, 'serializeAuthBackend'], $storageBackends) |
|
68 | + ]; |
|
69 | 69 | |
70 | - $type = $input->getArgument('type'); |
|
71 | - $backend = $input->getArgument('backend'); |
|
72 | - if ($type) { |
|
73 | - if (!isset($data[$type])) { |
|
74 | - $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
75 | - return 1; |
|
76 | - } |
|
77 | - $data = $data[$type]; |
|
70 | + $type = $input->getArgument('type'); |
|
71 | + $backend = $input->getArgument('backend'); |
|
72 | + if ($type) { |
|
73 | + if (!isset($data[$type])) { |
|
74 | + $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
75 | + return 1; |
|
76 | + } |
|
77 | + $data = $data[$type]; |
|
78 | 78 | |
79 | - if ($backend) { |
|
80 | - if (!isset($data[$backend])) { |
|
81 | - $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
82 | - return 1; |
|
83 | - } |
|
84 | - $data = $data[$backend]; |
|
85 | - } |
|
86 | - } |
|
79 | + if ($backend) { |
|
80 | + if (!isset($data[$backend])) { |
|
81 | + $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
82 | + return 1; |
|
83 | + } |
|
84 | + $data = $data[$backend]; |
|
85 | + } |
|
86 | + } |
|
87 | 87 | |
88 | - $this->writeArrayInOutputFormat($input, $output, $data); |
|
89 | - } |
|
88 | + $this->writeArrayInOutputFormat($input, $output, $data); |
|
89 | + } |
|
90 | 90 | |
91 | - private function serializeAuthBackend(\JsonSerializable $backend) { |
|
92 | - $data = $backend->jsonSerialize(); |
|
93 | - $result = [ |
|
94 | - 'name' => $data['name'], |
|
95 | - 'identifier' => $data['identifier'], |
|
96 | - 'configuration' => $this->formatConfiguration($data['configuration']) |
|
97 | - ]; |
|
98 | - if ($backend instanceof Backend) { |
|
99 | - $result['storage_class'] = $backend->getStorageClass(); |
|
100 | - $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
|
101 | - $result['supported_authentication_backends'] = array_keys($authBackends); |
|
102 | - $authConfig = array_map(function (AuthMechanism $auth) { |
|
103 | - return $this->serializeAuthBackend($auth)['configuration']; |
|
104 | - }, $authBackends); |
|
105 | - $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
|
106 | - } |
|
107 | - return $result; |
|
108 | - } |
|
91 | + private function serializeAuthBackend(\JsonSerializable $backend) { |
|
92 | + $data = $backend->jsonSerialize(); |
|
93 | + $result = [ |
|
94 | + 'name' => $data['name'], |
|
95 | + 'identifier' => $data['identifier'], |
|
96 | + 'configuration' => $this->formatConfiguration($data['configuration']) |
|
97 | + ]; |
|
98 | + if ($backend instanceof Backend) { |
|
99 | + $result['storage_class'] = $backend->getStorageClass(); |
|
100 | + $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
|
101 | + $result['supported_authentication_backends'] = array_keys($authBackends); |
|
102 | + $authConfig = array_map(function (AuthMechanism $auth) { |
|
103 | + return $this->serializeAuthBackend($auth)['configuration']; |
|
104 | + }, $authBackends); |
|
105 | + $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
|
106 | + } |
|
107 | + return $result; |
|
108 | + } |
|
109 | 109 | |
110 | - /** |
|
111 | - * @param DefinitionParameter[] $parameters |
|
112 | - * @return string[] |
|
113 | - */ |
|
114 | - private function formatConfiguration(array $parameters) { |
|
115 | - $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
116 | - return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
|
117 | - }); |
|
118 | - return array_map(function (DefinitionParameter $parameter) { |
|
119 | - return $parameter->getTypeName(); |
|
120 | - }, $configuration); |
|
121 | - } |
|
110 | + /** |
|
111 | + * @param DefinitionParameter[] $parameters |
|
112 | + * @return string[] |
|
113 | + */ |
|
114 | + private function formatConfiguration(array $parameters) { |
|
115 | + $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
116 | + return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
|
117 | + }); |
|
118 | + return array_map(function (DefinitionParameter $parameter) { |
|
119 | + return $parameter->getTypeName(); |
|
120 | + }, $configuration); |
|
121 | + } |
|
122 | 122 | } |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | $backend = $input->getArgument('backend'); |
72 | 72 | if ($type) { |
73 | 73 | if (!isset($data[$type])) { |
74 | - $output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>'); |
|
74 | + $output->writeln('<error>Invalid type "'.$type.'". Possible values are "authentication" or "storage"</error>'); |
|
75 | 75 | return 1; |
76 | 76 | } |
77 | 77 | $data = $data[$type]; |
78 | 78 | |
79 | 79 | if ($backend) { |
80 | 80 | if (!isset($data[$backend])) { |
81 | - $output->writeln('<error>Unknown backend "' . $backend . '" of type "' . $type . '"</error>'); |
|
81 | + $output->writeln('<error>Unknown backend "'.$backend.'" of type "'.$type.'"</error>'); |
|
82 | 82 | return 1; |
83 | 83 | } |
84 | 84 | $data = $data[$backend]; |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | $result['storage_class'] = $backend->getStorageClass(); |
100 | 100 | $authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes())); |
101 | 101 | $result['supported_authentication_backends'] = array_keys($authBackends); |
102 | - $authConfig = array_map(function (AuthMechanism $auth) { |
|
102 | + $authConfig = array_map(function(AuthMechanism $auth) { |
|
103 | 103 | return $this->serializeAuthBackend($auth)['configuration']; |
104 | 104 | }, $authBackends); |
105 | 105 | $result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig); |
@@ -112,10 +112,10 @@ discard block |
||
112 | 112 | * @return string[] |
113 | 113 | */ |
114 | 114 | private function formatConfiguration(array $parameters) { |
115 | - $configuration = array_filter($parameters, function (DefinitionParameter $parameter) { |
|
115 | + $configuration = array_filter($parameters, function(DefinitionParameter $parameter) { |
|
116 | 116 | return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN; |
117 | 117 | }); |
118 | - return array_map(function (DefinitionParameter $parameter) { |
|
118 | + return array_map(function(DefinitionParameter $parameter) { |
|
119 | 119 | return $parameter->getTypeName(); |
120 | 120 | }, $configuration); |
121 | 121 | } |
@@ -28,55 +28,55 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | - * e.g. 'ldap' |
|
48 | - * |
|
49 | - * @returns string |
|
50 | - */ |
|
51 | - public function getID() { |
|
52 | - return 'externalstorages'; |
|
53 | - } |
|
45 | + /** |
|
46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | + * e.g. 'ldap' |
|
48 | + * |
|
49 | + * @returns string |
|
50 | + */ |
|
51 | + public function getID() { |
|
52 | + return 'externalstorages'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | - * integration'. Use the L10N service to translate it. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getName() { |
|
62 | - return $this->l->t('External storages'); |
|
63 | - } |
|
55 | + /** |
|
56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | + * integration'. Use the L10N service to translate it. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getName() { |
|
62 | + return $this->l->t('External storages'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return int whether the form should be rather on the top or bottom of |
|
67 | - * the settings navigation. The sections are arranged in ascending order of |
|
68 | - * the priority values. It is required to return a value between 0 and 99. |
|
69 | - * |
|
70 | - * E.g.: 70 |
|
71 | - */ |
|
72 | - public function getPriority() { |
|
73 | - return 10; |
|
74 | - } |
|
65 | + /** |
|
66 | + * @return int whether the form should be rather on the top or bottom of |
|
67 | + * the settings navigation. The sections are arranged in ascending order of |
|
68 | + * the priority values. It is required to return a value between 0 and 99. |
|
69 | + * |
|
70 | + * E.g.: 70 |
|
71 | + */ |
|
72 | + public function getPriority() { |
|
73 | + return 10; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('files_external', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('files_external', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -32,65 +32,65 @@ |
||
32 | 32 | |
33 | 33 | class Admin implements ISettings { |
34 | 34 | |
35 | - /** @var IManager */ |
|
36 | - private $encryptionManager; |
|
35 | + /** @var IManager */ |
|
36 | + private $encryptionManager; |
|
37 | 37 | |
38 | - /** @var GlobalStoragesService */ |
|
39 | - private $globalStoragesService; |
|
38 | + /** @var GlobalStoragesService */ |
|
39 | + private $globalStoragesService; |
|
40 | 40 | |
41 | - /** @var BackendService */ |
|
42 | - private $backendService; |
|
41 | + /** @var BackendService */ |
|
42 | + private $backendService; |
|
43 | 43 | |
44 | - /** @var GlobalAuth */ |
|
45 | - private $globalAuth; |
|
44 | + /** @var GlobalAuth */ |
|
45 | + private $globalAuth; |
|
46 | 46 | |
47 | - public function __construct( |
|
48 | - IManager $encryptionManager, |
|
49 | - GlobalStoragesService $globalStoragesService, |
|
50 | - BackendService $backendService, |
|
51 | - GlobalAuth $globalAuth |
|
52 | - ) { |
|
53 | - $this->encryptionManager = $encryptionManager; |
|
54 | - $this->globalStoragesService = $globalStoragesService; |
|
55 | - $this->backendService = $backendService; |
|
56 | - $this->globalAuth = $globalAuth; |
|
57 | - } |
|
47 | + public function __construct( |
|
48 | + IManager $encryptionManager, |
|
49 | + GlobalStoragesService $globalStoragesService, |
|
50 | + BackendService $backendService, |
|
51 | + GlobalAuth $globalAuth |
|
52 | + ) { |
|
53 | + $this->encryptionManager = $encryptionManager; |
|
54 | + $this->globalStoragesService = $globalStoragesService; |
|
55 | + $this->backendService = $backendService; |
|
56 | + $this->globalAuth = $globalAuth; |
|
57 | + } |
|
58 | 58 | |
59 | - /** |
|
60 | - * @return TemplateResponse |
|
61 | - */ |
|
62 | - public function getForm() { |
|
63 | - $parameters = [ |
|
64 | - 'encryptionEnabled' => $this->encryptionManager->isEnabled(), |
|
65 | - 'visibilityType' => BackendService::VISIBILITY_ADMIN, |
|
66 | - 'storages' => $this->globalStoragesService->getStorages(), |
|
67 | - 'backends' => $this->backendService->getAvailableBackends(), |
|
68 | - 'authMechanisms' => $this->backendService->getAuthMechanisms(), |
|
69 | - 'dependencies' => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()), |
|
70 | - 'allowUserMounting' => $this->backendService->isUserMountingAllowed(), |
|
71 | - 'globalCredentials' => $this->globalAuth->getAuth(''), |
|
72 | - 'globalCredentialsUid' => '', |
|
73 | - ]; |
|
59 | + /** |
|
60 | + * @return TemplateResponse |
|
61 | + */ |
|
62 | + public function getForm() { |
|
63 | + $parameters = [ |
|
64 | + 'encryptionEnabled' => $this->encryptionManager->isEnabled(), |
|
65 | + 'visibilityType' => BackendService::VISIBILITY_ADMIN, |
|
66 | + 'storages' => $this->globalStoragesService->getStorages(), |
|
67 | + 'backends' => $this->backendService->getAvailableBackends(), |
|
68 | + 'authMechanisms' => $this->backendService->getAuthMechanisms(), |
|
69 | + 'dependencies' => \OC_Mount_Config::dependencyMessage($this->backendService->getBackends()), |
|
70 | + 'allowUserMounting' => $this->backendService->isUserMountingAllowed(), |
|
71 | + 'globalCredentials' => $this->globalAuth->getAuth(''), |
|
72 | + 'globalCredentialsUid' => '', |
|
73 | + ]; |
|
74 | 74 | |
75 | - return new TemplateResponse('files_external', 'settings', $parameters, ''); |
|
76 | - } |
|
75 | + return new TemplateResponse('files_external', 'settings', $parameters, ''); |
|
76 | + } |
|
77 | 77 | |
78 | - /** |
|
79 | - * @return string the section ID, e.g. 'sharing' |
|
80 | - */ |
|
81 | - public function getSection() { |
|
82 | - return 'externalstorages'; |
|
83 | - } |
|
78 | + /** |
|
79 | + * @return string the section ID, e.g. 'sharing' |
|
80 | + */ |
|
81 | + public function getSection() { |
|
82 | + return 'externalstorages'; |
|
83 | + } |
|
84 | 84 | |
85 | - /** |
|
86 | - * @return int whether the form should be rather on the top or bottom of |
|
87 | - * the admin section. The forms are arranged in ascending order of the |
|
88 | - * priority values. It is required to return a value between 0 and 100. |
|
89 | - * |
|
90 | - * E.g.: 70 |
|
91 | - */ |
|
92 | - public function getPriority() { |
|
93 | - return 40; |
|
94 | - } |
|
85 | + /** |
|
86 | + * @return int whether the form should be rather on the top or bottom of |
|
87 | + * the admin section. The forms are arranged in ascending order of the |
|
88 | + * priority values. It is required to return a value between 0 and 100. |
|
89 | + * |
|
90 | + * E.g.: 70 |
|
91 | + */ |
|
92 | + public function getPriority() { |
|
93 | + return 40; |
|
94 | + } |
|
95 | 95 | |
96 | 96 | } |
@@ -29,43 +29,43 @@ |
||
29 | 29 | */ |
30 | 30 | trait LegacyDependencyCheckPolyfill { |
31 | 31 | |
32 | - /** |
|
33 | - * @return string |
|
34 | - */ |
|
35 | - abstract public function getStorageClass(); |
|
32 | + /** |
|
33 | + * @return string |
|
34 | + */ |
|
35 | + abstract public function getStorageClass(); |
|
36 | 36 | |
37 | - /** |
|
38 | - * Check if object is valid for use |
|
39 | - * |
|
40 | - * @return MissingDependency[] Unsatisfied dependencies |
|
41 | - */ |
|
42 | - public function checkDependencies() { |
|
43 | - $ret = []; |
|
37 | + /** |
|
38 | + * Check if object is valid for use |
|
39 | + * |
|
40 | + * @return MissingDependency[] Unsatisfied dependencies |
|
41 | + */ |
|
42 | + public function checkDependencies() { |
|
43 | + $ret = []; |
|
44 | 44 | |
45 | - $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
46 | - if ($result !== true) { |
|
47 | - if (!is_array($result)) { |
|
48 | - $result = [$result]; |
|
49 | - } |
|
50 | - foreach ($result as $key => $value) { |
|
51 | - if (!($value instanceof MissingDependency)) { |
|
52 | - $module = null; |
|
53 | - $message = null; |
|
54 | - if (is_numeric($key)) { |
|
55 | - $module = $value; |
|
56 | - } else { |
|
57 | - $module = $key; |
|
58 | - $message = $value; |
|
59 | - } |
|
60 | - $value = new MissingDependency($module, $this); |
|
61 | - $value->setMessage($message); |
|
62 | - } |
|
63 | - $ret[] = $value; |
|
64 | - } |
|
65 | - } |
|
45 | + $result = call_user_func([$this->getStorageClass(), 'checkDependencies']); |
|
46 | + if ($result !== true) { |
|
47 | + if (!is_array($result)) { |
|
48 | + $result = [$result]; |
|
49 | + } |
|
50 | + foreach ($result as $key => $value) { |
|
51 | + if (!($value instanceof MissingDependency)) { |
|
52 | + $module = null; |
|
53 | + $message = null; |
|
54 | + if (is_numeric($key)) { |
|
55 | + $module = $value; |
|
56 | + } else { |
|
57 | + $module = $key; |
|
58 | + $message = $value; |
|
59 | + } |
|
60 | + $value = new MissingDependency($module, $this); |
|
61 | + $value->setMessage($message); |
|
62 | + } |
|
63 | + $ret[] = $value; |
|
64 | + } |
|
65 | + } |
|
66 | 66 | |
67 | - return $ret; |
|
68 | - } |
|
67 | + return $ret; |
|
68 | + } |
|
69 | 69 | |
70 | 70 | } |
71 | 71 |
@@ -36,102 +36,102 @@ |
||
36 | 36 | */ |
37 | 37 | trait VisibilityTrait { |
38 | 38 | |
39 | - /** @var int visibility */ |
|
40 | - protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
41 | - |
|
42 | - /** @var int allowed visibilities */ |
|
43 | - protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
44 | - |
|
45 | - /** |
|
46 | - * @return int |
|
47 | - */ |
|
48 | - public function getVisibility() { |
|
49 | - return $this->visibility; |
|
50 | - } |
|
51 | - |
|
52 | - /** |
|
53 | - * Check if the backend is visible for a user type |
|
54 | - * |
|
55 | - * @param int $visibility |
|
56 | - * @return bool |
|
57 | - */ |
|
58 | - public function isVisibleFor($visibility) { |
|
59 | - if ($this->visibility & $visibility) { |
|
60 | - return true; |
|
61 | - } |
|
62 | - return false; |
|
63 | - } |
|
64 | - |
|
65 | - /** |
|
66 | - * @param int $visibility |
|
67 | - * @return self |
|
68 | - */ |
|
69 | - public function setVisibility($visibility) { |
|
70 | - $this->visibility = $visibility; |
|
71 | - $this->allowedVisibility |= $visibility; |
|
72 | - return $this; |
|
73 | - } |
|
74 | - |
|
75 | - /** |
|
76 | - * @param int $visibility |
|
77 | - * @return self |
|
78 | - */ |
|
79 | - public function addVisibility($visibility) { |
|
80 | - return $this->setVisibility($this->visibility | $visibility); |
|
81 | - } |
|
82 | - |
|
83 | - /** |
|
84 | - * @param int $visibility |
|
85 | - * @return self |
|
86 | - */ |
|
87 | - public function removeVisibility($visibility) { |
|
88 | - return $this->setVisibility($this->visibility & ~$visibility); |
|
89 | - } |
|
90 | - |
|
91 | - /** |
|
92 | - * @return int |
|
93 | - */ |
|
94 | - public function getAllowedVisibility() { |
|
95 | - return $this->allowedVisibility; |
|
96 | - } |
|
97 | - |
|
98 | - /** |
|
99 | - * Check if the backend is allowed to be visible for a user type |
|
100 | - * |
|
101 | - * @param int $allowedVisibility |
|
102 | - * @return bool |
|
103 | - */ |
|
104 | - public function isAllowedVisibleFor($allowedVisibility) { |
|
105 | - if ($this->allowedVisibility & $allowedVisibility) { |
|
106 | - return true; |
|
107 | - } |
|
108 | - return false; |
|
109 | - } |
|
110 | - |
|
111 | - /** |
|
112 | - * @param int $allowedVisibility |
|
113 | - * @return self |
|
114 | - */ |
|
115 | - public function setAllowedVisibility($allowedVisibility) { |
|
116 | - $this->allowedVisibility = $allowedVisibility; |
|
117 | - $this->visibility &= $allowedVisibility; |
|
118 | - return $this; |
|
119 | - } |
|
120 | - |
|
121 | - /** |
|
122 | - * @param int $allowedVisibility |
|
123 | - * @return self |
|
124 | - */ |
|
125 | - public function addAllowedVisibility($allowedVisibility) { |
|
126 | - return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * @param int $allowedVisibility |
|
131 | - * @return self |
|
132 | - */ |
|
133 | - public function removeAllowedVisibility($allowedVisibility) { |
|
134 | - return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
135 | - } |
|
39 | + /** @var int visibility */ |
|
40 | + protected $visibility = BackendService::VISIBILITY_DEFAULT; |
|
41 | + |
|
42 | + /** @var int allowed visibilities */ |
|
43 | + protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT; |
|
44 | + |
|
45 | + /** |
|
46 | + * @return int |
|
47 | + */ |
|
48 | + public function getVisibility() { |
|
49 | + return $this->visibility; |
|
50 | + } |
|
51 | + |
|
52 | + /** |
|
53 | + * Check if the backend is visible for a user type |
|
54 | + * |
|
55 | + * @param int $visibility |
|
56 | + * @return bool |
|
57 | + */ |
|
58 | + public function isVisibleFor($visibility) { |
|
59 | + if ($this->visibility & $visibility) { |
|
60 | + return true; |
|
61 | + } |
|
62 | + return false; |
|
63 | + } |
|
64 | + |
|
65 | + /** |
|
66 | + * @param int $visibility |
|
67 | + * @return self |
|
68 | + */ |
|
69 | + public function setVisibility($visibility) { |
|
70 | + $this->visibility = $visibility; |
|
71 | + $this->allowedVisibility |= $visibility; |
|
72 | + return $this; |
|
73 | + } |
|
74 | + |
|
75 | + /** |
|
76 | + * @param int $visibility |
|
77 | + * @return self |
|
78 | + */ |
|
79 | + public function addVisibility($visibility) { |
|
80 | + return $this->setVisibility($this->visibility | $visibility); |
|
81 | + } |
|
82 | + |
|
83 | + /** |
|
84 | + * @param int $visibility |
|
85 | + * @return self |
|
86 | + */ |
|
87 | + public function removeVisibility($visibility) { |
|
88 | + return $this->setVisibility($this->visibility & ~$visibility); |
|
89 | + } |
|
90 | + |
|
91 | + /** |
|
92 | + * @return int |
|
93 | + */ |
|
94 | + public function getAllowedVisibility() { |
|
95 | + return $this->allowedVisibility; |
|
96 | + } |
|
97 | + |
|
98 | + /** |
|
99 | + * Check if the backend is allowed to be visible for a user type |
|
100 | + * |
|
101 | + * @param int $allowedVisibility |
|
102 | + * @return bool |
|
103 | + */ |
|
104 | + public function isAllowedVisibleFor($allowedVisibility) { |
|
105 | + if ($this->allowedVisibility & $allowedVisibility) { |
|
106 | + return true; |
|
107 | + } |
|
108 | + return false; |
|
109 | + } |
|
110 | + |
|
111 | + /** |
|
112 | + * @param int $allowedVisibility |
|
113 | + * @return self |
|
114 | + */ |
|
115 | + public function setAllowedVisibility($allowedVisibility) { |
|
116 | + $this->allowedVisibility = $allowedVisibility; |
|
117 | + $this->visibility &= $allowedVisibility; |
|
118 | + return $this; |
|
119 | + } |
|
120 | + |
|
121 | + /** |
|
122 | + * @param int $allowedVisibility |
|
123 | + * @return self |
|
124 | + */ |
|
125 | + public function addAllowedVisibility($allowedVisibility) { |
|
126 | + return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility); |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * @param int $allowedVisibility |
|
131 | + * @return self |
|
132 | + */ |
|
133 | + public function removeAllowedVisibility($allowedVisibility) { |
|
134 | + return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility); |
|
135 | + } |
|
136 | 136 | |
137 | 137 | } |
@@ -28,167 +28,167 @@ |
||
28 | 28 | */ |
29 | 29 | class DefinitionParameter implements \JsonSerializable { |
30 | 30 | |
31 | - /** Value constants */ |
|
32 | - const VALUE_TEXT = 0; |
|
33 | - const VALUE_BOOLEAN = 1; |
|
34 | - const VALUE_PASSWORD = 2; |
|
35 | - const VALUE_HIDDEN = 3; |
|
36 | - |
|
37 | - /** Flag constants */ |
|
38 | - const FLAG_NONE = 0; |
|
39 | - const FLAG_OPTIONAL = 1; |
|
40 | - const FLAG_USER_PROVIDED = 2; |
|
41 | - |
|
42 | - /** @var string name of parameter */ |
|
43 | - private $name; |
|
44 | - |
|
45 | - /** @var string human-readable parameter text */ |
|
46 | - private $text; |
|
47 | - |
|
48 | - /** @var int value type, see self::VALUE_* constants */ |
|
49 | - private $type = self::VALUE_TEXT; |
|
50 | - |
|
51 | - /** @var int flags, see self::FLAG_* constants */ |
|
52 | - private $flags = self::FLAG_NONE; |
|
53 | - |
|
54 | - /** |
|
55 | - * @param string $name |
|
56 | - * @param string $text |
|
57 | - */ |
|
58 | - public function __construct($name, $text) { |
|
59 | - $this->name = $name; |
|
60 | - $this->text = $text; |
|
61 | - } |
|
62 | - |
|
63 | - /** |
|
64 | - * @return string |
|
65 | - */ |
|
66 | - public function getName() { |
|
67 | - return $this->name; |
|
68 | - } |
|
69 | - |
|
70 | - /** |
|
71 | - * @return string |
|
72 | - */ |
|
73 | - public function getText() { |
|
74 | - return $this->text; |
|
75 | - } |
|
76 | - |
|
77 | - /** |
|
78 | - * Get value type |
|
79 | - * |
|
80 | - * @return int |
|
81 | - */ |
|
82 | - public function getType() { |
|
83 | - return $this->type; |
|
84 | - } |
|
85 | - |
|
86 | - /** |
|
87 | - * Set value type |
|
88 | - * |
|
89 | - * @param int $type |
|
90 | - * @return self |
|
91 | - */ |
|
92 | - public function setType($type) { |
|
93 | - $this->type = $type; |
|
94 | - return $this; |
|
95 | - } |
|
96 | - |
|
97 | - /** |
|
98 | - * @return string |
|
99 | - */ |
|
100 | - public function getTypeName() { |
|
101 | - switch ($this->type) { |
|
102 | - case self::VALUE_BOOLEAN: |
|
103 | - return 'boolean'; |
|
104 | - case self::VALUE_TEXT: |
|
105 | - return 'text'; |
|
106 | - case self::VALUE_PASSWORD: |
|
107 | - return 'password'; |
|
108 | - default: |
|
109 | - return 'unknown'; |
|
110 | - } |
|
111 | - } |
|
112 | - |
|
113 | - /** |
|
114 | - * @return int |
|
115 | - */ |
|
116 | - public function getFlags() { |
|
117 | - return $this->flags; |
|
118 | - } |
|
119 | - |
|
120 | - /** |
|
121 | - * @param int $flags |
|
122 | - * @return self |
|
123 | - */ |
|
124 | - public function setFlags($flags) { |
|
125 | - $this->flags = $flags; |
|
126 | - return $this; |
|
127 | - } |
|
128 | - |
|
129 | - /** |
|
130 | - * @param int $flag |
|
131 | - * @return self |
|
132 | - */ |
|
133 | - public function setFlag($flag) { |
|
134 | - $this->flags |= $flag; |
|
135 | - return $this; |
|
136 | - } |
|
137 | - |
|
138 | - /** |
|
139 | - * @param int $flag |
|
140 | - * @return bool |
|
141 | - */ |
|
142 | - public function isFlagSet($flag) { |
|
143 | - return (bool)($this->flags & $flag); |
|
144 | - } |
|
145 | - |
|
146 | - /** |
|
147 | - * Serialize into JSON for client-side JS |
|
148 | - * |
|
149 | - * @return string |
|
150 | - */ |
|
151 | - public function jsonSerialize() { |
|
152 | - return [ |
|
153 | - 'value' => $this->getText(), |
|
154 | - 'flags' => $this->getFlags(), |
|
155 | - 'type' => $this->getType() |
|
156 | - ]; |
|
157 | - } |
|
158 | - |
|
159 | - public function isOptional() { |
|
160 | - return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED); |
|
161 | - } |
|
162 | - |
|
163 | - /** |
|
164 | - * Validate a parameter value against this |
|
165 | - * Convert type as necessary |
|
166 | - * |
|
167 | - * @param mixed $value Value to check |
|
168 | - * @return bool success |
|
169 | - */ |
|
170 | - public function validateValue(&$value) { |
|
171 | - switch ($this->getType()) { |
|
172 | - case self::VALUE_BOOLEAN: |
|
173 | - if (!is_bool($value)) { |
|
174 | - switch ($value) { |
|
175 | - case 'true': |
|
176 | - $value = true; |
|
177 | - break; |
|
178 | - case 'false': |
|
179 | - $value = false; |
|
180 | - break; |
|
181 | - default: |
|
182 | - return false; |
|
183 | - } |
|
184 | - } |
|
185 | - break; |
|
186 | - default: |
|
187 | - if (!$value && !$this->isOptional()) { |
|
188 | - return false; |
|
189 | - } |
|
190 | - break; |
|
191 | - } |
|
192 | - return true; |
|
193 | - } |
|
31 | + /** Value constants */ |
|
32 | + const VALUE_TEXT = 0; |
|
33 | + const VALUE_BOOLEAN = 1; |
|
34 | + const VALUE_PASSWORD = 2; |
|
35 | + const VALUE_HIDDEN = 3; |
|
36 | + |
|
37 | + /** Flag constants */ |
|
38 | + const FLAG_NONE = 0; |
|
39 | + const FLAG_OPTIONAL = 1; |
|
40 | + const FLAG_USER_PROVIDED = 2; |
|
41 | + |
|
42 | + /** @var string name of parameter */ |
|
43 | + private $name; |
|
44 | + |
|
45 | + /** @var string human-readable parameter text */ |
|
46 | + private $text; |
|
47 | + |
|
48 | + /** @var int value type, see self::VALUE_* constants */ |
|
49 | + private $type = self::VALUE_TEXT; |
|
50 | + |
|
51 | + /** @var int flags, see self::FLAG_* constants */ |
|
52 | + private $flags = self::FLAG_NONE; |
|
53 | + |
|
54 | + /** |
|
55 | + * @param string $name |
|
56 | + * @param string $text |
|
57 | + */ |
|
58 | + public function __construct($name, $text) { |
|
59 | + $this->name = $name; |
|
60 | + $this->text = $text; |
|
61 | + } |
|
62 | + |
|
63 | + /** |
|
64 | + * @return string |
|
65 | + */ |
|
66 | + public function getName() { |
|
67 | + return $this->name; |
|
68 | + } |
|
69 | + |
|
70 | + /** |
|
71 | + * @return string |
|
72 | + */ |
|
73 | + public function getText() { |
|
74 | + return $this->text; |
|
75 | + } |
|
76 | + |
|
77 | + /** |
|
78 | + * Get value type |
|
79 | + * |
|
80 | + * @return int |
|
81 | + */ |
|
82 | + public function getType() { |
|
83 | + return $this->type; |
|
84 | + } |
|
85 | + |
|
86 | + /** |
|
87 | + * Set value type |
|
88 | + * |
|
89 | + * @param int $type |
|
90 | + * @return self |
|
91 | + */ |
|
92 | + public function setType($type) { |
|
93 | + $this->type = $type; |
|
94 | + return $this; |
|
95 | + } |
|
96 | + |
|
97 | + /** |
|
98 | + * @return string |
|
99 | + */ |
|
100 | + public function getTypeName() { |
|
101 | + switch ($this->type) { |
|
102 | + case self::VALUE_BOOLEAN: |
|
103 | + return 'boolean'; |
|
104 | + case self::VALUE_TEXT: |
|
105 | + return 'text'; |
|
106 | + case self::VALUE_PASSWORD: |
|
107 | + return 'password'; |
|
108 | + default: |
|
109 | + return 'unknown'; |
|
110 | + } |
|
111 | + } |
|
112 | + |
|
113 | + /** |
|
114 | + * @return int |
|
115 | + */ |
|
116 | + public function getFlags() { |
|
117 | + return $this->flags; |
|
118 | + } |
|
119 | + |
|
120 | + /** |
|
121 | + * @param int $flags |
|
122 | + * @return self |
|
123 | + */ |
|
124 | + public function setFlags($flags) { |
|
125 | + $this->flags = $flags; |
|
126 | + return $this; |
|
127 | + } |
|
128 | + |
|
129 | + /** |
|
130 | + * @param int $flag |
|
131 | + * @return self |
|
132 | + */ |
|
133 | + public function setFlag($flag) { |
|
134 | + $this->flags |= $flag; |
|
135 | + return $this; |
|
136 | + } |
|
137 | + |
|
138 | + /** |
|
139 | + * @param int $flag |
|
140 | + * @return bool |
|
141 | + */ |
|
142 | + public function isFlagSet($flag) { |
|
143 | + return (bool)($this->flags & $flag); |
|
144 | + } |
|
145 | + |
|
146 | + /** |
|
147 | + * Serialize into JSON for client-side JS |
|
148 | + * |
|
149 | + * @return string |
|
150 | + */ |
|
151 | + public function jsonSerialize() { |
|
152 | + return [ |
|
153 | + 'value' => $this->getText(), |
|
154 | + 'flags' => $this->getFlags(), |
|
155 | + 'type' => $this->getType() |
|
156 | + ]; |
|
157 | + } |
|
158 | + |
|
159 | + public function isOptional() { |
|
160 | + return $this->isFlagSet(self::FLAG_OPTIONAL) || $this->isFlagSet(self::FLAG_USER_PROVIDED); |
|
161 | + } |
|
162 | + |
|
163 | + /** |
|
164 | + * Validate a parameter value against this |
|
165 | + * Convert type as necessary |
|
166 | + * |
|
167 | + * @param mixed $value Value to check |
|
168 | + * @return bool success |
|
169 | + */ |
|
170 | + public function validateValue(&$value) { |
|
171 | + switch ($this->getType()) { |
|
172 | + case self::VALUE_BOOLEAN: |
|
173 | + if (!is_bool($value)) { |
|
174 | + switch ($value) { |
|
175 | + case 'true': |
|
176 | + $value = true; |
|
177 | + break; |
|
178 | + case 'false': |
|
179 | + $value = false; |
|
180 | + break; |
|
181 | + default: |
|
182 | + return false; |
|
183 | + } |
|
184 | + } |
|
185 | + break; |
|
186 | + default: |
|
187 | + if (!$value && !$this->isOptional()) { |
|
188 | + return false; |
|
189 | + } |
|
190 | + break; |
|
191 | + } |
|
192 | + return true; |
|
193 | + } |
|
194 | 194 | } |
@@ -140,7 +140,7 @@ |
||
140 | 140 | * @return bool |
141 | 141 | */ |
142 | 142 | public function isFlagSet($flag) { |
143 | - return (bool)($this->flags & $flag); |
|
143 | + return (bool) ($this->flags & $flag); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | /** |
@@ -39,31 +39,31 @@ |
||
39 | 39 | */ |
40 | 40 | class SessionCredentials extends AuthMechanism { |
41 | 41 | |
42 | - /** @var CredentialsStore */ |
|
43 | - private $credentialsStore; |
|
42 | + /** @var CredentialsStore */ |
|
43 | + private $credentialsStore; |
|
44 | 44 | |
45 | - public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
46 | - $this->credentialsStore = $credentialsStore; |
|
45 | + public function __construct(IL10N $l, CredentialsStore $credentialsStore) { |
|
46 | + $this->credentialsStore = $credentialsStore; |
|
47 | 47 | |
48 | - $this->setIdentifier('password::sessioncredentials') |
|
49 | - ->setScheme(self::SCHEME_PASSWORD) |
|
50 | - ->setText($l->t('Log-in credentials, save in session')) |
|
51 | - ->addParameters([]); |
|
52 | - } |
|
48 | + $this->setIdentifier('password::sessioncredentials') |
|
49 | + ->setScheme(self::SCHEME_PASSWORD) |
|
50 | + ->setText($l->t('Log-in credentials, save in session')) |
|
51 | + ->addParameters([]); |
|
52 | + } |
|
53 | 53 | |
54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
55 | - try { |
|
56 | - $credentials = $this->credentialsStore->getLoginCredentials(); |
|
57 | - } catch (CredentialsUnavailableException $e) { |
|
58 | - throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
59 | - } |
|
54 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
55 | + try { |
|
56 | + $credentials = $this->credentialsStore->getLoginCredentials(); |
|
57 | + } catch (CredentialsUnavailableException $e) { |
|
58 | + throw new InsufficientDataForMeaningfulAnswerException('No session credentials saved'); |
|
59 | + } |
|
60 | 60 | |
61 | - $storage->setBackendOption('user', $credentials->getLoginName()); |
|
62 | - $storage->setBackendOption('password', $credentials->getPassword()); |
|
63 | - } |
|
61 | + $storage->setBackendOption('user', $credentials->getLoginName()); |
|
62 | + $storage->setBackendOption('password', $credentials->getPassword()); |
|
63 | + } |
|
64 | 64 | |
65 | - public function wrapStorage(Storage $storage) { |
|
66 | - return new SessionStorageWrapper(['storage' => $storage]); |
|
67 | - } |
|
65 | + public function wrapStorage(Storage $storage) { |
|
66 | + return new SessionStorageWrapper(['storage' => $storage]); |
|
67 | + } |
|
68 | 68 | |
69 | 69 | } |