Skip to content

Return quota even if user is not initialised - #8926

Merged
blizzz merged 2 commits into
masterfrom
ocs-api-quota-fallback
Apr 4, 2018
Merged

Return quota even if user is not initialised#8926
blizzz merged 2 commits into
masterfrom
ocs-api-quota-fallback

Conversation

@skjnldsv

@skjnldsvskjnldsv commented Mar 21, 2018•
edited
Loading

Copy link
Copy Markdown
Member

Needed by #8824
fix#7212

@skjnldsvskjnldsv added this to the Nextcloud 14 milestone Mar 21, 2018
@skjnldsvskjnldsv self-assigned this Mar 21, 2018
@skjnldsvskjnldsv mentioned this pull request Mar 21, 2018
Merged
34 tasks
@skjnldsvskjnldsv added the 3. to review Waiting for reviews label Mar 21, 2018
@MorrisJobke

MorrisJobke commented Mar 21, 2018

Copy link
Copy Markdown
Member

Seems to fix #7212

@MorrisJobkeMorrisJobke mentioned this pull request Mar 21, 2018
Closed
@skjnldsv

skjnldsv commented Mar 21, 2018

Copy link
Copy Markdown
MemberAuthor

Seems to fix #7212

Awesome!! It's exactly that :) 🎉

@MorrisJobke

MorrisJobke commented Mar 21, 2018•
edited by skjnldsv
Loading

Copy link
Copy Markdown
Member
  • It says <quota></quota> instead of <quota>-3</quota> for unlimited quote :/
  • querying your new API endpoint ocs/v2.php/cloud/users/details results in this:
<?xml version="1.0"?>
<ocs>
<meta>
<status>failure</status>
<statuscode>998</statuscode>
<message>The requested user could not be found</message>
</meta>
<data/>
</ocs>

@skjnldsvskjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Mar 21, 2018
@skjnldsv
Return quota even if user is not initialized
6e7b774
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv
Fix quota return if unlimited
63fa245
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
@skjnldsv

skjnldsv commented Mar 22, 2018•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

querying your new API endpoint ocs/v2.php/cloud/users/details results in this:

This is not rebased :)

@MorrisJobke ready for review again :)

@skjnldsv
skjnldsvforce-pushed the ocs-api-quota-fallback branch from 761fba3 to 63fa245CompareMarch 22, 2018 09:19
@skjnldsvskjnldsv added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 22, 2018
@codecov

codecovBot commented Mar 28, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8926 into master will increase coverage by 0.23%.
The diff coverage is 22.22%.

@@ Coverage Diff @@## master #8926 +/- ##
============================================
+ Coverage 51.96% 52.19% +0.23% - Complexity 25269 25508 +239 
============================================
Files 1603 1604 +1 Lines 94876 96100 +1224 Branches 1388 1411 +23 ============================================
+ Hits 49302 50163 +861 - Misses 45574 45937 +363
Impacted FilesCoverage ΔComplexity Δ
...rovisioning_api/lib/Controller/UsersController.php80.85% <22.22%> (+3.64%)168 <0> (+34)⬆️
lib/public/User.php30% <0%> (-12.86%)10% <0%> (+3%)
apps/files_sharing/lib/ShareBackend/File.php26.71% <0%> (-3.2%)38% <0%> (+3%)
apps/files_sharing/lib/ShareBackend/Folder.php52% <0%> (-1.49%)18% <0%> (+5%)
lib/private/Files/Cache/Propagator.php94.93% <0%> (-1.27%)16% <0%> (ø)
...haring/lib/Controller/RequestHandlerController.php30.97% <0%> (-0.8%)105% <0%> (+23%)
lib/private/Group/Database.php100% <0%> (ø)37% <0%> (+11%)⬆️
apps/provisioning_api/appinfo/routes.php0% <0%> (ø)0% <0%> (ø)⬇️
...r_backupcodes/lib/Provider/BackupCodesProvider.php100% <0%> (ø)10% <0%> (+2%)⬆️
themes/example/defaults.php0% <0%> (ø)21% <0%> (+4%)⬆️
... and 18 more

@skjnldsv

skjnldsv commented Apr 3, 2018•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Bump! :)

Test OK 🚢

MorrisJobke
MorrisJobke approved these changes Apr 3, 2018
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Tested and works 👍

blizzz
blizzz approved these changes Apr 4, 2018
View reviewed changes

@blizzzblizzz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

looks good

@blizzz
blizzz merged commit 3678d3b into masterApr 4, 2018
@blizzz
blizzz deleted the ocs-api-quota-fallback branch April 4, 2018 15:19
@skjnldsvskjnldsv mentioned this pull request May 24, 2018
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@blizzzblizzzblizzz approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr

Assignees

@skjnldsvskjnldsv

Labels

3. to reviewWaiting for reviewsfeature: users and groups

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

Quota missing in "get user" API request before the user logged in first

3 participants

@skjnldsv@MorrisJobke@blizzz