Skip to content

[stable29] fix(shares): guest users inherit edit_group #4838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elzody merged 1 commit into from
Jun 6, 2025
Merged

[stable29] fix(shares): guest users inherit edit_group #4838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/Listener/ShareLinkListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,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');
Expand Down
5 changes: 5 additions & 0 deletions lib/Service/InitialStateService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,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'),
Expand Down
7 changes: 2 additions & 5 deletions src/public.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
isDocument,
isDownloadHidden,
} from './helpers/index.js'
import { getCurrentUser } from '@nextcloud/auth'
import NewFileMenu from './view/NewFileMenu.js'
import { loadState } from '@nextcloud/initial-state'

const optionalMimetypes = getCapabilities().richdocuments.mimetypesNoDefaultOpen

Expand All @@ -15,10 +15,7 @@ document.addEventListener('DOMContentLoaded', () => {
return
}

const userGroups = getCurrentUser()?.groups || []
const editGroups = getCapabilities().richdocuments.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)
Expand Down
Loading