enabling "invite people" for password-protected folder/file (#9931)

* enabling invite people for password-protected folder/files * removed hasPassword from LinkShareRoles * added invite people for password-protected folder changelog
owncloud · Dec 13, 2023 · 61adcf6 · 61adcf6
1 parent 241e7dd
commit 61adcf6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/changelog/unreleased/bugfix-invite people-password-protected-folder b/changelog/unreleased/bugfix-invite people-password-protected-folder
@@ -0,0 +1,7 @@
+Bugfix: Enabling "invite people" for password-protected folder/file
+
+Enables selecting "invite people" for password-protected folder/file.
+Selecting this permission will drop password protection and expiration date.
+
+https://github.com/owncloud/web/pull/9931
+https://github.com/owncloud/web/issues/9922
diff --git a/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue b/packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue
@@ -444,7 +444,14 @@ export default defineComponent({
     },
 
     checkLinkToUpdate({ link }) {
-      const params = this.getParamsForLink(link)
+      let params = this.getParamsForLink(link)
+      if (link.permissions === 0) {
+        params = {
+          ...params,
+          password: '',
+          expireDate: ''
+        }
+      }
 
       if (!link.password && !this.canDeletePublicLinkPassword(link)) {
         showQuickLinkPasswordModal(
@@ -630,7 +637,6 @@ export default defineComponent({
           this.hasPublicLinkEditing,
           this.hasPublicLinkContribute,
           this.hasPublicLinkAliasSupport,
-          !!link.password,
           this.canCreatePublicLinks
         )
       }
@@ -640,7 +646,6 @@ export default defineComponent({
         this.hasPublicLinkEditing,
         this.hasPublicLinkContribute,
         this.hasPublicLinkAliasSupport,
-        !!link.password,
         this.canCreatePublicLinks
       )
     }

diff --git a/packages/web-client/src/helpers/share/role.ts b/packages/web-client/src/helpers/share/role.ts
@@ -377,11 +377,10 @@ export abstract class LinkShareRoles {
     canEditFile = false,
     canContribute = false,
     hasAliasLinks = false,
-    hasPassword = false,
     canCreatePublicLinks = true
   ): ShareRole[] {
     return [
-      ...(hasAliasLinks && !hasPassword ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
+      ...(hasAliasLinks ? [linkRoleInternalFile, linkRoleInternalFolder] : []),
       ...(canCreatePublicLinks ? [linkRoleViewerFile] : []),
       ...(canCreatePublicLinks ? [linkRoleViewerFolder] : []),
       ...(canCreatePublicLinks && canContribute ? [linkRoleContributorFolder] : []),
@@ -392,7 +391,7 @@ export abstract class LinkShareRoles {
   }
 
   static getByBitmask(bitmask: number, isFolder: boolean): ShareRole {
-    return this.list(isFolder, true, true, true, false).find((r) => r.bitmask(false) === bitmask)
+    return this.list(isFolder, true, true, true, true).find((r) => r.bitmask(false) === bitmask)
   }
 
   /**
@@ -402,7 +401,6 @@ export abstract class LinkShareRoles {
    * @param canEditFile
    * @param canContribute
    * @param hasAliasLinks
-   * @param hasPassword
    * @param canCreatePublicLinks
    */
   static filterByBitmask(
@@ -411,15 +409,13 @@ export abstract class LinkShareRoles {
     canEditFile = false,
     canContribute = false,
     hasAliasLinks = false,
-    hasPassword = false,
     canCreatePublicLinks = true
   ): ShareRole[] {
     return this.list(
       isFolder,
       canEditFile,
       canContribute,
       hasAliasLinks,
-      hasPassword,
       canCreatePublicLinks
     ).filter((r) => {
       return bitmask === (bitmask | r.bitmask(false))

diff --git a/packages/web-client/tests/unit/helpers/share/role.spec.ts b/packages/web-client/tests/unit/helpers/share/role.spec.ts
@@ -239,7 +239,7 @@ describe('roles', () => {
           }
         ]
       ])('%s', (name: string, { folder, result }) => {
-        expect(LinkShareRoles.list(folder, true, true, true, false)).toEqual(result)
+        expect(LinkShareRoles.list(folder, true, true, true, true)).toEqual(result)
       })
     })
     describe('getByBitmask', () => {