nextcloud / server

lib/private/Settings/DeclarativeManager.php

Indentation +444 added lines, -444 removed lines

@@ -35,448 +35,448 @@
  */
 class DeclarativeManager implements IDeclarativeManager {
 
-	/** @var array<string, list<IDeclarativeSettingsForm>> */
-	private array $declarativeForms = [];
-
-	/**
-	 * @var array<string, list<DeclarativeSettingsFormSchemaWithoutValues>>
-	 */
-	private array $appSchemas = [];
-
-	public function __construct(
-		private IEventDispatcher $eventDispatcher,
-		private IGroupManager $groupManager,
-		private Coordinator $coordinator,
-		private IConfig $config,
-		private IAppConfig $appConfig,
-		private LoggerInterface $logger,
-		private ICrypto $crypto,
-	) {
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function registerSchema(string $app, array $schema): void {
-		$this->appSchemas[$app] ??= [];
-
-		if (!$this->validateSchema($app, $schema)) {
-			throw new Exception('Invalid schema. Please check the logs for more details.');
-		}
-
-		foreach ($this->appSchemas[$app] as $otherSchema) {
-			if ($otherSchema['id'] === $schema['id']) {
-				throw new Exception('Duplicate form IDs detected: ' . $schema['id']);
-			}
-		}
-
-		$fieldIDs = array_map(fn ($field) => $field['id'], $schema['fields']);
-		$otherFieldIDs = array_merge(...array_map(fn ($schema) => array_map(fn ($field) => $field['id'], $schema['fields']), $this->appSchemas[$app]));
-		$intersectionFieldIDs = array_intersect($fieldIDs, $otherFieldIDs);
-		if (count($intersectionFieldIDs) > 0) {
-			throw new Exception('Non unique field IDs detected: ' . join(', ', $intersectionFieldIDs));
-		}
-
-		$this->appSchemas[$app][] = $schema;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function loadSchemas(): void {
-		if (empty($this->declarativeForms)) {
-			$declarativeSettings = $this->coordinator->getRegistrationContext()->getDeclarativeSettings();
-			foreach ($declarativeSettings as $declarativeSetting) {
-				$app = $declarativeSetting->getAppId();
-				/** @var IDeclarativeSettingsForm $declarativeForm */
-				$declarativeForm = Server::get($declarativeSetting->getService());
-				$this->registerSchema($app, $declarativeForm->getSchema());
-				$this->declarativeForms[$app][] = $declarativeForm;
-			}
-		}
-
-		$this->eventDispatcher->dispatchTyped(new DeclarativeSettingsRegisterFormEvent($this));
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFormIDs(IUser $user, string $type, string $section): array {
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		/** @var array<string, list<string>> $formIds */
-		$formIds = [];
-
-		foreach ($this->appSchemas as $app => $schemas) {
-			$ids = [];
-			usort($schemas, [$this, 'sortSchemasByPriorityCallback']);
-			foreach ($schemas as $schema) {
-				if ($schema['section_type'] === DeclarativeSettingsTypes::SECTION_TYPE_ADMIN && !$isAdmin) {
-					continue;
-				}
-				if ($schema['section_type'] === $type && $schema['section_id'] === $section) {
-					$ids[] = $schema['id'];
-				}
-			}
-
-			if (!empty($ids)) {
-				$formIds[$app] = array_merge($formIds[$app] ?? [], $ids);
-			}
-		}
-
-		return $formIds;
-	}
-
-	/**
-	 * @inheritdoc
-	 * @throws Exception
-	 */
-	public function getFormsWithValues(IUser $user, ?string $type, ?string $section): array {
-		$isAdmin = $this->groupManager->isAdmin($user->getUID());
-		$forms = [];
-
-		foreach ($this->appSchemas as $app => $schemas) {
-			foreach ($schemas as $schema) {
-				if ($type !== null && $schema['section_type'] !== $type) {
-					continue;
-				}
-				if ($section !== null && $schema['section_id'] !== $section) {
-					continue;
-				}
-				// If listing all fields skip the admin fields which a non-admin user has no access to
-				if ($type === null && $schema['section_type'] === 'admin' && !$isAdmin) {
-					continue;
-				}
-
-				$s = $schema;
-				$s['app'] = $app;
-
-				foreach ($s['fields'] as &$field) {
-					$field['value'] = $this->getValue($user, $app, $schema['id'], $field['id']);
-				}
-				unset($field);
-
-				/** @var DeclarativeSettingsFormSchemaWithValues $s */
-				$forms[] = $s;
-			}
-		}
-
-		usort($forms, [$this, 'sortSchemasByPriorityCallback']);
-
-		return $forms;
-	}
-
-	private function sortSchemasByPriorityCallback(mixed $a, mixed $b): int {
-		if ($a['priority'] === $b['priority']) {
-			return 0;
-		}
-		return $a['priority'] > $b['priority'] ? -1 : 1;
-	}
-
-	/**
-	 * @return DeclarativeSettingsStorageType
-	 */
-	private function getStorageType(string $app, string $fieldId): string {
-		if (array_key_exists($app, $this->appSchemas)) {
-			foreach ($this->appSchemas[$app] as $schema) {
-				foreach ($schema['fields'] as $field) {
-					if ($field['id'] == $fieldId) {
-						if (array_key_exists('storage_type', $field)) {
-							return $field['storage_type'];
-						}
-					}
-				}
-
-				if (array_key_exists('storage_type', $schema)) {
-					return $schema['storage_type'];
-				}
-			}
-		}
-
-		return DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL;
-	}
-
-	/**
-	 * @return DeclarativeSettingsSectionType
-	 * @throws Exception
-	 */
-	private function getSectionType(string $app, string $fieldId): string {
-		if (array_key_exists($app, $this->appSchemas)) {
-			foreach ($this->appSchemas[$app] as $schema) {
-				foreach ($schema['fields'] as $field) {
-					if ($field['id'] == $fieldId) {
-						return $schema['section_type'];
-					}
-				}
-			}
-		}
-
-		throw new Exception('Unknown fieldId "' . $fieldId . '"');
-	}
-
-	/**
-	 * @psalm-param DeclarativeSettingsSectionType $sectionType
-	 * @throws NotAdminException
-	 */
-	private function assertAuthorized(IUser $user, string $sectionType): void {
-		if ($sectionType === 'admin' && !$this->groupManager->isAdmin($user->getUID())) {
-			throw new NotAdminException('Logged in user does not have permission to access these settings.');
-		}
-	}
-
-	/**
-	 * @return DeclarativeSettingsValueTypes
-	 * @throws Exception
-	 * @throws NotAdminException
-	 */
-	private function getValue(IUser $user, string $app, string $formId, string $fieldId): mixed {
-		$sectionType = $this->getSectionType($app, $fieldId);
-		$this->assertAuthorized($user, $sectionType);
-
-		$storageType = $this->getStorageType($app, $fieldId);
-		switch ($storageType) {
-			case DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL:
-				$form = $this->getForm($app, $formId);
-				if ($form !== null && $form instanceof IDeclarativeSettingsFormWithHandlers) {
-					return $form->getValue($fieldId, $user);
-				}
-				$event = new DeclarativeSettingsGetValueEvent($user, $app, $formId, $fieldId);
-				$this->eventDispatcher->dispatchTyped($event);
-				return $event->getValue();
-			case DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL:
-				return $this->getInternalValue($user, $app, $formId, $fieldId);
-			default:
-				throw new Exception('Unknown storage type "' . $storageType . '"');
-		}
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function setValue(IUser $user, string $app, string $formId, string $fieldId, mixed $value): void {
-		$sectionType = $this->getSectionType($app, $fieldId);
-		$this->assertAuthorized($user, $sectionType);
-
-		$storageType = $this->getStorageType($app, $fieldId);
-		switch ($storageType) {
-			case DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL:
-				$form = $this->getForm($app, $formId);
-				if ($form !== null && $form instanceof IDeclarativeSettingsFormWithHandlers) {
-					$form->setValue($fieldId, $value, $user);
-					break;
-				}
-				// fall back to event handling
-				$this->eventDispatcher->dispatchTyped(new DeclarativeSettingsSetValueEvent($user, $app, $formId, $fieldId, $value));
-				break;
-			case DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL:
-				$this->saveInternalValue($user, $app, $formId, $fieldId, $value);
-				break;
-			default:
-				throw new Exception('Unknown storage type "' . $storageType . '"');
-		}
-	}
-
-	/**
-	 * If a declarative setting was registered as a form and not just a schema
-	 * then this will yield the registering form.
-	 */
-	private function getForm(string $app, string $formId): ?IDeclarativeSettingsForm {
-		$allForms = $this->declarativeForms[$app] ?? [];
-		foreach ($allForms as $form) {
-			if ($form->getSchema()['id'] === $formId) {
-				return $form;
-			}
-		}
-		return null;
-	}
-
-	private function getInternalValue(IUser $user, string $app, string $formId, string $fieldId): mixed {
-		$sectionType = $this->getSectionType($app, $fieldId);
-		$defaultValue = $this->getDefaultValue($app, $formId, $fieldId);
-
-		$field = $this->getSchemaField($app, $formId, $fieldId);
-		$isSensitive = $field !== null && isset($field['sensitive']) && $field['sensitive'] === true;
-
-		switch ($sectionType) {
-			case DeclarativeSettingsTypes::SECTION_TYPE_ADMIN:
-				$value = $this->config->getAppValue($app, $fieldId, $defaultValue);
-				break;
-			case DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL:
-				$value = $this->config->getUserValue($user->getUID(), $app, $fieldId, $defaultValue);
-				break;
-			default:
-				throw new Exception('Unknown section type "' . $sectionType . '"');
-		}
-		if ($isSensitive && $value !== '') {
-			try {
-				$value = $this->crypto->decrypt($value);
-			} catch (Exception $e) {
-				$this->logger->warning('Failed to decrypt sensitive value for field {field} in app {app}: {message}', [
-					'field' => $fieldId,
-					'app' => $app,
-					'message' => $e->getMessage(),
-				]);
-				$value = $defaultValue;
-			}
-		}
-		return $value;
-	}
-
-	private function saveInternalValue(IUser $user, string $app, string $formId, string $fieldId, mixed $value): void {
-		$sectionType = $this->getSectionType($app, $fieldId);
-
-		$field = $this->getSchemaField($app, $formId, $fieldId);
-		if ($field !== null && isset($field['sensitive']) && $field['sensitive'] === true && $value !== '' && $value !== 'dummySecret') {
-			try {
-				$value = $this->crypto->encrypt($value);
-			} catch (Exception $e) {
-				$this->logger->warning('Failed to decrypt sensitive value for field {field} in app {app}: {message}', [
-					'field' => $fieldId,
-					'app' => $app,
-					'message' => $e->getMessage()]
-				);
-				throw new Exception('Failed to encrypt sensitive value');
-			}
-		}
-
-		switch ($sectionType) {
-			case DeclarativeSettingsTypes::SECTION_TYPE_ADMIN:
-				$this->appConfig->setValueString($app, $fieldId, $value);
-				break;
-			case DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL:
-				$this->config->setUserValue($user->getUID(), $app, $fieldId, $value);
-				break;
-			default:
-				throw new Exception('Unknown section type "' . $sectionType . '"');
-		}
-	}
-
-	private function getSchemaField(string $app, string $formId, string $fieldId): ?array {
-		$form = $this->getForm($app, $formId);
-		if ($form !== null) {
-			foreach ($form->getSchema()['fields'] as $field) {
-				if ($field['id'] === $fieldId) {
-					return $field;
-				}
-			}
-		}
-		foreach ($this->appSchemas[$app] ?? [] as $schema) {
-			if ($schema['id'] === $formId) {
-				foreach ($schema['fields'] as $field) {
-					if ($field['id'] === $fieldId) {
-						return $field;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	private function getDefaultValue(string $app, string $formId, string $fieldId): mixed {
-		foreach ($this->appSchemas[$app] as $schema) {
-			if ($schema['id'] === $formId) {
-				foreach ($schema['fields'] as $field) {
-					if ($field['id'] === $fieldId) {
-						if (isset($field['default'])) {
-							if (is_array($field['default'])) {
-								return json_encode($field['default']);
-							}
-							return $field['default'];
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	private function validateSchema(string $appId, array $schema): bool {
-		if (!isset($schema['id'])) {
-			$this->logger->warning('Attempt to register a declarative settings schema with no id', ['app' => $appId]);
-			return false;
-		}
-		$formId = $schema['id'];
-		if (!isset($schema['section_type'])) {
-			$this->logger->warning('Declarative settings: missing section_type', ['app' => $appId, 'form_id' => $formId]);
-			return false;
-		}
-		if (!in_array($schema['section_type'], [DeclarativeSettingsTypes::SECTION_TYPE_ADMIN, DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL])) {
-			$this->logger->warning('Declarative settings: invalid section_type', ['app' => $appId, 'form_id' => $formId, 'section_type' => $schema['section_type']]);
-			return false;
-		}
-		if (!isset($schema['section_id'])) {
-			$this->logger->warning('Declarative settings: missing section_id', ['app' => $appId, 'form_id' => $formId]);
-			return false;
-		}
-		if (!isset($schema['storage_type'])) {
-			$this->logger->warning('Declarative settings: missing storage_type', ['app' => $appId, 'form_id' => $formId]);
-			return false;
-		}
-		if (!in_array($schema['storage_type'], [DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL, DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL])) {
-			$this->logger->warning('Declarative settings: invalid storage_type', ['app' => $appId, 'form_id' => $formId, 'storage_type' => $schema['storage_type']]);
-			return false;
-		}
-		if (!isset($schema['title'])) {
-			$this->logger->warning('Declarative settings: missing title', ['app' => $appId, 'form_id' => $formId]);
-			return false;
-		}
-		if (!isset($schema['fields']) || !is_array($schema['fields'])) {
-			$this->logger->warning('Declarative settings: missing or invalid fields', ['app' => $appId, 'form_id' => $formId]);
-			return false;
-		}
-		foreach ($schema['fields'] as $field) {
-			if (!isset($field['id'])) {
-				$this->logger->warning('Declarative settings: missing field id', ['app' => $appId, 'form_id' => $formId, 'field' => $field]);
-				return false;
-			}
-			$fieldId = $field['id'];
-			if (!isset($field['title'])) {
-				$this->logger->warning('Declarative settings: missing field title', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
-				return false;
-			}
-			if (!isset($field['type'])) {
-				$this->logger->warning('Declarative settings: missing field type', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
-				return false;
-			}
-			if (!in_array($field['type'], [
-				DeclarativeSettingsTypes::MULTI_SELECT, DeclarativeSettingsTypes::MULTI_CHECKBOX, DeclarativeSettingsTypes::RADIO,
-				DeclarativeSettingsTypes::SELECT, DeclarativeSettingsTypes::CHECKBOX,
-				DeclarativeSettingsTypes::URL, DeclarativeSettingsTypes::EMAIL, DeclarativeSettingsTypes::NUMBER,
-				DeclarativeSettingsTypes::TEL, DeclarativeSettingsTypes::TEXT, DeclarativeSettingsTypes::PASSWORD,
-			])) {
-				$this->logger->warning('Declarative settings: invalid field type', [
-					'app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId, 'type' => $field['type'],
-				]);
-				return false;
-			}
-			if (isset($field['sensitive']) && $field['sensitive'] === true && !in_array($field['type'], [DeclarativeSettingsTypes::TEXT, DeclarativeSettingsTypes::PASSWORD])) {
-				$this->logger->warning('Declarative settings: sensitive field type is supported only for TEXT and PASSWORD types ({app}, {form_id}, {field_id})', [
-					'app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId,
-				]);
-				return false;
-			}
-			if (!$this->validateField($appId, $formId, $field)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	private function validateField(string $appId, string $formId, array $field): bool {
-		$fieldId = $field['id'];
-		if (in_array($field['type'], [
-			DeclarativeSettingsTypes::MULTI_SELECT, DeclarativeSettingsTypes::MULTI_CHECKBOX, DeclarativeSettingsTypes::RADIO,
-			DeclarativeSettingsTypes::SELECT
-		])) {
-			if (!isset($field['options'])) {
-				$this->logger->warning('Declarative settings: missing field options', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
-				return false;
-			}
-			if (!is_array($field['options'])) {
-				$this->logger->warning('Declarative settings: field options should be an array', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
-				return false;
-			}
-		}
-		return true;
-	}
+    /** @var array<string, list<IDeclarativeSettingsForm>> */
+    private array $declarativeForms = [];
+
+    /**
+     * @var array<string, list<DeclarativeSettingsFormSchemaWithoutValues>>
+     */
+    private array $appSchemas = [];
+
+    public function __construct(
+        private IEventDispatcher $eventDispatcher,
+        private IGroupManager $groupManager,
+        private Coordinator $coordinator,
+        private IConfig $config,
+        private IAppConfig $appConfig,
+        private LoggerInterface $logger,
+        private ICrypto $crypto,
+    ) {
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function registerSchema(string $app, array $schema): void {
+        $this->appSchemas[$app] ??= [];
+
+        if (!$this->validateSchema($app, $schema)) {
+            throw new Exception('Invalid schema. Please check the logs for more details.');
+        }
+
+        foreach ($this->appSchemas[$app] as $otherSchema) {
+            if ($otherSchema['id'] === $schema['id']) {
+                throw new Exception('Duplicate form IDs detected: ' . $schema['id']);
+            }
+        }
+
+        $fieldIDs = array_map(fn ($field) => $field['id'], $schema['fields']);
+        $otherFieldIDs = array_merge(...array_map(fn ($schema) => array_map(fn ($field) => $field['id'], $schema['fields']), $this->appSchemas[$app]));
+        $intersectionFieldIDs = array_intersect($fieldIDs, $otherFieldIDs);
+        if (count($intersectionFieldIDs) > 0) {
+            throw new Exception('Non unique field IDs detected: ' . join(', ', $intersectionFieldIDs));
+        }
+
+        $this->appSchemas[$app][] = $schema;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function loadSchemas(): void {
+        if (empty($this->declarativeForms)) {
+            $declarativeSettings = $this->coordinator->getRegistrationContext()->getDeclarativeSettings();
+            foreach ($declarativeSettings as $declarativeSetting) {
+                $app = $declarativeSetting->getAppId();
+                /** @var IDeclarativeSettingsForm $declarativeForm */
+                $declarativeForm = Server::get($declarativeSetting->getService());
+                $this->registerSchema($app, $declarativeForm->getSchema());
+                $this->declarativeForms[$app][] = $declarativeForm;
+            }
+        }
+
+        $this->eventDispatcher->dispatchTyped(new DeclarativeSettingsRegisterFormEvent($this));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFormIDs(IUser $user, string $type, string $section): array {
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        /** @var array<string, list<string>> $formIds */
+        $formIds = [];
+
+        foreach ($this->appSchemas as $app => $schemas) {
+            $ids = [];
+            usort($schemas, [$this, 'sortSchemasByPriorityCallback']);
+            foreach ($schemas as $schema) {
+                if ($schema['section_type'] === DeclarativeSettingsTypes::SECTION_TYPE_ADMIN && !$isAdmin) {
+                    continue;
+                }
+                if ($schema['section_type'] === $type && $schema['section_id'] === $section) {
+                    $ids[] = $schema['id'];
+                }
+            }
+
+            if (!empty($ids)) {
+                $formIds[$app] = array_merge($formIds[$app] ?? [], $ids);
+            }
+        }
+
+        return $formIds;
+    }
+
+    /**
+     * @inheritdoc
+     * @throws Exception
+     */
+    public function getFormsWithValues(IUser $user, ?string $type, ?string $section): array {
+        $isAdmin = $this->groupManager->isAdmin($user->getUID());
+        $forms = [];
+
+        foreach ($this->appSchemas as $app => $schemas) {
+            foreach ($schemas as $schema) {
+                if ($type !== null && $schema['section_type'] !== $type) {
+                    continue;
+                }
+                if ($section !== null && $schema['section_id'] !== $section) {
+                    continue;
+                }
+                // If listing all fields skip the admin fields which a non-admin user has no access to
+                if ($type === null && $schema['section_type'] === 'admin' && !$isAdmin) {
+                    continue;
+                }
+
+                $s = $schema;
+                $s['app'] = $app;
+
+                foreach ($s['fields'] as &$field) {
+                    $field['value'] = $this->getValue($user, $app, $schema['id'], $field['id']);
+                }
+                unset($field);
+
+                /** @var DeclarativeSettingsFormSchemaWithValues $s */
+                $forms[] = $s;
+            }
+        }
+
+        usort($forms, [$this, 'sortSchemasByPriorityCallback']);
+
+        return $forms;
+    }
+
+    private function sortSchemasByPriorityCallback(mixed $a, mixed $b): int {
+        if ($a['priority'] === $b['priority']) {
+            return 0;
+        }
+        return $a['priority'] > $b['priority'] ? -1 : 1;
+    }
+
+    /**
+     * @return DeclarativeSettingsStorageType
+     */
+    private function getStorageType(string $app, string $fieldId): string {
+        if (array_key_exists($app, $this->appSchemas)) {
+            foreach ($this->appSchemas[$app] as $schema) {
+                foreach ($schema['fields'] as $field) {
+                    if ($field['id'] == $fieldId) {
+                        if (array_key_exists('storage_type', $field)) {
+                            return $field['storage_type'];
+                        }
+                    }
+                }
+
+                if (array_key_exists('storage_type', $schema)) {
+                    return $schema['storage_type'];
+                }
+            }
+        }
+
+        return DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL;
+    }
+
+    /**
+     * @return DeclarativeSettingsSectionType
+     * @throws Exception
+     */
+    private function getSectionType(string $app, string $fieldId): string {
+        if (array_key_exists($app, $this->appSchemas)) {
+            foreach ($this->appSchemas[$app] as $schema) {
+                foreach ($schema['fields'] as $field) {
+                    if ($field['id'] == $fieldId) {
+                        return $schema['section_type'];
+                    }
+                }
+            }
+        }
+
+        throw new Exception('Unknown fieldId "' . $fieldId . '"');
+    }
+
+    /**
+     * @psalm-param DeclarativeSettingsSectionType $sectionType
+     * @throws NotAdminException
+     */
+    private function assertAuthorized(IUser $user, string $sectionType): void {
+        if ($sectionType === 'admin' && !$this->groupManager->isAdmin($user->getUID())) {
+            throw new NotAdminException('Logged in user does not have permission to access these settings.');
+        }
+    }
+
+    /**
+     * @return DeclarativeSettingsValueTypes
+     * @throws Exception
+     * @throws NotAdminException
+     */
+    private function getValue(IUser $user, string $app, string $formId, string $fieldId): mixed {
+        $sectionType = $this->getSectionType($app, $fieldId);
+        $this->assertAuthorized($user, $sectionType);
+
+        $storageType = $this->getStorageType($app, $fieldId);
+        switch ($storageType) {
+            case DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL:
+                $form = $this->getForm($app, $formId);
+                if ($form !== null && $form instanceof IDeclarativeSettingsFormWithHandlers) {
+                    return $form->getValue($fieldId, $user);
+                }
+                $event = new DeclarativeSettingsGetValueEvent($user, $app, $formId, $fieldId);
+                $this->eventDispatcher->dispatchTyped($event);
+                return $event->getValue();
+            case DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL:
+                return $this->getInternalValue($user, $app, $formId, $fieldId);
+            default:
+                throw new Exception('Unknown storage type "' . $storageType . '"');
+        }
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function setValue(IUser $user, string $app, string $formId, string $fieldId, mixed $value): void {
+        $sectionType = $this->getSectionType($app, $fieldId);
+        $this->assertAuthorized($user, $sectionType);
+
+        $storageType = $this->getStorageType($app, $fieldId);
+        switch ($storageType) {
+            case DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL:
+                $form = $this->getForm($app, $formId);
+                if ($form !== null && $form instanceof IDeclarativeSettingsFormWithHandlers) {
+                    $form->setValue($fieldId, $value, $user);
+                    break;
+                }
+                // fall back to event handling
+                $this->eventDispatcher->dispatchTyped(new DeclarativeSettingsSetValueEvent($user, $app, $formId, $fieldId, $value));
+                break;
+            case DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL:
+                $this->saveInternalValue($user, $app, $formId, $fieldId, $value);
+                break;
+            default:
+                throw new Exception('Unknown storage type "' . $storageType . '"');
+        }
+    }
+
+    /**
+     * If a declarative setting was registered as a form and not just a schema
+     * then this will yield the registering form.
+     */
+    private function getForm(string $app, string $formId): ?IDeclarativeSettingsForm {
+        $allForms = $this->declarativeForms[$app] ?? [];
+        foreach ($allForms as $form) {
+            if ($form->getSchema()['id'] === $formId) {
+                return $form;
+            }
+        }
+        return null;
+    }
+
+    private function getInternalValue(IUser $user, string $app, string $formId, string $fieldId): mixed {
+        $sectionType = $this->getSectionType($app, $fieldId);
+        $defaultValue = $this->getDefaultValue($app, $formId, $fieldId);
+
+        $field = $this->getSchemaField($app, $formId, $fieldId);
+        $isSensitive = $field !== null && isset($field['sensitive']) && $field['sensitive'] === true;
+
+        switch ($sectionType) {
+            case DeclarativeSettingsTypes::SECTION_TYPE_ADMIN:
+                $value = $this->config->getAppValue($app, $fieldId, $defaultValue);
+                break;
+            case DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL:
+                $value = $this->config->getUserValue($user->getUID(), $app, $fieldId, $defaultValue);
+                break;
+            default:
+                throw new Exception('Unknown section type "' . $sectionType . '"');
+        }
+        if ($isSensitive && $value !== '') {
+            try {
+                $value = $this->crypto->decrypt($value);
+            } catch (Exception $e) {
+                $this->logger->warning('Failed to decrypt sensitive value for field {field} in app {app}: {message}', [
+                    'field' => $fieldId,
+                    'app' => $app,
+                    'message' => $e->getMessage(),
+                ]);
+                $value = $defaultValue;
+            }
+        }
+        return $value;
+    }
+
+    private function saveInternalValue(IUser $user, string $app, string $formId, string $fieldId, mixed $value): void {
+        $sectionType = $this->getSectionType($app, $fieldId);
+
+        $field = $this->getSchemaField($app, $formId, $fieldId);
+        if ($field !== null && isset($field['sensitive']) && $field['sensitive'] === true && $value !== '' && $value !== 'dummySecret') {
+            try {
+                $value = $this->crypto->encrypt($value);
+            } catch (Exception $e) {
+                $this->logger->warning('Failed to decrypt sensitive value for field {field} in app {app}: {message}', [
+                    'field' => $fieldId,
+                    'app' => $app,
+                    'message' => $e->getMessage()]
+                );
+                throw new Exception('Failed to encrypt sensitive value');
+            }
+        }
+
+        switch ($sectionType) {
+            case DeclarativeSettingsTypes::SECTION_TYPE_ADMIN:
+                $this->appConfig->setValueString($app, $fieldId, $value);
+                break;
+            case DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL:
+                $this->config->setUserValue($user->getUID(), $app, $fieldId, $value);
+                break;
+            default:
+                throw new Exception('Unknown section type "' . $sectionType . '"');
+        }
+    }
+
+    private function getSchemaField(string $app, string $formId, string $fieldId): ?array {
+        $form = $this->getForm($app, $formId);
+        if ($form !== null) {
+            foreach ($form->getSchema()['fields'] as $field) {
+                if ($field['id'] === $fieldId) {
+                    return $field;
+                }
+            }
+        }
+        foreach ($this->appSchemas[$app] ?? [] as $schema) {
+            if ($schema['id'] === $formId) {
+                foreach ($schema['fields'] as $field) {
+                    if ($field['id'] === $fieldId) {
+                        return $field;
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private function getDefaultValue(string $app, string $formId, string $fieldId): mixed {
+        foreach ($this->appSchemas[$app] as $schema) {
+            if ($schema['id'] === $formId) {
+                foreach ($schema['fields'] as $field) {
+                    if ($field['id'] === $fieldId) {
+                        if (isset($field['default'])) {
+                            if (is_array($field['default'])) {
+                                return json_encode($field['default']);
+                            }
+                            return $field['default'];
+                        }
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    private function validateSchema(string $appId, array $schema): bool {
+        if (!isset($schema['id'])) {
+            $this->logger->warning('Attempt to register a declarative settings schema with no id', ['app' => $appId]);
+            return false;
+        }
+        $formId = $schema['id'];
+        if (!isset($schema['section_type'])) {
+            $this->logger->warning('Declarative settings: missing section_type', ['app' => $appId, 'form_id' => $formId]);
+            return false;
+        }
+        if (!in_array($schema['section_type'], [DeclarativeSettingsTypes::SECTION_TYPE_ADMIN, DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL])) {
+            $this->logger->warning('Declarative settings: invalid section_type', ['app' => $appId, 'form_id' => $formId, 'section_type' => $schema['section_type']]);
+            return false;
+        }
+        if (!isset($schema['section_id'])) {
+            $this->logger->warning('Declarative settings: missing section_id', ['app' => $appId, 'form_id' => $formId]);
+            return false;
+        }
+        if (!isset($schema['storage_type'])) {
+            $this->logger->warning('Declarative settings: missing storage_type', ['app' => $appId, 'form_id' => $formId]);
+            return false;
+        }
+        if (!in_array($schema['storage_type'], [DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL, DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL])) {
+            $this->logger->warning('Declarative settings: invalid storage_type', ['app' => $appId, 'form_id' => $formId, 'storage_type' => $schema['storage_type']]);
+            return false;
+        }
+        if (!isset($schema['title'])) {
+            $this->logger->warning('Declarative settings: missing title', ['app' => $appId, 'form_id' => $formId]);
+            return false;
+        }
+        if (!isset($schema['fields']) || !is_array($schema['fields'])) {
+            $this->logger->warning('Declarative settings: missing or invalid fields', ['app' => $appId, 'form_id' => $formId]);
+            return false;
+        }
+        foreach ($schema['fields'] as $field) {
+            if (!isset($field['id'])) {
+                $this->logger->warning('Declarative settings: missing field id', ['app' => $appId, 'form_id' => $formId, 'field' => $field]);
+                return false;
+            }
+            $fieldId = $field['id'];
+            if (!isset($field['title'])) {
+                $this->logger->warning('Declarative settings: missing field title', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
+                return false;
+            }
+            if (!isset($field['type'])) {
+                $this->logger->warning('Declarative settings: missing field type', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
+                return false;
+            }
+            if (!in_array($field['type'], [
+                DeclarativeSettingsTypes::MULTI_SELECT, DeclarativeSettingsTypes::MULTI_CHECKBOX, DeclarativeSettingsTypes::RADIO,
+                DeclarativeSettingsTypes::SELECT, DeclarativeSettingsTypes::CHECKBOX,
+                DeclarativeSettingsTypes::URL, DeclarativeSettingsTypes::EMAIL, DeclarativeSettingsTypes::NUMBER,
+                DeclarativeSettingsTypes::TEL, DeclarativeSettingsTypes::TEXT, DeclarativeSettingsTypes::PASSWORD,
+            ])) {
+                $this->logger->warning('Declarative settings: invalid field type', [
+                    'app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId, 'type' => $field['type'],
+                ]);
+                return false;
+            }
+            if (isset($field['sensitive']) && $field['sensitive'] === true && !in_array($field['type'], [DeclarativeSettingsTypes::TEXT, DeclarativeSettingsTypes::PASSWORD])) {
+                $this->logger->warning('Declarative settings: sensitive field type is supported only for TEXT and PASSWORD types ({app}, {form_id}, {field_id})', [
+                    'app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId,
+                ]);
+                return false;
+            }
+            if (!$this->validateField($appId, $formId, $field)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private function validateField(string $appId, string $formId, array $field): bool {
+        $fieldId = $field['id'];
+        if (in_array($field['type'], [
+            DeclarativeSettingsTypes::MULTI_SELECT, DeclarativeSettingsTypes::MULTI_CHECKBOX, DeclarativeSettingsTypes::RADIO,
+            DeclarativeSettingsTypes::SELECT
+        ])) {
+            if (!isset($field['options'])) {
+                $this->logger->warning('Declarative settings: missing field options', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
+                return false;
+            }
+            if (!is_array($field['options'])) {
+                $this->logger->warning('Declarative settings: field options should be an array', ['app' => $appId, 'form_id' => $formId, 'field_id' => $fieldId]);
+                return false;
+            }
+        }
+        return true;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -66,7 +66,7 @@ 
 
 		foreach ($this->appSchemas[$app] as $otherSchema) {
 			if ($otherSchema['id'] === $schema['id']) {
-				throw new Exception('Duplicate form IDs detected: ' . $schema['id']);
+				throw new Exception('Duplicate form IDs detected: '.$schema['id']);
 			}
 		}
 
@@ -74,7 +74,7 @@ 
 		$otherFieldIDs = array_merge(...array_map(fn ($schema) => array_map(fn ($field) => $field['id'], $schema['fields']), $this->appSchemas[$app]));
 		$intersectionFieldIDs = array_intersect($fieldIDs, $otherFieldIDs);
 		if (count($intersectionFieldIDs) > 0) {
-			throw new Exception('Non unique field IDs detected: ' . join(', ', $intersectionFieldIDs));
+			throw new Exception('Non unique field IDs detected: '.join(', ', $intersectionFieldIDs));
 		}
 
 		$this->appSchemas[$app][] = $schema;
@@ -210,7 +210,7 @@ 
 			}
 		}
 
-		throw new Exception('Unknown fieldId "' . $fieldId . '"');
+		throw new Exception('Unknown fieldId "'.$fieldId.'"');
 	}
 
 	/**
@@ -245,7 +245,7 @@ 
 			case DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL:
 				return $this->getInternalValue($user, $app, $formId, $fieldId);
 			default:
-				throw new Exception('Unknown storage type "' . $storageType . '"');
+				throw new Exception('Unknown storage type "'.$storageType.'"');
 		}
 	}
 
@@ -271,7 +271,7 @@ 
 				$this->saveInternalValue($user, $app, $formId, $fieldId, $value);
 				break;
 			default:
-				throw new Exception('Unknown storage type "' . $storageType . '"');
+				throw new Exception('Unknown storage type "'.$storageType.'"');
 		}
 	}
 
@@ -304,7 +304,7 @@ 
 				$value = $this->config->getUserValue($user->getUID(), $app, $fieldId, $defaultValue);
 				break;
 			default:
-				throw new Exception('Unknown section type "' . $sectionType . '"');
+				throw new Exception('Unknown section type "'.$sectionType.'"');
 		}
 		if ($isSensitive && $value !== '') {
 			try {
@@ -346,7 +346,7 @@ 
 				$this->config->setUserValue($user->getUID(), $app, $fieldId, $value);
 				break;
 			default:
-				throw new Exception('Unknown section type "' . $sectionType . '"');
+				throw new Exception('Unknown section type "'.$sectionType.'"');
 		}
 	}
 

apps/settings/lib/Controller/CommonSettingsTrait.php

Indentation +159 added lines, -159 removed lines

@@ -28,163 +28,163 @@
  */
 trait CommonSettingsTrait {
 
-	/** @var ISettingsManager */
-	private $settingsManager;
-
-	/** @var INavigationManager */
-	private $navigationManager;
-
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var IGroupManager */
-	private $groupManager;
-
-	/** @var ISubAdmin */
-	private $subAdmin;
-
-	private IDeclarativeManager $declarativeSettingsManager;
-
-	/** @var IInitialState */
-	private $initialState;
-
-	/**
-	 * @return array{forms: array{personal: array, admin: array}}
-	 */
-	private function getNavigationParameters(string $currentType, string $currentSection): array {
-		return [
-			'forms' => [
-				'personal' => $this->formatPersonalSections($currentType, $currentSection),
-				'admin' => $this->formatAdminSections($currentType, $currentSection),
-			],
-		];
-	}
-
-	/**
-	 * @param IIconSection[][] $sections
-	 * @psalm-param 'admin'|'personal' $type
-	 * @return list<array{anchor: string, section-name: string, active: bool, icon: string}>
-	 */
-	protected function formatSections(array $sections, string $currentSection, string $type, string $currentType): array {
-		$templateParameters = [];
-		foreach ($sections as $prioritizedSections) {
-			foreach ($prioritizedSections as $section) {
-				if ($type === 'admin') {
-					$settings = $this->settingsManager->getAllowedAdminSettings($section->getID(), $this->userSession->getUser());
-				} elseif ($type === 'personal') {
-					$settings = $this->settingsManager->getPersonalSettings($section->getID());
-				}
-
-				/** @psalm-suppress PossiblyNullArgument */
-				$declarativeFormIDs = $this->declarativeSettingsManager->getFormIDs($this->userSession->getUser(), $type, $section->getID());
-
-				if (empty($settings) && empty($declarativeFormIDs)) {
-					continue;
-				}
-
-				$icon = $section->getIcon();
-
-				$active = $section->getID() === $currentSection
-					&& $type === $currentType;
-
-				$templateParameters[] = [
-					'anchor' => $section->getID(),
-					'section-name' => $section->getName(),
-					'active' => $active,
-					'icon' => $icon,
-				];
-			}
-		}
-		return $templateParameters;
-	}
-
-	protected function formatPersonalSections(string $currentType, string $currentSection): array {
-		$sections = $this->settingsManager->getPersonalSections();
-		return $this->formatSections($sections, $currentSection, 'personal', $currentType);
-	}
-
-	protected function formatAdminSections(string $currentType, string $currentSection): array {
-		$sections = $this->settingsManager->getAdminSections();
-		return $this->formatSections($sections, $currentSection, 'admin', $currentType);
-	}
-
-	/**
-	 * @param list<ISettings> $settings
-	 * @param list<DeclarativeSettingsFormSchemaWithValues> $declarativeSettings
-	 * @return array{content: string}
-	 */
-	private function formatSettings(array $settings, array $declarativeSettings): array {
-		$settings = array_merge($settings, $declarativeSettings);
-
-		usort($settings, function ($first, $second) {
-			$priorityOne = $first instanceof ISettings ? $first->getPriority() : $first['priority'];
-			$priorityTwo = $second instanceof ISettings ? $second->getPriority() : $second['priority'];
-			return $priorityOne - $priorityTwo;
-		});
-
-		$html = '';
-		foreach ($settings as $setting) {
-			if ($setting instanceof ISettings) {
-				$form = $setting->getForm();
-				$html .= $form->renderAs('')->render();
-			} else {
-				$html .= '<div id="' . $setting['app'] . '_' . $setting['id'] . '"></div>';
-			}
-		}
-		return ['content' => $html];
-	}
-
-	/**
-	 * @psalm-param 'admin'|'personal' $type
-	 */
-	private function getIndexResponse(string $type, string $section): TemplateResponse {
-		$user = $this->userSession->getUser();
-		assert($user !== null, 'No user logged in for settings');
-
-		$this->declarativeSettingsManager->loadSchemas();
-		$declarativeSettings = $this->declarativeSettingsManager->getFormsWithValues($user, $type, $section);
-
-		foreach ($declarativeSettings as &$form) {
-			foreach ($form['fields'] as &$field) {
-				if (isset($field['sensitive']) && $field['sensitive'] === true && !empty($field['value'])) {
-					$field['value'] = 'dummySecret';
-				}
-			}
-		}
-
-		if ($type === 'personal') {
-			$settings = array_values($this->settingsManager->getPersonalSettings($section));
-			if ($section === 'theming') {
-				$this->navigationManager->setActiveEntry('accessibility_settings');
-			} else {
-				$this->navigationManager->setActiveEntry('settings');
-			}
-		} elseif ($type === 'admin') {
-			$settings = array_values($this->settingsManager->getAllowedAdminSettings($section, $user));
-			if (empty($settings) && empty($declarativeSettings)) {
-				throw new NotAdminException('Logged in user does not have permission to access these settings.');
-			}
-			$this->navigationManager->setActiveEntry('admin_settings');
-		} else {
-			throw new InvalidArgumentException('$type must be either "admin" or "personal"');
-		}
-
-		if (!empty($declarativeSettings)) {
-			Util::addScript(Application::APP_ID, 'declarative-settings-forms');
-			$this->initialState->provideInitialState('declarative-settings-forms', $declarativeSettings);
-		}
-
-		$settings = array_merge(...$settings);
-		$templateParams = $this->formatSettings($settings, $declarativeSettings);
-		$templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
-
-		$activeSection = $this->settingsManager->getSection($type, $section);
-		if ($activeSection) {
-			$templateParams['pageTitle'] = $activeSection->getName();
-			$templateParams['activeSectionId'] = $activeSection->getID();
-			$templateParams['activeSectionType'] = $type;
-		}
-
-		return new TemplateResponse('settings', 'settings/frame', $templateParams);
-	}
+    /** @var ISettingsManager */
+    private $settingsManager;
+
+    /** @var INavigationManager */
+    private $navigationManager;
+
+    /** @var IUserSession */
+    private $userSession;
+
+    /** @var IGroupManager */
+    private $groupManager;
+
+    /** @var ISubAdmin */
+    private $subAdmin;
+
+    private IDeclarativeManager $declarativeSettingsManager;
+
+    /** @var IInitialState */
+    private $initialState;
+
+    /**
+     * @return array{forms: array{personal: array, admin: array}}
+     */
+    private function getNavigationParameters(string $currentType, string $currentSection): array {
+        return [
+            'forms' => [
+                'personal' => $this->formatPersonalSections($currentType, $currentSection),
+                'admin' => $this->formatAdminSections($currentType, $currentSection),
+            ],
+        ];
+    }
+
+    /**
+     * @param IIconSection[][] $sections
+     * @psalm-param 'admin'|'personal' $type
+     * @return list<array{anchor: string, section-name: string, active: bool, icon: string}>
+     */
+    protected function formatSections(array $sections, string $currentSection, string $type, string $currentType): array {
+        $templateParameters = [];
+        foreach ($sections as $prioritizedSections) {
+            foreach ($prioritizedSections as $section) {
+                if ($type === 'admin') {
+                    $settings = $this->settingsManager->getAllowedAdminSettings($section->getID(), $this->userSession->getUser());
+                } elseif ($type === 'personal') {
+                    $settings = $this->settingsManager->getPersonalSettings($section->getID());
+                }
+
+                /** @psalm-suppress PossiblyNullArgument */
+                $declarativeFormIDs = $this->declarativeSettingsManager->getFormIDs($this->userSession->getUser(), $type, $section->getID());
+
+                if (empty($settings) && empty($declarativeFormIDs)) {
+                    continue;
+                }
+
+                $icon = $section->getIcon();
+
+                $active = $section->getID() === $currentSection
+                    && $type === $currentType;
+
+                $templateParameters[] = [
+                    'anchor' => $section->getID(),
+                    'section-name' => $section->getName(),
+                    'active' => $active,
+                    'icon' => $icon,
+                ];
+            }
+        }
+        return $templateParameters;
+    }
+
+    protected function formatPersonalSections(string $currentType, string $currentSection): array {
+        $sections = $this->settingsManager->getPersonalSections();
+        return $this->formatSections($sections, $currentSection, 'personal', $currentType);
+    }
+
+    protected function formatAdminSections(string $currentType, string $currentSection): array {
+        $sections = $this->settingsManager->getAdminSections();
+        return $this->formatSections($sections, $currentSection, 'admin', $currentType);
+    }
+
+    /**
+     * @param list<ISettings> $settings
+     * @param list<DeclarativeSettingsFormSchemaWithValues> $declarativeSettings
+     * @return array{content: string}
+     */
+    private function formatSettings(array $settings, array $declarativeSettings): array {
+        $settings = array_merge($settings, $declarativeSettings);
+
+        usort($settings, function ($first, $second) {
+            $priorityOne = $first instanceof ISettings ? $first->getPriority() : $first['priority'];
+            $priorityTwo = $second instanceof ISettings ? $second->getPriority() : $second['priority'];
+            return $priorityOne - $priorityTwo;
+        });
+
+        $html = '';
+        foreach ($settings as $setting) {
+            if ($setting instanceof ISettings) {
+                $form = $setting->getForm();
+                $html .= $form->renderAs('')->render();
+            } else {
+                $html .= '<div id="' . $setting['app'] . '_' . $setting['id'] . '"></div>';
+            }
+        }
+        return ['content' => $html];
+    }
+
+    /**
+     * @psalm-param 'admin'|'personal' $type
+     */
+    private function getIndexResponse(string $type, string $section): TemplateResponse {
+        $user = $this->userSession->getUser();
+        assert($user !== null, 'No user logged in for settings');
+
+        $this->declarativeSettingsManager->loadSchemas();
+        $declarativeSettings = $this->declarativeSettingsManager->getFormsWithValues($user, $type, $section);
+
+        foreach ($declarativeSettings as &$form) {
+            foreach ($form['fields'] as &$field) {
+                if (isset($field['sensitive']) && $field['sensitive'] === true && !empty($field['value'])) {
+                    $field['value'] = 'dummySecret';
+                }
+            }
+        }
+
+        if ($type === 'personal') {
+            $settings = array_values($this->settingsManager->getPersonalSettings($section));
+            if ($section === 'theming') {
+                $this->navigationManager->setActiveEntry('accessibility_settings');
+            } else {
+                $this->navigationManager->setActiveEntry('settings');
+            }
+        } elseif ($type === 'admin') {
+            $settings = array_values($this->settingsManager->getAllowedAdminSettings($section, $user));
+            if (empty($settings) && empty($declarativeSettings)) {
+                throw new NotAdminException('Logged in user does not have permission to access these settings.');
+            }
+            $this->navigationManager->setActiveEntry('admin_settings');
+        } else {
+            throw new InvalidArgumentException('$type must be either "admin" or "personal"');
+        }
+
+        if (!empty($declarativeSettings)) {
+            Util::addScript(Application::APP_ID, 'declarative-settings-forms');
+            $this->initialState->provideInitialState('declarative-settings-forms', $declarativeSettings);
+        }
+
+        $settings = array_merge(...$settings);
+        $templateParams = $this->formatSettings($settings, $declarativeSettings);
+        $templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
+
+        $activeSection = $this->settingsManager->getSection($type, $section);
+        if ($activeSection) {
+            $templateParams['pageTitle'] = $activeSection->getName();
+            $templateParams['activeSectionId'] = $activeSection->getID();
+            $templateParams['activeSectionType'] = $type;
+        }
+
+        return new TemplateResponse('settings', 'settings/frame', $templateParams);
+    }
 }

apps/settings/lib/Controller/DeclarativeSettingsController.php

Indentation +95 added lines, -95 removed lines

@@ -28,104 +28,104 @@
  * @psalm-import-type SettingsDeclarativeForm from ResponseDefinitions
  */
 class DeclarativeSettingsController extends OCSController {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private IUserSession $userSession,
-		private IDeclarativeManager $declarativeManager,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private IUserSession $userSession,
+        private IDeclarativeManager $declarativeManager,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * Sets a declarative settings value
-	 *
-	 * @param string $app ID of the app
-	 * @param string $formId ID of the form
-	 * @param string $fieldId ID of the field
-	 * @param mixed $value Value to be saved
-	 * @return DataResponse<Http::STATUS_OK, null, array{}>
-	 * @throws NotLoggedInException Not logged in or not an admin user
-	 * @throws NotAdminException Not logged in or not an admin user
-	 * @throws OCSBadRequestException Invalid arguments to save value
-	 *
-	 * 200: Value set successfully
-	 */
-	#[NoAdminRequired]
-	public function setValue(string $app, string $formId, string $fieldId, mixed $value): DataResponse {
-		return $this->saveValue($app, $formId, $fieldId, $value);
-	}
+    /**
+     * Sets a declarative settings value
+     *
+     * @param string $app ID of the app
+     * @param string $formId ID of the form
+     * @param string $fieldId ID of the field
+     * @param mixed $value Value to be saved
+     * @return DataResponse<Http::STATUS_OK, null, array{}>
+     * @throws NotLoggedInException Not logged in or not an admin user
+     * @throws NotAdminException Not logged in or not an admin user
+     * @throws OCSBadRequestException Invalid arguments to save value
+     *
+     * 200: Value set successfully
+     */
+    #[NoAdminRequired]
+    public function setValue(string $app, string $formId, string $fieldId, mixed $value): DataResponse {
+        return $this->saveValue($app, $formId, $fieldId, $value);
+    }
 
-	/**
-	 * Sets a declarative settings value.
-	 * Password confirmation is required for sensitive values.
-	 *
-	 * @param string $app ID of the app
-	 * @param string $formId ID of the form
-	 * @param string $fieldId ID of the field
-	 * @param mixed $value Value to be saved
-	 * @return DataResponse<Http::STATUS_OK, null, array{}>
-	 * @throws NotLoggedInException Not logged in or not an admin user
-	 * @throws NotAdminException Not logged in or not an admin user
-	 * @throws OCSBadRequestException Invalid arguments to save value
-	 *
-	 * 200: Value set successfully
-	 */
-	#[NoAdminRequired]
-	#[PasswordConfirmationRequired]
-	public function setSensitiveValue(string $app, string $formId, string $fieldId, mixed $value): DataResponse {
-		return $this->saveValue($app, $formId, $fieldId, $value);
-	}
+    /**
+     * Sets a declarative settings value.
+     * Password confirmation is required for sensitive values.
+     *
+     * @param string $app ID of the app
+     * @param string $formId ID of the form
+     * @param string $fieldId ID of the field
+     * @param mixed $value Value to be saved
+     * @return DataResponse<Http::STATUS_OK, null, array{}>
+     * @throws NotLoggedInException Not logged in or not an admin user
+     * @throws NotAdminException Not logged in or not an admin user
+     * @throws OCSBadRequestException Invalid arguments to save value
+     *
+     * 200: Value set successfully
+     */
+    #[NoAdminRequired]
+    #[PasswordConfirmationRequired]
+    public function setSensitiveValue(string $app, string $formId, string $fieldId, mixed $value): DataResponse {
+        return $this->saveValue($app, $formId, $fieldId, $value);
+    }
 
-	/**
-	 * Sets a declarative settings value.
-	 *
-	 * @param string $app ID of the app
-	 * @param string $formId ID of the form
-	 * @param string $fieldId ID of the field
-	 * @param mixed $value Value to be saved
-	 * @return DataResponse<Http::STATUS_OK, null, array{}>
-	 * @throws NotLoggedInException Not logged in or not an admin user
-	 * @throws NotAdminException Not logged in or not an admin user
-	 * @throws OCSBadRequestException Invalid arguments to save value
-	 *
-	 * 200: Value set successfully
-	 */
-	private function saveValue(string $app, string $formId, string $fieldId, mixed $value): DataResponse {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			throw new NotLoggedInException();
-		}
+    /**
+     * Sets a declarative settings value.
+     *
+     * @param string $app ID of the app
+     * @param string $formId ID of the form
+     * @param string $fieldId ID of the field
+     * @param mixed $value Value to be saved
+     * @return DataResponse<Http::STATUS_OK, null, array{}>
+     * @throws NotLoggedInException Not logged in or not an admin user
+     * @throws NotAdminException Not logged in or not an admin user
+     * @throws OCSBadRequestException Invalid arguments to save value
+     *
+     * 200: Value set successfully
+     */
+    private function saveValue(string $app, string $formId, string $fieldId, mixed $value): DataResponse {
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            throw new NotLoggedInException();
+        }
 
-		try {
-			$this->declarativeManager->loadSchemas();
-			$this->declarativeManager->setValue($user, $app, $formId, $fieldId, $value);
-			return new DataResponse(null);
-		} catch (NotAdminException $e) {
-			throw $e;
-		} catch (Exception $e) {
-			$this->logger->error('Failed to set declarative settings value: ' . $e->getMessage());
-			throw new OCSBadRequestException();
-		}
-	}
+        try {
+            $this->declarativeManager->loadSchemas();
+            $this->declarativeManager->setValue($user, $app, $formId, $fieldId, $value);
+            return new DataResponse(null);
+        } catch (NotAdminException $e) {
+            throw $e;
+        } catch (Exception $e) {
+            $this->logger->error('Failed to set declarative settings value: ' . $e->getMessage());
+            throw new OCSBadRequestException();
+        }
+    }
 
-	/**
-	 * Gets all declarative forms with the values prefilled.
-	 *
-	 * @return DataResponse<Http::STATUS_OK, list<SettingsDeclarativeForm>, array{}>
-	 * @throws NotLoggedInException
-	 * @NoSubAdminRequired
-	 *
-	 * 200: Forms returned
-	 */
-	#[NoAdminRequired]
-	public function getForms(): DataResponse {
-		$user = $this->userSession->getUser();
-		if ($user === null) {
-			throw new NotLoggedInException();
-		}
-		$this->declarativeManager->loadSchemas();
-		return new DataResponse($this->declarativeManager->getFormsWithValues($user, null, null));
-	}
+    /**
+     * Gets all declarative forms with the values prefilled.
+     *
+     * @return DataResponse<Http::STATUS_OK, list<SettingsDeclarativeForm>, array{}>
+     * @throws NotLoggedInException
+     * @NoSubAdminRequired
+     *
+     * 200: Forms returned
+     */
+    #[NoAdminRequired]
+    public function getForms(): DataResponse {
+        $user = $this->userSession->getUser();
+        if ($user === null) {
+            throw new NotLoggedInException();
+        }
+        $this->declarativeManager->loadSchemas();
+        return new DataResponse($this->declarativeManager->getFormsWithValues($user, null, null));
+    }
 }

apps/settings/appinfo/routes.php

Indentation +55 added lines, -55 removed lines

@@ -8,66 +8,66 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 return [
-	'resources' => [
-		'AuthSettings' => ['url' => '/settings/personal/authtokens' , 'root' => ''],
-	],
-	'routes' => [
-		['name' => 'AuthorizedGroup#saveSettings', 'url' => '/settings/authorizedgroups/saveSettings', 'verb' => 'POST'],
+    'resources' => [
+        'AuthSettings' => ['url' => '/settings/personal/authtokens' , 'root' => ''],
+    ],
+    'routes' => [
+        ['name' => 'AuthorizedGroup#saveSettings', 'url' => '/settings/authorizedgroups/saveSettings', 'verb' => 'POST'],
 
-		['name' => 'AuthSettings#wipe', 'url' => '/settings/personal/authtokens/wipe/{id}', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'AuthSettings#wipe', 'url' => '/settings/personal/authtokens/wipe/{id}', 'verb' => 'POST' , 'root' => ''],
 
-		['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST' , 'root' => ''],
 
-		['name' => 'AppSettings#getAppDiscoverJSON', 'url' => '/settings/api/apps/discover', 'verb' => 'GET', 'root' => ''],
-		['name' => 'AppSettings#getAppDiscoverMedia', 'url' => '/settings/api/apps/media', 'verb' => 'GET', 'root' => ''],
-		['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => ''] , 'root' => ''],
-		['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => ''] , 'root' => ''],
-		['name' => 'AppSettings#force', 'url' => '/settings/apps/force', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'AppSettings#getAppDiscoverJSON', 'url' => '/settings/api/apps/discover', 'verb' => 'GET', 'root' => ''],
+        ['name' => 'AppSettings#getAppDiscoverMedia', 'url' => '/settings/api/apps/media', 'verb' => 'GET', 'root' => ''],
+        ['name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#enableApp', 'url' => '/settings/apps/enable/{appId}', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'AppSettings#enableApps', 'url' => '/settings/apps/enable', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'AppSettings#disableApp', 'url' => '/settings/apps/disable/{appId}', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#disableApps', 'url' => '/settings/apps/disable', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'AppSettings#updateApp', 'url' => '/settings/apps/update/{appId}', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#uninstallApp', 'url' => '/settings/apps/uninstall/{appId}', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}', 'verb' => 'GET', 'defaults' => ['category' => ''] , 'root' => ''],
+        ['name' => 'AppSettings#viewApps', 'url' => '/settings/apps/{category}/{id}', 'verb' => 'GET', 'defaults' => ['category' => '', 'id' => ''] , 'root' => ''],
+        ['name' => 'AppSettings#force', 'url' => '/settings/apps/force', 'verb' => 'POST' , 'root' => ''],
 
-		['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT' , 'root' => ''],
-		['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT' , 'root' => ''],
-		['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+'] , 'root' => ''],
-		['name' => 'Users#setPreference', 'url' => '/settings/users/preferences/{key}', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'CheckSetup#setupCheckManager', 'url' => '/settings/setupcheck', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info'] , 'root' => ''],
-		['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server'] , 'root' => ''],
-		['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'TwoFactorSettings#index', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'TwoFactorSettings#update', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'PUT' , 'root' => ''],
-		['name' => 'AISettings#update', 'url' => '/settings/api/admin/ai', 'verb' => 'PUT' , 'root' => ''],
+        ['name' => 'Users#setDisplayName', 'url' => '/settings/users/{username}/displayName', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'Users#setEMailAddress', 'url' => '/settings/users/{id}/mailAddress', 'verb' => 'PUT' , 'root' => ''],
+        ['name' => 'Users#setUserSettings', 'url' => '/settings/users/{username}/settings', 'verb' => 'PUT' , 'root' => ''],
+        ['name' => 'Users#getVerificationCode', 'url' => '/settings/users/{account}/verify', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'Users#usersList', 'url' => '/settings/users', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'Users#usersListByGroup', 'url' => '/settings/users/{group}', 'verb' => 'GET', 'requirements' => ['group' => '.+'] , 'root' => ''],
+        ['name' => 'Users#setPreference', 'url' => '/settings/users/preferences/{key}', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'LogSettings#download', 'url' => '/settings/admin/log/download', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'CheckSetup#setupCheckManager', 'url' => '/settings/setupcheck', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'CheckSetup#check', 'url' => '/settings/ajax/checksetup', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'CheckSetup#getFailedIntegrityCheckFiles', 'url' => '/settings/integrity/failed', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'CheckSetup#rescanFailedIntegrityCheck', 'url' => '/settings/integrity/rescan', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info'] , 'root' => ''],
+        ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server'] , 'root' => ''],
+        ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'ChangePassword#changeUserPassword', 'url' => '/settings/users/changepassword', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'TwoFactorSettings#index', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'TwoFactorSettings#update', 'url' => '/settings/api/admin/twofactorauth', 'verb' => 'PUT' , 'root' => ''],
+        ['name' => 'AISettings#update', 'url' => '/settings/api/admin/ai', 'verb' => 'PUT' , 'root' => ''],
 
-		['name' => 'Help#help', 'url' => '/settings/help/{mode}', 'verb' => 'GET', 'defaults' => ['mode' => ''] , 'root' => ''],
+        ['name' => 'Help#help', 'url' => '/settings/help/{mode}', 'verb' => 'GET', 'defaults' => ['mode' => ''] , 'root' => ''],
 
-		['name' => 'WebAuthn#startRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'GET' , 'root' => ''],
-		['name' => 'WebAuthn#finishRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'POST' , 'root' => ''],
-		['name' => 'WebAuthn#deleteRegistration', 'url' => '/settings/api/personal/webauthn/registration/{id}', 'verb' => 'DELETE' , 'root' => ''],
+        ['name' => 'WebAuthn#startRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'GET' , 'root' => ''],
+        ['name' => 'WebAuthn#finishRegistration', 'url' => '/settings/api/personal/webauthn/registration', 'verb' => 'POST' , 'root' => ''],
+        ['name' => 'WebAuthn#deleteRegistration', 'url' => '/settings/api/personal/webauthn/registration/{id}', 'verb' => 'DELETE' , 'root' => ''],
 
-		['name' => 'Reasons#getPdf', 'url' => '/settings/download/reasons', 'verb' => 'GET', 'root' => ''],
-	],
-	'ocs' => [
-		['name' => 'DeclarativeSettings#setValue', 'url' => '/settings/api/declarative/value', 'verb' => 'POST', 'root' => ''],
-		['name' => 'DeclarativeSettings#setSensitiveValue', 'url' => '/settings/api/declarative/value-sensitive', 'verb' => 'POST', 'root' => ''],
-		['name' => 'DeclarativeSettings#getForms', 'url' => '/settings/api/declarative/forms', 'verb' => 'GET', 'root' => ''],
-	],
+        ['name' => 'Reasons#getPdf', 'url' => '/settings/download/reasons', 'verb' => 'GET', 'root' => ''],
+    ],
+    'ocs' => [
+        ['name' => 'DeclarativeSettings#setValue', 'url' => '/settings/api/declarative/value', 'verb' => 'POST', 'root' => ''],
+        ['name' => 'DeclarativeSettings#setSensitiveValue', 'url' => '/settings/api/declarative/value-sensitive', 'verb' => 'POST', 'root' => ''],
+        ['name' => 'DeclarativeSettings#getForms', 'url' => '/settings/api/declarative/forms', 'verb' => 'GET', 'root' => ''],
+    ],
 ];

apps/testing/lib/Settings/DeclarativeSettingsForm.php

Indentation +191 added lines, -191 removed lines

@@ -11,195 +11,195 @@
 use OCP\Settings\IDeclarativeSettingsForm;
 
 class DeclarativeSettingsForm implements IDeclarativeSettingsForm {
-	public function getSchema(): array {
-		return [
-			'id' => 'test_declarative_form',
-			'priority' => 10,
-			'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN, // admin, personal
-			'section_id' => 'additional',
-			'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL, // external, internal (handled by core to store in appconfig and preferences)
-			'title' => 'Test declarative settings class', // NcSettingsSection name
-			'description' => 'This form is registered with a DeclarativeSettingsForm class', // NcSettingsSection description
-			'doc_url' => '', // NcSettingsSection doc_url for documentation or help page, empty string if not needed
-			'fields' => [
-				[
-					'id' => 'test_ex_app_field_7', // configkey
-					'title' => 'Multi-selection', // name or label
-					'description' => 'Select some option setting', // hint
-					'type' => DeclarativeSettingsTypes::MULTI_SELECT, // select, radio, multi-select
-					'options' => ['foo', 'bar', 'baz'], // simple options for select, radio, multi-select
-					'placeholder' => 'Select some multiple options', // input placeholder
-					'default' => ['foo', 'bar'],
-				],
-				[
-					'id' => 'some_real_setting',
-					'title' => 'Choose init status check background job interval',
-					'description' => 'How often AppAPI should check for initialization status',
-					'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
-					'placeholder' => 'Choose init status check background job interval',
-					'default' => '40m',
-					'options' => [
-						[
-							'name' => 'Each 40 minutes', // NcCheckboxRadioSwitch display name
-							'value' => '40m' // NcCheckboxRadioSwitch value
-						],
-						[
-							'name' => 'Each 60 minutes',
-							'value' => '60m'
-						],
-						[
-							'name' => 'Each 120 minutes',
-							'value' => '120m'
-						],
-						[
-							'name' => 'Each day',
-							'value' => 60 * 24 . 'm'
-						],
-					],
-				],
-				[
-					'id' => 'test_ex_app_field_1', // configkey
-					'title' => 'Default text field', // label
-					'description' => 'Set some simple text setting', // hint
-					'type' => DeclarativeSettingsTypes::TEXT, // text, password, email, tel, url, number
-					'placeholder' => 'Enter text setting', // placeholder
-					'default' => 'foo',
-				],
-				[
-					'id' => 'test_ex_app_field_1_1',
-					'title' => 'Email field',
-					'description' => 'Set email config',
-					'type' => DeclarativeSettingsTypes::EMAIL,
-					'placeholder' => 'Enter email',
-					'default' => '',
-				],
-				[
-					'id' => 'test_ex_app_field_1_2',
-					'title' => 'Tel field',
-					'description' => 'Set tel config',
-					'type' => DeclarativeSettingsTypes::TEL,
-					'placeholder' => 'Enter your tel',
-					'default' => '',
-				],
-				[
-					'id' => 'test_ex_app_field_1_3',
-					'title' => 'Url (website) field',
-					'description' => 'Set url config',
-					'type' => 'url',
-					'placeholder' => 'Enter url',
-					'default' => '',
-				],
-				[
-					'id' => 'test_ex_app_field_1_4',
-					'title' => 'Number field',
-					'description' => 'Set number config',
-					'type' => DeclarativeSettingsTypes::NUMBER,
-					'placeholder' => 'Enter number value',
-					'default' => 0,
-				],
-				[
-					'id' => 'test_ex_app_field_2',
-					'title' => 'Password',
-					'description' => 'Set some secure value setting',
-					'type' => 'password',
-					'placeholder' => 'Set secure value',
-					'default' => '',
-				],
-				[
-					'id' => 'test_ex_app_field_3',
-					'title' => 'Selection',
-					'description' => 'Select some option setting',
-					'type' => DeclarativeSettingsTypes::SELECT, // select, radio, multi-select
-					'options' => ['foo', 'bar', 'baz'],
-					'placeholder' => 'Select some option setting',
-					'default' => 'foo',
-				],
-				[
-					'id' => 'test_ex_app_field_4',
-					'title' => 'Toggle something',
-					'description' => 'Select checkbox option setting',
-					'type' => DeclarativeSettingsTypes::CHECKBOX, // checkbox, multiple-checkbox
-					'label' => 'Verify something if enabled',
-					'default' => false,
-				],
-				[
-					'id' => 'test_ex_app_field_5',
-					'title' => 'Multiple checkbox toggles, describing one setting, checked options are saved as an JSON object {foo: true, bar: false}',
-					'description' => 'Select checkbox option setting',
-					'type' => DeclarativeSettingsTypes::MULTI_CHECKBOX, // checkbox, multi-checkbox
-					'default' => ['foo' => true, 'bar' => true, 'baz' => true],
-					'options' => [
-						[
-							'name' => 'Foo',
-							'value' => 'foo', // multiple-checkbox configkey
-						],
-						[
-							'name' => 'Bar',
-							'value' => 'bar',
-						],
-						[
-							'name' => 'Baz',
-							'value' => 'baz',
-						],
-						[
-							'name' => 'Qux',
-							'value' => 'qux',
-						],
-					],
-				],
-				[
-					'id' => 'test_ex_app_field_6',
-					'title' => 'Radio toggles, describing one setting like single select',
-					'description' => 'Select radio option setting',
-					'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
-					'label' => 'Select single toggle',
-					'default' => 'foo',
-					'options' => [
-						[
-							'name' => 'First radio', // NcCheckboxRadioSwitch display name
-							'value' => 'foo' // NcCheckboxRadioSwitch value
-						],
-						[
-							'name' => 'Second radio',
-							'value' => 'bar'
-						],
-						[
-							'name' => 'Third radio',
-							'value' => 'baz'
-						],
-					],
-				],
-				[
-					'id' => 'test_sensitive_field',
-					'title' => 'Sensitive text field',
-					'description' => 'Set some secure value setting that is stored encrypted',
-					'type' => DeclarativeSettingsTypes::TEXT,
-					'label' => 'Sensitive field',
-					'placeholder' => 'Set secure value',
-					'default' => '',
-					'sensitive' => true, // only for TEXT, PASSWORD types
-				],
-				[
-					'id' => 'test_sensitive_field_2',
-					'title' => 'Sensitive password field',
-					'description' => 'Set some password setting that is stored encrypted',
-					'type' => DeclarativeSettingsTypes::PASSWORD,
-					'label' => 'Sensitive field',
-					'placeholder' => 'Set secure value',
-					'default' => '',
-					'sensitive' => true, // only for TEXT, PASSWORD types
-				],
-				[
-					'id' => 'test_non_sensitive_field',
-					'title' => 'Password field',
-					'description' => 'Set some password setting',
-					'type' => DeclarativeSettingsTypes::PASSWORD,
-					'label' => 'Password field',
-					'placeholder' => 'Set secure value',
-					'default' => '',
-					'sensitive' => false,
-				],
-			],
-		];
-	}
+    public function getSchema(): array {
+        return [
+            'id' => 'test_declarative_form',
+            'priority' => 10,
+            'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN, // admin, personal
+            'section_id' => 'additional',
+            'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL, // external, internal (handled by core to store in appconfig and preferences)
+            'title' => 'Test declarative settings class', // NcSettingsSection name
+            'description' => 'This form is registered with a DeclarativeSettingsForm class', // NcSettingsSection description
+            'doc_url' => '', // NcSettingsSection doc_url for documentation or help page, empty string if not needed
+            'fields' => [
+                [
+                    'id' => 'test_ex_app_field_7', // configkey
+                    'title' => 'Multi-selection', // name or label
+                    'description' => 'Select some option setting', // hint
+                    'type' => DeclarativeSettingsTypes::MULTI_SELECT, // select, radio, multi-select
+                    'options' => ['foo', 'bar', 'baz'], // simple options for select, radio, multi-select
+                    'placeholder' => 'Select some multiple options', // input placeholder
+                    'default' => ['foo', 'bar'],
+                ],
+                [
+                    'id' => 'some_real_setting',
+                    'title' => 'Choose init status check background job interval',
+                    'description' => 'How often AppAPI should check for initialization status',
+                    'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
+                    'placeholder' => 'Choose init status check background job interval',
+                    'default' => '40m',
+                    'options' => [
+                        [
+                            'name' => 'Each 40 minutes', // NcCheckboxRadioSwitch display name
+                            'value' => '40m' // NcCheckboxRadioSwitch value
+                        ],
+                        [
+                            'name' => 'Each 60 minutes',
+                            'value' => '60m'
+                        ],
+                        [
+                            'name' => 'Each 120 minutes',
+                            'value' => '120m'
+                        ],
+                        [
+                            'name' => 'Each day',
+                            'value' => 60 * 24 . 'm'
+                        ],
+                    ],
+                ],
+                [
+                    'id' => 'test_ex_app_field_1', // configkey
+                    'title' => 'Default text field', // label
+                    'description' => 'Set some simple text setting', // hint
+                    'type' => DeclarativeSettingsTypes::TEXT, // text, password, email, tel, url, number
+                    'placeholder' => 'Enter text setting', // placeholder
+                    'default' => 'foo',
+                ],
+                [
+                    'id' => 'test_ex_app_field_1_1',
+                    'title' => 'Email field',
+                    'description' => 'Set email config',
+                    'type' => DeclarativeSettingsTypes::EMAIL,
+                    'placeholder' => 'Enter email',
+                    'default' => '',
+                ],
+                [
+                    'id' => 'test_ex_app_field_1_2',
+                    'title' => 'Tel field',
+                    'description' => 'Set tel config',
+                    'type' => DeclarativeSettingsTypes::TEL,
+                    'placeholder' => 'Enter your tel',
+                    'default' => '',
+                ],
+                [
+                    'id' => 'test_ex_app_field_1_3',
+                    'title' => 'Url (website) field',
+                    'description' => 'Set url config',
+                    'type' => 'url',
+                    'placeholder' => 'Enter url',
+                    'default' => '',
+                ],
+                [
+                    'id' => 'test_ex_app_field_1_4',
+                    'title' => 'Number field',
+                    'description' => 'Set number config',
+                    'type' => DeclarativeSettingsTypes::NUMBER,
+                    'placeholder' => 'Enter number value',
+                    'default' => 0,
+                ],
+                [
+                    'id' => 'test_ex_app_field_2',
+                    'title' => 'Password',
+                    'description' => 'Set some secure value setting',
+                    'type' => 'password',
+                    'placeholder' => 'Set secure value',
+                    'default' => '',
+                ],
+                [
+                    'id' => 'test_ex_app_field_3',
+                    'title' => 'Selection',
+                    'description' => 'Select some option setting',
+                    'type' => DeclarativeSettingsTypes::SELECT, // select, radio, multi-select
+                    'options' => ['foo', 'bar', 'baz'],
+                    'placeholder' => 'Select some option setting',
+                    'default' => 'foo',
+                ],
+                [
+                    'id' => 'test_ex_app_field_4',
+                    'title' => 'Toggle something',
+                    'description' => 'Select checkbox option setting',
+                    'type' => DeclarativeSettingsTypes::CHECKBOX, // checkbox, multiple-checkbox
+                    'label' => 'Verify something if enabled',
+                    'default' => false,
+                ],
+                [
+                    'id' => 'test_ex_app_field_5',
+                    'title' => 'Multiple checkbox toggles, describing one setting, checked options are saved as an JSON object {foo: true, bar: false}',
+                    'description' => 'Select checkbox option setting',
+                    'type' => DeclarativeSettingsTypes::MULTI_CHECKBOX, // checkbox, multi-checkbox
+                    'default' => ['foo' => true, 'bar' => true, 'baz' => true],
+                    'options' => [
+                        [
+                            'name' => 'Foo',
+                            'value' => 'foo', // multiple-checkbox configkey
+                        ],
+                        [
+                            'name' => 'Bar',
+                            'value' => 'bar',
+                        ],
+                        [
+                            'name' => 'Baz',
+                            'value' => 'baz',
+                        ],
+                        [
+                            'name' => 'Qux',
+                            'value' => 'qux',
+                        ],
+                    ],
+                ],
+                [
+                    'id' => 'test_ex_app_field_6',
+                    'title' => 'Radio toggles, describing one setting like single select',
+                    'description' => 'Select radio option setting',
+                    'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
+                    'label' => 'Select single toggle',
+                    'default' => 'foo',
+                    'options' => [
+                        [
+                            'name' => 'First radio', // NcCheckboxRadioSwitch display name
+                            'value' => 'foo' // NcCheckboxRadioSwitch value
+                        ],
+                        [
+                            'name' => 'Second radio',
+                            'value' => 'bar'
+                        ],
+                        [
+                            'name' => 'Third radio',
+                            'value' => 'baz'
+                        ],
+                    ],
+                ],
+                [
+                    'id' => 'test_sensitive_field',
+                    'title' => 'Sensitive text field',
+                    'description' => 'Set some secure value setting that is stored encrypted',
+                    'type' => DeclarativeSettingsTypes::TEXT,
+                    'label' => 'Sensitive field',
+                    'placeholder' => 'Set secure value',
+                    'default' => '',
+                    'sensitive' => true, // only for TEXT, PASSWORD types
+                ],
+                [
+                    'id' => 'test_sensitive_field_2',
+                    'title' => 'Sensitive password field',
+                    'description' => 'Set some password setting that is stored encrypted',
+                    'type' => DeclarativeSettingsTypes::PASSWORD,
+                    'label' => 'Sensitive field',
+                    'placeholder' => 'Set secure value',
+                    'default' => '',
+                    'sensitive' => true, // only for TEXT, PASSWORD types
+                ],
+                [
+                    'id' => 'test_non_sensitive_field',
+                    'title' => 'Password field',
+                    'description' => 'Set some password setting',
+                    'type' => DeclarativeSettingsTypes::PASSWORD,
+                    'label' => 'Password field',
+                    'placeholder' => 'Set secure value',
+                    'default' => '',
+                    'sensitive' => false,
+                ],
+            ],
+        ];
+    }
 }

tests/lib/Settings/DeclarativeManagerTest.php

Indentation +599 added lines, -599 removed lines

@@ -30,604 +30,604 @@
 
 class DeclarativeManagerTest extends TestCase {
 
-	/** @var IDeclarativeManager|MockObject */
-	private $declarativeManager;
-
-	/** @var IEventDispatcher|MockObject */
-	private $eventDispatcher;
-
-	/** @var IGroupManager|MockObject */
-	private $groupManager;
-
-	/** @var Coordinator|MockObject */
-	private $coordinator;
-
-	/** @var IConfig|MockObject */
-	private $config;
-
-	/** @var IAppConfig|MockObject */
-	private $appConfig;
-
-	/** @var LoggerInterface|MockObject */
-	private $logger;
-
-	/** @var ICrypto|MockObject */
-	private $crypto;
-
-	/** @var IUser|MockObject */
-	private $user;
-
-	/** @var IUser|MockObject */
-	private $adminUser;
-
-	private IDeclarativeSettingsForm&MockObject $closureForm;
-
-	public const validSchemaAllFields = [
-		'id' => 'test_form_1',
-		'priority' => 10,
-		'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN, // admin, personal
-		'section_id' => 'additional',
-		'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL, // external, internal (handled by core to store in appconfig and preferences)
-		'title' => 'Test declarative settings', // NcSettingsSection name
-		'description' => 'These fields are rendered dynamically from declarative schema', // NcSettingsSection description
-		'doc_url' => '', // NcSettingsSection doc_url for documentation or help page, empty string if not needed
-		'fields' => [
-			[
-				'id' => 'test_field_7', // configkey
-				'title' => 'Multi-selection', // name or label
-				'description' => 'Select some option setting', // hint
-				'type' => DeclarativeSettingsTypes::MULTI_SELECT,
-				'options' => ['foo', 'bar', 'baz'], // simple options for select, radio, multi-select
-				'placeholder' => 'Select some multiple options', // input placeholder
-				'default' => ['foo', 'bar'],
-			],
-			[
-				'id' => 'some_real_setting',
-				'title' => 'Select single option',
-				'description' => 'Single option radio buttons',
-				'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
-				'placeholder' => 'Select single option, test interval',
-				'default' => '40m',
-				'options' => [
-					[
-						'name' => 'Each 40 minutes', // NcCheckboxRadioSwitch display name
-						'value' => '40m' // NcCheckboxRadioSwitch value
-					],
-					[
-						'name' => 'Each 60 minutes',
-						'value' => '60m'
-					],
-					[
-						'name' => 'Each 120 minutes',
-						'value' => '120m'
-					],
-					[
-						'name' => 'Each day',
-						'value' => 60 * 24 . 'm'
-					],
-				],
-			],
-			[
-				'id' => 'test_field_1', // configkey
-				'title' => 'Default text field', // label
-				'description' => 'Set some simple text setting', // hint
-				'type' => DeclarativeSettingsTypes::TEXT,
-				'placeholder' => 'Enter text setting', // placeholder
-				'default' => 'foo',
-			],
-			[
-				'id' => 'test_field_1_1',
-				'title' => 'Email field',
-				'description' => 'Set email config',
-				'type' => DeclarativeSettingsTypes::EMAIL,
-				'placeholder' => 'Enter email',
-				'default' => '',
-			],
-			[
-				'id' => 'test_field_1_2',
-				'title' => 'Tel field',
-				'description' => 'Set tel config',
-				'type' => DeclarativeSettingsTypes::TEL,
-				'placeholder' => 'Enter your tel',
-				'default' => '',
-			],
-			[
-				'id' => 'test_field_1_3',
-				'title' => 'Url (website) field',
-				'description' => 'Set url config',
-				'type' => 'url',
-				'placeholder' => 'Enter url',
-				'default' => '',
-			],
-			[
-				'id' => 'test_field_1_4',
-				'title' => 'Number field',
-				'description' => 'Set number config',
-				'type' => DeclarativeSettingsTypes::NUMBER,
-				'placeholder' => 'Enter number value',
-				'default' => 0,
-			],
-			[
-				'id' => 'test_field_2',
-				'title' => 'Password',
-				'description' => 'Set some secure value setting',
-				'type' => 'password',
-				'placeholder' => 'Set secure value',
-				'default' => '',
-			],
-			[
-				'id' => 'test_field_3',
-				'title' => 'Selection',
-				'description' => 'Select some option setting',
-				'type' => DeclarativeSettingsTypes::SELECT,
-				'options' => ['foo', 'bar', 'baz'],
-				'placeholder' => 'Select some option setting',
-				'default' => 'foo',
-			],
-			[
-				'id' => 'test_field_4',
-				'title' => 'Toggle something',
-				'description' => 'Select checkbox option setting',
-				'type' => DeclarativeSettingsTypes::CHECKBOX,
-				'label' => 'Verify something if enabled',
-				'default' => false,
-			],
-			[
-				'id' => 'test_field_5',
-				'title' => 'Multiple checkbox toggles, describing one setting, checked options are saved as an JSON object {foo: true, bar: false}',
-				'description' => 'Select checkbox option setting',
-				'type' => DeclarativeSettingsTypes::MULTI_CHECKBOX,
-				'default' => ['foo' => true, 'bar' => true],
-				'options' => [
-					[
-						'name' => 'Foo',
-						'value' => 'foo', // multiple-checkbox configkey
-					],
-					[
-						'name' => 'Bar',
-						'value' => 'bar',
-					],
-					[
-						'name' => 'Baz',
-						'value' => 'baz',
-					],
-					[
-						'name' => 'Qux',
-						'value' => 'qux',
-					],
-				],
-			],
-			[
-				'id' => 'test_field_6',
-				'title' => 'Radio toggles, describing one setting like single select',
-				'description' => 'Select radio option setting',
-				'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
-				'label' => 'Select single toggle',
-				'default' => 'foo',
-				'options' => [
-					[
-						'name' => 'First radio', // NcCheckboxRadioSwitch display name
-						'value' => 'foo' // NcCheckboxRadioSwitch value
-					],
-					[
-						'name' => 'Second radio',
-						'value' => 'bar'
-					],
-					[
-						'name' => 'Second radio',
-						'value' => 'baz'
-					],
-				],
-			],
-			[
-				'id' => 'test_sensitive_field',
-				'title' => 'Sensitive text field',
-				'description' => 'Set some secure value setting that is stored encrypted',
-				'type' => DeclarativeSettingsTypes::TEXT,
-				'label' => 'Sensitive field',
-				'placeholder' => 'Set secure value',
-				'default' => '',
-				'sensitive' => true, // only for TEXT, PASSWORD types
-			],
-			[
-				'id' => 'test_sensitive_field_2',
-				'title' => 'Sensitive password field',
-				'description' => 'Set some password setting that is stored encrypted',
-				'type' => DeclarativeSettingsTypes::PASSWORD,
-				'label' => 'Sensitive field',
-				'placeholder' => 'Set secure value',
-				'default' => '',
-				'sensitive' => true, // only for TEXT, PASSWORD types
-			],
-			[
-				'id' => 'test_non_sensitive_field',
-				'title' => 'Password field',
-				'description' => 'Set some password setting',
-				'type' => DeclarativeSettingsTypes::PASSWORD,
-				'label' => 'Password field',
-				'placeholder' => 'Set secure value',
-				'default' => '',
-				'sensitive' => false,
-			],
-		],
-	];
-
-	public static bool $testSetInternalValueAfterChange = false;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->eventDispatcher = $this->createMock(IEventDispatcher::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->coordinator = $this->createMock(Coordinator::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->crypto = $this->createMock(ICrypto::class);
-
-		$this->declarativeManager = new DeclarativeManager(
-			$this->eventDispatcher,
-			$this->groupManager,
-			$this->coordinator,
-			$this->config,
-			$this->appConfig,
-			$this->logger,
-			$this->crypto,
-		);
-
-		$this->user = $this->createMock(IUser::class);
-		$this->user->expects($this->any())
-			->method('getUID')
-			->willReturn('test_user');
-
-		$this->adminUser = $this->createMock(IUser::class);
-		$this->adminUser->expects($this->any())
-			->method('getUID')
-			->willReturn('admin_test_user');
-
-		$this->groupManager->expects($this->any())
-			->method('isAdmin')
-			->willReturnCallback(function ($userId) {
-				return $userId === 'admin_test_user';
-			});
-	}
-
-	public function testRegisterSchema(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		$this->declarativeManager->registerSchema($app, $schema);
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
-	}
-
-	/**
-	 * Simple test to verify that exception is thrown when trying to register schema with duplicate id
-	 */
-	public function testRegisterDuplicateSchema(): void {
-		$this->declarativeManager->registerSchema('testing', self::validSchemaAllFields);
-		$this->expectException(\Exception::class);
-		$this->declarativeManager->registerSchema('testing', self::validSchemaAllFields);
-	}
-
-	/**
-	 * It's not allowed to register schema with duplicate fields ids for the same app
-	 */
-	public function testRegisterSchemaWithDuplicateFields(): void {
-		// Register first valid schema
-		$this->declarativeManager->registerSchema('testing', self::validSchemaAllFields);
-		// Register second schema with duplicate fields, but different schema id
-		$this->expectException(\Exception::class);
-		$schema = self::validSchemaAllFields;
-		$schema['id'] = 'test_form_2';
-		$this->declarativeManager->registerSchema('testing', $schema);
-	}
-
-	public function testRegisterMultipleSchemasAndDuplicate(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		$this->declarativeManager->registerSchema($app, $schema);
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
-		// 1. Check that form is registered for the app
-		$this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
-		$app = 'testing2';
-		$this->declarativeManager->registerSchema($app, $schema);
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
-		// 2. Check that form is registered for the second app
-		$this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
-		$app = 'testing';
-		$this->expectException(\Exception::class); // expecting duplicate form id and duplicate fields ids exception
-		$this->declarativeManager->registerSchema($app, $schema);
-		$schemaDuplicateFields = self::validSchemaAllFields;
-		$schemaDuplicateFields['id'] = 'test_form_2'; // change form id to test duplicate fields
-		$this->declarativeManager->registerSchema($app, $schemaDuplicateFields);
-		// 3. Check that not valid form with duplicate fields is not registered
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schemaDuplicateFields['section_type'], $schemaDuplicateFields['section_id']);
-		$this->assertFalse(isset($formIds[$app]) && in_array($schemaDuplicateFields['id'], $formIds[$app]));
-	}
-
-	/**
-	 * @dataProvider dataValidateSchema
-	 */
-	public function testValidateSchema(bool $expected, bool $expectException, string $app, array $schema): void {
-		if ($expectException) {
-			$this->expectException(\Exception::class);
-		}
-		$this->declarativeManager->registerSchema($app, $schema);
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertEquals($expected, isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
-	}
-
-	public static function dataValidateSchema(): array {
-		return [
-			'valid schema with all supported fields' => [
-				true,
-				false,
-				'testing',
-				self::validSchemaAllFields,
-			],
-			'invalid schema with missing id' => [
-				false,
-				true,
-				'testing',
-				[
-					'priority' => 10,
-					'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN,
-					'section_id' => 'additional',
-					'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL,
-					'title' => 'Test declarative settings',
-					'description' => 'These fields are rendered dynamically from declarative schema',
-					'doc_url' => '',
-					'fields' => [
-						[
-							'id' => 'test_field_7',
-							'title' => 'Multi-selection',
-							'description' => 'Select some option setting',
-							'type' => DeclarativeSettingsTypes::MULTI_SELECT,
-							'options' => ['foo', 'bar', 'baz'],
-							'placeholder' => 'Select some multiple options',
-							'default' => ['foo', 'bar'],
-						],
-					],
-				],
-			],
-			'invalid schema with invalid field' => [
-				false,
-				true,
-				'testing',
-				[
-					'id' => 'test_form_1',
-					'priority' => 10,
-					'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN,
-					'section_id' => 'additional',
-					'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL,
-					'title' => 'Test declarative settings',
-					'description' => 'These fields are rendered dynamically from declarative schema',
-					'doc_url' => '',
-					'fields' => [
-						[
-							'id' => 'test_invalid_field',
-							'title' => 'Invalid field',
-							'description' => 'Some invalid setting description',
-							'type' => 'some_invalid_type',
-							'placeholder' => 'Some invalid field placeholder',
-							'default' => null,
-						],
-					],
-				],
-			],
-		];
-	}
-
-	public function testGetFormIDs(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		$this->declarativeManager->registerSchema($app, $schema);
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
-		$app = 'testing2';
-		$this->declarativeManager->registerSchema($app, $schema);
-		$formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
-	}
-
-	/**
-	 * Check that form with default values is returned with internal storage_type
-	 */
-	public function testGetFormsWithDefaultValues(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		$this->declarativeManager->registerSchema($app, $schema);
-
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(fn ($app, $configkey, $default) => $default);
-
-		$forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertNotEmpty($forms);
-		$this->assertTrue(array_search($schema['id'], array_column($forms, 'id')) !== false);
-		// Check some_real_setting field default value
-		$someRealSettingField = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
-		$schemaSomeRealSettingField = array_values(array_filter($schema['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
-		$this->assertEquals($schemaSomeRealSettingField['default'], $someRealSettingField['default']);
-	}
-
-	/**
-	 * Check values in json format to ensure that they are properly encoded
-	 */
-	public function testGetFormsWithDefaultValuesJson(): void {
-		$app = 'testing';
-		$schema = [
-			'id' => 'test_form_1',
-			'priority' => 10,
-			'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL,
-			'section_id' => 'additional',
-			'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL,
-			'title' => 'Test declarative settings',
-			'description' => 'These fields are rendered dynamically from declarative schema',
-			'doc_url' => '',
-			'fields' => [
-				[
-					'id' => 'test_field_json',
-					'title' => 'Multi-selection',
-					'description' => 'Select some option setting',
-					'type' => DeclarativeSettingsTypes::MULTI_SELECT,
-					'options' => ['foo', 'bar', 'baz'],
-					'placeholder' => 'Select some multiple options',
-					'default' => ['foo', 'bar'],
-				],
-			],
-		];
-		$this->declarativeManager->registerSchema($app, $schema);
-
-		// config->getUserValue() should be called with json encoded default value
-		$this->config->expects($this->once())
-			->method('getUserValue')
-			->with($this->adminUser->getUID(), $app, 'test_field_json', json_encode($schema['fields'][0]['default']))
-			->willReturn(json_encode($schema['fields'][0]['default']));
-
-		$forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertNotEmpty($forms);
-		$this->assertTrue(array_search($schema['id'], array_column($forms, 'id')) !== false);
-		$testFieldJson = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'test_field_json'))[0];
-		$this->assertEquals(json_encode($schema['fields'][0]['default']), $testFieldJson['value']);
-	}
-
-	/**
-	 * Check that saving value for field with internal storage_type is handled by core
-	 */
-	public function testSetInternalValue(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		$this->declarativeManager->registerSchema($app, $schema);
-		self::$testSetInternalValueAfterChange = false;
-
-		$this->config->expects($this->any())
-			->method('getAppValue')
-			->willReturnCallback(function ($app, $configkey, $default) {
-				if ($configkey === 'some_real_setting' && self::$testSetInternalValueAfterChange) {
-					return '120m';
-				}
-				return $default;
-			});
-
-		$this->appConfig->expects($this->once())
-			->method('setValueString')
-			->with($app, 'some_real_setting', '120m');
-
-		$forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$someRealSettingField = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
-		$this->assertEquals('40m', $someRealSettingField['value']); // first check that default value (40m) is returned
-
-		// Set new value for some_real_setting field
-		$this->declarativeManager->setValue($this->adminUser, $app, $schema['id'], 'some_real_setting', '120m');
-		self::$testSetInternalValueAfterChange = true;
-
-		$forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
-		$this->assertNotEmpty($forms);
-		$this->assertTrue(array_search($schema['id'], array_column($forms, 'id')) !== false);
-		// Check some_real_setting field default value
-		$someRealSettingField = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
-		$this->assertEquals('120m', $someRealSettingField['value']);
-	}
-
-	public function testSetExternalValue(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		// Change storage_type to external and section_type to personal
-		$schema['storage_type'] = DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL;
-		$schema['section_type'] = DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL;
-		$this->declarativeManager->registerSchema($app, $schema);
-
-		$setDeclarativeSettingsValueEvent = new DeclarativeSettingsSetValueEvent(
-			$this->adminUser,
-			$app,
-			$schema['id'],
-			'some_real_setting',
-			'120m'
-		);
-
-		$this->eventDispatcher->expects($this->once())
-			->method('dispatchTyped')
-			->with($setDeclarativeSettingsValueEvent);
-		$this->declarativeManager->setValue($this->adminUser, $app, $schema['id'], 'some_real_setting', '120m');
-	}
-
-	public function testAdminFormUserUnauthorized(): void {
-		$app = 'testing';
-		$schema = self::validSchemaAllFields;
-		$this->declarativeManager->registerSchema($app, $schema);
-
-		$this->expectException(\Exception::class);
-		$this->declarativeManager->getFormsWithValues($this->user, $schema['section_type'], $schema['section_id']);
-	}
-
-	/**
-	 * Ensure that the `setValue` method is called if the form implements the handler interface.
-	 */
-	public function testSetValueWithHandler(): void {
-		$schema = self::validSchemaAllFields;
-		$schema['storage_type'] = DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL;
-
-		$form = $this->createMock(IDeclarativeSettingsFormWithHandlers::class);
-		$form->expects(self::atLeastOnce())
-			->method('getSchema')
-			->willReturn($schema);
-		// The setter should be called once!
-		$form->expects(self::once())
-			->method('setValue')
-			->with('test_field_2', 'some password', $this->adminUser);
-
-		\OC::$server->registerService('OCA\\Testing\\Settings\\DeclarativeForm', fn () => $form, false);
-
-		$context = $this->createMock(RegistrationContext::class);
-		$context->expects(self::atLeastOnce())
-			->method('getDeclarativeSettings')
-			->willReturn([new ServiceRegistration('testing', 'OCA\\Testing\\Settings\\DeclarativeForm')]);
-
-		$this->coordinator->expects(self::atLeastOnce())
-			->method('getRegistrationContext')
-			->willReturn($context);
-
-		$this->declarativeManager->loadSchemas();
-
-		$this->eventDispatcher->expects(self::never())
-			->method('dispatchTyped');
-
-		$this->declarativeManager->setValue($this->adminUser, 'testing', 'test_form_1', 'test_field_2', 'some password');
-	}
-
-	public function testGetValueWithHandler(): void {
-		$schema = self::validSchemaAllFields;
-		$schema['storage_type'] = DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL;
-
-		$form = $this->createMock(IDeclarativeSettingsFormWithHandlers::class);
-		$form->expects(self::atLeastOnce())
-			->method('getSchema')
-			->willReturn($schema);
-		// The setter should be called once!
-		$form->expects(self::once())
-			->method('getValue')
-			->with('test_field_2', $this->adminUser)
-			->willReturn('very secret password');
-
-		\OC::$server->registerService('OCA\\Testing\\Settings\\DeclarativeForm', fn () => $form, false);
-
-		$context = $this->createMock(RegistrationContext::class);
-		$context->expects(self::atLeastOnce())
-			->method('getDeclarativeSettings')
-			->willReturn([new ServiceRegistration('testing', 'OCA\\Testing\\Settings\\DeclarativeForm')]);
-
-		$this->coordinator->expects(self::atLeastOnce())
-			->method('getRegistrationContext')
-			->willReturn($context);
-
-		$this->declarativeManager->loadSchemas();
-
-		$this->eventDispatcher->expects(self::never())
-			->method('dispatchTyped');
-
-		$password = $this->invokePrivate($this->declarativeManager, 'getValue', [$this->adminUser, 'testing', 'test_form_1', 'test_field_2']);
-		self::assertEquals('very secret password', $password);
-	}
+    /** @var IDeclarativeManager|MockObject */
+    private $declarativeManager;
+
+    /** @var IEventDispatcher|MockObject */
+    private $eventDispatcher;
+
+    /** @var IGroupManager|MockObject */
+    private $groupManager;
+
+    /** @var Coordinator|MockObject */
+    private $coordinator;
+
+    /** @var IConfig|MockObject */
+    private $config;
+
+    /** @var IAppConfig|MockObject */
+    private $appConfig;
+
+    /** @var LoggerInterface|MockObject */
+    private $logger;
+
+    /** @var ICrypto|MockObject */
+    private $crypto;
+
+    /** @var IUser|MockObject */
+    private $user;
+
+    /** @var IUser|MockObject */
+    private $adminUser;
+
+    private IDeclarativeSettingsForm&MockObject $closureForm;
+
+    public const validSchemaAllFields = [
+        'id' => 'test_form_1',
+        'priority' => 10,
+        'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN, // admin, personal
+        'section_id' => 'additional',
+        'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL, // external, internal (handled by core to store in appconfig and preferences)
+        'title' => 'Test declarative settings', // NcSettingsSection name
+        'description' => 'These fields are rendered dynamically from declarative schema', // NcSettingsSection description
+        'doc_url' => '', // NcSettingsSection doc_url for documentation or help page, empty string if not needed
+        'fields' => [
+            [
+                'id' => 'test_field_7', // configkey
+                'title' => 'Multi-selection', // name or label
+                'description' => 'Select some option setting', // hint
+                'type' => DeclarativeSettingsTypes::MULTI_SELECT,
+                'options' => ['foo', 'bar', 'baz'], // simple options for select, radio, multi-select
+                'placeholder' => 'Select some multiple options', // input placeholder
+                'default' => ['foo', 'bar'],
+            ],
+            [
+                'id' => 'some_real_setting',
+                'title' => 'Select single option',
+                'description' => 'Single option radio buttons',
+                'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
+                'placeholder' => 'Select single option, test interval',
+                'default' => '40m',
+                'options' => [
+                    [
+                        'name' => 'Each 40 minutes', // NcCheckboxRadioSwitch display name
+                        'value' => '40m' // NcCheckboxRadioSwitch value
+                    ],
+                    [
+                        'name' => 'Each 60 minutes',
+                        'value' => '60m'
+                    ],
+                    [
+                        'name' => 'Each 120 minutes',
+                        'value' => '120m'
+                    ],
+                    [
+                        'name' => 'Each day',
+                        'value' => 60 * 24 . 'm'
+                    ],
+                ],
+            ],
+            [
+                'id' => 'test_field_1', // configkey
+                'title' => 'Default text field', // label
+                'description' => 'Set some simple text setting', // hint
+                'type' => DeclarativeSettingsTypes::TEXT,
+                'placeholder' => 'Enter text setting', // placeholder
+                'default' => 'foo',
+            ],
+            [
+                'id' => 'test_field_1_1',
+                'title' => 'Email field',
+                'description' => 'Set email config',
+                'type' => DeclarativeSettingsTypes::EMAIL,
+                'placeholder' => 'Enter email',
+                'default' => '',
+            ],
+            [
+                'id' => 'test_field_1_2',
+                'title' => 'Tel field',
+                'description' => 'Set tel config',
+                'type' => DeclarativeSettingsTypes::TEL,
+                'placeholder' => 'Enter your tel',
+                'default' => '',
+            ],
+            [
+                'id' => 'test_field_1_3',
+                'title' => 'Url (website) field',
+                'description' => 'Set url config',
+                'type' => 'url',
+                'placeholder' => 'Enter url',
+                'default' => '',
+            ],
+            [
+                'id' => 'test_field_1_4',
+                'title' => 'Number field',
+                'description' => 'Set number config',
+                'type' => DeclarativeSettingsTypes::NUMBER,
+                'placeholder' => 'Enter number value',
+                'default' => 0,
+            ],
+            [
+                'id' => 'test_field_2',
+                'title' => 'Password',
+                'description' => 'Set some secure value setting',
+                'type' => 'password',
+                'placeholder' => 'Set secure value',
+                'default' => '',
+            ],
+            [
+                'id' => 'test_field_3',
+                'title' => 'Selection',
+                'description' => 'Select some option setting',
+                'type' => DeclarativeSettingsTypes::SELECT,
+                'options' => ['foo', 'bar', 'baz'],
+                'placeholder' => 'Select some option setting',
+                'default' => 'foo',
+            ],
+            [
+                'id' => 'test_field_4',
+                'title' => 'Toggle something',
+                'description' => 'Select checkbox option setting',
+                'type' => DeclarativeSettingsTypes::CHECKBOX,
+                'label' => 'Verify something if enabled',
+                'default' => false,
+            ],
+            [
+                'id' => 'test_field_5',
+                'title' => 'Multiple checkbox toggles, describing one setting, checked options are saved as an JSON object {foo: true, bar: false}',
+                'description' => 'Select checkbox option setting',
+                'type' => DeclarativeSettingsTypes::MULTI_CHECKBOX,
+                'default' => ['foo' => true, 'bar' => true],
+                'options' => [
+                    [
+                        'name' => 'Foo',
+                        'value' => 'foo', // multiple-checkbox configkey
+                    ],
+                    [
+                        'name' => 'Bar',
+                        'value' => 'bar',
+                    ],
+                    [
+                        'name' => 'Baz',
+                        'value' => 'baz',
+                    ],
+                    [
+                        'name' => 'Qux',
+                        'value' => 'qux',
+                    ],
+                ],
+            ],
+            [
+                'id' => 'test_field_6',
+                'title' => 'Radio toggles, describing one setting like single select',
+                'description' => 'Select radio option setting',
+                'type' => DeclarativeSettingsTypes::RADIO, // radio (NcCheckboxRadioSwitch type radio)
+                'label' => 'Select single toggle',
+                'default' => 'foo',
+                'options' => [
+                    [
+                        'name' => 'First radio', // NcCheckboxRadioSwitch display name
+                        'value' => 'foo' // NcCheckboxRadioSwitch value
+                    ],
+                    [
+                        'name' => 'Second radio',
+                        'value' => 'bar'
+                    ],
+                    [
+                        'name' => 'Second radio',
+                        'value' => 'baz'
+                    ],
+                ],
+            ],
+            [
+                'id' => 'test_sensitive_field',
+                'title' => 'Sensitive text field',
+                'description' => 'Set some secure value setting that is stored encrypted',
+                'type' => DeclarativeSettingsTypes::TEXT,
+                'label' => 'Sensitive field',
+                'placeholder' => 'Set secure value',
+                'default' => '',
+                'sensitive' => true, // only for TEXT, PASSWORD types
+            ],
+            [
+                'id' => 'test_sensitive_field_2',
+                'title' => 'Sensitive password field',
+                'description' => 'Set some password setting that is stored encrypted',
+                'type' => DeclarativeSettingsTypes::PASSWORD,
+                'label' => 'Sensitive field',
+                'placeholder' => 'Set secure value',
+                'default' => '',
+                'sensitive' => true, // only for TEXT, PASSWORD types
+            ],
+            [
+                'id' => 'test_non_sensitive_field',
+                'title' => 'Password field',
+                'description' => 'Set some password setting',
+                'type' => DeclarativeSettingsTypes::PASSWORD,
+                'label' => 'Password field',
+                'placeholder' => 'Set secure value',
+                'default' => '',
+                'sensitive' => false,
+            ],
+        ],
+    ];
+
+    public static bool $testSetInternalValueAfterChange = false;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->eventDispatcher = $this->createMock(IEventDispatcher::class);
+        $this->groupManager = $this->createMock(IGroupManager::class);
+        $this->coordinator = $this->createMock(Coordinator::class);
+        $this->config = $this->createMock(IConfig::class);
+        $this->appConfig = $this->createMock(IAppConfig::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+        $this->crypto = $this->createMock(ICrypto::class);
+
+        $this->declarativeManager = new DeclarativeManager(
+            $this->eventDispatcher,
+            $this->groupManager,
+            $this->coordinator,
+            $this->config,
+            $this->appConfig,
+            $this->logger,
+            $this->crypto,
+        );
+
+        $this->user = $this->createMock(IUser::class);
+        $this->user->expects($this->any())
+            ->method('getUID')
+            ->willReturn('test_user');
+
+        $this->adminUser = $this->createMock(IUser::class);
+        $this->adminUser->expects($this->any())
+            ->method('getUID')
+            ->willReturn('admin_test_user');
+
+        $this->groupManager->expects($this->any())
+            ->method('isAdmin')
+            ->willReturnCallback(function ($userId) {
+                return $userId === 'admin_test_user';
+            });
+    }
+
+    public function testRegisterSchema(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        $this->declarativeManager->registerSchema($app, $schema);
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
+    }
+
+    /**
+     * Simple test to verify that exception is thrown when trying to register schema with duplicate id
+     */
+    public function testRegisterDuplicateSchema(): void {
+        $this->declarativeManager->registerSchema('testing', self::validSchemaAllFields);
+        $this->expectException(\Exception::class);
+        $this->declarativeManager->registerSchema('testing', self::validSchemaAllFields);
+    }
+
+    /**
+     * It's not allowed to register schema with duplicate fields ids for the same app
+     */
+    public function testRegisterSchemaWithDuplicateFields(): void {
+        // Register first valid schema
+        $this->declarativeManager->registerSchema('testing', self::validSchemaAllFields);
+        // Register second schema with duplicate fields, but different schema id
+        $this->expectException(\Exception::class);
+        $schema = self::validSchemaAllFields;
+        $schema['id'] = 'test_form_2';
+        $this->declarativeManager->registerSchema('testing', $schema);
+    }
+
+    public function testRegisterMultipleSchemasAndDuplicate(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        $this->declarativeManager->registerSchema($app, $schema);
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
+        // 1. Check that form is registered for the app
+        $this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
+        $app = 'testing2';
+        $this->declarativeManager->registerSchema($app, $schema);
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
+        // 2. Check that form is registered for the second app
+        $this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
+        $app = 'testing';
+        $this->expectException(\Exception::class); // expecting duplicate form id and duplicate fields ids exception
+        $this->declarativeManager->registerSchema($app, $schema);
+        $schemaDuplicateFields = self::validSchemaAllFields;
+        $schemaDuplicateFields['id'] = 'test_form_2'; // change form id to test duplicate fields
+        $this->declarativeManager->registerSchema($app, $schemaDuplicateFields);
+        // 3. Check that not valid form with duplicate fields is not registered
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schemaDuplicateFields['section_type'], $schemaDuplicateFields['section_id']);
+        $this->assertFalse(isset($formIds[$app]) && in_array($schemaDuplicateFields['id'], $formIds[$app]));
+    }
+
+    /**
+     * @dataProvider dataValidateSchema
+     */
+    public function testValidateSchema(bool $expected, bool $expectException, string $app, array $schema): void {
+        if ($expectException) {
+            $this->expectException(\Exception::class);
+        }
+        $this->declarativeManager->registerSchema($app, $schema);
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertEquals($expected, isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
+    }
+
+    public static function dataValidateSchema(): array {
+        return [
+            'valid schema with all supported fields' => [
+                true,
+                false,
+                'testing',
+                self::validSchemaAllFields,
+            ],
+            'invalid schema with missing id' => [
+                false,
+                true,
+                'testing',
+                [
+                    'priority' => 10,
+                    'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN,
+                    'section_id' => 'additional',
+                    'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL,
+                    'title' => 'Test declarative settings',
+                    'description' => 'These fields are rendered dynamically from declarative schema',
+                    'doc_url' => '',
+                    'fields' => [
+                        [
+                            'id' => 'test_field_7',
+                            'title' => 'Multi-selection',
+                            'description' => 'Select some option setting',
+                            'type' => DeclarativeSettingsTypes::MULTI_SELECT,
+                            'options' => ['foo', 'bar', 'baz'],
+                            'placeholder' => 'Select some multiple options',
+                            'default' => ['foo', 'bar'],
+                        ],
+                    ],
+                ],
+            ],
+            'invalid schema with invalid field' => [
+                false,
+                true,
+                'testing',
+                [
+                    'id' => 'test_form_1',
+                    'priority' => 10,
+                    'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_ADMIN,
+                    'section_id' => 'additional',
+                    'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL,
+                    'title' => 'Test declarative settings',
+                    'description' => 'These fields are rendered dynamically from declarative schema',
+                    'doc_url' => '',
+                    'fields' => [
+                        [
+                            'id' => 'test_invalid_field',
+                            'title' => 'Invalid field',
+                            'description' => 'Some invalid setting description',
+                            'type' => 'some_invalid_type',
+                            'placeholder' => 'Some invalid field placeholder',
+                            'default' => null,
+                        ],
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    public function testGetFormIDs(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        $this->declarativeManager->registerSchema($app, $schema);
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
+        $app = 'testing2';
+        $this->declarativeManager->registerSchema($app, $schema);
+        $formIds = $this->declarativeManager->getFormIDs($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertTrue(isset($formIds[$app]) && in_array($schema['id'], $formIds[$app]));
+    }
+
+    /**
+     * Check that form with default values is returned with internal storage_type
+     */
+    public function testGetFormsWithDefaultValues(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        $this->declarativeManager->registerSchema($app, $schema);
+
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(fn ($app, $configkey, $default) => $default);
+
+        $forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertNotEmpty($forms);
+        $this->assertTrue(array_search($schema['id'], array_column($forms, 'id')) !== false);
+        // Check some_real_setting field default value
+        $someRealSettingField = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
+        $schemaSomeRealSettingField = array_values(array_filter($schema['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
+        $this->assertEquals($schemaSomeRealSettingField['default'], $someRealSettingField['default']);
+    }
+
+    /**
+     * Check values in json format to ensure that they are properly encoded
+     */
+    public function testGetFormsWithDefaultValuesJson(): void {
+        $app = 'testing';
+        $schema = [
+            'id' => 'test_form_1',
+            'priority' => 10,
+            'section_type' => DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL,
+            'section_id' => 'additional',
+            'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_INTERNAL,
+            'title' => 'Test declarative settings',
+            'description' => 'These fields are rendered dynamically from declarative schema',
+            'doc_url' => '',
+            'fields' => [
+                [
+                    'id' => 'test_field_json',
+                    'title' => 'Multi-selection',
+                    'description' => 'Select some option setting',
+                    'type' => DeclarativeSettingsTypes::MULTI_SELECT,
+                    'options' => ['foo', 'bar', 'baz'],
+                    'placeholder' => 'Select some multiple options',
+                    'default' => ['foo', 'bar'],
+                ],
+            ],
+        ];
+        $this->declarativeManager->registerSchema($app, $schema);
+
+        // config->getUserValue() should be called with json encoded default value
+        $this->config->expects($this->once())
+            ->method('getUserValue')
+            ->with($this->adminUser->getUID(), $app, 'test_field_json', json_encode($schema['fields'][0]['default']))
+            ->willReturn(json_encode($schema['fields'][0]['default']));
+
+        $forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertNotEmpty($forms);
+        $this->assertTrue(array_search($schema['id'], array_column($forms, 'id')) !== false);
+        $testFieldJson = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'test_field_json'))[0];
+        $this->assertEquals(json_encode($schema['fields'][0]['default']), $testFieldJson['value']);
+    }
+
+    /**
+     * Check that saving value for field with internal storage_type is handled by core
+     */
+    public function testSetInternalValue(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        $this->declarativeManager->registerSchema($app, $schema);
+        self::$testSetInternalValueAfterChange = false;
+
+        $this->config->expects($this->any())
+            ->method('getAppValue')
+            ->willReturnCallback(function ($app, $configkey, $default) {
+                if ($configkey === 'some_real_setting' && self::$testSetInternalValueAfterChange) {
+                    return '120m';
+                }
+                return $default;
+            });
+
+        $this->appConfig->expects($this->once())
+            ->method('setValueString')
+            ->with($app, 'some_real_setting', '120m');
+
+        $forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $someRealSettingField = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
+        $this->assertEquals('40m', $someRealSettingField['value']); // first check that default value (40m) is returned
+
+        // Set new value for some_real_setting field
+        $this->declarativeManager->setValue($this->adminUser, $app, $schema['id'], 'some_real_setting', '120m');
+        self::$testSetInternalValueAfterChange = true;
+
+        $forms = $this->declarativeManager->getFormsWithValues($this->adminUser, $schema['section_type'], $schema['section_id']);
+        $this->assertNotEmpty($forms);
+        $this->assertTrue(array_search($schema['id'], array_column($forms, 'id')) !== false);
+        // Check some_real_setting field default value
+        $someRealSettingField = array_values(array_filter(array_filter($forms, fn ($form) => $form['id'] === $schema['id'])[0]['fields'], fn ($field) => $field['id'] === 'some_real_setting'))[0];
+        $this->assertEquals('120m', $someRealSettingField['value']);
+    }
+
+    public function testSetExternalValue(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        // Change storage_type to external and section_type to personal
+        $schema['storage_type'] = DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL;
+        $schema['section_type'] = DeclarativeSettingsTypes::SECTION_TYPE_PERSONAL;
+        $this->declarativeManager->registerSchema($app, $schema);
+
+        $setDeclarativeSettingsValueEvent = new DeclarativeSettingsSetValueEvent(
+            $this->adminUser,
+            $app,
+            $schema['id'],
+            'some_real_setting',
+            '120m'
+        );
+
+        $this->eventDispatcher->expects($this->once())
+            ->method('dispatchTyped')
+            ->with($setDeclarativeSettingsValueEvent);
+        $this->declarativeManager->setValue($this->adminUser, $app, $schema['id'], 'some_real_setting', '120m');
+    }
+
+    public function testAdminFormUserUnauthorized(): void {
+        $app = 'testing';
+        $schema = self::validSchemaAllFields;
+        $this->declarativeManager->registerSchema($app, $schema);
+
+        $this->expectException(\Exception::class);
+        $this->declarativeManager->getFormsWithValues($this->user, $schema['section_type'], $schema['section_id']);
+    }
+
+    /**
+     * Ensure that the `setValue` method is called if the form implements the handler interface.
+     */
+    public function testSetValueWithHandler(): void {
+        $schema = self::validSchemaAllFields;
+        $schema['storage_type'] = DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL;
+
+        $form = $this->createMock(IDeclarativeSettingsFormWithHandlers::class);
+        $form->expects(self::atLeastOnce())
+            ->method('getSchema')
+            ->willReturn($schema);
+        // The setter should be called once!
+        $form->expects(self::once())
+            ->method('setValue')
+            ->with('test_field_2', 'some password', $this->adminUser);
+
+        \OC::$server->registerService('OCA\\Testing\\Settings\\DeclarativeForm', fn () => $form, false);
+
+        $context = $this->createMock(RegistrationContext::class);
+        $context->expects(self::atLeastOnce())
+            ->method('getDeclarativeSettings')
+            ->willReturn([new ServiceRegistration('testing', 'OCA\\Testing\\Settings\\DeclarativeForm')]);
+
+        $this->coordinator->expects(self::atLeastOnce())
+            ->method('getRegistrationContext')
+            ->willReturn($context);
+
+        $this->declarativeManager->loadSchemas();
+
+        $this->eventDispatcher->expects(self::never())
+            ->method('dispatchTyped');
+
+        $this->declarativeManager->setValue($this->adminUser, 'testing', 'test_form_1', 'test_field_2', 'some password');
+    }
+
+    public function testGetValueWithHandler(): void {
+        $schema = self::validSchemaAllFields;
+        $schema['storage_type'] = DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL;
+
+        $form = $this->createMock(IDeclarativeSettingsFormWithHandlers::class);
+        $form->expects(self::atLeastOnce())
+            ->method('getSchema')
+            ->willReturn($schema);
+        // The setter should be called once!
+        $form->expects(self::once())
+            ->method('getValue')
+            ->with('test_field_2', $this->adminUser)
+            ->willReturn('very secret password');
+
+        \OC::$server->registerService('OCA\\Testing\\Settings\\DeclarativeForm', fn () => $form, false);
+
+        $context = $this->createMock(RegistrationContext::class);
+        $context->expects(self::atLeastOnce())
+            ->method('getDeclarativeSettings')
+            ->willReturn([new ServiceRegistration('testing', 'OCA\\Testing\\Settings\\DeclarativeForm')]);
+
+        $this->coordinator->expects(self::atLeastOnce())
+            ->method('getRegistrationContext')
+            ->willReturn($context);
+
+        $this->declarativeManager->loadSchemas();
+
+        $this->eventDispatcher->expects(self::never())
+            ->method('dispatchTyped');
+
+        $password = $this->invokePrivate($this->declarativeManager, 'getValue', [$this->adminUser, 'testing', 'test_form_1', 'test_field_2']);
+        self::assertEquals('very secret password', $password);
+    }
 
 }