Merge pull request #4831 from nextcloud/fix/user-edit-groups-public-shares

fix(shares): guest users inherit edit_group

Author: juliusknorr

lib/Listener/ShareLinkListener.php

@@ -42,8 +42,11 @@ public function handle(Event $event): void {
 		$loggedInUser = $this->permissionManager->loggedInUser();
 
 		if ($this->permissionManager->isEnabledForUser($owner)) {
+			$updatable = (bool)($share->getPermissions() & \OCP\Constants::PERMISSION_UPDATE);
+			$updatable = $updatable && $this->permissionManager->userCanEdit($owner);
+			
 			$this->initialStateService->prepareParams(['userId' => $loggedInUser]);
-			$this->initialStateService->provideCapabilities();
+			$this->initialStateService->providePublicShare($updatable);
 
 			Util::addScript('richdocuments', 'richdocuments-viewer', 'viewer');
 			Util::addScript('richdocuments', 'richdocuments-public', 'viewer');

lib/Service/InitialStateService.php

@@ -58,6 +58,11 @@ public function provideDocument(Wopi $wopi, array $params): void {
 		$this->provideOptions();
 	}
 
+	public function providePublicShare(?bool $userInEditGroups = true): void {
+		$this->initialState->provideInitialState('userInEditGroups', $userInEditGroups);
+		$this->provideCapabilities();
+	}
+
 	public function prepareParams(array $params): array {
 		$defaults = [
 			'instanceId' => $this->config->getSystemValue('instanceid'),

src/public.js

@@ -10,18 +10,15 @@ import {
 	isDownloadHidden,
 } from './helpers/index.js'
 import { getCapabilities } from './services/capabilities.ts'
-import { getCurrentUser } from '@nextcloud/auth'
 import NewFileMenu from './view/NewFileMenu.js'
+import { loadState } from '@nextcloud/initial-state'
 
 document.addEventListener('DOMContentLoaded', () => {
 	if (!isPublic() || !OCA.Viewer) {
 		return
 	}
 
-	const userGroups = getCurrentUser()?.groups || []
-	const editGroups = getCapabilities().config.edit_groups || []
-	const editGroupsArray = Array.isArray(editGroups) ? editGroups : [editGroups]
-	const userInEditGroups = editGroupsArray.some(group => userGroups.includes(group))
+	const userInEditGroups = loadState('richdocuments', 'userInEditGroups', true)
 
 	if (OCA.Files && OCA.Files.fileActions && userInEditGroups) {
 		OC.Plugins.register('OCA.Files.NewFileMenu', NewFileMenu)