Add filter for backend to rest index #12726

LukasReschke · 2014-12-09T17:40:23Z

This adds a "backend" type filter to the index REST route which is a pre-requisite for #12620

For example when calling index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database only users within the backend OC_User_Database would be shown. (requires sending a CSRF token as well)

LukasReschke · 2014-12-09T17:40:29Z

@MorrisJobke

LukasReschke · 2014-12-09T17:52:24Z

Mentioning @nickvergessen as he always likes to review stuff.

LukasReschke · 2014-12-10T11:02:49Z

@nickvergessen Rebased on master and added unit-test as suggested for the $backend parameter.

This adds a "backend" type filter to the index REST route which is a pre-requisite for #12620 For example when calling `index.php/settings/users/users?offset=0&limit=10&gid=&pattern=&backend=OC_User_Database` only users within the backend `OC_User_Database` would be shown. (requires sending a CSRF token as well) Depends upon #12711

LukasReschke · 2014-12-10T13:19:49Z

CI is at #12755

LukasReschke · 2014-12-10T14:11:24Z

From #12755 (comment):

🚀 Test PASSed. 🚀
Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/4213/
🚀 Test PASSed. 🚀

@MorrisJobke @nickvergessen Please review.

MorrisJobke · 2014-12-10T21:30:51Z

lib/public/iusermanager.php

Why not \OCP\UserInterface (and change it in every backend;) I know you will love it )?

I changed the PHPDoc accordingly. Will update specific interfaces later as modifications on them are anyways required.

ghost · 2014-12-11T12:02:40Z

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/4286/

Build result: FAILURE

[...truncated 16 lines...]Fetching upstream changes from https://github.com/owncloud/core.gitusing GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git791989861574526983.credentials # timeout=10 > git fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse origin/pr/12726/merge^{commit} # timeout=10 > git branch -a --contains 16c9a2c22869e9424913f02b648a4ea668d6779f # timeout=10 > git rev-parse remotes/origin/pr/12726/merge^{commit} # timeout=10Checking out Revision 16c9a2c22869e9424913f02b648a4ea668d6779f (origin/pr/12726/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 16c9a2c22869e9424913f02b648a4ea668d6779fFirst time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILUREStarted calculate disk usage of buildFinished Calculation of disk usage of build in 0 secondsStarted calculate disk usage of workspaceFinished Calculation of disk usage of workspace in 34 second
💣 Test FAILed. 💣

MorrisJobke · 2014-12-12T08:29:41Z

👍

LukasReschke · 2014-12-12T10:33:47Z

@owncloud-bot Retest this please.

LukasReschke · 2014-12-12T10:33:51Z

@nickvergessen Care to review? :-)

ghost · 2014-12-12T11:05:59Z

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/4380/

Build result: FAILURE

[...truncated 16 lines...]Fetching upstream changes from https://github.com/owncloud/core.gitusing GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git8165423963444798092.credentials # timeout=10 > git fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse origin/pr/12726/merge^{commit} # timeout=10 > git branch -a --contains 7dbaa9612384e38158a6e2454f254fdde11c626b # timeout=10 > git rev-parse remotes/origin/pr/12726/merge^{commit} # timeout=10Checking out Revision 7dbaa9612384e38158a6e2454f254fdde11c626b (origin/pr/12726/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 7dbaa9612384e38158a6e2454f254fdde11c626bFirst time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILUREStarted calculate disk usage of buildFinished Calculation of disk usage of build in 0 secondsStarted calculate disk usage of workspaceFinished Calculation of disk usage of workspace in 27 second
💣 Test FAILed. 💣

nickvergessen · 2014-12-12T11:07:52Z

tests/settings/controller/userscontrollertest.php

please also add a test for a backend that does not have users

nickvergessen · 2014-12-12T11:09:08Z

Looks good, but I'd like to have a second test which then receives an empty result

MorrisJobke · 2014-12-12T12:46:34Z

Test looks good 👍

PVince81 · 2014-12-12T15:27:05Z

settings/controller/userscontroller.php

Comparison on classes instead of names ? Is that safe / faster than string comparison ? (very minor)

Honestly: No idea :-)

PVince81 · 2014-12-12T15:35:41Z

settings/controller/userscontroller.php

Code comment would be appreciated. This is confusing but I'm pretty sure you understood it while touching it 😉

PVince81 · 2014-12-12T15:48:33Z

settings/controller/userscontroller.php

Might need to make it clear that the input array is in form $uid => $displayName now

PVince81 · 2014-12-12T15:58:42Z

Seems to work fine with the LDAP zombie army 👍

PVince81 · 2014-12-12T15:59:01Z

(the order of users is wrong but I get this was already a problem before) CC @blizzz

ghost · 2014-12-12T17:04:59Z

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/4429/

Build result: FAILURE

[...truncated 17 lines...]using GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git6533418843201547087.credentials # timeout=10 > git fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse origin/pr/12726/merge^{commit} # timeout=10 > git branch -a --contains 96051d925d902562801572c9a62960119715c07a # timeout=10 > git rev-parse remotes/origin/pr/12726/merge^{commit} # timeout=10Checking out Revision 96051d925d902562801572c9a62960119715c07a (origin/pr/12726/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 96051d925d902562801572c9a62960119715c07a > git rev-list b4f10be9e41b1c1af4d5a6f8d65d8b4d3caaa870 # timeout=10First time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILUREStarted calculate disk usage of buildFinished Calculation of disk usage of build in 0 secondsStarted calculate disk usage of workspaceFinished Calculation of disk usage of workspace in 2 second
💣 Test FAILed. 💣

MorrisJobke · 2014-12-12T17:11:02Z

jenkins PR #12822

scrutinizer-notifier · 2014-12-12T18:40:35Z

The inspection completed: 25 new issues, 9 updated code elements

scrutinizer-notifier · 2014-12-12T18:55:25Z

The inspection completed: 25 new issues, 9 updated code elements

MorrisJobke · 2014-12-13T07:50:11Z

The failing tests also appear on other branches and are unrelated (files cache) -> merge

…t-index Add filter for backend to rest index

LukasReschke added the 3 - To Review label Dec 9, 2014

LukasReschke mentioned this pull request Dec 9, 2014

User Management - ownCloud 8.0 #12620

Closed

23 tasks

LukasReschke force-pushed the add-filter-for-backend-to-rest-index branch 2 times, most recently from b620659 to aa6c7c6 Compare December 10, 2014 11:02

LukasReschke force-pushed the add-filter-for-backend-to-rest-index branch from aa6c7c6 to d3d2ca3 Compare December 10, 2014 11:05

LukasReschke force-pushed the add-filter-for-backend-to-rest-index branch from d3d2ca3 to 5dc6406 Compare December 10, 2014 11:07

LukasReschke mentioned this pull request Dec 10, 2014

[MAKE CI HAPPY] #12755

Closed

MorrisJobke added this to the 8.0-current milestone Dec 10, 2014

MorrisJobke reviewed Dec 10, 2014
View reviewed changes

LukasReschke added 2 commits December 11, 2014 12:29

Break loop

661dc78

Use public interface

d0716d2

nickvergessen reviewed Dec 12, 2014
View reviewed changes

Add test for user without backend

26b0a89

PVince81 reviewed Dec 12, 2014
View reviewed changes

LukasReschke added 3 commits December 12, 2014 16:42

Use array key instead of value

d5b26e6

Use limit and offset

202f121

Comment code path

dced436

PVince81 reviewed Dec 12, 2014
View reviewed changes

Make comment clear

76a633b

MorrisJobke mentioned this pull request Dec 12, 2014

[Jenkins only] add filter for backend to rest index #12822

Merged

MorrisJobke added a commit that referenced this pull request Dec 13, 2014

Merge pull request #12726 from owncloud/add-filter-for-backend-to-res…

efb495b

…t-index Add filter for backend to rest index

MorrisJobke merged commit efb495b into master Dec 13, 2014

MorrisJobke deleted the add-filter-for-backend-to-rest-index branch December 13, 2014 07:50

MorrisJobke mentioned this pull request Dec 22, 2014

User Management #12998

Closed

27 tasks

lock bot locked as resolved and limited conversation to collaborators Aug 15, 2019

Add filter for backend to rest index #12726

Add filter for backend to rest index #12726

Uh oh!

Conversation

LukasReschke commented Dec 9, 2014

Uh oh!

LukasReschke commented Dec 9, 2014

Uh oh!

LukasReschke commented Dec 9, 2014

Uh oh!

LukasReschke commented Dec 10, 2014

Uh oh!

LukasReschke commented Dec 10, 2014

Uh oh!

LukasReschke commented Dec 10, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Dec 11, 2014

Build result: FAILURE

Uh oh!

MorrisJobke commented Dec 12, 2014

Uh oh!

LukasReschke commented Dec 12, 2014

Uh oh!

LukasReschke commented Dec 12, 2014

Uh oh!

ghost commented Dec 12, 2014

Build result: FAILURE

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nickvergessen commented Dec 12, 2014

Uh oh!

MorrisJobke commented Dec 12, 2014

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PVince81 commented Dec 12, 2014

Uh oh!

PVince81 commented Dec 12, 2014

Uh oh!

ghost commented Dec 12, 2014

Build result: FAILURE

Uh oh!

MorrisJobke commented Dec 12, 2014

Uh oh!

scrutinizer-notifier commented Dec 12, 2014

Uh oh!

scrutinizer-notifier commented Dec 12, 2014

Uh oh!

MorrisJobke commented Dec 13, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants