chore: Rewrite LDAP wizard

apps/user_ldap/appinfo/routes.php

@@ -23,14 +23,6 @@
 	->actionInclude('user_ldap/ajax/wizard.php');
 
 $application = new \OCP\AppFramework\App('user_ldap');
-$application->registerRoutes($this, [
-	'ocs' => [
-		['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'],
-		['name' => 'ConfigAPI#show',   'url' => '/api/v1/config/{configID}', 'verb' => 'GET'],
-		['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'],
-		['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'],
-	]
-]);
 
 /** @var \OCA\User_LDAP\AppInfo\Application $application */
 $application = \OC::$server->query(\OCA\User_LDAP\AppInfo\Application::class);

apps/user_ldap/lib/Controller/ConfigAPIController.php

@@ -12,7 +12,7 @@
 use OCA\User_LDAP\ConnectionFactory;
 use OCA\User_LDAP\Helper;
 use OCA\User_LDAP\Settings\Admin;
-use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSBadRequestException;
@@ -51,12 +51,13 @@
 	/**
 	 * Create a new (empty) configuration and return the resulting prefix
 	 *
 	 * @return DataResponse<Http::STATUS_OK, array{configID: string}, array{}>
 	 * @throws OCSException
 	 *
 	 * 200: Config created successfully
 	 */
 	#[AuthorizedAdminSetting(settings: Admin::class)]
+	#[ApiRoute(verb: 'POST', url: '/api/v1/config')]
 	public function create() {
 		try {
 			$configPrefix = $this->ldapHelper->getNextServerConfigurationPrefix();
@@ -67,20 +68,21 @@
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
 			throw new OCSException('An issue occurred when creating the new config.');
 		}
 		return new DataResponse(['configID' => $configPrefix]);
 	}
 
 	/**
 	 * Delete a LDAP configuration
 	 *
 	 * @param string $configID ID of the config
 	 * @return DataResponse<Http::STATUS_OK, array<empty>, array{}>
 	 * @throws OCSException
 	 * @throws OCSNotFoundException Config not found
 	 *
 	 * 200: Config deleted successfully
 	 */
 	#[AuthorizedAdminSetting(settings: Admin::class)]
+	#[ApiRoute(verb: 'DELETE', url: '/api/v1/config/{configID}')]
 	public function delete($configID) {
 		try {
 			$this->ensureConfigIDExists($configID);
@@ -94,7 +96,7 @@
 			throw new OCSException('An issue occurred when deleting the config.');
 		}
 
 		return new DataResponse();
 	}
 
 	/**
@@ -102,7 +104,7 @@
 	 *
 	 * @param string $configID ID of the config
 	 * @param array<string, mixed> $configData New config
 	 * @return DataResponse<Http::STATUS_OK, array<empty>, array{}>
 	 * @throws OCSException
 	 * @throws OCSBadRequestException Modifying config is not possible
 	 * @throws OCSNotFoundException Config not found
@@ -110,6 +112,7 @@
 	 * 200: Config returned
 	 */
 	#[AuthorizedAdminSetting(settings: Admin::class)]
+	#[ApiRoute(verb: 'PUT', url: '/api/v1/config/{configID}')]
 	public function modify($configID, $configData) {
 		try {
 			$this->ensureConfigIDExists($configID);
@@ -214,6 +217,7 @@
 	 * 200: Config returned
 	 */
 	#[AuthorizedAdminSetting(settings: Admin::class)]
+	#[ApiRoute(verb: 'GET', url: '/api/v1/config/{configID}')]
 	public function show($configID, $showPassword = false) {
 		try {
 			$this->ensureConfigIDExists($configID);

apps/user_ldap/lib/Settings/Admin.php

@@ -8,19 +8,16 @@
 use OCA\User_LDAP\Configuration;
 use OCA\User_LDAP\Helper;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IL10N;
 use OCP\Settings\IDelegatedSettings;
 use OCP\Template;
 
 class Admin implements IDelegatedSettings {
-	/** @var IL10N */
-	private $l;
-
-	/**
-	 * @param IL10N $l
-	 */
-	public function __construct(IL10N $l) {
-		$this->l = $l;
+	public function __construct(
+		private IL10N $l,
+		private IInitialState $InitialState
+	) {
 	}
 
 	/**
@@ -44,6 +41,7 @@ public function getForm() {
 		$sControls = new Template('user_ldap', 'part.settingcontrols');
 		$sControls = $sControls->fetchPage();
 
+		// TODO: remove
 		$parameters['serverConfigurationPrefixes'] = $prefixes;
 		$parameters['serverConfigurationHosts'] = $hosts;
 		$parameters['settingControls'] = $sControls;
@@ -58,6 +56,22 @@ public function getForm() {
 			$parameters[$key . '_default'] = $default;
 		}
 
+		$ldapConfigs = [];
+		foreach ($prefixes as $prefix) {
+			$ldapConfig = new Configuration($prefix);
+			$rawLdapConfig = $ldapConfig->getConfiguration();
+			foreach ($rawLdapConfig as $key => $value) {
+				if (is_array($value)) {
+					$rawLdapConfig[$key] = implode(';', $value);
+				}
+			}
+
+			$ldapConfigs[$prefix] = $rawLdapConfig;
+		}
+
+		$this->InitialState->provideInitialState('ldapConfigs', $ldapConfigs);
+		$this->InitialState->provideInitialState('ldapModuleInstalled', function_exists('ldap_connect'));
+
 		return new TemplateResponse('user_ldap', 'settings', $parameters);
 	}
 

apps/user_ldap/src/LDAPSettingsApp.vue

@@ -0,0 +1,21 @@
+<!--
+ - SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+ -->
+<template>
+	<Settings />
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue'
+
+import Settings from './views/Settings.vue'
+
+export default defineComponent({
+	name: 'LDAPSettingsApp',
+
+	components: {
+		Settings,
+	},
+})
+</script>