fix review comments

Signed-off-by: Christian Hartmann <chris-hartmann@gmx.de>

Author: Chartman123

lib/Constants.php

@@ -36,14 +36,15 @@ class Constants {
 	public const CONFIG_KEY_TYPES = [
 		self::CONFIG_KEY_ALLOWPERMITALL => 'bool',
 		self::CONFIG_KEY_ALLOWPUBLICLINK => 'bool',
+		self::CONFIG_KEY_ALLOWCUSTOMPUBLICTOKEN => 'bool',
 		self::CONFIG_KEY_ALLOWSHOWTOALL => 'bool',
 		self::CONFIG_KEY_RESTRICTCREATION => 'bool',
 		self::CONFIG_KEY_ALLOWCONFIRMATIONEMAIL => 'bool',
 		self::CONFIG_KEY_CREATIONALLOWEDGROUPS => 'array',
 		self::CONFIG_KEY_CONFIRMATIONEMAILRATELIMIT => 'int',
 	];
 
-	public const PUBLIC_SHARE_TOKEN_MIN_LENGTH = 8;
+	public const PUBLIC_SHARE_TOKEN_MIN_LENGTH = 1;
 	public const PUBLIC_SHARE_TOKEN_MAX_LENGTH = 256;
 	public const PUBLIC_SHARE_HASH_REQUIREMENT = '[a-zA-Z0-9]{' . self::PUBLIC_SHARE_TOKEN_MIN_LENGTH . ',' . self::PUBLIC_SHARE_TOKEN_MAX_LENGTH . '}';
 

lib/Controller/ShareApiController.php

@@ -213,7 +213,6 @@ public function newShare(int $formId, int $shareType, string $shareWith = '', ar
 	 * @throws OCSBadRequestException Share doesn't belong to given Form
 	 * @throws OCSBadRequestException Invalid permission given
 	 * @throws OCSBadRequestException Invalid share token
-	 * @throws OCSBadRequestException Share hash exists, please retry
 	 * @throws OCSForbiddenException Custom public share tokens are not allowed
 	 * @throws OCSForbiddenException This form is not owned by the current user
 	 * @throws OCSForbiddenException Empty keyValuePairs, will not update
@@ -296,7 +295,7 @@ public function updateShare(int $formId, int $shareId, array $keyValuePairs): Da
 					$existingShare = $this->shareMapper->findPublicShareByHash($token);
 					if ($existingShare->getId() !== $formShare->getId()) {
 						$this->logger->debug('Share hash already exists.');
-						throw new OCSBadRequestException('Share hash exists, please retry.');
+						throw new OCSBadRequestException('Invalid share token');
 					}
 				} catch (DoesNotExistException $e) {
 					// Just continue, this is what we expect to happen (share hash not existing yet).

lib/Service/ConfigService.php

@@ -39,7 +39,7 @@ public function getAllowPublicLink(): bool {
 		return $this->appConfig->getAppValueBool(Constants::CONFIG_KEY_ALLOWPUBLICLINK, true);
 	}
 	public function getAllowCustomPublicToken(): bool {
-		return json_decode($this->config->getAppValue($this->appName, Constants::CONFIG_KEY_ALLOWCUSTOMPUBLICTOKEN, 'false'));
+		return $this->appConfig->getAppValueBool(Constants::CONFIG_KEY_ALLOWCUSTOMPUBLICTOKEN, false);
 	}
 	public function getAllowShowToAll(): bool {
 		return $this->appConfig->getAppValueBool(Constants::CONFIG_KEY_ALLOWSHOWTOALL, true);

openapi.json

@@ -5293,7 +5293,7 @@
                         }
                     },
                     "400": {
-                        "description": "Share hash exists, please retry",
+                        "description": "Invalid share token",
                         "content": {
                             "application/json": {
                                 "schema": {

src/FormsSettings.vue

@@ -73,14 +73,13 @@
 				{{ t('forms', 'Allow sharing by link') }}
 			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch
-				ref="switchAllowCustomPublicShareTokens"
 				v-model="appConfig.allowCustomPublicShareTokens"
+				:loading="loading.allowCustomPublicShareTokens"
 				type="switch"
 				@update:modelValue="onAllowCustomPublicShareTokensChange">
 				{{ t('forms', 'Allow custom public share tokens') }}
 			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch
-				ref="switchAllowPermitAll"
 				v-model="appConfig.allowPermitAll"
 				:loading="loading.allowPermitAll"
 				type="switch"
@@ -176,14 +175,13 @@ export default {
 		async onAllowPublicLinkChange(newVal) {
 			this.loading.allowPublicLink = true
 			await this.saveAppConfig('allowPublicLink', newVal)
-			el.loading = false
+			this.loading.allowPublicLink = false
 		},
 
 		async onAllowCustomPublicShareTokensChange(newVal) {
-			const el = this.$refs.switchAllowCustomPublicShareTokens
-			el.loading = true
+			this.loading.allowCustomPublicShareTokens = true
 			await this.saveAppConfig('allowCustomPublicShareTokens', newVal)
-			el.loading = false
+			this.loading.allowCustomPublicShareTokens = false
 		},
 
 		async onAllowPermitAllChange(newVal) {

src/components/SidebarTabs/SharingSidebarTab.vue

@@ -97,7 +97,7 @@
 						"
 						@click="updateShareToken(share)">
 						<template #icon>
-							<IconCheck :size="20" />
+							<NcIconSvgWrapper :svg="IconCheck" />
 						</template>
 						{{ t('forms', 'Save token') }}
 					</NcActionButton>
@@ -231,6 +231,7 @@
 
 <script>
 import IconPlus from '@material-symbols/svg-400/outlined/add.svg?raw'
+import IconCheck from '@material-symbols/svg-400/outlined/check.svg?raw'
 import IconCodeBrackets from '@material-symbols/svg-400/outlined/code.svg?raw'
 import IconCopyAll from '@material-symbols/svg-400/outlined/copy_all.svg?raw'
 import IconDelete from '@material-symbols/svg-400/outlined/delete.svg?raw'
@@ -250,16 +251,6 @@ import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwit
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
 import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
-import IconAccountMultiple from 'vue-material-design-icons/AccountMultipleOutline.vue'
-import IconCheck from 'vue-material-design-icons/Check.vue'
-import IconCodeBrackets from 'vue-material-design-icons/CodeBrackets.vue'
-import IconLinkVariant from 'vue-material-design-icons/Link.vue'
-import IconLinkBoxVariantOutline from 'vue-material-design-icons/LinkBoxOutline.vue'
-import IconPlus from 'vue-material-design-icons/Plus.vue'
-import IconQr from 'vue-material-design-icons/Qrcode.vue'
-import IconDelete from 'vue-material-design-icons/TrashCanOutline.vue'
-import FormsIcon from '../Icons/FormsIcon.vue'
-import IconCopyAll from '../Icons/IconCopyAll.vue'
 import QRDialog from '../QRDialog.vue'
 import SharingSearchDiv from './SharingSearchDiv.vue'
 import SharingShareDiv from './SharingShareDiv.vue'
@@ -273,16 +264,6 @@ import OcsResponse2Data from '../../utils/OcsResponse2Data.js'
 export default {
 	components: {
 		NcIconSvgWrapper,
-		FormsIcon,
-		IconAccountMultiple,
-		IconCheck,
-		IconCodeBrackets,
-		IconCopyAll,
-		IconDelete,
-		IconLinkBoxVariantOutline,
-		IconLinkVariant,
-		IconPlus,
-		IconQr,
 		NcActions,
 		NcActionButton,
 		NcActionLink,
@@ -318,6 +299,7 @@ export default {
 	setup() {
 		return {
 			FormsIcon,
+			IconCheck,
 			IconCopyAll,
 			IconPlus,
 			IconCodeBrackets,
@@ -339,21 +321,6 @@ export default {
 		}
 	},
 
-	watch: {
-		publicLinkShares: {
-			immediate: true,
-			handler(shares) {
-				const nextShareTokens = {}
-				for (const share of shares) {
-					nextShareTokens[share.id] =
-						this.shareTokens[share.id] ?? share.shareWith
-				}
-
-				this.shareTokens = nextShareTokens
-			},
-		},
-	},
-
 	computed: {
 		isCurrentUserOwner() {
 			return getCurrentUser().uid === this.form.ownerId
@@ -383,6 +350,21 @@ export default {
 		},
 	},
 
+	watch: {
+		publicLinkShares: {
+			immediate: true,
+			handler(shares) {
+				const nextShareTokens = {}
+				for (const share of shares) {
+					nextShareTokens[share.id] =
+						this.shareTokens[share.id] ?? share.shareWith
+				}
+
+				this.shareTokens = nextShareTokens
+			},
+		},
+	},
+
 	methods: {
 		/**
 		 * Add share

tests/Unit/Controller/ConfigControllerTest.php

@@ -61,25 +61,21 @@ public static function dataUpdateAppConfig() {
 			'booleanAllowPermitAll' => [
 				'configKey' => 'allowPermitAll',
 				'configValue' => true,
-				'strConfig' => 'true'
 			],
 			'booleanAllowShowToAll' => [
 				'configKey' => 'allowShowToAll',
 				'configValue' => true,
-				'strConfig' => 'true'
 			],
-			'booleanConfigAllowCustomPublicShareTokens' => [
+			'booleanAllowCustomPublicShareTokens' => [
 				'configKey' => 'allowCustomPublicShareTokens',
 				'configValue' => true,
-				'strConfig' => 'true'
 			],
 			'arrayCreationAllowedGroups' => [
 				'configKey' => 'creationAllowedGroups',
 				'configValue' => [
 					'admin',
 					'group1'
 				],
-				'strConfig' => '["admin","group1"]'
 			]
 		];
 	}
@@ -88,9 +84,8 @@ public static function dataUpdateAppConfig() {
 	 *
 	 * @param string $configKey
 	 * @param mixed $configValue
-	 * @param string $strConfig The configValue as json-string
 	 */
-	public function testUpdateAppConfig(string $configKey, $configValue, string $strConfig) {
+	public function testUpdateAppConfig(string $configKey, $configValue) {
 		$this->logger->expects($this->once())
 			->method('debug');