Merge pull request #62599 from nextcloud/feat/sharing/enforced-hints

Add hints for password and expiration date if they are required

Author: provokateurin

apps/files/lib/Sharing/Property/NodeGridViewSharePropertyType.php

@@ -21,7 +21,7 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
 		return null;
 	}
 

core/Sharing/Property/ExpirationDateSharePropertyType.php

@@ -39,7 +39,11 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
+		if ($this->isRequired($share)) {
+			return $l10nFactory->get(Application::APP_ID)->t('Your administrator has enforced a %d days expiration policy.', [$this->getMaxExpirationDays($share)]);
+		}
+
 		return null;
 	}
 
@@ -87,7 +91,7 @@ public function getMaxDate(Share $share): ?DateTimeImmutable {
 		return null;
 	}
 
-	private function getMaxExpirationDate(Share $share): ?DateTimeImmutable {
+	private function getMaxExpirationDays(Share $share): ?int {
 		$days = INF;
 
 		if ($this->hasTokenOrEmailRecipient($share) && $this->legacyManager->shareApiLinkDefaultExpireDate()) {
@@ -103,6 +107,15 @@ private function getMaxExpirationDate(Share $share): ?DateTimeImmutable {
 		}
 
 		if ($days !== INF) {
+			return $days;
+		}
+
+		return null;
+	}
+
+	private function getMaxExpirationDate(Share $share): ?DateTimeImmutable {
+		$days = $this->getMaxExpirationDays($share);
+		if ($days !== null) {
 			return $this->now->add(new DateInterval('P' . $days . 'D'));
 		}
 

core/Sharing/Property/LabelSharePropertyType.php

@@ -21,7 +21,7 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
 		return null;
 	}
 

core/Sharing/Property/NoteSharePropertyType.php

@@ -21,7 +21,7 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
 		return null;
 	}
 

core/Sharing/Property/PasswordSharePropertyType.php

@@ -41,7 +41,11 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
+		if ($this->isRequired($share)) {
+			return $l10nFactory->get(Application::APP_ID)->t('Your administrator has enforced a password protection.');
+		}
+
 		return null;
 	}
 

lib/public/Sharing/Property/ISharePropertyType.php

@@ -43,7 +43,7 @@ public function getDisplayName(IFactory $l10nFactory): string;
 	 * @return ?non-empty-string
 	 * @since 35.0.0
 	 */
-	public function getHint(IFactory $l10nFactory): ?string;
+	public function getHint(IFactory $l10nFactory, Share $share): ?string;
 
 	/**
 	 * Returns a priority used for sorting the properties for the user interface.

lib/public/Sharing/Property/ShareProperty.php

@@ -47,7 +47,7 @@ public function format(ISharingRegistry $registry, IFactory $l10nFactory, Share
 		return $propertyType->format($share, [
 			'class' => $this->class,
 			'display_name' => $propertyType->getDisplayName($l10nFactory),
-			'hint' => $propertyType->getHint($l10nFactory),
+			'hint' => $propertyType->getHint($l10nFactory, $share),
 			'priority' => $propertyType->getPriority(),
 			'advanced' => $propertyType->isAdvanced(),
 			'required' => $propertyType->isRequired($share),

tests/lib/Sharing/Property/ABooleanSharePropertyTypeTest.php

@@ -24,7 +24,7 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
 		throw new \RuntimeException();
 	}
 

tests/lib/Sharing/Property/ADateSharePropertyTypeTest.php

@@ -43,7 +43,7 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
 		throw new \RuntimeException();
 	}
 

tests/lib/Sharing/Property/AEnumSharePropertyTypeTest.php

@@ -38,7 +38,7 @@ public function getDisplayName(IFactory $l10nFactory): string {
 	}
 
 	#[\Override]
-	public function getHint(IFactory $l10nFactory): ?string {
+	public function getHint(IFactory $l10nFactory, Share $share): ?string {
 		throw new \RuntimeException();
 	}