feat(email): add email field type

lib/Enum/FieldType.php

@@ -15,6 +15,7 @@ enum FieldType: string {
 	case BOOLEAN = 'boolean';
 	case DATE = 'date';
 	case URL = 'url';
+	case EMAIL = 'email';
 	case SELECT = 'select';
 	case MULTISELECT = 'multiselect';
 
@@ -28,6 +29,7 @@ public static function values(): array {
 			self::BOOLEAN->value,
 			self::DATE->value,
 			self::URL->value,
+			self::EMAIL->value,
 			self::SELECT->value,
 			self::MULTISELECT->value,
 		];

lib/ResponseDefinitions.php

@@ -10,7 +10,7 @@
 namespace OCA\ProfileFields;
 
 /**
- * @psalm-type ProfileFieldsType = 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect'
+ * @psalm-type ProfileFieldsType = 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect'
  * @psalm-type ProfileFieldsVisibility = 'private'|'users'|'public'
  * @psalm-type ProfileFieldsEditPolicy = 'admins'|'users'
  * @psalm-type ProfileFieldsExposurePolicy = 'hidden'|'private'|'users'|'public'

lib/Service/DataImportService.php

@@ -69,7 +69,7 @@ public function import(array $payload, bool $dryRun = false): array {
 	 * @param list<array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -148,7 +148,7 @@ private function collectValueSummary(array $values, array &$summary): void {
 	 * @param list<array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -248,7 +248,7 @@ private function persistValues(array $values, array $definitionsByFieldKey, arra
 	 * @param array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,

lib/Service/FieldDefinitionValidator.php

@@ -29,7 +29,7 @@ class FieldDefinitionValidator {
 	 * @return array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,

lib/Service/FieldValueService.php

@@ -109,6 +109,7 @@ public function normalizeValue(FieldDefinition $definition, array|string|int|flo
 			FieldType::BOOLEAN => $this->normalizeBooleanValue($rawValue),
 			FieldType::DATE => $this->normalizeDateValue($rawValue),
 			FieldType::URL => $this->normalizeUrlValue($rawValue),
+			FieldType::EMAIL => $this->normalizeEmailValue($rawValue),
 			FieldType::SELECT => $this->normalizeSelectValue($rawValue, $definition),
 			FieldType::MULTISELECT => $this->normalizeMultiSelectValue($rawValue, $definition),
 		};
@@ -367,6 +368,23 @@ private function normalizeUrlValue(array|string|int|float|bool $rawValue): array
 		return ['value' => $value];
 	}
 
+	/**
+	 * @param array<string, mixed>|scalar $rawValue
+	 * @return array{value: string}
+	 */
+	private function normalizeEmailValue(array|string|int|float|bool $rawValue): array {
+		if (!is_string($rawValue)) {
+			throw new InvalidArgumentException($this->l10n->t('Email fields require a valid email address.'));
+		}
+
+		$value = trim($rawValue);
+		if (filter_var($value, FILTER_VALIDATE_EMAIL) === false) {
+			throw new InvalidArgumentException($this->l10n->t('Email fields require a valid email address.'));
+		}
+
+		return ['value' => $value];
+	}
+
 	/**
 	 * @param array<string, mixed> $value
 	 */
@@ -429,8 +447,8 @@ private function normalizeSearchValue(FieldDefinition $definition, string $opera
 			return $this->normalizeValue($definition, $rawValue);
 		}
 
-		if (FieldType::from($definition->getType()) !== FieldType::TEXT) {
-			throw new InvalidArgumentException($this->l10n->t('The "contains" operator is only available for text fields.'));
+		if (!in_array(FieldType::from($definition->getType()), [FieldType::TEXT, FieldType::EMAIL], true)) {
+			throw new InvalidArgumentException($this->l10n->t('The "contains" operator is only available for text and email fields.'));
 		}
 
 		$normalized = $this->normalizeValue($definition, $rawValue);
@@ -451,7 +469,7 @@ private function matchesSearchOperator(FieldType $fieldType, array $candidateVal
 			return ($candidateValue['value'] ?? null) === ($searchValue['value'] ?? null);
 		}
 
-		if ($fieldType !== FieldType::TEXT) {
+		if (!in_array($fieldType, [FieldType::TEXT, FieldType::EMAIL], true)) {
 			return false;
 		}
 

lib/Service/ImportPayloadValidator.php

@@ -32,7 +32,7 @@ public function __construct(
 	 *     definitions: list<array{
 	 *         field_key: non-empty-string,
 	 *         label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *         edit_policy: 'admins'|'users',
 	 *         exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *         sort_order: int,
@@ -71,7 +71,7 @@ public function validate(array $payload): array {
 	 * @return array<non-empty-string, array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -119,7 +119,7 @@ private function validateDefinitions(array $definitions): array {
 	 * @param array<non-empty-string, array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,
@@ -255,7 +255,7 @@ private function normalizeOptionalDate(array $payload, string $key, string $mess
 	 * @param array{
 	 *     field_key: non-empty-string,
 	 *     label: non-empty-string,
-	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'select'|'multiselect',
+	 *     type: 'text'|'number'|'boolean'|'date'|'url'|'email'|'select'|'multiselect',
 	 *     edit_policy: 'admins'|'users',
 	 *     exposure_policy: 'hidden'|'private'|'users'|'public',
 	 *     sort_order: int,

lib/Workflow/UserProfileFieldCheck.php

@@ -67,6 +67,14 @@ class UserProfileFieldCheck implements ICheck {
 		'contains',
 		'!contains',
 	];
+	private const EMAIL_OPERATORS = [
+		self::OPERATOR_IS_SET,
+		self::OPERATOR_IS_NOT_SET,
+		'is',
+		'!is',
+		'contains',
+		'!contains',
+	];
 	private const SELECT_OPERATORS = [
 		self::OPERATOR_IS_SET,
 		self::OPERATOR_IS_NOT_SET,
@@ -133,8 +141,11 @@ public function validateCheck($operator, $value) {
 				$fieldType = FieldType::from($definition->getType());
 				if ($fieldType === FieldType::MULTISELECT) {
 					$this->normalizeExpectedMultiSelectOperand($definition, $config['value']);
-				} elseif ($fieldType === FieldType::URL && ((string)$operator === 'contains' || (string)$operator === '!contains')) {
-					// URL contains search terms are plain substrings — no URL validation needed.
+				} elseif (
+					($fieldType === FieldType::URL || $fieldType === FieldType::EMAIL)
+					&& ((string)$operator === 'contains' || (string)$operator === '!contains')
+				) {
+					// URL/email contains search terms are plain substrings — no strict value validation needed.
 				} else {
 					$this->fieldValueService->normalizeValue($definition, $config['value']);
 				}
@@ -196,6 +207,7 @@ private function isOperatorSupported(FieldDefinition $definition, string $operat
 			FieldType::BOOLEAN => self::BOOLEAN_OPERATORS,
 			FieldType::DATE => self::DATE_OPERATORS,
 			FieldType::URL => self::URL_OPERATORS,
+			FieldType::EMAIL => self::EMAIL_OPERATORS,
 			FieldType::SELECT => self::SELECT_OPERATORS,
 			FieldType::MULTISELECT => self::SELECT_OPERATORS,
 		};
@@ -261,7 +273,7 @@ private function evaluate(FieldDefinition $definition, string $operator, string|
 			return $this->evaluateMultiSelectOperator($operator, $expectedValue, $actualValue);
 		}
 
-		if ($fieldType === FieldType::URL && ($operator === 'contains' || $operator === '!contains')) {
+		if (($fieldType === FieldType::URL || $fieldType === FieldType::EMAIL) && ($operator === 'contains' || $operator === '!contains')) {
 			return $this->evaluateTextOperator($operator, trim((string)$expectedRawValue), (string)$actualValue);
 		}
 
@@ -271,6 +283,7 @@ private function evaluate(FieldDefinition $definition, string $operator, string|
 		return match ($fieldType) {
 			FieldType::TEXT,
 			FieldType::URL,
+			FieldType::EMAIL,
 			FieldType::SELECT => $this->evaluateTextOperator($operator, (string)$expectedValue, (string)$actualValue),
 			FieldType::BOOLEAN => $this->evaluateBooleanOperator(
 				$operator,

openapi-administration.json

@@ -201,6 +201,7 @@
                     "boolean",
                     "date",
                     "url",
+                    "email",
                     "select",
                     "multiselect"
                 ]

openapi-full.json

@@ -276,6 +276,7 @@
                     "boolean",
                     "date",
                     "url",
+                    "email",
                     "select",
                     "multiselect"
                 ]

openapi.json

@@ -147,6 +147,7 @@
                     "boolean",
                     "date",
                     "url",
+                    "email",
                     "select",
                     "multiselect"
                 ]

src/components/AdminUserFieldsDialog.vue

@@ -212,6 +212,7 @@ export default defineComponent({
 			boolean: t('profile_fields', 'Choose either true or false.'),
 			date: t('profile_fields', 'Use a valid date in YYYY-MM-DD format.'),
 			url: t('profile_fields', 'Enter a valid URL (e.g. https://example.com).'),
+			email: t('profile_fields', 'Enter a valid email address (e.g. alice@example.com).'),
 			select: t('profile_fields', 'Choose one of the predefined options.'),
 			multiselect: t('profile_fields', 'Choose one or more predefined options.'),
 		} as Record<FieldType, string>)[type]
@@ -222,6 +223,7 @@ export default defineComponent({
 			boolean: t('profile_fields', 'Select true or false'),
 			date: t('profile_fields', 'Select a date'),
 			url: t('profile_fields', 'Enter a URL'),
+			email: t('profile_fields', 'Enter an email address'),
 			select: t('profile_fields', 'Select an option'),
 			multiselect: t('profile_fields', 'Select one or more options'),
 		} as Record<FieldType, string>)[type]
@@ -235,6 +237,7 @@ export default defineComponent({
 			boolean: 'text',
 			date: 'numeric',
 			url: 'url',
+			email: 'email',
 			select: 'text',
 			multiselect: 'text',
 		} as Record<FieldType, string>)[type]
@@ -245,6 +248,7 @@ export default defineComponent({
 			boolean: 'text',
 			date: 'date',
 			url: 'url',
+			email: 'email',
 			select: 'text',
 			multiselect: 'text',
 		} as Record<FieldType, string>)[type]
@@ -337,6 +341,13 @@ export default defineComponent({
 				}
 			}
 
+			if (field.definition.type === 'email') {
+				const emailPattern = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
+				if (!emailPattern.test(rawValue)) {
+					return t('profile_fields', '{fieldLabel} must be a valid email address.', { fieldLabel: field.definition.label })
+				}
+			}
+
 			if (field.definition.type === 'select') {
 				const options = field.definition.options ?? []
 				if (!options.includes(rawValue)) {
@@ -368,7 +379,7 @@ export default defineComponent({
 		const hasInvalidFields = computed(() => invalidFields.value.length > 0)
 
 		const helperTextForField = (field: AdminEditableField) => {
-			return field.definition.type === 'number' || field.definition.type === 'date' || field.definition.type === 'boolean' || field.definition.type === 'url'
+			return field.definition.type === 'number' || field.definition.type === 'date' || field.definition.type === 'boolean' || field.definition.type === 'url' || field.definition.type === 'email'
 				? descriptionForType(field.definition.type)
 				: ''
 		}
@@ -444,6 +455,7 @@ export default defineComponent({
 				'Boolean fields require true or false values.': t('profile_fields', '{fieldLabel} must be either true or false.', { fieldLabel: field.definition.label }),
 				'Date fields require a valid ISO-8601 date in YYYY-MM-DD format.': t('profile_fields', '{fieldLabel} must be a valid date in YYYY-MM-DD format.', { fieldLabel: field.definition.label }),
 				'URL fields require a valid URL.': t('profile_fields', '{fieldLabel} must be a valid URL.', { fieldLabel: field.definition.label }),
+				'Email fields require a valid email address.': t('profile_fields', '{fieldLabel} must be a valid email address.', { fieldLabel: field.definition.label }),
 				'current_visibility is not supported': t('profile_fields', 'The selected visibility is not supported.'),
 			}[message] ?? (message.includes('is not a valid option')
 				? t('profile_fields', '{fieldLabel}: invalid option selected.', { fieldLabel: field.definition.label })

src/tests/components/AdminSettings.spec.ts

@@ -120,4 +120,19 @@ describe('AdminSettings', () => {
 
 		expect(wrapper.text()).toContain('tr:URL')
 	})
+
+	it('offers the Email field type in the editor', async() => {
+		const wrapper = mount(AdminSettings, {
+			global: {
+				stubs: {
+					Draggable: defineComponent({ template: '<div><slot /></div>' }),
+				},
+			},
+		})
+
+		await flushPromises()
+		await wrapper.get('button').trigger('click')
+
+		expect(wrapper.text()).toContain('tr:Email')
+	})
 })

src/tests/components/AdminUserFieldsDialog.spec.ts

@@ -59,6 +59,17 @@ vi.mock('../../api', () => ({
 			active: true,
 			options: null,
 		},
+		{
+			id: 6,
+			field_key: 'work_email',
+			label: 'Work email',
+			type: 'email',
+			edit_policy: 'users',
+			exposure_policy: 'private',
+			sort_order: 3,
+			active: true,
+			options: null,
+		},
 	]),
 	listAdminUserValues: vi.fn().mockResolvedValue([
 		{
@@ -178,4 +189,36 @@ describe('AdminUserFieldsDialog', () => {
 		// helper-text is bound as an attribute through v-bind="$attrs"
 		expect(urlInput.attributes('helper-text')).toBeTruthy()
 	})
+
+	it('renders email fields with type=email input', async() => {
+		const wrapper = mount(AdminUserFieldsDialog, {
+			props: {
+				open: true,
+				userUid: 'alice',
+				userDisplayName: 'Alice',
+			},
+		})
+
+		await flushPromises()
+
+		const emailInput = wrapper.find('#profile-fields-user-dialog-value-6')
+		expect(emailInput.exists()).toBe(true)
+		expect(emailInput.attributes('type')).toBe('email')
+	})
+
+	it('shows email helper text for email fields', async() => {
+		const wrapper = mount(AdminUserFieldsDialog, {
+			props: {
+				open: true,
+				userUid: 'alice',
+				userDisplayName: 'Alice',
+			},
+		})
+
+		await flushPromises()
+
+		const emailInput = wrapper.find('#profile-fields-user-dialog-value-6')
+		expect(emailInput.exists()).toBe(true)
+		expect(emailInput.attributes('helper-text')).toBeTruthy()
+	})
 })