Skip to content

Commit

Permalink
Show pending popover menu when password is enabled by default
Browse files Browse the repository at this point in the history
When "Enforce password protection" is enabled in the sharing settings a
popover menu is shown to set a password before the share is created. On
the other hand, when "Always ask for a password" was enabled in the
sharing settings and a new link share was created the share was
immediately created with a default password; the user was not able to
specify a password (nor create the share without password).

The component template already provided the needed elements to also ask
for the password without enforcing it, but the popover menu was not
shown due to "enableLinkPasswordByDefault" being missing in "if"
conditions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
  • Loading branch information
danxuliu authored and nickvergessen committed May 22, 2023
1 parent d80f8fc commit d463192
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions apps/files_sharing/src/components/SharingEntryLink.vue
Expand Up @@ -47,7 +47,7 @@
</NcActions>

<!-- pending actions -->
<NcActions v-if="!pending && (pendingEnforcedPassword || pendingExpirationDate)"
<NcActions v-if="!pending && (pendingPassword || pendingEnforcedPassword || pendingExpirationDate)"
class="sharing-entry__actions"
:aria-label="actionsTooltip"
menu-align="right"
Expand All @@ -67,7 +67,7 @@
<NcActionText v-if="pendingEnforcedPassword" icon="icon-password">
{{ t('files_sharing', 'Password protection (enforced)') }}
</NcActionText>
<NcActionCheckbox v-else-if="config.enableLinkPasswordByDefault"
<NcActionCheckbox v-else-if="pendingPassword"
:checked.sync="isPasswordProtected"
:disabled="config.enforcePasswordForPublicLink || saving"
class="share-link-password-checkbox"
Expand Down Expand Up @@ -516,6 +516,9 @@ export default {
*
* @return {boolean}
*/
pendingPassword() {
return this.config.enableLinkPasswordByDefault && this.share && !this.share.id
},
pendingEnforcedPassword() {
return this.config.enforcePasswordForPublicLink && this.share && !this.share.id
},
Expand Down Expand Up @@ -613,12 +616,9 @@ export default {
// expiration is the share object key, not expireDate
shareDefaults.expiration = this.formatDateToString(this.config.defaultExpirationDate)
}
if (this.config.enableLinkPasswordByDefault) {
shareDefaults.password = await GeneratePassword()
}
// do not push yet if we need a password or an expiration date: show pending menu
if (this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced) {
if (this.config.enableLinkPasswordByDefault || this.config.enforcePasswordForPublicLink || this.config.isDefaultExpireDateEnforced) {
this.pending = true
// if a share already exists, pushing it
Expand All @@ -641,8 +641,8 @@ export default {
}
// ELSE, show the pending popovermenu
// if password enforced, pre-fill with random one
if (this.config.enforcePasswordForPublicLink) {
// if password default or enforced, pre-fill with random one
if (this.config.enableLinkPasswordByDefault || this.config.enforcePasswordForPublicLink) {
shareDefaults.password = await GeneratePassword()
}
Expand Down

0 comments on commit d463192

Please sign in to comment.