Skip to content

Added parameter to disable web UI integration with local client #54191

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+21 −5
Open

Added parameter to disable web UI integration with local client #54191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25972a4
feat(files): added parameter to disable web UI integration with local…
pboguslawski Jan 20, 2025
e9f3885
chore(assets): Recompile assets
nextcloud-command Aug 1, 2025
17d7c7e
fix: remove unnecessary copyright header
skjnldsv Aug 1, 2025
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
1 change: 1 addition & 0 deletions apps/files/lib/Controller/ViewController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public function index($dir = '', $view = '', $fileid = null) {
$this->initialState->provideInitialState('templates_enabled', ($this->config->getSystemValueString('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton') !== '') || ($this->config->getSystemValueString('templatedirectory', \OC::$SERVERROOT . '/core/skeleton/Templates') !== ''));
$this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);
$this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
$this->initialState->provideInitialState('integration_local_client_enabled', ($this->config->getSystemValueBool('web_ui_integration_local_client_enabled', true)));

$isTwoFactorEnabled = false;
foreach ($this->twoFactorRegistry->getProviderStates($user) as $providerId => $providerState) {
Expand Down
8 changes: 8 additions & 0 deletions apps/files/src/actions/openLocallyAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import axios from '@nextcloud/axios'
import LaptopSvg from '@mdi/svg/svg/laptop.svg?raw'
import IconWeb from '@mdi/svg/svg/web.svg?raw'
import { isPublicShare } from '@nextcloud/sharing/public'
import { loadState } from '@nextcloud/initial-state'

const integrationLocalClientEnabled = loadState('files', 'integration_local_client_enabled', true)

export const action = new FileAction({
id: 'edit-locally',
Expand All @@ -20,6 +23,11 @@ export const action = new FileAction({

// Only works on single files
enabled(nodes: Node[]) {
// Only works when enabled.
if (!integrationLocalClientEnabled) {
return false
}

// Only works on single node
if (nodes.length !== 1) {
return false
Expand Down
4 changes: 2 additions & 2 deletions apps/files/tests/Controller/ViewControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@ public function testTwoFactorAuthEnabled(): void {
'backup_codes' => true,
]);

$invokedCountProvideInitialState = $this->exactly(9);
$invokedCountProvideInitialState = $this->exactly(10);
$this->initialState->expects($invokedCountProvideInitialState)
->method('provideInitialState')
->willReturnCallback(function ($key, $data) use ($invokedCountProvideInitialState) {
if ($invokedCountProvideInitialState->numberOfInvocations() === 9) {
if ($invokedCountProvideInitialState->numberOfInvocations() === 10) {
$this->assertEquals('isTwoFactorEnabled', $key);
$this->assertTrue($data);
}
Expand Down
7 changes: 7 additions & 0 deletions config/config.sample.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2740,4 +2740,11 @@
* Defaults to ``true``
*/
'enable_lazy_objects' => true,

/**
* Enables web UI integration with local client.
*
* Defaults to ``true``
*/
'web_ui_integration_local_client_enabled' => true,
Copy link
Contributor

@susnux susnux Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be a system config rather than a app config to be set in admin settings?

Copy link
Member Author

@skjnldsv skjnldsv Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I mean, I didn't think this through, I just revived an old approved PR 🙈

Copy link
Contributor

@come-nc come-nc Aug 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better as an app config, so that it can be added to UI more easily later.

];
4 changes: 2 additions & 2 deletions dist/files-init.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-init.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading