From 11903eb29af1753c756600cb6dd5d059f2ac4879 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Mon, 24 Feb 2020 17:52:15 +0100
Subject: [PATCH] Added expiration date to collaborators

Added acceptance tests
---
 .../components/Collaborators/Collaborator.vue |   8 +-
 .../CollaboratorsEditOptions.vue              | 179 ++++++++++++++++--
 .../Collaborators/EditCollaborator.vue        |  49 ++++-
 .../Collaborators/NewCollaborator.vue         |   6 +-
 apps/files/src/mixins/collaborators.js        |   3 +-
 apps/files/src/store/actions.js               |  13 +-
 changelog/unreleased/2543                     |   7 +
 package.json                                  |   6 +-
 .../shareWithUsers.feature                    |  12 ++
 .../FilesPageElement/sharingDialog.js         |  50 ++++-
 .../stepDefinitions/generalContext.js         |  10 +
 .../stepDefinitions/sharingContext.js         |  95 ++++++++++
 yarn.lock                                     |  12 +-
 13 files changed, 410 insertions(+), 40 deletions(-)
 create mode 100644 changelog/unreleased/2543

diff --git a/apps/files/src/components/Collaborators/Collaborator.vue b/apps/files/src/components/Collaborators/Collaborator.vue
index 8f7e6f14604..ae9d87f9c8d 100644
--- a/apps/files/src/components/Collaborators/Collaborator.vue
+++ b/apps/files/src/components/Collaborators/Collaborator.vue
@@ -65,8 +65,8 @@
               (me)
             </translate>
           </div>
-          <span class="oc-text"><span class="files-collaborators-collaborator-role">{{ originalRole.label }}</span><template v-if="collaborator.expires"> | <translate :translate-params="{expires: formDateFromNow(collaborator.expires)}">Expires: %{expires}</translate></template></span>
           <span class="uk-text-meta files-collaborators-collaborator-share-type" v-text="$_ocCollaborators_collaboratorType(collaborator.shareType)" />
+          <span class="oc-text"><span class="files-collaborators-collaborator-role">{{ originalRole.label }}</span><template v-if="collaborator.expires"> | <translate class="files-collaborators-collaborator-expires" :translate-params="{expires: formDateFromNow(collaborator.expires)}">Expires %{expires}</translate></template></span>
         </div>
       </oc-table-cell>
       <oc-table-cell shrink>
@@ -94,12 +94,14 @@
 import { mapGetters } from 'vuex'
 import { shareTypes } from '../../helpers/shareTypes'
 import { basename, dirname } from 'path'
-import Mixins from '../../mixins/collaborators'
+import CollaboratorsMixins from '../../mixins/collaborators'
+import Mixins from '../../mixins'
 
 export default {
   name: 'Collaborator',
   mixins: [
-    Mixins
+    Mixins,
+    CollaboratorsMixins
   ],
   props: {
     collaborator: {
diff --git a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
index 91738d1655e..0ad78d35857 100644
--- a/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
+++ b/apps/files/src/components/Collaborators/CollaboratorsEditOptions.vue
@@ -14,19 +14,37 @@
       :collaboratorsPermissions="collaboratorsPermissions"
       @permissionChecked="checkAdditionalPermissions"
     />
-    <oc-grid v-if="$_ocCollaborators_expirationSupported" gutter="small">
-      <div class="uk-width-1-1">
-          <label class="oc-label" for="files-collaborators-new-collaborator-expiration">
-            <translate>Expiration date</translate>
-            <translate class="uk-text-meta uk-remove-margin">(optional)</translate>
-          </label>
-          <oc-text-input type="date" class="uk-width-1-1 oc-button-role" id="files-collaborators-new-collaborator-expiration" :value="expirationDate">04 - 07 - 2019</oc-text-input>
+    <div v-if="expirationSupported">
+      <label for="files-collaborators-collaborator-expiration-input">
+        <translate>Expiration date:</translate>
+        <translate v-if="expirationDateEnforced" tag="em">(required)</translate>
+      </label>
+      <div class="uk-position-relative">
+        <oc-datepicker
+          id="files-collaborators-collaborator-expiration-input"
+          :key="`collaborator-datepicker-${enteredExpirationDate}`"
+          :date="enteredExpirationDate"
+          :maxDatetime="maxExpirationDate"
+          :minDatetime="minExpirationDate"
+          :placeholder="expirationDatePlaceholder"
+          @input="setExpirationDate"
+        />
+        <div
+          v-if="canResetExpirationDate"
+          id="files-collaborators-collaborator-expiration-delete"
+          class="uk-position-small uk-position-center-right oc-cursor-pointer"
+          :uk-tooltip="expirationDateRemoveTooltip"
+          @click="resetExpirationDate"
+          uk-close
+        />
       </div>
-    </oc-grid>
+    </div>
   </oc-grid>
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+import moment from 'moment'
 import collaboratorsMixins from '../../mixins/collaborators'
 
 const RolesSelect = () => import('../Roles/RolesSelect.vue')
@@ -34,13 +52,16 @@ const AdditionalPermissions = () => import('./AdditionalPermissions.vue')
 
 export default {
   name: 'CollaboratorsEditOptions',
+
   components: {
     RolesSelect,
     AdditionalPermissions
   },
+
   mixins: [
     collaboratorsMixins
   ],
+
   props: {
     existingRole: {
       type: Object,
@@ -51,19 +72,35 @@ export default {
       required: false
     },
     expirationDate: {
-      type: String,
+      type: Date,
       required: false
+    },
+    existingCollaboratorType: {
+      type: [Object, String],
+      required: false,
+      validator: function (value) {
+        return ['user', 'group'].indexOf(value) > -1 || value === null
+      }
     }
   },
+
   data () {
     return {
       selectedRole: null,
-      additionalPermissions: null
+      additionalPermissions: null,
+      enteredExpirationDate: null
     }
   },
+
   computed: {
-    $_ocCollaborators_expirationSupported () {
-      return false
+    ...mapGetters(['capabilities']),
+
+    editingUser () {
+      return this.existingCollaboratorType === 'user'
+    },
+
+    editingGroup () {
+      return this.existingCollaboratorType === 'group'
     },
 
     $_ocCollaborators_hasAdditionalPermissions () {
@@ -98,8 +135,108 @@ export default {
       }
 
       return this.selectedRole
+    },
+
+    expirationSupported () {
+      return this.userExpirationDate && this.groupExpirationDate
+    },
+
+    defaultExpirationDateSet () {
+      if (this.editingUser) {
+        return this.userExpirationDate.enabled
+      }
+
+      if (this.editingGroup) {
+        return this.groupExpirationDate.enabled
+      }
+
+      return this.userExpirationDate.enabled || this.groupExpirationDate.enabled
+    },
+
+    userExpirationDate () {
+      return this.capabilities.files_sharing.user.expire_date
+    },
+
+    groupExpirationDate () {
+      return this.capabilities.files_sharing.group.expire_date
+    },
+
+    defaultExpirationDate () {
+      if (!this.defaultExpirationDateSet) {
+        return null
+      }
+
+      const userMaxExpirationDays = parseInt(this.userExpirationDate.days, 10)
+      const groupMaxExpirationDays = parseInt(this.groupExpirationDate.days, 10)
+
+      if (this.editingUser) {
+        return moment().add(userMaxExpirationDays, 'days').endOf('day').toISOString()
+      }
+
+      if (this.editingGroup) {
+        return moment().add(groupMaxExpirationDays, 'days').endOf('day').toISOString()
+      }
+
+      // Since we are not separating process for adding users and groups as collaborators
+      // we are using the one which is smaller as enforced date
+      let days = 0
+
+      if (userMaxExpirationDays && groupMaxExpirationDays) {
+        days = Math.min(userMaxExpirationDays, groupMaxExpirationDays)
+      } else {
+        days = userMaxExpirationDays || groupMaxExpirationDays
+      }
+
+      return moment().add(days, 'days').endOf('day').toISOString()
+    },
+
+    expirationDateEnforced () {
+      if (this.editingUser) {
+        return this.userExpirationDate.enforced
+      }
+
+      if (this.editingGroup) {
+        return this.groupExpirationDate.enforced
+      }
+
+      return this.userExpirationDate.enforced || this.groupExpirationDate.enforced
+    },
+
+    maxExpirationDate () {
+      if (!this.expirationDateEnforced) {
+        return null
+      }
+
+      return this.defaultExpirationDate
+    },
+
+    minExpirationDate () {
+      return moment().add(1, 'days').endOf('day').toISOString()
+    },
+
+    expirationDatePlaceholder () {
+      return this.$gettext('Expiration date')
+    },
+
+    expirationDateRemoveTooltip () {
+      return this.$gettext('Remove expiration date')
+    },
+
+    canResetExpirationDate () {
+      return !this.expirationDateEnforced && this.enteredExpirationDate
+    }
+  },
+
+  mounted () {
+    if (this.editingUser || this.editingGroup) {
+      // FIXME: Datepicker is not displaying correct timezone so for now we add it manually
+      // this.enteredExpirationDate = this.expirationDate ? moment(this.expirationDate).toISOString(true) : null
+      this.enteredExpirationDate = this.expirationDate ? moment(this.expirationDate).add(moment().utcOffset(), 'm').toISOString() : null
+    } else {
+      this.enteredExpirationDate = this.defaultExpirationDate
     }
   },
+
   methods: {
     selectRole (role) {
       this.selectedRole = role
@@ -111,8 +248,24 @@ export default {
       this.publishChange()
     },
 
+    setExpirationDate (date) {
+      // Expiration date picker is emitting empty string when the component is initialised
+      // This ensures it will be null as we treat it everywhere in that way
+      this.enteredExpirationDate = date === '' ? null : date
+      this.publishChange()
+    },
+
+    resetExpirationDate () {
+      this.enteredExpirationDate = null
+      this.publishChange()
+    },
+
     publishChange () {
-      this.$emit('optionChange', { role: this.selectedRole, permissions: this.additionalPermissions, expirationDate: this.expirationDate })
+      this.$emit('optionChange', {
+        role: this.selectedRole,
+        permissions: this.additionalPermissions,
+        expirationDate: this.enteredExpirationDate
+      })
     }
   }
 }
diff --git a/apps/files/src/components/Collaborators/EditCollaborator.vue b/apps/files/src/components/Collaborators/EditCollaborator.vue
index 06bc30973dd..b66725baa00 100644
--- a/apps/files/src/components/Collaborators/EditCollaborator.vue
+++ b/apps/files/src/components/Collaborators/EditCollaborator.vue
@@ -5,6 +5,8 @@
     <collaborators-edit-options
       :existingRole="$_originalRole"
       :collaboratorsPermissions="$_originalPermissions"
+      :expirationDate="originalExpirationDate"
+      :existingCollaboratorType="collaboratorType"
       @optionChange="collaboratorOptionChanged"
       class="uk-margin-bottom"
     />
@@ -31,7 +33,9 @@
 <script>
 import filterObject from 'filter-obj'
 import { mapGetters, mapActions } from 'vuex'
+import moment from 'moment'
 import { roleToBitmask, bitmaskToRole } from '../../helpers/collaborators'
+import { shareTypes } from '../../helpers/shareTypes'
 import Collaborator from './Collaborator.vue'
 import CollaboratorsEditOptions from './CollaboratorsEditOptions.vue'
 import Mixins from '../../mixins/collaborators'
@@ -55,13 +59,32 @@ export default {
     return {
       selectedRole: null,
       additionalPermissions: null,
-      saving: false
+      saving: false,
+      expirationDate: null
     }
   },
   computed: {
     ...mapGetters('Files', ['highlightedFile']),
     ...mapGetters(['user']),
 
+    collaboratorType () {
+      const collaboratorShareType = this.collaborator.shareType
+
+      if (
+        collaboratorShareType === shareTypes.user ||
+        collaboratorShareType === shareTypes.guest ||
+        collaboratorShareType === shareTypes.remote
+      ) {
+        return 'user'
+      }
+
+      if (collaboratorShareType === shareTypes.group) {
+        return 'group'
+      }
+
+      return null
+    },
+
     $_originalPermissions () {
       const permissions = this.collaborator.customPermissions
       return filterObject(permissions, (key, value) => value)
@@ -82,8 +105,28 @@ export default {
         // if the role has changed, always return true. The user doesn't need to understand if two bitmasks of different roles are the same!
         return true
       }
+
+      // FIXME: Datepicker is not displaying correct timezone so for now we add it manually
+      const originalExpirationDate = this.originalExpirationDate
+        ? moment(this.originalExpirationDate).add(moment().utcOffset(), 'm').toISOString()
+        : null
+
+      if (this.expirationDate !== originalExpirationDate) {
+        return true
+      }
+
       const originalBitmask = roleToBitmask(this.$_originalRole, Object.keys(this.$_originalPermissions))
       return originalBitmask !== this.$_permissionsBitmask
+    },
+
+    originalExpirationDate () {
+      const expirationDate = this.collaborator.expires
+
+      if (expirationDate) {
+        return expirationDate
+      }
+
+      return null
     }
   },
   methods: {
@@ -100,7 +143,8 @@ export default {
         share: this.collaborator,
         // Map bitmask to role to get the correct role in case the advanced role was mapped to existing role
         role: bitmaskToRole(bitmask, this.highlightedFile.type === 'folder'),
-        permissions: bitmask
+        permissions: bitmask,
+        expirationDate: this.expirationDate
       })
         .then(() => this.$_ocCollaborators_cancelChanges())
         .catch(() => {
@@ -111,6 +155,7 @@ export default {
     $_ocCollaborators_cancelChanges () {
       this.selectedRole = null
       this.additionalPermissions = null
+      this.expirationDate = this.originalExpirationDate
       this.saving = false
       this.close()
     },
diff --git a/apps/files/src/components/Collaborators/NewCollaborator.vue b/apps/files/src/components/Collaborators/NewCollaborator.vue
index 9a7e7692361..207d8dccef4 100644
--- a/apps/files/src/components/Collaborators/NewCollaborator.vue
+++ b/apps/files/src/components/Collaborators/NewCollaborator.vue
@@ -95,7 +95,8 @@ export default {
       selectedCollaborators: [],
       selectedRole: null,
       additionalPermissions: null,
-      saving: false
+      saving: false,
+      expirationDate: null
     }
   },
   computed: {
@@ -209,7 +210,8 @@ export default {
           $gettext: this.$gettext,
           shareWith: collaborator.value.shareWith,
           shareType: collaborator.value.shareType,
-          permissions: roleToBitmask(this.selectedRole, this.additionalPermissions)
+          permissions: roleToBitmask(this.selectedRole, this.additionalPermissions),
+          expirationDate: this.expirationDate
         })))
       })
 
diff --git a/apps/files/src/mixins/collaborators.js b/apps/files/src/mixins/collaborators.js
index 6dd9e07fb65..d61f6a5f3ea 100644
--- a/apps/files/src/mixins/collaborators.js
+++ b/apps/files/src/mixins/collaborators.js
@@ -76,9 +76,10 @@ export default {
 
       return this.$gettext('Group')
     },
-    collaboratorOptionChanged ({ role, permissions }) {
+    collaboratorOptionChanged ({ role, permissions, expirationDate }) {
       this.selectedRole = role
       this.additionalPermissions = permissions
+      this.expirationDate = expirationDate
     }
   }
 }
diff --git a/apps/files/src/store/actions.js b/apps/files/src/store/actions.js
index f31d2cec561..f21bed4dd65 100644
--- a/apps/files/src/store/actions.js
+++ b/apps/files/src/store/actions.js
@@ -310,7 +310,7 @@ function _buildCollaboratorShare (s, file) {
 
   // expiration:Object if unset, or string "2019-04-24 00:00:00"
   if (typeof s.expiration === 'string' || s.expiration instanceof String) {
-    share.expires = Date.parse(s.expiration)
+    share.expires = new Date(s.expiration)
   }
   share.path = s.path
   share.stime = s.stime
@@ -656,9 +656,10 @@ export default {
     context.commit('INCOMING_SHARES_LOAD', [])
     context.commit('INCOMING_SHARES_ERROR', null)
   },
-  changeShare ({ commit, getters }, { client, share, role, permissions }) {
+  changeShare ({ commit, getters }, { client, share, role, permissions, expirationDate }) {
     const params = {
-      permissions: permissions
+      permissions: permissions,
+      expireDate: expirationDate
     }
 
     if (!params.permissions) {
@@ -675,9 +676,9 @@ export default {
         console.log(e)
       })
   },
-  addShare (context, { client, path, $gettext, shareWith, shareType, permissions }) {
+  addShare (context, { client, path, $gettext, shareWith, shareType, permissions, expirationDate }) {
     if (shareType === shareTypes.group) {
-      client.shares.shareFileWithGroup(path, shareWith, { permissions: permissions })
+      client.shares.shareFileWithGroup(path, shareWith, { permissions: permissions, expirationDate: expirationDate })
         .then(share => {
           context.commit('CURRENT_FILE_OUTGOING_SHARES_ADD', _buildCollaboratorShare(share.shareInfo, context.getters.highlightedFile))
           context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
@@ -693,7 +694,7 @@ export default {
     }
 
     const remoteShare = shareType === shareTypes.remote
-    client.shares.shareFileWithUser(path, shareWith, { permissions: permissions, remoteUser: remoteShare })
+    client.shares.shareFileWithUser(path, shareWith, { permissions: permissions, remoteUser: remoteShare, expirationDate: expirationDate })
       .then(share => {
         context.commit('CURRENT_FILE_OUTGOING_SHARES_ADD', _buildCollaboratorShare(share.shareInfo, context.getters.highlightedFile))
         context.commit('UPDATE_CURRENT_FILE_SHARE_TYPES')
diff --git a/changelog/unreleased/2543 b/changelog/unreleased/2543
new file mode 100644
index 00000000000..7b6fb8714fd
--- /dev/null
+++ b/changelog/unreleased/2543
@@ -0,0 +1,7 @@
+Enhancement: Expiration date for collaborators
+
+We've added an expiration date for collaborators. Users can choose an expiration date for users and groups.
+After the date is reached the collaborator is automatically removed. Admins can set default expiration date or enforce it.
+
+https://github.com/owncloud/phoenix/issues/2543
+https://github.com/owncloud/phoenix/pull/3086
diff --git a/package.json b/package.json
index 07ee61fa5a9..3f5bc53c94d 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
     "html-webpack-plugin": "^3.2.0",
     "husky": ">=3.0.5",
     "inert-polyfill": "^0.2.5",
-    "path": "^0.12.7",
     "join-path": "^1.1.1",
     "lint-staged": ">=9",
     "lodash": "^4.17.15",
@@ -78,9 +77,10 @@
     "npm-run-all": "^4.1.5",
     "oidc-client": "^1.9.1",
     "owncloud-design-system": "^1.0.4",
-    "owncloud-sdk": "^1.0.0-490",
+    "owncloud-sdk": "^1.0.0-523",
     "p-limit": "^2.2.1",
     "parse-json": "^5.0.0",
+    "path": "^0.12.7",
     "requirejs": "^2.3.6",
     "rimraf": "^3.0.0",
     "start-server-and-test": "^1.9.1",
@@ -93,8 +93,8 @@
     "vue-gettext": "^2.1.5",
     "vue-loader": "^15.7.1",
     "vue-meta": "^2.2.2",
-    "vue-router": "^3.1.3",
     "vue-resize": "^0.4.5",
+    "vue-router": "^3.1.3",
     "vue-scrollto": "^2.15.0",
     "vue-template-compiler": "^2.6.10",
     "vuex": "^3.1.1",
diff --git a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
index 48629660060..8e094bf033a 100644
--- a/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
+++ b/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature
@@ -575,3 +575,15 @@ Feature: Sharing files and folders with internal users
     And user "user1" has shared folder "simple-folder" with group "grp1" with "read,update,create,delete" permissions
     When user "user2" has logged in using the webUI
     Then user "User Two" should be listed as "Editor" in the collaborators list for folder "simple-folder (2)" on the webUI
+
+  Scenario: share a file with another internal user which should expire after 2 days
+    Given user "user1" has logged in using the webUI
+    When the user shares file "testimage.jpg" with user "User Two" which expires after 2 days using the webUI
+    Then user "user2" should have received a share with target "testimage (2).jpg" and expiration date in 2 days
+
+  Scenario: share a file with another internal user with default expiration date
+    Given the setting "shareapi_default_expire_date_user_share" of app "core" has been set to "yes"
+    And default expiration date for users is set to 3 days
+    And user "user1" has logged in using the webUI
+    When the user shares file "testimage.jpg" with user "User Two" using the webUI
+    Then user "user2" should have received a share with target "testimage (2).jpg" and expiration date in 3 days
\ No newline at end of file
diff --git a/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js b/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
index 53be7534402..efc503cbd04 100644
--- a/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
+++ b/tests/acceptance/pageObjects/FilesPageElement/sharingDialog.js
@@ -140,6 +140,27 @@ module.exports = {
       return this
     },
 
+    /**
+     * @param {int} days
+     */
+    selectExpirationDaysOnPendingShare: async function (days) {
+      const currentDate = new Date()
+      const currentDay = currentDate.getDate()
+      const currentMonth = currentDate.getMonth()
+      const expirationDate = new Date(currentDate.setDate(currentDay + days))
+      const dateSelector = util.format(this.elements.collaboratorExpirationDateModalDay.selector, expirationDate.getDate())
+
+      if (expirationDate.getMonth() !== currentMonth) {
+        await this.click('@collaboratorExpirationDateModalNextMonthButton')
+      }
+
+      await this.click('@collaboratorExpirationDateInput')
+      await this.useXpath().click(dateSelector)
+      await this.click('@collaboratorExpirationDateModalConfirmButton')
+
+      return this
+    },
+
     /**
      *
      * @param {string} sharee
@@ -147,14 +168,18 @@ module.exports = {
      * @param {string} role
      * @param {string} permissions
      */
-    shareWithUserOrGroup: async function (sharee, shareWithGroup = false, role, permissions, remote = false) {
+    shareWithUserOrGroup: async function (sharee, shareWithGroup = false, role, permissions, remote = false, days) {
       await collaboratorDialog.clickCreateShare()
       await this.selectCollaboratorForShare(sharee, shareWithGroup, remote)
       await this.selectRoleForNewCollaborator(role)
-      if (permissions === undefined) {
-        return this.confirmShare()
+
+      if (permissions) {
+        await this.selectPermissionsOnPendingShare(permissions)
+      }
+
+      if (days) {
+        await this.selectExpirationDaysOnPendingShare(days)
       }
-      await this.selectPermissionsOnPendingShare(permissions)
 
       return this.confirmShare()
     },
@@ -484,6 +509,23 @@ module.exports = {
     permissionCheckbox: {
       selector: '//label[@id="files-collaborators-permission-%s"]/input',
       locateStrategy: 'xpath'
+    },
+    collaboratorExpirationDateInput: {
+      selector: '#files-collaborators-collaborator-expiration-input'
+    },
+    collaboratorExpirationDateModalNextMonthButton: {
+      selector: '.vdatetime-calendar__navigation--next'
+    },
+    collaboratorExpirationDateModalDay: {
+      selector: '//div[contains(@class, "vdatetime-calendar__month__day")]/span/span[text()="%s"]',
+      locateStrategy: 'xpath'
+    },
+    collaboratorExpirationDateModalConfirmButton: {
+      selector: '.vdatetime-popup__actions__button--confirm'
+    },
+    collaboratorExpirationDate: {
+      selector: '//span[contains(@class, "files-collaborators-collaborator-name") and text()="%s"]/../../span/span[contains(@class, "files-collaborators-collaborator-expires")]',
+      locateStrategy: 'xpath'
     }
   }
 }
diff --git a/tests/acceptance/stepDefinitions/generalContext.js b/tests/acceptance/stepDefinitions/generalContext.js
index bf609a75a95..c1a78886ff2 100644
--- a/tests/acceptance/stepDefinitions/generalContext.js
+++ b/tests/acceptance/stepDefinitions/generalContext.js
@@ -206,3 +206,13 @@ Given('the app {string} has been disabled', function (app) {
       'app:disable', app
     ])
 })
+
+Given('default expiration date for users is set to {int} day/days', function (days) {
+  occHelper.runOcc(
+    [
+      `config:app:set --value ${days} core shareapi_expire_after_n_days_user_share`
+    ]
+  )
+
+  return this
+})
diff --git a/tests/acceptance/stepDefinitions/sharingContext.js b/tests/acceptance/stepDefinitions/sharingContext.js
index abe8dd52a94..7a40fbe74ba 100644
--- a/tests/acceptance/stepDefinitions/sharingContext.js
+++ b/tests/acceptance/stepDefinitions/sharingContext.js
@@ -14,6 +14,7 @@ const _ = require('lodash')
 const path = require('../helpers/path')
 const util = require('util')
 const { COLLABORATOR_PERMISSION_ARRAY } = require('../helpers/sharingHelper')
+const { join } = require('../helpers/path')
 
 /**
  *
@@ -347,6 +348,84 @@ const assertUsersGroupsWithPatternInAutocompleteListExcluding = async function (
   return assertGroupsInAutocompleteList(groupMatchingPattern)
 }
 
+/**
+ *
+ * @param {string} resource
+ * @param {string} sharee
+ * @param {int} days
+ * @param {boolean} shareWithGroup
+ * @param {boolean} remote
+ */
+const userSharesFileOrFolderWithUserOrGroupWithExpirationDate = async function ({
+  resource, sharee, days, shareWithGroup = false, remote = false
+}) {
+  const api = client.page
+    .FilesPageElement
+
+  await api
+    .appSideBar()
+    .closeSidebar(100)
+    .openSharingDialog(resource)
+
+  return api.sharingDialog().shareWithUserOrGroup(sharee, shareWithGroup, 'Viewer', undefined, remote, days)
+}
+
+/**
+ * @param {string} collaborator
+ * @param {string} resource
+ * @param {string} value
+ */
+const checkCollaboratorsExpirationDate = async function (collaborator, resource, value) {
+  const api = client.page
+    .FilesPageElement
+
+  await api
+    .appSideBar()
+    .closeSidebar(100)
+    .openSharingDialog(resource)
+
+  return api.sharingDialog().checkExpirationDate(collaborator, value)
+}
+
+const checkReceivedSharesExpirationDate = function (user, target, days) {
+  const headers = httpHelper.createOCSRequestHeaders(user)
+
+  const apiURL = new URL(join(client.globals.backend_url, '/ocs/v2.php/apps/files_sharing/api/v1/shares'))
+  apiURL.search = new URLSearchParams({ format: 'json', shared_with_me: true }).toString()
+
+  return fetch(apiURL, { method: 'GET', headers: headers })
+    .then(res => res.json())
+    .then(function (result) {
+      httpHelper.checkOCSStatus(result, 'Could not get shares. Message: ' + result.ocs.meta.message)
+      const shares = result.ocs.data
+      const currentDate = new Date()
+      let expectedExpirationDate = new Date(currentDate.setDate(currentDate.getDate() + days))
+      // Set time to midnight
+      expectedExpirationDate = new Date(expectedExpirationDate.setHours(0, 0, 0, 0))
+      let found = false
+      const foundDates = []
+
+      for (const share of shares) {
+        if (share.file_target === `/${target}` && expectedExpirationDate.getTime() === new Date(share.expiration).getTime()) {
+          found = true
+          break
+        }
+
+        if (share.expiration) {
+          foundDates.push(`${share.file_target.substr(1)}: ${new Date(share.expiration)}`)
+        }
+      }
+
+      foundDates.join(', ')
+
+      const message = found
+        ? 'Expiration date was found'
+        : `Expected ${target}: ${expectedExpirationDate}. Found ${foundDates || 'none'}`
+
+      return client.assert.ok(found, message)
+    })
+}
+
 Given('user {string} has shared file/folder {string} with user {string}', function (sharer, elementToShare, receiver) {
   return shareFileFolder(elementToShare, sharer, receiver)
 })
@@ -927,3 +1006,19 @@ Then('the following resources should have the following collaborators', async fu
     )
   }
 })
+
+When('the user shares file/folder/resource {string} with user {string} which expires after {int} day/days using the webUI', function (resource, sharee, days) {
+  return userSharesFileOrFolderWithUserOrGroupWithExpirationDate({ resource, sharee, days })
+})
+
+When('the user shares file/folder/resource {string} with user {string} using the webUI', function (resource, user) {
+  return userSharesFileOrFolderWithUser(resource, user, 'Viewer')
+})
+
+Then('the fields of the {string} collaborator for file/folder/resource {string} should contain expiration date with value {string} on the webUI', function (collaborator, resource, value) {
+  return checkCollaboratorsExpirationDate(collaborator, resource, value)
+})
+
+Then('user {string} should have received a share with target {string} and expiration date in {int} day/days', function (user, target, days) {
+  return checkReceivedSharesExpirationDate(user, target, days)
+})
diff --git a/yarn.lock b/yarn.lock
index c986cb323d2..f1de482278b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2792,9 +2792,9 @@ date-fns@^1.27.2:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-"davclient.js@https://github.com/owncloud/davclient.js.git":
+"davclient.js@git+https://github.com/owncloud/davclient.js.git":
   version "0.2.1"
-  resolved "https://github.com/owncloud/davclient.js.git#1ab200d099a3c2cd2ef919c3a56353ce26865994"
+  resolved "git+https://github.com/owncloud/davclient.js.git#1ab200d099a3c2cd2ef919c3a56353ce26865994"
 
 de-indent@^1.0.2:
   version "1.0.2"
@@ -6550,10 +6550,10 @@ owncloud-design-system@^1.0.4:
     vuex "^3.1.1"
     webfontloader "^1.6.28"
 
-owncloud-sdk@^1.0.0-490:
-  version "1.0.0-490"
-  resolved "https://registry.yarnpkg.com/owncloud-sdk/-/owncloud-sdk-1.0.0-490.tgz#f49285548405dd56c95b909da781e9de824f8a22"
-  integrity sha512-yqG2pyJUGgFBe/3PvjwRxfoJX+0LuN3yqja4ftMGKy00Fyq4VaYH8WxYwXj1ztNRprMM6VA4e7I9GGPleDiBVw==
+owncloud-sdk@^1.0.0-523:
+  version "1.0.0-523"
+  resolved "https://registry.yarnpkg.com/owncloud-sdk/-/owncloud-sdk-1.0.0-523.tgz#bca4fb9b37c650af3e78e989dbadb88c4c05dfbe"
+  integrity sha512-uxb77BG34qmfWuGn+Dltl7q5OqtcfbbJaAymvRI1LLWrsZ7VAFRDvwkM9rwqHj6zvZs0LqPCrb1Lob0dxZew0g==
   dependencies:
     browser-request "^0.3.3"
     davclient.js "https://github.com/owncloud/davclient.js.git"