Merge aa22ac0 into ed2bb57

lib/Service/FolderService.php

@@ -2,6 +2,7 @@
 
 namespace OCA\Libresign\Service;
 
+use OCA\Libresign\AppInfo\Application;
 use OCP\Files\Folder;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
@@ -91,7 +92,8 @@ public function getLibreSignDefaultPath(): string {
 		$path = $this->config->getUserValue($this->userId, 'libresign', 'folder');
 
 		if (empty($path)) {
-			$path = '/' . $this->l10n->t('LibreSign');
+			$defaultFolder = $this->config->getAppValue(Application::APP_ID, 'default_user_folder', 'LibreSign');
+			$path = '/' . $defaultFolder;
 			$this->config->setUserValue($this->userId, 'libresign', 'folder', $path);
 		}
 

src/views/CreatePassword.vue

@@ -63,7 +63,11 @@ export default {
 				this.$emit('close', true)
 				this.$emit('change-pfx', true)
 			} catch (err) {
-				showError(t('libresign', 'Error creating new password, please contact the administrator'))
+				if (err.response.data.message) {
+					showError(err.response.data.message)
+				} else {
+					showError(t('libresign', 'Error creating new password, please contact the administrator'))
+				}
 				this.hasLoading = false
 				this.$emit('change-pfx', false)
 			}

src/views/Settings/DefaultUserFolder.vue

@@ -0,0 +1,65 @@
+<template>
+	<NcSettingsSection :title="title" :description="description">
+		<div class="default-user-folder-content">
+			<NcCheckboxRadioSwitch
+				type="switch"
+				:checked.sync="customUserFolder">
+				{{ t('libresign', 'Customize default user folder') }}
+			</NcCheckboxRadioSwitch>
+			<div v-if="customUserFolder">
+				<NcTextField
+					:placeholder="t('libresign', 'Customize default user folder')"
+					:value.sync="value"
+					@update:value="saveDefaultUserFolder" />
+			</div>
+		</div>
+	</NcSettingsSection>
+</template>
+<script>
+import { translate as t } from '@nextcloud/l10n'
+import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection'
+import NcTextField from '@nextcloud/vue/dist/Components/NcTextField'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch'
+import { generateOcsUrl } from '@nextcloud/router'
+import axios from '@nextcloud/axios'
+
+export default {
+	name: 'DefaultUserFolder',
+	components: {
+		NcSettingsSection,
+		NcTextField,
+		NcCheckboxRadioSwitch,
+	},
+	data() {
+		return {
+			title: t('libresign', 'Customize default user folder'),
+			description: t('libresign', 'Name of the folder that will contain the user\'s digital certificate, visible signature images, and other files related to LibreSign.'),
+			value: '',
+			customUserFolder: false,
+		}
+	},
+	created() {
+		this.getData()
+	},
+	methods: {
+		async getData() {
+			const response = await axios.get(generateOcsUrl('/apps/provisioning_api/api/v1', 2) + '/config/apps/libresign/default_user_folder', {})
+			this.customUserFolder = response.data.ocs.data.data ? true : false
+			this.value = response.data.ocs.data.data || 'LibreSign'
+		},
+		saveDefaultUserFolder() {
+			OCP.AppConfig.setValue('libresign', 'default_user_folder', this.value)
+		},
+	},
+}
+</script>
+<style scoped>
+.default-user-folder-content{
+	display: flex;
+	flex-direction: column;
+}
+textarea {
+	width: 50%;
+	height: 150px;
+}
+</style>

src/views/Settings/Settings.vue

@@ -31,6 +31,7 @@
 		<LegalInformation />
 		<IdentificationDocuments />
 		<CollectMetadata />
+		<DefaultUserFolder />
 	</NcSettingsSection>
 </template>
 
@@ -44,6 +45,7 @@ import AllowedGroups from './AllowedGroups.vue'
 import LegalInformation from './LegalInformation.vue'
 import IdentificationDocuments from './IdentificationDocuments.vue'
 import CollectMetadata from './CollectMetadata.vue'
+import DefaultUserFolder from './DefaultUserFolder.vue'
 
 export default {
 	name: 'Settings',
@@ -57,6 +59,7 @@ export default {
 		LegalInformation,
 		IdentificationDocuments,
 		CollectMetadata,
+		DefaultUserFolder,
 	},
 	data() {
 		return {