fix: expiration dates defined in capabilities

packages/web-app-files/src/components/SideBar/Shares/FileLinks.vue

@@ -107,7 +107,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, inject, ref } from 'vue'
-import { DateTime } from 'luxon'
+import { DateTime, Duration } from 'luxon'
 import { mapGetters, mapActions, mapState, mapMutations } from 'vuex'
 import {
   useStore,
@@ -190,29 +190,28 @@ export default defineComponent({
       const expireDate = this.capabilities.files_sharing.public.expire_date
 
       let defaultExpireDate = null
-      let maxExpireDateFromCaps = null
+      let maxExpireDate = null
 
-      if (expireDate.days) {
-        const days = parseInt(expireDate.days)
+      if (expireDate.default_rw_folders) {
+        const expireDateDefault = Duration.fromObject(expireDate.default_rw_folders).toObject()
         defaultExpireDate = DateTime.now()
           .setLocale(getLocaleFromLanguage(this.$language.current))
-          .plus({ days })
+          .plus(expireDateDefault)
           .toJSDate()
       }
 
-      if (expireDate.enforced) {
-        const days = parseInt(expireDate.max)
-        maxExpireDateFromCaps = DateTime.now()
+      if (expireDate.max_rw_folders) {
+        const expireDateMax = Duration.fromObject(expireDate.max_rw_folders).toObject()
+        maxExpireDate = DateTime.now()
           .setLocale(getLocaleFromLanguage(this.$language.current))
-          .plus({ days })
+          .plus(expireDateMax)
           .toJSDate()
       }
 
       return {
-        enforced: expireDate.enforced,
         default: defaultExpireDate,
         min: DateTime.now().setLocale(getLocaleFromLanguage(this.$language.current)).toJSDate(),
-        max: maxExpireDateFromCaps
+        max: maxExpireDate
       }
     },
 
@@ -377,7 +376,6 @@ export default defineComponent({
         link: {
           name: this.$gettext('Link'),
           permissions: 1,
-          expiration: this.expirationDate.default,
           password: false
         }
       })
@@ -408,17 +406,21 @@ export default defineComponent({
     },
 
     getExpireDate(currentDate) {
+      const expireDate = this.capabilities.files_sharing.public.expire_date
+
       if (!currentDate) {
+        const expireDateDefault = Duration.fromObject(expireDate.default_rw_folders).toObject()
         return DateTime.now()
           .setLocale(getLocaleFromLanguage(this.$language.current))
-          .plus({ days: 30 })
+          .plus(expireDateDefault)
           .endOf('day')
           .toFormat("yyyy-MM-dd'T'HH:mm:ssZZZ")
       }
 
+      const expireDateMax = Duration.fromObject(expireDate.max_rw_folders).toObject()
       const maxDate = DateTime.now()
         .setLocale(getLocaleFromLanguage(this.$language.current))
-        .plus({ years: 3 })
+        .plus(expireDateMax)
         .endOf('day')
         .toFormat("yyyy-MM-dd'T'HH:mm:ssZZZ")
 

packages/web-app-files/src/components/SideBar/Shares/Links/CreateQuickLink.vue

@@ -50,7 +50,6 @@ export default defineComponent({
         link: {
           name: this.$gettext('Quicklink'),
           permissions: 1,
-          expiration: this.expirationDate.enforced ? this.expirationDate.default : null,
           quicklink: true,
           password: false
         }

packages/web-app-files/src/components/SideBar/Shares/Links/DetailsAndEdit.vue

@@ -139,14 +139,17 @@
                 class="link-expiry-picker"
                 :min-date="expirationDate.min"
                 :max-date="
-                  link.file.type === 'folder' && link.description.toLowerCase() === 'editor'
-                    ? new Date(Date.now()).setFullYear(new Date(Date.now()).getFullYear() + 3)
-                    : expirationDate.max
+                  link.file.type === 'folder' &&
+                  link.description.toLowerCase() === 'editor' &&
+                  expirationDate.max
+                    ? expirationDate.max
+                    : null
                 "
                 :locale="$language.current"
                 :is-required="
-                  expirationDate.enforce ||
-                  (link.description.toLowerCase() === 'editor' && link.file.type === 'folder')
+                  link.file.type === 'folder' &&
+                  link.description.toLowerCase() === 'editor' &&
+                  expirationDate.max
                 "
               >
                 <template #default="{ togglePopover }">
@@ -224,7 +227,7 @@ export default defineComponent({
     },
     expirationDate: {
       type: Object,
-      default: () => ({}),
+      default: () => {},
       required: true
     },
     isFolderShare: {
@@ -294,8 +297,11 @@ export default defineComponent({
           showDatepicker: true
         })
         if (
-          !this.expirationDate.enforced &&
-          !(this.link.file.type === 'folder' && this.link.description.toLowerCase() === 'editor')
+          !(
+            this.link.file.type === 'folder' &&
+            this.link.description.toLowerCase() === 'editor' &&
+            this.expirationDate.max
+          )
         ) {
           result.push({
             id: 'remove-expiration',

packages/web-client/src/ocs/capabilities.ts

@@ -68,6 +68,8 @@ export interface Capabilities {
         enabled: boolean
         expire_date: {
           enabled: boolean
+          default_rw_folders: object
+          max_rw_folders: object
         }
         multiple: boolean
         password: {