Skip to content

Return quota even if user is not initialised #8926

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
Merged
blizzz merged 2 commits into from
Apr 4, 2018
Merged

Return quota even if user is not initialised #8926

blizzz merged 2 commits into from
Apr 4, 2018

Conversation

@skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented Mar 21, 2018 •
edited
Loading

Needed by #8824
fix #7212

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

MorrisJobke commented Mar 21, 2018

Seems to fix #7212

@MorrisJobke MorrisJobke mentioned this pull request Mar 21, 2018
Closed
@skjnldsv
Copy link
Member Author

skjnldsv commented Mar 21, 2018

Seems to fix #7212

Awesome!! It's exactly that :) 🎉

@MorrisJobke
Copy link
Member

MorrisJobke commented Mar 21, 2018 •
edited by skjnldsv
Loading

  • 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>

@skjnldsv skjnldsv added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Mar 21, 2018
skjnldsv added 2 commits March 22, 2018 10:14
@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
Copy link
Member Author

skjnldsv commented Mar 22, 2018 •
edited
Loading

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

This is not rebased :)

@MorrisJobke ready for review again :)

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

codecov bot commented Mar 28, 2018

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 Files Coverage Δ Complexity Δ
...rovisioning_api/lib/Controller/UsersController.php 80.85% <22.22%> (+3.64%) 168 <0> (+34) ⬆️
lib/public/User.php 30% <0%> (-12.86%) 10% <0%> (+3%)
apps/files_sharing/lib/ShareBackend/File.php 26.71% <0%> (-3.2%) 38% <0%> (+3%)
apps/files_sharing/lib/ShareBackend/Folder.php 52% <0%> (-1.49%) 18% <0%> (+5%)
lib/private/Files/Cache/Propagator.php 94.93% <0%> (-1.27%) 16% <0%> (ø)
...haring/lib/Controller/RequestHandlerController.php 30.97% <0%> (-0.8%) 105% <0%> (+23%)
lib/private/Group/Database.php 100% <0%> (ø) 37% <0%> (+11%) ⬆️
apps/provisioning_api/appinfo/routes.php 0% <0%> (ø) 0% <0%> (ø) ⬇️
...r_backupcodes/lib/Provider/BackupCodesProvider.php 100% <0%> (ø) 10% <0%> (+2%) ⬆️
themes/example/defaults.php 0% <0%> (ø) 21% <0%> (+4%) ⬆️
... and 18 more

@skjnldsv skjnldsv requested a review from juliusknorr March 29, 2018 06:08
@skjnldsv
Copy link
Member Author

skjnldsv commented Apr 3, 2018 •
edited
Loading

Bump! :)

Test OK 🚢

MorrisJobke
MorrisJobke approved these changes Apr 3, 2018
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

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
Copy link
Member

@blizzz blizzz left a comment

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 master Apr 4, 2018
@blizzz blizzz deleted the ocs-api-quota-fallback branch April 4, 2018 15:19
@skjnldsv skjnldsv mentioned this pull request May 24, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@blizzz blizzz blizzz approved these changes

@rullzer rullzer Awaiting requested review from rullzer

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees

@skjnldsv skjnldsv

Labels

3. to review Waiting for reviews feature: 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

4 participants

@skjnldsv @MorrisJobke @blizzz