fixup! refactor: extract logic to hide mounts and share information

Author: salmart-dev

apps/dav/composer/composer/autoload_classmap.php

@@ -209,7 +209,6 @@
     'OCA\\DAV\\ConfigLexicon' => $baseDir . '/../lib/ConfigLexicon.php',
     'OCA\\DAV\\Connector\\LegacyDAVACL' => $baseDir . '/../lib/Connector/LegacyDAVACL.php',
     'OCA\\DAV\\Connector\\LegacyPublicAuth' => $baseDir . '/../lib/Connector/LegacyPublicAuth.php',
-    'OCA\\DAV\\Connector\\PermissionsTrait' => $baseDir . '/../lib/Connector/PermissionsTrait.php',
     'OCA\\DAV\\Connector\\Sabre\\AddExtraHeadersPlugin' => $baseDir . '/../lib/Connector/Sabre/AddExtraHeadersPlugin.php',
     'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => $baseDir . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
     'OCA\\DAV\\Connector\\Sabre\\AppleQuirksPlugin' => $baseDir . '/../lib/Connector/Sabre/AppleQuirksPlugin.php',

apps/dav/composer/composer/autoload_static.php

@@ -224,7 +224,6 @@ class ComposerStaticInitDAV
         'OCA\\DAV\\ConfigLexicon' => __DIR__ . '/..' . '/../lib/ConfigLexicon.php',
         'OCA\\DAV\\Connector\\LegacyDAVACL' => __DIR__ . '/..' . '/../lib/Connector/LegacyDAVACL.php',
         'OCA\\DAV\\Connector\\LegacyPublicAuth' => __DIR__ . '/..' . '/../lib/Connector/LegacyPublicAuth.php',
-        'OCA\\DAV\\Connector\\PermissionsTrait' => __DIR__ . '/..' . '/../lib/Connector/PermissionsTrait.php',
         'OCA\\DAV\\Connector\\Sabre\\AddExtraHeadersPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AddExtraHeadersPlugin.php',
         'OCA\\DAV\\Connector\\Sabre\\AnonymousOptionsPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AnonymousOptionsPlugin.php',
         'OCA\\DAV\\Connector\\Sabre\\AppleQuirksPlugin' => __DIR__ . '/..' . '/../lib/Connector/Sabre/AppleQuirksPlugin.php',

apps/dav/lib/Connector/PermissionsTrait.php

@@ -10,7 +10,6 @@
 use OC\AppFramework\Http\Request;
 use OC\FilesMetadata\Model\FilesMetadata;
 use OC\User\NoUserException;
-use OCA\DAV\Connector\PermissionsTrait;
 use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
 use OCA\Files_Sharing\External\Mount as SharingExternalMount;
 use OCP\Accounts\IAccountManager;
@@ -42,8 +41,6 @@
 
 class FilesPlugin extends ServerPlugin {
 
-	use PermissionsTrait;
-
 	// namespace
 	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
 	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
@@ -318,8 +315,7 @@ public function handleGetProperties(PropFind $propFind, \Sabre\DAV\INode $node)
 			});
 
 			$propFind->handle(self::PERMISSIONS_PROPERTYNAME, function () use ($node) {
-				return $this->getPermissionString($this->isPublic,
-					$node->getDavPermissions());
+				return $this->isPublic ? $node->getPublicDavPermissions() : $node->getDavPermissions();
 			});
 
 			$propFind->handle(self::SHARE_PERMISSIONS_PROPERTYNAME, function () use ($node, $httpRequest) {

apps/dav/lib/Connector/Sabre/FilesPlugin.php

@@ -337,6 +337,13 @@ public function getDavPermissions() {
 		return DavUtil::getDavPermissions($this->info);
 	}
 
+	/**
+	 * Returns the DAV Permissions with share and mount infromation stripped.
+	 */
+	public function getPublicDavPermissions(): string {
+		return str_replace(['S', 'M'], '', $this->getDavPermissions());
+	}
+
 	public function getOwner() {
 		return $this->info->getOwner();
 	}