Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable10] OCM Convert providerId/remoteId into string #35122

Merged
merged 2 commits into from
Apr 29, 2019

Conversation

VicDeo
Copy link
Member

@VicDeo VicDeo commented Apr 29, 2019

Backport of #35002 and #35100

Description

providerId that we are storing in remoteId field should be a string according to the spec:

"providerId": "7c084226-d9a1-11e6-bf26-cec0c932ce01",

Related Issue

Motivation and Context

Better OCM spec support

How Has This Been Tested?

curl --header "Content-Type: application/json"   --request POST   --data \
'{"shareWith":"user@http:\/\/oc1","name":"\u0432\u0430\u0432\u0430.txt","providerId":"STRING","owner":"user2@http:\/\/oc2","ownerDisplayName":"manic","sender":"user2@http:\/\/oc2","senderDisplayName":"manic","shareType":"user","resourceType":"file","protocol":{"name":"webdav","options":{"sharedSecret":"pljNJU60e7ACFgW"}}}' \
http://oc1/index.php/apps/federatedfilesharing/shares

Before (internal server error)

{"message":"internal server error, was not able to add share from user2@http:\/\/oc2"}

After (share created)

[]

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:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@codecov
Copy link

codecov bot commented Apr 29, 2019

Codecov Report

Merging #35122 into stable10 will increase coverage by <.01%.
The diff coverage is 60%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35122      +/-   ##
==============================================
+ Coverage       64.46%   64.47%   +<.01%     
- Complexity      20064    20068       +4     
==============================================
  Files            1286     1288       +2     
  Lines           76928    76934       +6     
  Branches         1307     1307              
==============================================
+ Hits            49595    49604       +9     
+ Misses          26952    26949       -3     
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.69% <60%> (ø) 20068 <4> (+4) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/federatedfilesharing/lib/FedShareManager.php 80.12% <ø> (ø) 24 <0> (ø) ⬇️
apps/files_sharing/lib/External/Manager.php 78.65% <ø> (ø) 30 <0> (ø) ⬇️
...aring/appinfo/Migrations/Version20190426123324.php 0% <0%> (ø) 2 <2> (?)
apps/federatedfilesharing/lib/Notifications.php 11.53% <0%> (ø) 3 <0> (ø) ⬇️
lib/public/Share/Events/ShareEvent.php 40% <100%> (ø) 5 <0> (ø) ⬇️
...aring/appinfo/Migrations/Version20190410160725.php 100% <100%> (ø) 2 <2> (?)
...ederatedfilesharing/lib/FederatedShareProvider.php 62.66% <100%> (+1.52%) 85 <0> (ø) ⬇️
lib/private/Server.php 86.54% <0%> (-0.12%) 253% <0%> (ø)
... and 1 more

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 67d879b...c31e367. Read the comment docs.

2 similar comments
@codecov
Copy link

codecov bot commented Apr 29, 2019

Codecov Report

Merging #35122 into stable10 will increase coverage by <.01%.
The diff coverage is 60%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35122      +/-   ##
==============================================
+ Coverage       64.46%   64.47%   +<.01%     
- Complexity      20064    20068       +4     
==============================================
  Files            1286     1288       +2     
  Lines           76928    76934       +6     
  Branches         1307     1307              
==============================================
+ Hits            49595    49604       +9     
+ Misses          26952    26949       -3     
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.69% <60%> (ø) 20068 <4> (+4) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/federatedfilesharing/lib/FedShareManager.php 80.12% <ø> (ø) 24 <0> (ø) ⬇️
apps/files_sharing/lib/External/Manager.php 78.65% <ø> (ø) 30 <0> (ø) ⬇️
...aring/appinfo/Migrations/Version20190426123324.php 0% <0%> (ø) 2 <2> (?)
apps/federatedfilesharing/lib/Notifications.php 11.53% <0%> (ø) 3 <0> (ø) ⬇️
lib/public/Share/Events/ShareEvent.php 40% <100%> (ø) 5 <0> (ø) ⬇️
...aring/appinfo/Migrations/Version20190410160725.php 100% <100%> (ø) 2 <2> (?)
...ederatedfilesharing/lib/FederatedShareProvider.php 62.66% <100%> (+1.52%) 85 <0> (ø) ⬇️
lib/private/Server.php 86.54% <0%> (-0.12%) 253% <0%> (ø)
... and 1 more

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 67d879b...c31e367. Read the comment docs.

@codecov
Copy link

codecov bot commented Apr 29, 2019

Codecov Report

Merging #35122 into stable10 will increase coverage by <.01%.
The diff coverage is 60%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #35122      +/-   ##
==============================================
+ Coverage       64.46%   64.47%   +<.01%     
- Complexity      20064    20068       +4     
==============================================
  Files            1286     1288       +2     
  Lines           76928    76934       +6     
  Branches         1307     1307              
==============================================
+ Hits            49595    49604       +9     
+ Misses          26952    26949       -3     
  Partials          381      381
Flag Coverage Δ Complexity Δ
#javascript 53.01% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.69% <60%> (ø) 20068 <4> (+4) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/federatedfilesharing/lib/FedShareManager.php 80.12% <ø> (ø) 24 <0> (ø) ⬇️
apps/files_sharing/lib/External/Manager.php 78.65% <ø> (ø) 30 <0> (ø) ⬇️
...aring/appinfo/Migrations/Version20190426123324.php 0% <0%> (ø) 2 <2> (?)
apps/federatedfilesharing/lib/Notifications.php 11.53% <0%> (ø) 3 <0> (ø) ⬇️
lib/public/Share/Events/ShareEvent.php 40% <100%> (ø) 5 <0> (ø) ⬇️
...aring/appinfo/Migrations/Version20190410160725.php 100% <100%> (ø) 2 <2> (?)
...ederatedfilesharing/lib/FederatedShareProvider.php 62.66% <100%> (+1.52%) 85 <0> (ø) ⬇️
lib/private/Server.php 86.54% <0%> (-0.12%) 253% <0%> (ø)
... and 1 more

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 67d879b...c31e367. Read the comment docs.

@phil-davis phil-davis merged commit a6a20b1 into stable10 Apr 29, 2019
@delete-merged-branch delete-merged-branch bot deleted the stable10-35002-and-35100 branch April 29, 2019 23:24
@davitol davitol mentioned this pull request Sep 3, 2019
13 tasks
@lock lock bot locked as resolved and limited conversation to collaborators May 5, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants