Commit Graph

165 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) eb4d7fba20
Rebase to master
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:12:52 +02:00
Joas Schilling 348171f311
Use abstract subclass so members can be defined
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-04-05 17:11:41 +02:00
John Molakvoæ (skjnldsv) 762002ec2e
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:11:41 +02:00
John Molakvoæ (skjnldsv) c103aaaf25
Trait bump
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:11:41 +02:00
John Molakvoæ (skjnldsv) b023bfe38f
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:09:00 +02:00
John Molakvoæ (skjnldsv) 4011ea97b1
Cast types directly
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:09:00 +02:00
John Molakvoæ (skjnldsv) f4e84e1727
Limit and offset
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:09:00 +02:00
John Molakvoæ (skjnldsv) 68ae4394f7
Api, return users details by groups
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-05 17:08:59 +02:00
blizzz 3678d3b14a
Merge pull request #8926 from nextcloud/ocs-api-quota-fallback
Return quota even if user is not initialised
2018-04-04 17:19:54 +02:00
Joas Schilling 3d8fcad88b
Merge pull request #8865 from nextcloud/ocs-groups-displayname
Return groups displayname in provisioning api
2018-03-23 14:44:13 +01:00
John Molakvoæ (skjnldsv) 5f38cfbc80
Return groups displayname in provisioning api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-23 12:06:50 +01:00
John Molakvoæ (skjnldsv) 41b690ed53
Allow admin to create users withoutpassword by sending mail automatically
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-22 15:06:04 +01:00
John Molakvoæ (skjnldsv) 63fa245461
Fix quota return if unlimited
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-22 10:14:15 +01:00
John Molakvoæ (skjnldsv) 6e7b7749bd
Return quota even if user is not initialized
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-22 10:14:15 +01:00
Morris Jobke 29c551c88f
Merge pull request #8847 from nextcloud/ocs-api-userdetails
Add userdetails to ocs api
2018-03-20 18:12:25 +01:00
John Molakvoæ (skjnldsv) 24659342f5
fixup! Check if groups is array, return empty do not throw
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-19 15:12:32 +01:00
John Molakvoæ (skjnldsv) ccd57ce1b1
Allow empty emails provisionning api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-17 12:18:22 +01:00
John Molakvoæ (skjnldsv) 2493e9426d
Check if groups is array, return empty do not throw
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 15:32:36 +01:00
John Molakvoæ (skjnldsv) f5137fef6c
Fixed tests and improved code
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 11:44:20 +01:00
John Molakvoæ (skjnldsv) aa1e8713fb
Fixed throw error on unreachable users
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 09:38:09 +01:00
John Molakvoæ (skjnldsv) ce625bbad5
Add userdetails to ocs api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-16 09:19:47 +01:00
John Molakvoæ (skjnldsv) 23a1553539
Fixed api tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-03-08 17:13:52 +01:00
Roeland Jago Douma fbeaacdf1b
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 22:03:40 +01:00
Roeland Jago Douma 24b58a7683
Make the provisioning api app strict
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-02-27 15:47:59 +01:00
Morris Jobke 9aaf1c2a06
Show hint in OCS API for user creation
* adds a 107 error code together with the hint of the exception
* logs the exception as warning
* fixes #7946

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-22 14:16:49 +01:00
Roeland Jago Douma 119896a8d7
Fix tests
* Add factory for the federatedfilesharing app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-26 12:49:11 +01:00
Roeland Jago Douma f3723434ee
Don't expose language and password as editable
* Password might not always be editable
  - Also chaging that will invalide apptokens etc which will directly
  lock out your phone
* Chaging the language also doesn't make that much sense to me currently

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-26 11:22:20 +01:00
Roeland Jago Douma 70b19761aa
Provide list of editable fields via OCS API
Fixes #7983

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-26 11:20:58 +01:00
Morris Jobke 2a38605545
Properly log the full exception instead of only the message
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-23 10:57:21 +01:00
Morris Jobke 31c5c2a592
Change @georgehrke's email
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 20:38:59 +01:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Arthur Schiwon a62b4a68a0
throw 101 when an empty group string is provided
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-09-18 10:56:13 +02:00
Lukas Reschke f93a82b8b0
Remove explicit type hints for Controller
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
Roeland Jago Douma 3548603a88
Fix middleware implementations signatures
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Roeland Jago Douma 6d4731024a
Some app fixes of phpstorm inspections
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
Joas Schilling 7816c54625
Allow to force a language and set it via the ocs api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 11:34:52 +02:00
Joas Schilling 0e26ba4c2a
Don't allow the user to set fields they can't see
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 10:09:42 +02:00
Morris Jobke b156117cbd Merge pull request #4457 from nextcloud/fix-storage-info-with-wrong-casing
Fix storage info with wrong casing
2017-04-24 10:41:16 -03:00
Joas Schilling 7a87fedac3
Remove dead arguments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:18:14 +02:00
Joas Schilling e19126425b
Fix similar issues with the group id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:15:03 +02:00
Joas Schilling 992c48c89b
Fix the storage info and other checks when the user has wrong casing
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-24 10:10:50 +02:00
Morris Jobke c54a59d51e
Remove unused use statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-22 19:23:31 -05:00
Morris Jobke 4dd72e9eb9
Use RESPOND_NOT_FOUND for non existing user
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-21 11:30:00 -05:00
Morris Jobke 5b4adf66e5
Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values:
  OCP\Defaults or OC_Defaults (which is extended by
  OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
  it hard to work on theme values
* this extended the public interface with the missing
  methods and uses them everywhere to only rely on the
  public interface

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-09 21:43:01 -05:00
Morris Jobke 8838ed4c2e Merge pull request #4244 from nextcloud/welcome-email
New layout for welcome email
2017-04-07 14:52:28 -05:00
Lukas Reschke 281ad406e8
Add support for theming
Add support for theming in generated emails and simplify API

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-04-07 12:03:47 -05:00
Joas Schilling 3d628783d9
Allow to change account info via provisioning api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-07 12:50:47 +02:00
Joas Schilling 3c1e7e5ada
Make deleting a group compatible with ocs v2
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 19:24:02 +01:00
Joas Schilling 3abe86dade
Fix provisioning API call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Morris Jobke 50f3efad6f
OCS API endpoint to resend welcome message
* send a POST request to ocs/v1.php/cloud/users/USERNAME/resendWelcomeMessage to trigger
  the welcome message to be send
* fixes #3367

example curl statement:

  curl -i https://example.org/ocs/v1.php/cloud/users/USERNAME/welcome -H  "OCS-APIRequest: true" -u admin:password -X POST

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-28 16:30:33 -06:00
Bjoern Schiessle 2ca8339d01
add groups to user info output
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-02-09 16:23:10 +01:00
Bjoern Schiessle 3e6c40eeb4
make sure that 'getCurrentUser' gets an array in order to manipulate the data to match the old API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-26 11:31:08 +01:00
Bjoern Schiessle 5086335643
unify endpoints form core and the the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-25 11:20:35 +01:00
Bjoern Schiessle fee42647fb
add data from the users profile to the provisioning api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-01-24 14:23:18 +01:00
Joas Schilling 5d1f7e5a7b
Allow subadmins to add people to groups via provisioning api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 14:34:38 +01:00
Joas Schilling d80a4453af
Make sure subadmins can not delete users from their last subadmin group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:56:24 +01:00
Joas Schilling ae77067a07
No need to check the subadmin again
The user needs to be a subadmin of the group,
otherwise they are not allowed to remove anyone from the group

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-18 11:43:52 +01:00
Joas Schilling bea85adc08
Require sudo mode on the provisioning API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-05 11:55:21 +01:00
Lukas Reschke 32cf661215
Use new appstore API
This change introduces the new appstore API in Nextcloud.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-10-31 17:17:44 +01:00
Joas Schilling 0d878f94e6
Add unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-21 09:59:34 +02:00
Joas Schilling 0b1fb180a5
Make AppConfig part of the public API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-10-21 09:09:23 +02:00
Joas Schilling 04c5259df0
Allow to retrieve the quota itself via the provisioning api 2016-08-17 10:41:13 +02:00
Roeland Jago Douma 092b767ef9
Move Apps to OCSController 2016-08-14 18:34:07 +02:00
Roeland Jago Douma 8f4adebab7
Move Users to OCSController 2016-08-14 18:34:02 +02:00
Roeland Jago Douma 432e7c93c6
Move Groups over to OCSController
* Take advantage of the AppFramework
* Fix tests
2016-08-14 18:34:01 +02:00
Roeland Jago Douma 0fdeefe47c
Add ProvisioningAPI middleware
The provisioning API has 3 access levels:

* Admin
* SubAdmin
* User

This middleware adds a check for the SubAdmin part.
2016-08-14 18:34:01 +02:00
Joas Schilling 813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Roeland Jago Douma f9e0e3d972
Fix Warnings Provisioning API
* OC_OCS_Result is deprecated
* getMock is deprecated in phpunit 5.4
2016-07-12 08:53:12 +02:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Joas Schilling 2a05035339 Move Provisioning api to PSR-4 (#24510)
* Move app to PSR-4

* Fix setUp method

* Fix the tests
2016-05-11 19:38:49 +02:00
Thomas Müller 8486926a14
Add provisioning api to enable and disable users 2016-05-02 09:31:22 +02:00
Lukas Reschke 933f60e314 Update author information
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Arthur Schiwon 3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Thomas Müller aeb89947a2 Introduce IUser::setEMailAddress and add hook mechanism 2016-01-20 14:57:20 +01:00
Thomas Müller 682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Tom Needham 3327857c1a Update log message when error occurs during addGroup 2016-01-08 13:35:00 +01:00
Tom Needham 673a8a1e4a Remove unnecessary group name validation 2016-01-08 13:35:00 +01:00
Lukas Reschke 88c7face07 Inject OCSClient
Fixes https://github.com/owncloud/core/issues/21451
2016-01-06 11:40:22 +01:00
Thomas Müller eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +01:00
Roeland Jago Douma 6dcaac7e2c Return empty list if group does not have subadmins
Instead of throwing an error just return an empty list. Since that is
actually what it is.

Fixes #19789
2015-11-16 22:24:53 +01:00
Thomas Müller 5ec64c4fd7 Merge pull request #20292 from owncloud/provisioning_api_group_unittest
Moved grouptest over to pure unit tests
2015-11-16 18:00:03 +01:00
Roeland Jago Douma 61425b7621 Moved grouptest over to pure unit tests 2015-11-16 14:40:01 +01:00
Roeland Jago Douma fc1f0233ff Added unit test for new functionality 2015-11-12 22:31:17 +01:00
michag86 3b88c469c7 enable api addUser for subadmins
* Fix existing unit tests
2015-11-12 22:31:17 +01:00
Joas Schilling 960c9f386d Revert OCS error code change from #20135 2015-11-05 17:01:47 +01:00
Lukas Reschke c6f6a8758b Drop OC_SubAdmin and replace usages 2015-10-29 11:31:18 +01:00
Lukas Reschke 8f09d5b67c Update license headers 2015-10-26 14:04:01 +01:00
Thomas Müller 60abc2738b Merge pull request #18399 from owncloud/api-getusers-for-subadmins
enable api getUsers for subadmins
2015-10-20 14:28:31 +02:00
Roeland Jago Douma 002e9c76cd Combine OCS API getUser method code into provisioning_api app
Fixes #13002

Move the cloud/users/{userid} code in total to the provisioning API.
2015-10-13 21:07:48 +02:00
michag86 23db51f69a Merge branch 'master' into api-getusers-for-subadmins 2015-10-13 14:40:22 +02:00
Morris Jobke b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Lukas Reschke a7f132a964 Add proper PHPDoc
Makes my IDE happier when going through that file.
2015-09-08 14:02:30 +02:00
michag86 e958638221 enable api getUsers for subadmins
Now subadmins can get a list of users they are subadmins of.
2015-08-26 11:00:13 +02:00
Roeland Jago Douma b41bccd385 Check for userSession->getUser() === null 2015-08-11 15:37:06 +02:00
Roeland Jago Douma 2148120883 [provisioning api] Test for correct displayname 2015-08-11 13:01:37 +02:00
Roeland Jago Douma ed1f034e6b Fix groups 2015-08-11 12:47:42 +02:00
Roeland Jago Douma 98a7e42ebb [provisioning api] Move away from OC\Util to OCP\Util 2015-08-02 10:27:36 +02:00
Roeland Jago Douma a4822f9f9a [provisioning_api] Move part of apps to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma 97d79202ac [provisioning_api] OC_User to IUserSession 2015-08-02 10:22:26 +02:00
Roeland Jago Douma 9f59add9ed [provisioning_api] subadmin check for users 2015-08-02 10:22:26 +02:00