Skip to content

Move Provisioning API to the AppFramework#846

Merged
nickvergessen merged 8 commits into
masterfrom
provisioning_api_ocs
Aug 17, 2016
Merged

Move Provisioning API to the AppFramework#846
nickvergessen merged 8 commits into
masterfrom
provisioning_api_ocs

Conversation

@rullzer

@rullzer rullzer commented Aug 12, 2016

Copy link
Copy Markdown
Member

Requires: #844 and #845

Lets see what CI tells us

@rullzer rullzer added the 2. developing Work in progress label Aug 12, 2016
@rullzer rullzer added this to the Nextcloud 11.0 milestone Aug 12, 2016
@rullzer rullzer force-pushed the provisioning_api_ocs branch 3 times, most recently from 4e70c62 to da64baa Compare August 13, 2016 11:54
@rullzer rullzer added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 13, 2016
@rullzer

rullzer commented Aug 13, 2016

Copy link
Copy Markdown
Member Author

Wheehee intergration tests are happy!

Review time: @LukasReschke @MorrisJobke @nickvergessen @schiessle @icewind1991

*
* @param array $parameters
* @return \OC\OCS\Result
* @NoAdminRequired

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.

Is there any middleware in place to require at least subadmin rights?

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.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes :)

This is required to be able to catch the NotLoggedIn exceptions etc in
the OCSMiddleware and convert them to proper OCS Responses.
* Always set 401 (v1.php and v2.php)
* Set proper error codes for v2.php
* Proper OCS output on unhandled exceptions
The provisioning API has 3 access levels:

* Admin
* SubAdmin
* User

This middleware adds a check for the SubAdmin part.
* Take advantage of the AppFramework
* Fix tests
* Set OCS-APIREQUEST: true
* PUT requires a body
@rullzer rullzer force-pushed the provisioning_api_ocs branch from da64baa to 7754281 Compare August 14, 2016 16:35
@LukasReschke

Copy link
Copy Markdown
Member

LGTM

@nickvergessen

Copy link
Copy Markdown
Member

👍

@nickvergessen nickvergessen merged commit 027069c into master Aug 17, 2016
@nickvergessen nickvergessen deleted the provisioning_api_ocs branch August 17, 2016 08:23
GitHubUser4234 pushed a commit to GitHubUser4234/server that referenced this pull request Aug 30, 2016
Move Provisioning API to the AppFramework
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants