wipavatar-work-29

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>

8 files changed, 53 insertions, 1 deletions

diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index 7c9c7099878..58b032f4863 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -81,6 +81,7 @@ class FilesPlugin extends ServerPlugin {
 	public const MOUNT_TYPE_PROPERTYNAME = '{http://nextcloud.org/ns}mount-type';
 	public const MOUNT_ROOT_PROPERTYNAME = '{http://nextcloud.org/ns}is-mount-root';
 	public const IS_ENCRYPTED_PROPERTYNAME = '{http://nextcloud.org/ns}is-encrypted';
+	public const IS_FEDERATED_PROPERTYNAME = '{http://nextcloud.org/ns}is-federated';
 	public const METADATA_ETAG_PROPERTYNAME = '{http://nextcloud.org/ns}metadata_etag';
 	public const UPLOAD_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}upload_time';
 	public const CREATION_TIME_PROPERTYNAME = '{http://nextcloud.org/ns}creation_time';
@@ -149,6 +150,7 @@ class FilesPlugin extends ServerPlugin {
 		$server->protectedProperties[] = self::HAS_PREVIEW_PROPERTYNAME;
 		$server->protectedProperties[] = self::MOUNT_TYPE_PROPERTYNAME;
 		$server->protectedProperties[] = self::IS_ENCRYPTED_PROPERTYNAME;
+		$server->protectedProperties[] = self::IS_FEDERATED_PROPERTYNAME;
 		$server->protectedProperties[] = self::SHARE_NOTE;
 
 		// normally these cannot be changed (RFC4918), but we want them modifiable through PROPPATCH
@@ -413,6 +415,10 @@ class FilesPlugin extends ServerPlugin {
 			$propFind->handle(self::DISPLAYNAME_PROPERTYNAME, function () use ($node) {
 				return $node->getName();
 			});
+
+			$propFind->handle(self::IS_FEDERATED_PROPERTYNAME, function () use ($node) {
+				return $node->getOwner()->isFederated() ? 'true' : 'false';
+			});
 		}
 
 		if ($node instanceof \OCA\DAV\Connector\Sabre\File) {
diff --git a/apps/files/src/components/VirtualList.vue b/apps/files/src/components/VirtualList.vue
index c0794ffc7a7..4c8fe42fa42 100644
--- a/apps/files/src/components/VirtualList.vue
+++ b/apps/files/src/components/VirtualList.vue
@@ -168,10 +168,12 @@ export default Vue.extend({
 			}
 
 			const items = this.dataSources.slice(this.startIndex, this.startIndex + this.shownItems) as Node[]
+			console.log("Items list", items)
 
 			const oldItems = items.filter(item => Object.values(this.$_recycledPool).includes(item[this.dataKey]))
 			const oldItemsKeys = oldItems.map(item => item[this.dataKey] as string)
 			const unusedKeys = Object.keys(this.$_recycledPool).filter(key => !oldItemsKeys.includes(this.$_recycledPool[key]))
+			console.log("Unused keys", unusedKeys)
 
 			return items.map(item => {
 				const index = Object.values(this.$_recycledPool).indexOf(item[this.dataKey])
diff --git a/apps/files/src/init.ts b/apps/files/src/init.ts
index a9af6a8c65f..f3672e3f26f 100644
--- a/apps/files/src/init.ts
+++ b/apps/files/src/init.ts
@@ -72,5 +72,6 @@ registerPreviewServiceWorker()
 
 registerDavProperty('nc:hidden', { nc: 'http://nextcloud.org/ns' })
 registerDavProperty('nc:is-mount-root', { nc: 'http://nextcloud.org/ns' })
+registerDavProperty('nc:is-federated', { nc: 'http://nextcloud.org/ns' })
 
 initLivePhotos()
diff --git a/apps/files_sharing/src/actions/sharingStatusAction.ts b/apps/files_sharing/src/actions/sharingStatusAction.ts
index 4f9648fa27f..4cc054e8394 100644
--- a/apps/files_sharing/src/actions/sharingStatusAction.ts
+++ b/apps/files_sharing/src/actions/sharingStatusAction.ts
@@ -84,6 +84,7 @@ export const action = new FileAction({
 
 	iconSvgInline(nodes: Node[]) {
 		const node = nodes[0]
+		console.debug("Node check", node)
 		const shareTypes = Object.values(node?.attributes?.['share-types'] || {}).flat() as number[]
 
 		// Mixed share types
diff --git a/core/src/files/client.js b/core/src/files/client.js
index 9d32fefdfc4..cbcb26e4333 100644
--- a/core/src/files/client.js
+++ b/core/src/files/client.js
@@ -103,6 +103,7 @@ import escapeHTML from 'escape-html'
 	Client.PROPERTY_SIZE	= '{' + Client.NS_OWNCLOUD + '}size'
 	Client.PROPERTY_GETCONTENTLENGTH	= '{' + Client.NS_DAV + '}getcontentlength'
 	Client.PROPERTY_ISENCRYPTED	= '{' + Client.NS_DAV + '}is-encrypted'
+	Client.PROPERTY_ISFEDERATED	= '{' + Client.NS_DAV + '}is-federated'
 	Client.PROPERTY_SHARE_PERMISSIONS	= '{' + Client.NS_OCS + '}share-permissions'
 	Client.PROPERTY_SHARE_ATTRIBUTES	= '{' + Client.NS_NEXTCLOUD + '}share-attributes'
 	Client.PROPERTY_QUOTA_AVAILABLE_BYTES	= '{' + Client.NS_DAV + '}quota-available-bytes'
@@ -158,6 +159,10 @@ import escapeHTML from 'escape-html'
 		 */
 		[Client.NS_NEXTCLOUD, 'is-encrypted'],
 		/**
+		 * Federation state
+		 */
+		[Client.NS_NEXTCLOUD, 'is-federated'],
+		/**
 		 * Share permissions
 		 */
 		[Client.NS_OCS, 'share-permissions'],
@@ -303,7 +308,7 @@ import escapeHTML from 'escape-html'
 		 *
 		 * @returns {Array.<FileInfo>} array of file info
 		 */
-		_parseFileInfo: function(response) {
+		_parseFileInfo: function(response) {Encrypted
 			let path = decodeURIComponent(response.href)
 			if (path.substr(0, this._root.length) === this._root) {
 				path = path.substr(this._root.length)
@@ -355,6 +360,13 @@ import escapeHTML from 'escape-html'
 				data.isEncrypted = false
 			}
 
+			const isFederatedProp = props['{' + Client.NS_NEXTCLOUD + '}is-federated']
+			if (!_.isUndefined(isFederatedProp)) {
+				data.isFederated = isFederatedProp === '1'
+			} else {
+				data.isFederated = false
+			}
+
 			const isFavouritedProp = props['{' + Client.NS_OWNCLOUD + '}favorite']
 			if (!_.isUndefined(isFavouritedProp)) {
 				data.isFavourited = isFavouritedProp === '1'
diff --git a/lib/private/User/LazyUser.php b/lib/private/User/LazyUser.php
index 396d3c252f1..ae10937a66b 100644
--- a/lib/private/User/LazyUser.php
+++ b/lib/private/User/LazyUser.php
@@ -51,6 +51,11 @@ class LazyUser implements IUser {
 				$this->user = $this->userManager->get($this->uid);
 			}
 		}
+
+		if ($this->user === null) {
+			throw new \Exception('User not found');
+		}
+		
 		/** @var IUser */
 		$user = $this->user;
 		return $user;
@@ -167,4 +172,16 @@ class LazyUser implements IUser {
 	public function setManagerUids(array $uids): void {
 		$this->getUser()->setManagerUids($uids);
 	}
+
+	public function isFederated(): bool {
+		try {
+			// If getUser succeeds then user is definitely not federated
+			// This could fail for other reasons (especially a race condition where a user is deleted)
+			// But it's what we have now
+			$this->getUser();
+			return false;
+		} catch (\Exception $e) {
+			return true;
+		}
+	}
 }
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
index daa78011007..398ea9e1a19 100644
--- a/lib/private/User/User.php
+++ b/lib/private/User/User.php
@@ -619,4 +619,9 @@ class User implements IUser {
 			$this->emitter->emit('\OC\User', 'changeUser', [$this, $feature, $value, $oldValue]);
 		}
 	}
+
+	public function isFederated(): bool {
+		// Federated users only use LazyUser
+		return 0;
+	}
 }
diff --git a/lib/public/IUser.php b/lib/public/IUser.php
index b326e6192c0..61ecb5d2f21 100644
--- a/lib/public/IUser.php
+++ b/lib/public/IUser.php
@@ -287,4 +287,12 @@ interface IUser {
 	 * @since 27.0.0
 	 */
 	public function setManagerUids(array $uids): void;
+
+	/**
+	 * Check if the user is federated (from another server)
+	 *
+	 * @return boll
+	 * @since 28.0.11
+	 */
+	public function isFederated(): bool;
 }