Add support to expire outgoing federated shares #37548

jvillafanez · 2020-06-17T16:03:26Z

Description

Add support to expire federated shares the same way it was added for user and group shares.
New settings to add a default date and enforce it as maximum also included (the same way as for user and group shares)

Related Issue

https://github.com/owncloud/enterprise/issues/3969

Motivation and Context

How Has This Been Tested?

Manually tested:

expiration date for federated shares is stored and retrieved
default expiration used when the share is created from the web UI
maximum expiration enforced in the web UI if the setting is active

Screenshots (if appropriate):

(orange bars are scrollbars, nothing to do with the page style)

We might need to review how we can deal with long sharee's names. Text is moved below, which looks bad compared with how shorter names are handled (local user shares)

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Database schema changes (next release will require increase of minor version instead of patch)
Breaking change (fix or feature that would cause existing functionality to change)
Technical debt
Tests only (no source changes)

Checklist:

codecov · 2020-06-19T13:43:21Z

Codecov Report

Merging #37548 into master will increase coverage by 0.00%.
The diff coverage is 69.35%.

@@            Coverage Diff            @@
##             master   #37548   +/-   ##
=========================================
  Coverage     64.66%   64.66%           
- Complexity    19343    19350    +7     
=========================================
  Files          1279     1279           
  Lines         75600    75654   +54     
  Branches       1333     1336    +3     
=========================================
+ Hits          48885    48924   +39     
- Misses        26323    26336   +13     
- Partials        392      394    +2

Flag	Coverage Δ	Complexity Δ
#javascript	`54.06% <78.94%> (+0.03%)`	`0.00 <0.00> (ø)`
#phpunit	`65.84% <65.11%> (+<0.01%)`	`19350.00 <5.00> (+7.00)`

Impacted Files	Coverage Δ	Complexity Δ
core/js/config.php	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
core/js/shareitemmodel.js	`80.10% <0.00%> (-0.42%)`	`0.00 <0.00> (ø)`
settings/templates/panels/admin/filesharing.php	`19.29% <20.00%> (+0.06%)`	`0.00 <0.00> (ø)`
...ederatedfilesharing/lib/FederatedShareProvider.php	`63.76% <72.72%> (+0.39%)`	`95.00 <1.00> (+1.00)`
core/js/shareconfigmodel.js	`83.05% <86.66%> (-0.63%)`	`0.00 <0.00> (ø)`
apps/files_sharing/lib/Capabilities.php	`98.71% <100.00%> (+5.56%)`	`13.00 <0.00> (+1.00)`
core/js/sharedialogshareelistview.js	`72.00% <100.00%> (+0.32%)`	`0.00 <0.00> (ø)`
lib/private/Share20/Manager.php	`95.97% <100.00%> (-0.22%)`	`278.00 <4.00> (+5.00)`	⬇️
settings/Panels/Admin/FileSharing.php	`98.71% <100.00%> (+0.05%)`	`7.00 <0.00> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2bc948d...157dd9f. Read the comment docs.

codecov · 2020-06-19T13:46:04Z

Codecov Report

Merging #37548 into master will increase coverage by 0.00%.
The diff coverage is 69.35%.

@@            Coverage Diff            @@
##             master   #37548   +/-   ##
=========================================
  Coverage     64.75%   64.75%           
- Complexity    19396    19403    +7     
=========================================
  Files          1285     1285           
  Lines         75762    75816   +54     
  Branches       1333     1336    +3     
=========================================
+ Hits          49057    49096   +39     
- Misses        26313    26326   +13     
- Partials        392      394    +2

Flag	Coverage Δ	Complexity Δ
#javascript	`54.06% <78.94%> (+0.03%)`	`0.00 <0.00> (ø)`
#phpunit	`65.93% <65.11%> (+<0.01%)`	`19403.00 <5.00> (+7.00)`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ	Complexity Δ
core/js/config.php	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
core/js/shareitemmodel.js	`80.10% <0.00%> (-0.42%)`	`0.00 <0.00> (ø)`
settings/templates/panels/admin/filesharing.php	`19.29% <20.00%> (+0.06%)`	`0.00 <0.00> (ø)`
...ederatedfilesharing/lib/FederatedShareProvider.php	`63.76% <72.72%> (+0.39%)`	`95.00 <1.00> (+1.00)`
core/js/shareconfigmodel.js	`83.05% <86.66%> (-0.63%)`	`0.00 <0.00> (ø)`
apps/files_sharing/lib/Capabilities.php	`98.71% <100.00%> (+5.56%)`	`13.00 <0.00> (+1.00)`
core/js/sharedialogshareelistview.js	`72.00% <100.00%> (+0.32%)`	`0.00 <0.00> (ø)`
lib/private/Share20/Manager.php	`95.97% <100.00%> (-0.22%)`	`278.00 <4.00> (+5.00)`	⬇️
settings/Panels/Admin/FileSharing.php	`98.71% <100.00%> (+0.05%)`	`7.00 <0.00> (ø)`

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a992db8...9a6dc50. Read the comment docs.

micbar

LGTM

micbar · 2020-06-22T07:31:23Z

@VicDeo can you do a code review?

phil-davis · 2020-06-22T11:03:47Z

We should make some acceptance tests like what is done for expiration dates on user, group and public link shares. Should those be added here? Or merge this and make a separate isssue for the tests?

micbar

Please include the acceptance tests here in that PR.

phil-davis · 2020-06-22T11:57:24Z

Assigned myself to sort out acceptance tests.

individual-it · 2020-06-24T03:49:52Z

assigned @swoichha for API tests and @haribhandari07 for UI tests

config/config.sample.php

haribhandari07 · 2020-06-25T08:55:37Z

@jvillafanez Here's an issue #37595 related to this PR

mmattel · 2020-06-25T11:45:51Z

Pls run: make test-php-style-fix to fix coding style error(s)

tests/acceptance/features/webUISharingExternal2/createFederationSharing.feature

jvillafanez · 2020-07-29T11:56:24Z

Anything left to do here? I see CI failing but I'm not sure if there is a problem with the tests or with the code...

phil-davis · 2020-08-21T08:49:34Z

I rebased just now. There were various conflicts and I think I sorted out the correct changes.

Now I will review what is here and get it going.

micbar · 2020-08-24T08:37:39Z

@phil-davis Thank you.

How can we move that forward?

phil-davis · 2020-08-24T08:40:27Z

I am working on it. But currently need to sort out #37838 also so that #37835 can be merged.

phil-davis · 2020-08-24T14:01:29Z

Squashed into just 2 commits and rebased. IMO there is just 1 test scenario to sort out...

…en made

tests are done

mmattel · 2020-08-25T16:26:01Z

@phil-davis @jvillafanez @micbar
This is doc relevant and I do not see an issue created in docs and linked to here!
Please file one else this gets forgotten!

jvillafanez · 2020-08-25T16:42:05Z

Doc ticket opened in owncloud/docs#2759

jvillafanez added the 2 - Developing label Jun 17, 2020

jvillafanez self-assigned this Jun 17, 2020

jvillafanez requested review from VicDeo and micbar June 18, 2020 11:12

jvillafanez added 3 - To Review and removed 2 - Developing labels Jun 18, 2020

jvillafanez marked this pull request as ready for review June 18, 2020 11:13

jvillafanez force-pushed the federated_expiration branch from e96f6f5 to 157dd9f Compare June 19, 2020 12:31

micbar reviewed Jun 22, 2020

View reviewed changes

VicDeo approved these changes Jun 22, 2020

View reviewed changes

micbar previously requested changes Jun 22, 2020

View reviewed changes

phil-davis added the QA:team label Jun 22, 2020

phil-davis self-assigned this Jun 22, 2020

individual-it assigned swoichha and haribhandari07 Jun 24, 2020

phil-davis removed their assignment Jun 24, 2020

haribhandari07 requested review from dpakach, phil-davis and swoichha June 24, 2020 10:55

haribhandari07 force-pushed the federated_expiration branch from 7bae6e5 to 0bc7980 Compare June 24, 2020 10:59

haribhandari07 reviewed Jun 24, 2020

View reviewed changes

config/config.sample.php Show resolved Hide resolved

haribhandari07 force-pushed the federated_expiration branch from 0bc7980 to 8d60174 Compare June 25, 2020 03:31

swoichha force-pushed the federated_expiration branch from 81c4f45 to 4bb8b4c Compare June 30, 2020 10:24

haribhandari07 reviewed Jun 30, 2020

View reviewed changes

tests/acceptance/features/webUISharingExternal2/createFederationSharing.feature Show resolved Hide resolved

phil-davis assigned phil-davis and unassigned swoichha and haribhandari07 Aug 21, 2020

phil-davis force-pushed the federated_expiration branch from 19294de to d670539 Compare August 21, 2020 08:48

phil-davis self-requested a review August 21, 2020 08:52

phil-davis force-pushed the federated_expiration branch from 60f9155 to 743cf33 Compare August 21, 2020 10:53

owncloud deleted a comment from update-docs bot Aug 21, 2020

phil-davis force-pushed the federated_expiration branch from d780480 to d594159 Compare August 24, 2020 14:00

jvillafanez and others added 2 commits August 25, 2020 16:36

Add support to expire outgoing federated shares

86e8456

[Tests-Only] acceptance tests for expiration of remote shares

8b5d8b5

phil-davis force-pushed the federated_expiration branch from d594159 to 8b5d8b5 Compare August 25, 2020 10:51

phil-davis added 2 commits August 25, 2020 18:40

Add missing defaultExpireDateRemoteEnabled setting

96c422f

Improve error messages in webUI tests openShareActionsIfNotOpen

c15648b

phil-davis approved these changes Aug 25, 2020

View reviewed changes

Make sure the user logs in after all expiration date settings have be…

d2a0d53

…en made

phil-davis force-pushed the federated_expiration branch from 9a6dc50 to d2a0d53 Compare August 25, 2020 14:15

phil-davis merged commit bf857ae into master Aug 25, 2020

phil-davis deleted the federated_expiration branch August 25, 2020 14:17

jvillafanez mentioned this pull request Aug 25, 2020

Document expiration of outgoing remote shares owncloud/docs#2759

Closed

12 tasks

michaelstingl mentioned this pull request Oct 12, 2020

[iOS][Sharing] Set expiration date for user-, group- & federated shares owncloud/product#269

Closed

Add support to expire outgoing federated shares #37548

Add support to expire outgoing federated shares #37548

Uh oh!

Conversation

jvillafanez commented Jun 17, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Types of changes

Checklist:

Uh oh!

codecov bot commented Jun 19, 2020

Codecov Report

Uh oh!

codecov bot commented Jun 19, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

micbar left a comment

Choose a reason for hiding this comment

Uh oh!

micbar commented Jun 22, 2020

Uh oh!

phil-davis commented Jun 22, 2020

Uh oh!

micbar left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

phil-davis commented Jun 22, 2020

Uh oh!

individual-it commented Jun 24, 2020

Uh oh!

Uh oh!

haribhandari07 commented Jun 25, 2020

Uh oh!

mmattel commented Jun 25, 2020

Uh oh!

Uh oh!

jvillafanez commented Jul 29, 2020

Uh oh!

phil-davis commented Aug 21, 2020

Uh oh!

micbar commented Aug 24, 2020

Uh oh!

phil-davis commented Aug 24, 2020

Uh oh!

phil-davis commented Aug 24, 2020

Uh oh!

mmattel commented Aug 25, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jvillafanez commented Aug 25, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

jvillafanez commented Jun 17, 2020 •

edited

Loading

codecov bot commented Jun 19, 2020 •

edited

Loading

micbar left a comment •

edited

Loading

mmattel commented Aug 25, 2020 •

edited

Loading