feat: updated plugins - exposes version owner

Signed-off-by: Eduardo Morales <emoral435@gmail.com>

Author: emoral435

apps/files_versions/lib/Db/VersionEntity.php

@@ -78,4 +78,23 @@ public function setLabel(string $label): void {
 		$this->metadata['label'] = $label;
 		$this->markFieldUpdated('metadata');
 	}
+
+	/**
+	 * @abstract given a key, return the value associated with the key in the metadata column
+	 * if nothing is found, we return an empty string
+	 * @param string $key key associated with the value
+	 */
+	public function getMetadataValue(string $key): string {
+		return $this->metadata[$key] ?? '';
+	}
+
+	/**
+	 * @abstract sets a key value pair in the metadata column
+	 * @param string $key key associated with the value
+	 * @param string $value value associated with the key
+	 */
+	public function setMetadataValue(string $key, $value): void {
+		$this->metadata[$key] = $value;
+		$this->markFieldUpdated('metadata');
+	}
 }

apps/files_versions/lib/Listener/MetadataFileEvents.php

@@ -60,7 +60,7 @@ public function post_write_hook(Node $node): void {
 		}
 		// check if our version manager supports setting the metadata
 		if ($this->versionManager instanceof IMetadataVersion) {
-			$owner = $this->userSession->getUser()->getDisplayName();
+			$owner = $this->userSession->getUser()->getDisplayName() ?? '';
 			$this->versionManager->setMetadataValue($node, "owner", $owner);
 		}
 	}

apps/files_versions/lib/Listener/MetadetaFileEvents.php

@@ -44,6 +44,8 @@ class Plugin extends ServerPlugin {
 
 	public const VERSION_LABEL = '{http://nextcloud.org/ns}version-label';
 
+	public const VERSION_OWNER = 'version-owner'; // dav property for owner
+
 	public function __construct(
 		private IRequest $request,
 		private IPreview $previewManager,
@@ -93,6 +95,7 @@ public function afterGet(RequestInterface $request, ResponseInterface $response)
 	public function propFind(PropFind $propFind, INode $node): void {
 		if ($node instanceof VersionFile) {
 			$propFind->handle(self::VERSION_LABEL, fn () => $node->getLabel());
+			$propFind->handle(self::VERSION_OWNER, fn () => $node->getOwner());
 			$propFind->handle(FilesPlugin::HAS_PREVIEW_PROPERTYNAME, fn () => $this->previewManager->isMimeSupported($node->getContentType()));
 		}
 	}

apps/files_versions/lib/Sabre/Plugin.php

@@ -27,10 +27,12 @@
 namespace OCA\Files_Versions\Sabre;
 
 use OCA\Files_Versions\Versions\IDeletableVersionBackend;
+use OCA\Files_Versions\Versions\IMetadataVersion;
 use OCA\Files_Versions\Versions\INameableVersion;
 use OCA\Files_Versions\Versions\INameableVersionBackend;
 use OCA\Files_Versions\Versions\IVersion;
 use OCA\Files_Versions\Versions\IVersionManager;
+use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
@@ -109,6 +111,27 @@ public function setLabel($label): bool {
 		}
 	}
 
+	public function getOwner(): ?string {
+		$source = $this->version->getSourceFile();
+		if ($this->versionManager instanceof IMetadataVersion && $source instanceof Node) {
+			return $this->versionManager->getMetadataValue($source, "owner") ?? '';
+		}
+		return null;
+	}
+
+	/**
+	 * @abstract sets the owner in the metadata column
+	 * @param string $owner the value that will be set for the owner in the metadata column
+	 */
+	public function setOwner(string $ownerValue): bool {
+		$source = $this->version->getSourceFile();
+		if ($this->versionManager instanceof IMetadataVersion && $source instanceof Node) {
+			$this->versionManager->setMetadataValue($source, "owner", $ownerValue);
+			return true;
+		}
+		return false;
+	}
+
 	public function getLastModified(): int {
 		return $this->version->getTimestamp();
 	}

apps/files_versions/lib/Sabre/VersionFile.php

@@ -315,6 +315,10 @@ private function currentUserHasPermissions(IVersion $version, int $permissions):
 	}
 
 	public function setMetadataValue(Node $node, string $key, string $value): void {
+		if (!($node instanceof File)) {
+			return;
+		}
+
 		try {
 			$versionEntity = $this->versionsMapper->findVersionForFileId($node->getId(), $node->getMTime());
 		} catch (\InvalidArgumentException $e) { // means that we have not created the version

apps/files_versions/lib/Versions/IStoreMetadataBackend.php

@@ -174,6 +174,7 @@ public function getMetadataValue(Node $node, string $key): ?string {
 		if ($backend instanceof IMetadataVersion) {
 			return $backend->getMetadataValue($node, $key);
 		}
+		return null;
 	}
 
 	/**

apps/files_versions/lib/Versions/LegacyVersionsBackend.php

@@ -31,6 +31,7 @@ export default `<?xml version="1.0"?>
 		<d:getlastmodified />
 		<d:getetag />
 		<nc:version-label />
+		<nc:version-owner />
 		<nc:has-preview />
 	</d:prop>
 </d:propfind>`