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.

Sign up for GitHub

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

Jump to bottom

[release-10.2.1] Return "password fields" only if public-link password is set. #35541 #35563

Merged
merged 1 commit into from
Jun 18, 2019
Merged

[release-10.2.1] Return "password fields" only if public-link password is set. #35541 #35563

merged 1 commit into from
Jun 18, 2019

Conversation

patrickjahns
Copy link
Contributor

The iOS client uses the presence of these fields to determine if a
password is required.

Despite their names they are historically used to store pw-hashes for public-links.

Description

Port of #35544

Related Issue

Motivation and Context

Fix #35541 for 10.2.1

How Has This Been Tested?

  • 🤖 automated tests have been ported (there were some merge conflicts though )
  • ❗️ NEEDS careful testing 👋

Screenshots (if appropriate):

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:

Open tasks:

🚫

@patrickjahns patrickjahns added this to the QA milestone Jun 17, 2019
phil-davis
phil-davis approved these changes Jun 17, 2019
View reviewed changes
Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

tests/acceptance/features/apiShareManagement/createShare.feature Outdated Show resolved Hide resolved
@micbar
Copy link
Contributor

micbar commented Jun 17, 2019

@phil-davis @patrickjahns We need to check the acceptance tests.

@phil-davis phil-davis changed the title Return "password fields" only if public-link password is set. #35541 [release-10.2.1] Return "password fields" only if public-link password is set. #35541 Jun 18, 2019
@phil-davis
Copy link
Contributor

It should be easiest to review PR #35562 first and merge that. Then rebase this and the diffs will properly match the original PR.

@IljaN @patrickjahns
Return "password fields" only if public-link password is set. #35541
afd5036 
The iOS client uses the presence of these fields to determine if a
password is required.

Despite their names they are historically used to store pw-hashes for public-links.
@patrickjahns patrickjahns reopened this Jun 18, 2019
@codecov
Copy link

codecov bot commented Jun 18, 2019

Codecov Report

❗ No coverage uploaded for pull request base (release-10.2.1@cf1a31a). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.2.1   #35563   +/-   ##
=================================================
  Coverage                  ?   64.39%           
  Complexity                ?    20140           
=================================================
  Files                     ?     1286           
  Lines                     ?    77076           
  Branches                  ?     1308           
=================================================
  Hits                      ?    49631           
  Misses                    ?    27061           
  Partials                  ?      384
Flag Coverage Δ Complexity Δ
#javascript 53.66% <ø> (?) 0 <ø> (?)
#phpunit 65.53% <100%> (?) 20140 <0> (?)
Impacted Files Coverage Δ Complexity Δ
...es_sharing/lib/Controller/Share20OcsController.php 87.41% <100%> (ø) 209 <0> (?)

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 cf1a31a...afd5036. Read the comment docs.

2 similar comments
@codecov
Copy link

codecov bot commented Jun 18, 2019

Codecov Report

❗ No coverage uploaded for pull request base (release-10.2.1@cf1a31a). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.2.1   #35563   +/-   ##
=================================================
  Coverage                  ?   64.39%           
  Complexity                ?    20140           
=================================================
  Files                     ?     1286           
  Lines                     ?    77076           
  Branches                  ?     1308           
=================================================
  Hits                      ?    49631           
  Misses                    ?    27061           
  Partials                  ?      384
Flag Coverage Δ Complexity Δ
#javascript 53.66% <ø> (?) 0 <ø> (?)
#phpunit 65.53% <100%> (?) 20140 <0> (?)
Impacted Files Coverage Δ Complexity Δ
...es_sharing/lib/Controller/Share20OcsController.php 87.41% <100%> (ø) 209 <0> (?)

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 cf1a31a...afd5036. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 18, 2019

Codecov Report

❗ No coverage uploaded for pull request base (release-10.2.1@cf1a31a). Click here to learn what that means.
The diff coverage is 100%.

Impacted file tree graph

@@                Coverage Diff                @@
##             release-10.2.1   #35563   +/-   ##
=================================================
  Coverage                  ?   64.39%           
  Complexity                ?    20140           
=================================================
  Files                     ?     1286           
  Lines                     ?    77076           
  Branches                  ?     1308           
=================================================
  Hits                      ?    49631           
  Misses                    ?    27061           
  Partials                  ?      384
Flag Coverage Δ Complexity Δ
#javascript 53.66% <ø> (?) 0 <ø> (?)
#phpunit 65.53% <100%> (?) 20140 <0> (?)
Impacted Files Coverage Δ Complexity Δ
...es_sharing/lib/Controller/Share20OcsController.php 87.41% <100%> (ø) 209 <0> (?)

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 cf1a31a...afd5036. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 18, 2019 •
edited
Loading

Codecov Report

Merging #35563 into release-10.2.1 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@                 Coverage Diff                  @@
##             release-10.2.1   #35563      +/-   ##
====================================================
+ Coverage             64.39%   64.39%   +<.01%     
- Complexity            20139    20140       +1     
====================================================
  Files                  1286     1286              
  Lines                 77075    77076       +1     
  Branches               1308     1308              
====================================================
+ Hits                  49630    49631       +1     
  Misses                27061    27061              
  Partials                384      384
Flag Coverage Δ Complexity Δ
#javascript 53.66% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.53% <100%> (ø) 20140 <0> (+1) ⬆️
Impacted Files Coverage Δ Complexity Δ
...es_sharing/lib/Controller/Share20OcsController.php 87.41% <100%> (+0.02%) 209 <0> (+1) ⬆️

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 cf1a31a...afd5036. Read the comment docs.

phil-davis
phil-davis approved these changes Jun 18, 2019
View reviewed changes
Copy link
Contributor

@phil-davis phil-davis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diffs now match with stable10 backport #35544 - good.

@patrickjahns patrickjahns merged commit 470f781 into release-10.2.1 Jun 18, 2019
@delete-merged-branch delete-merged-branch bot deleted the release-10.2.1-35541 branch June 18, 2019 14:28
@davitol davitol mentioned this pull request Jun 25, 2019
Closed
11 tasks
@patrickjahns patrickjahns modified the milestone: QA Jun 27, 2019
@phil-davis phil-davis mentioned this pull request Aug 2, 2019
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phil-davis phil-davis phil-davis approved these changes

@IljaN IljaN IljaN approved these changes

@individual-it individual-it Awaiting requested review from individual-it

Assignees
No one assigned
Labels
3 - To Review
Projects
None yet
Milestone
10.2.1
Development

Successfully merging this pull request may close these issues.
4 participants
@patrickjahns @micbar @phil-davis @IljaN