api update. added password recovery parameter for password change wit…

[akalevich]

Api update. added password recovery parameter for password change with enabled encryption. #7735

[nickvergessen]

Looks good, can you adjust the unit tests so they work again and add one for this new case?

[nickvergessen]

Can you please sign your commits? See https://github.com/nextcloud/server/blob/master/CONTRIBUTING.md#sign-your-work for more information.

You can do this manually for now:

git commit --amend -s
git push --force origin <your branch>

[codecov]

Codecov Report

Merging #7736 into master will increase coverage by 0.1%.
The diff coverage is 100%.

@@             Coverage Diff             @@
##             master    #7736     +/-   ##
===========================================
+ Coverage     51.12%   51.22%   +0.1%     
+ Complexity    25724    24970    -754     
===========================================
  Files          1574     1607     +33     
  Lines         88510    95011   +6501     
  Branches          0     1376   +1376     
===========================================
+ Hits          45252    48673   +3421     
- Misses        43258    46338   +3080

Impacted Files	Coverage Δ	Complexity Δ
...rovisioning_api/lib/Controller/UsersController.php	81.76% <100%> (+9.69%)	122 <32> (-14)	⬇️
apps/admin_audit/lib/Actions/GroupManagement.php	0% <0%> (-100%)	4% <0%> (ø)
...are/Security/Exceptions/AppNotEnabledException.php	0% <0%> (-100%)	1% <0%> (ø)
apps/workflowengine/lib/Check/RequestUserAgent.php	0% <0%> (-96.43%)	10% <0%> (-4%)
lib/private/Preview/GeneratorHelper.php	0% <0%> (-80%)	5% <0%> (ø)
apps/dav/lib/AppInfo/PluginManager.php	0% <0%> (-71.93%)	31% <0%> (ø)
apps/admin_audit/lib/Actions/AppManagement.php	0% <0%> (-66.67%)	3% <0%> (ø)
apps/files_sharing/lib/Helper.php	20.35% <0%> (-58.96%)	38% <0%> (+27%)
apps/comments/lib/Activity/Listener.php	23.52% <0%> (-56.87%)	10% <0%> (ø)
apps/admin_audit/lib/Actions/Action.php	0% <0%> (-56%)	7% <0%> (ø)
... and 734 more

[akalevich]

Done. But, if this method can use the user on himself and admin on any user, I have to write two tests? On change password without recovery one test written. I did the same.

[MorrisJobke]

@akalevich Sorry that this somehow slipped through :/ We added type hinting to this method which causes the merge conflict. Do you want to resolve this or should we take over and resolve it on our side?

[MorrisJobke]

@skjnldsv Didn't you added this lately?

[skjnldsv]

@schiessle :)
We decided to block password change if the master key is disabled and encryption enabled, can you confirm?

[akalevich]

@MorrisJobke

Do you want to resolve this or should we take over and resolve it on our side?

Is it still topical?

[MorrisJobke]

Do you want to resolve this or should we take over and resolve it on our side?
Is it still topical?

Sure we could take over this one if you wish.

[MorrisJobke]

We decided to block password change if the master key is disabled and encryption enabled, can you confirm?

Then this can be closed.

[akalevich]

@MorrisJobke Done

[skjnldsv]

@akalevich sorry, but for security reasons, we decided to simply block password change if the master key is disabled and encryption enabled. Therefore this pull request won't be merged :(