Skip to content

Commit 0aa6aa8

Browse files
committed
fix(user_ldap): restore OCS API functionality for configID = ''
The default in the past for a config prefix was '', changed to a default of s01 some year back. A refactor of the routes led to dropping the possibility of passing an empty config ID, breaking the administration interface for all users affected. Signed-off-by: Salvatore Martire <4652631+salmart-dev@users.noreply.github.com>
1 parent a91897f commit 0aa6aa8

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

apps/user_ldap/lib/Controller/ConfigAPIController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function create() {
7272
* 200: Config deleted successfully
7373
*/
7474
#[AuthorizedAdminSetting(settings: Admin::class)]
75-
#[ApiRoute(verb: 'DELETE', url: '/api/v1/config/{configID}')]
75+
#[ApiRoute(verb: 'DELETE', url: '/api/v1/config/{configID}', requirements: ['configID' => '.*'], defaults: ['configID' => ''])]
7676
public function delete($configID) {
7777
try {
7878
$this->ensureConfigIDExists($configID);
@@ -102,7 +102,7 @@ public function delete($configID) {
102102
* 200: Config returned
103103
*/
104104
#[AuthorizedAdminSetting(settings: Admin::class)]
105-
#[ApiRoute(verb: 'PUT', url: '/api/v1/config/{configID}')]
105+
#[ApiRoute(verb: 'PUT', url: '/api/v1/config/{configID}', requirements: ['configID' => '.*'], defaults: ['configID' => ''])]
106106
public function modify($configID, $configData) {
107107
try {
108108
$this->ensureConfigIDExists($configID);
@@ -207,7 +207,7 @@ public function modify($configID, $configData) {
207207
* 200: Config returned
208208
*/
209209
#[AuthorizedAdminSetting(settings: Admin::class)]
210-
#[ApiRoute(verb: 'GET', url: '/api/v1/config/{configID}')]
210+
#[ApiRoute(verb: 'GET', url: '/api/v1/config/{configID}', requirements: ['configID' => '.*'], defaults: ['configID' => ''])]
211211
public function show($configID, $showPassword = false) {
212212
try {
213213
$this->ensureConfigIDExists($configID);
@@ -244,7 +244,7 @@ public function show($configID, $showPassword = false) {
244244
* 200: Test was run and results are returned
245245
*/
246246
#[AuthorizedAdminSetting(settings: Admin::class)]
247-
#[ApiRoute(verb: 'POST', url: '/api/v1/config/{configID}/test')]
247+
#[ApiRoute(verb: 'POST', url: '/api/v1/config/{configID}/test', requirements: ['configID' => '.*'], defaults: ['configID' => ''])]
248248
public function testConfiguration(string $configID) {
249249
try {
250250
$this->ensureConfigIDExists($configID);
@@ -312,7 +312,7 @@ public function testConfiguration(string $configID) {
312312
* 200: Config was copied, new configID was returned
313313
*/
314314
#[AuthorizedAdminSetting(settings: Admin::class)]
315-
#[ApiRoute(verb: 'POST', url: '/api/v1/config/{configID}/copy')]
315+
#[ApiRoute(verb: 'POST', url: '/api/v1/config/{configID}/copy', requirements: ['configID' => '.*'], defaults: ['configID' => ''])]
316316
public function copyConfiguration(string $configID) {
317317
try {
318318
$this->ensureConfigIDExists($configID);

0 commit comments

Comments
 (0)