chore: delete certification.js file and adjustment some files

Signed-off-by: Crisciany Souza <criscianysilva1997@gmail.com>

Author: Any97Cris

lib/Service/Certificate/RulesService.php

@@ -46,7 +46,9 @@ public function __construct(
 	}
 
 	public function getRule(string $fieldName): array {
-		if (!array_key_exists($fieldName, $this->rules)) return [];
+		if (!array_key_exists($fieldName, $this->rules)) {
+			return [];
+		}
 		if (!isset($this->rules[$fieldName]['helperText'])) {
 			$this->rules[$fieldName]['helperText'] = $this->getHelperText($fieldName);
 			if (empty($this->rules[$fieldName]['helperText'])) {

lib/Settings/Admin.php

@@ -11,11 +11,11 @@
 use OCA\Libresign\AppInfo\Application;
 use OCA\Libresign\Exception\LibresignException;
 use OCA\Libresign\Handler\CertificateEngine\CertificateEngineFactory;
+use OCA\Libresign\Service\Certificate\RulesService;
 use OCA\Libresign\Service\CertificatePolicyService;
 use OCA\Libresign\Service\IdentifyMethodService;
 use OCA\Libresign\Service\SignatureBackgroundService;
 use OCA\Libresign\Service\SignatureTextService;
-use OCA\Libresign\Service\Certificate\RulesService;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
 use OCP\IAppConfig;

src/helpers/certification.js

@@ -60,7 +60,7 @@ import NcListItem from '@nextcloud/vue/components/NcListItem'
 import NcPopover from '@nextcloud/vue/components/NcPopover'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 
-import { options, selectCustonOption } from '../../helpers/certification.js'
+import { loadState } from '@nextcloud/initial-state'
 
 export default {
 	name: 'CertificateCustonOptions',
@@ -80,16 +80,17 @@ export default {
 	data() {
 		return {
 			certificateList: [],
+			allOptions: loadState('libresign', 'rules_service') || [],
 		}
 	},
 	computed: {
 		customNamesOptions() {
-			return this.options.filter(itemA =>
-				!this.certificateList.some(itemB => itemB.id === itemA.id),
-			)
+			return this.allOptions
+			.filter(itemA => itemA.id !== 'CN')
+			.filter(itemA => !this.certificateList.some(itemB => itemB.id === itemA.id))
 		},
 		options() {
-			return options.filter(option => option.id !== 'CN')
+			return this.allOptions.filter(option => option.id !== 'CN')
 		},
 	},
 	watch: {
@@ -98,6 +99,13 @@ export default {
 		},
 	},
 	methods: {
+		selectCustonOption(id) {
+			const found = this.allOptions.find(option => option.id === id)
+			if (found) {
+				return { ...found, value: '' }
+			}
+				return null
+		},
 		getOptionProperty(id, property) {
 			return this.options.find(option => option.id === id)[property]
 		},
@@ -111,20 +119,20 @@ export default {
 			return true
 		},
 		validate(id) {
-			const custonOption = selectCustonOption(id)
-			if (custonOption.isSome()) {
-				const item = custonOption.unwrap()
-				if (this.validateMin(item) && this.validateMax(item)) {
-					item.error = false
-				} else {
-					item.error = true
-				}
-				const listToSave = this.certificateList.map(certificate => ({
-					id: certificate.id,
-					value: certificate.value,
-				}))
-				emit('libresign:update:certificateToSave', listToSave)
-			}
+			const option = this.certificateList.find(c => c.id === id)
+			if (!option) return
+
+			const rule = this.allOptions.find(o => o.id === id)
+			if (!rule) return
+
+			option.error = !(this.validateMin({ ...rule, value: option.value }) &&
+							this.validateMax({ ...rule, value: option.value }))
+
+			const listToSave = this.certificateList.map(certificate => ({
+				id: certificate.id,
+				value: certificate.value,
+			}))
+			emit('libresign:update:certificateToSave', listToSave)
 		},
 		async removeOptionalAttribute(id) {
 			const custonOption = selectCustonOption(id)

src/views/Settings/CertificateCustonOptions.vue

@@ -126,7 +126,6 @@ import NcTextField from '@nextcloud/vue/components/NcTextField'
 import CertificateCustonOptions from './CertificateCustonOptions.vue'
 import CertificatePolicy from './CertificatePolicy.vue'
 
-import { selectCustonOption } from '../../helpers/certification.js'
 import logger from '../../logger.js'
 import { useConfigureCheckStore } from '../../store/configureCheck.js'
 
@@ -148,6 +147,7 @@ export default {
 	data() {
 		const OID = loadState('libresign', 'certificate_policies_oid')
 		const CPS = loadState('libresign', 'certificate_policies_cps')
+		const rules = loadState('libresign', 'rules_service') || []
 		return {
 			isThisEngine: loadState('libresign', 'certificate_engine') === 'cfssl',
 			modal: false,
@@ -170,6 +170,7 @@ export default {
 			CPS,
 			toggleCertificatePolicy: !!(OID || CPS),
 			certificatePolicyValid: !!OID && !!CPS,
+			allOptions: rules,
 		}
 	},
 	computed: {
@@ -212,9 +213,22 @@ export default {
 		updateNames(names) {
 			this.certificate.rootCert.names = names
 		},
+		selectCustonOption(id) {
+			return this.allOptions.find(option => option.id === id) || null
+		},
 		getLabelFromId(id) {
-			const item = selectCustonOption(id).unwrap()
-			return item.label
+			const option = selectCustonOption(id)
+			return option ? option.label : id
+		},
+		validateField(id, value) {
+			const rule = this.selectCustonOption(id)
+			if (!rule) return true
+
+			if (rule.required && !value) return false
+			if (rule.min && value.length < rule.min) return false
+			if (rule.max && value.length > rule.max) return false
+
+			return true
 		},
 		changeEngine(engine) {
 			this.isThisEngine = engine === 'cfssl'