Skip to content

fix(files_sharing): ensure password or date is enabled by default to be enforced #54159

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
skjnldsv merged 2 commits into from
Aug 4, 2025
Merged

fix(files_sharing): ensure password or date is enabled by default to be enforced #54159

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
627f8ca
fix(files_sharing): ensure password or date is enabled by default to …
skjnldsv Jul 30, 2025
7f93711
chore(assets): Recompile assets
nextcloud-command Aug 2, 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
Next Next commit
fix(files_sharing): ensure password or date is enabled by default to … 
…be enforced

Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
@skjnldsv @nextcloud-command
skjnldsv authored and nextcloud-command committed Aug 2, 2025
commit 627f8cabd6d8eccf11b58904f80ba834ca4b231a
30 changes: 21 additions & 9 deletions apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogDatePassword.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<fieldset class="file-request-dialog__expiration" data-cy-file-request-dialog-fieldset="expiration">
<!-- Enable expiration -->
<legend>{{ t('files_sharing', 'When should the request expire?') }}</legend>
<NcCheckboxRadioSwitch v-show="!defaultExpireDateEnforced"
:checked="defaultExpireDateEnforced || expirationDate !== null"
:disabled="disabled || defaultExpireDateEnforced"
<NcCheckboxRadioSwitch v-show="!isExpirationDateEnforced"
:checked="isExpirationDateEnforced || expirationDate !== null"
:disabled="disabled || isExpirationDateEnforced"
@update:checked="onToggleDeadline">
{{ t('files_sharing', 'Set a submission expiration date') }}
</NcCheckboxRadioSwitch>
Expand Down Expand Up @@ -46,9 +46,9 @@
<fieldset class="file-request-dialog__password" data-cy-file-request-dialog-fieldset="password">
<!-- Enable password -->
<legend>{{ t('files_sharing', 'What password should be used for the request?') }}</legend>
<NcCheckboxRadioSwitch v-show="!enforcePasswordForPublicLink"
:checked="enforcePasswordForPublicLink || password !== null"
:disabled="disabled || enforcePasswordForPublicLink"
<NcCheckboxRadioSwitch v-show="!isPasswordEnforced"
:checked="isPasswordEnforced || password !== null"
:disabled="disabled || isPasswordEnforced"
@update:checked="onTogglePassword">
{{ t('files_sharing', 'Set a password') }}
</NcCheckboxRadioSwitch>
Expand All @@ -59,7 +59,7 @@
:disabled="disabled"
:label="t('files_sharing', 'Password')"
:placeholder="t('files_sharing', 'Enter a valid password')"
:required="false"
:required="enforcePasswordForPublicLink"
:value="password"
name="password"
@update:value="$emit('update:password', $event)" />
Expand Down Expand Up @@ -180,6 +180,18 @@ export default defineComponent({

return ''
},

isExpirationDateEnforced(): boolean {
// Both fields needs to be enabled in the settings
return this.defaultExpireDateEnabled
&& this.defaultExpireDateEnforced
},

isPasswordEnforced(): boolean {
// Both fields needs to be enabled in the settings
return this.enableLinkPasswordByDefault
&& this.enforcePasswordForPublicLink
},
},

mounted() {
Expand All @@ -189,12 +201,12 @@ export default defineComponent({
}

// If enforced, we cannot set a date before the default expiration days (see admin settings)
if (this.defaultExpireDateEnforced) {
if (this.isExpirationDateEnforced) {
this.maxDate = sharingConfig.defaultExpirationDate
}

// If enabled by default, we generate a valid password
if (this.enableLinkPasswordByDefault) {
if (this.isPasswordEnforced) {
this.generatePassword()
}
},
Expand Down
2 changes: 1 addition & 1 deletion apps/settings/src/components/AdminSettingsSharingForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</NcCheckboxRadioSwitch>
<fieldset v-show="settings.allowLinks && settings.defaultExpireDate" id="settings-sharing-api-api-expiration" class="sharing__sub-section">
<NcCheckboxRadioSwitch :checked.sync="settings.enforceExpireDate">
{{ t('settings', 'Enforce expiration date for remote shares') }}
{{ t('settings', 'Enforce expiration date for link or mail shares') }}
</NcCheckboxRadioSwitch>
<NcTextField type="number"
class="sharing__input"
Expand Down