Skip to content

Commit 4a4c59c

Browse files
committed
Use @nextcloud/capabilities to obtain share api defaults
- Remove redundant initial state added - Call `getCapabilities()` in share config file. Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
1 parent 6edeefd commit 4a4c59c

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

apps/files_sharing/lib/Listener/LoadSidebarListener.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,5 @@ public function handle(Event $event): void {
4848
}
4949

5050
Util::addScript(Application::APP_ID, 'files_sharing_tab', 'files');
51-
52-
$shareConfig = [
53-
'allowPublicUploads' => $this->shareManager->shareApiLinkAllowPublicUpload(),
54-
'defaultPermissions' => $this->shareManager->shareApiDefaultPermissions(),
55-
];
56-
57-
$this->initialState->provideInitialState('shareConfig', $shareConfig);
5851
}
5952
}

apps/files_sharing/src/services/ConfigService.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2222
*
2323
*/
24-
25-
import { loadState } from '@nextcloud/initial-state'
2624
import { getCapabilities } from '@nextcloud/capabilities'
2725

2826
export default class Config {
2927

3028
constructor() {
31-
this._shareConfig = loadState('files_sharing', 'shareConfig', {})
29+
this._capabilities = getCapabilities()
3230
}
3331

3432
/**
@@ -39,7 +37,7 @@ export default class Config {
3937
* @memberof Config
4038
*/
4139
get defaultPermissions() {
42-
return this._shareConfig.defaultPermissions
40+
return this._capabilities.files_sharing?.default_permissions
4341
}
4442

4543
/**
@@ -50,7 +48,7 @@ export default class Config {
5048
* @memberof Config
5149
*/
5250
get isPublicUploadEnabled() {
53-
return this._shareConfig.allowPublicUploads
51+
return this._capabilities.files_sharing?.public.upload
5452
}
5553

5654
/**
@@ -225,11 +223,10 @@ export default class Config {
225223
* @memberof Config
226224
*/
227225
get isMailShareAllowed() {
228-
const capabilities = getCapabilities()
229226
// eslint-disable-next-line camelcase
230-
return capabilities?.files_sharing?.sharebymail !== undefined
227+
return this._capabilities?.files_sharing?.sharebymail !== undefined
231228
// eslint-disable-next-line camelcase
232-
&& capabilities?.files_sharing?.public?.enabled === true
229+
&& this._capabilities?.files_sharing?.public?.enabled === true
233230
}
234231

235232
/**
@@ -284,7 +281,7 @@ export default class Config {
284281
* @memberof Config
285282
*/
286283
get isPasswordForMailSharesRequired() {
287-
return (getCapabilities().files_sharing.sharebymail === undefined) ? false : getCapabilities().files_sharing.sharebymail.password.enforced
284+
return (this._capabilities.files_sharing.sharebymail === undefined) ? false : this._capabilities.files_sharing.sharebymail.password.enforced
288285
}
289286

290287
/**
@@ -293,7 +290,7 @@ export default class Config {
293290
* @memberof Config
294291
*/
295292
get shouldAlwaysShowUnique() {
296-
return (getCapabilities().files_sharing?.sharee?.always_show_unique === true)
293+
return (this._capabilities.files_sharing?.sharee?.always_show_unique === true)
297294
}
298295

299296
/**
@@ -338,7 +335,7 @@ export default class Config {
338335
* @memberof Config
339336
*/
340337
get passwordPolicy() {
341-
const capabilities = getCapabilities()
338+
const capabilities = this._capabilities
342339
return capabilities.password_policy ? capabilities.password_policy : {}
343340
}
344341

0 commit comments

Comments
 (0)