Merge pull request #41936 from nextcloud/41885-27-manual-backport

[stable27] Improve share logic for enforced password & expiry date

apps/files_sharing/src/components/SharingEntryLink.vue

@@ -97,13 +97,13 @@
 			</NcActionText>
 			<NcActionInput v-if="pendingExpirationDate"
 				class="share-link-expire-date"
-				:disabled="saving || isExpiryDateEnforced"
+				:disabled="saving"
 				:is-native-picker="true"
 				:hide-label="true"
 				:value="new Date(share.expireDate)"
 				type="date"
 				:min="dateTomorrow"
-				:max="dateMaxEnforced"
+				:max="maxExpirationDateEnforced"
 				@input="onExpirationChange">
 				<!-- let's not submit when picked, the user
 					might want to still edit or copy the password -->
@@ -302,12 +302,6 @@ export default {
 			}
 			return null
 		},
-		dateMaxEnforced() {
-			if (this.config.isDefaultExpireDateEnforced) {
-				return new Date(new Date().setDate(new Date().getDate() + this.config.defaultExpireDate))
-			}
-			return null
-		},
 		/**
 		 * Is the current share password protected ?
 		 *

apps/files_sharing/src/mixins/SharesMixin.js

@@ -132,6 +132,9 @@ export default {
 			const shareType = this.share.shareType ?? this.share.type
 			return [this.SHARE_TYPES.SHARE_TYPE_LINK, this.SHARE_TYPES.SHARE_TYPE_EMAIL].includes(shareType)
 		},
+		isRemoteShare() {
+			return this.share.type === this.SHARE_TYPES.SHARE_TYPE_REMOTE_GROUP || this.share.type === this.SHARE_TYPES.SHARE_TYPE_REMOTE
+		},
 		isShareOwner() {
 			return this.share && this.share.owner === getCurrentUser().uid
 		},
@@ -152,6 +155,19 @@ export default {
 			]
 			return !bundledPermissions.includes(this.share.permissions)
 		},
+		maxExpirationDateEnforced() {
+			if (this.isExpiryDateEnforced) {
+				if (this.isPublicShare) {
+					return this.config.defaultExpirationDate
+				}
+				if (this.isRemoteShare) {
+					return this.config.defaultRemoteExpirationDateString
+				}
+				// If it get's here then it must be an internal share
+				return this.config.defaultInternalExpirationDate
+			}
+			return null
+		},
 	},
 
 	methods: {