Merge pull request #4371 from LibreSign/backport/4366/stable29

[stable29] fix: handle settings after backend upgrade
LibreSign · Jan 16, 2025 · 846ffdb · 846ffdb
2 parents e506b71 + 1e4f6af
commit 846ffdb
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/lib/Controller/FileController.php b/lib/Controller/FileController.php
@@ -51,6 +51,7 @@
 use OCP\Files\File;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
+use OCP\IAppConfig;
 use OCP\IL10N;
 use OCP\IPreview;
 use OCP\IRequest;
@@ -80,6 +81,7 @@ public function __construct(
 		private RequestSignatureService $requestSignatureService,
 		private AccountService $accountService,
 		private IPreview $preview,
+		private IAppConfig $appConfig,
 		private IMimeIconProvider $mimeIconProvider,
 		private FileService $fileService,
 		private ValidateHelper $validateHelper,
@@ -194,6 +196,10 @@ public function validateBinary(): DataResponse {
 	#[ApiRoute(verb: 'GET', url: '/api/{apiVersion}/file/validate/', requirements: ['apiVersion' => '(v1)'])]
 	public function validate(?string $type = null, $identifier = null): DataResponse {
 		try {
+			$isValidationUrlPrivate = (bool)$this->appConfig->getValueBool(Application::APP_ID, 'make_validation_url_private', false);
+			if ($isValidationUrlPrivate) {
+				throw new LibresignException($this->l10n->t('You are not logged in. Please log in.'));
+			}
 			if ($type === 'Uuid' && !empty($identifier)) {
 				try {
 					$this->fileService

diff --git a/src/views/CreatePassword.vue b/src/views/CreatePassword.vue
@@ -12,8 +12,8 @@
 		<template #actions>
 			<NcButton :disabled="hasLoading"
 				native-type="submit"
-				@click="send()"
-				type="primary">
+				type="primary"
+				@click="send()">
 				<template #icon>
 					<NcLoadingIcon v-if="hasLoading" :size="20" />
 				</template>

diff --git a/src/views/ReadCertificate.vue b/src/views/ReadCertificate.vue
@@ -81,8 +81,8 @@
 		<template v-if="Object.keys(certificateData).length === 0" #actions>
 			<NcButton :disabled="hasLoading"
 				native-type="submit"
-				@click="send()"
-				type="primary">
+				type="primary"
+				@click="send()">
 				<template #icon>
 					<NcLoadingIcon v-if="hasLoading" :size="20" />
 				</template>

diff --git a/src/views/ResetPassword.vue b/src/views/ResetPassword.vue
@@ -18,8 +18,8 @@
 			<NcButton :disabled="!canSave"
 				:class="hasLoading ? 'btn-load loading primary btn-confirm' : 'primary btn-confirm'"
 				native-type="submit"
-				@click="send()"
-				type="primary">
+				type="primary"
+				@click="send()">
 				<template #icon>
 					<NcLoadingIcon v-if="hasLoading" :size="20" />
 				</template>

diff --git a/src/views/Settings/CollectMetadata.vue b/src/views/Settings/CollectMetadata.vue
@@ -34,7 +34,8 @@ export default {
 	methods: {
 		async getData() {
 			const responseCollectMetadata = await axios.get(generateOcsUrl('/apps/provisioning_api/api/v1/config/apps/libresign/collect_metadata'))
-			this.collectMetadataEnabled = !!responseCollectMetadata.data.ocs.data.data
+			const value = responseCollectMetadata?.data?.ocs?.data?.data
+			this.collectMetadataEnabled = value === true || value === 'true'
 		},
 		saveCollectMetadata() {
 			OCP.AppConfig.setValue('libresign', 'collect_metadata', this.collectMetadataEnabled ? 1 : 0)

diff --git a/src/views/Settings/Validation.vue b/src/views/Settings/Validation.vue
@@ -92,19 +92,22 @@ export default {
 			const response = await axios.get(
 				generateOcsUrl('/apps/provisioning_api/api/v1/config/apps/libresign/make_validation_url_private'),
 			)
-			this.makeValidationUrlPrivate = response.data.ocs.data.data === true
+			const value = response?.data?.ocs?.data.data
+			this.makeValidationUrlPrivate = value === true || value === 'true'
 		},
 		async getAddFooterData() {
 			const response = await axios.get(
 				generateOcsUrl('/apps/provisioning_api/api/v1/config/apps/libresign/add_footer'),
 			)
-			this.addFooter = response.data.ocs.data.data !== '0'
+			const value = response?.data?.ocs?.data.data
+			this.addFooter = value === true || value === 'true'
 		},
 		async getWriteQrcodeOnFooter() {
 			const response = await axios.get(
 				generateOcsUrl('/apps/provisioning_api/api/v1/config/apps/libresign/write_qrcode_on_footer'),
 			)
-			this.writeQrcodeOnFooter = response.data.ocs.data.data !== '0'
+			const value = response?.data?.ocs?.data.data
+			this.writeQrcodeOnFooter = value === true || value === 'true'
 		},
 		async getValidationUrlData() {
 			const response = await axios.get(