Commit Graph

310 Commits

Author SHA1 Message Date
Mikael Hammarin 6ffde74928
Patch to optimize for large installations (>5000 users >20000 groups) where subadmins have access to many of groups (>250)
- UsersController:editUser() calls isUserAccessible() even if the user is admin

This fix reduces API calls to editUser (ex change locale/display name) from >2 minutes (!) to ~3 seconds per call in average.

Signed-off-by: Mikael Hammarin <mikael@try2.se>
2020-04-25 14:37:46 +02:00
Christoph Wurst 833d1d2c3b
Fix php-cs formatting
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-14 17:53:44 +02:00
Julius Härtl c20321e7e0 Add tests for encoded group id
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2020-04-11 06:36:20 +00:00
Julius Härtl e7249de145
Make the groupId url encoded
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-04-11 08:28:15 +02:00
Christoph Wurst caff1023ea
Format control structures, classes, methods and function
To continue this formatting madness, here's a tiny patch that adds
unified formatting for control structures like if and loops as well as
classes, their methods and anonymous functions. This basically forces
the constructs to start on the same line. This is not exactly what PSR2
wants, but I think we can have a few exceptions with "our" style. The
starting of braces on the same line is pracrically standard for our
code.

This also removes and empty lines from method/function bodies at the
beginning and end.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 14:19:56 +02:00
Christoph Wurst 14c996d982
Use elseif instead of else if
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-10 10:35:09 +02:00
Christoph Wurst 44577e4345
Remove trailing and in between spaces
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 16:07:47 +02:00
Christoph Wurst afbd9c4e6e
Unify function spacing to PSR2 recommendation
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 13:54:22 +02:00
Christoph Wurst 41b5e5923a
Use exactly one empty line after the namespace declaration
For PSR2

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 11:48:10 +02:00
Christoph Wurst 2fbad1ed72
Fix (array) indent style to always use one tab
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-04-09 10:16:08 +02:00
Christoph Wurst 1a9330cd69
Update the license headers for Nextcloud 19
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-31 14:52:54 +02:00
Christoph Wurst b80ebc9674
Use the short array syntax, everywhere
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-26 16:34:56 +01:00
Christoph Wurst 2ee65f177e
Use the shorter phpunit syntax for mocked return values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-25 22:21:27 +01:00
Christoph Wurst 150f39ed50
Update autoloaders for composer v1.10.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-03-19 09:48:49 +01:00
Christoph Wurst d47daefe38
Revive the "send email to new users" toggle for the user form
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-02-28 14:01:03 +01:00
Roeland Jago Douma 8728eab9d7
Fix app updates
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-01-21 14:00:58 +01:00
Robin Appelman 170660840b
query FederatedFileSharing Application instead of creating it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-12-16 15:33:41 +01:00
Christoph Wurst 5bf3d1bb38
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-05 15:38:45 +01:00
John Molakvoæ (skjnldsv) f675e61c26
Fix provisioning_api getUsers types
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-11-28 20:28:27 +01:00
Roeland Jago Douma 3a7cf40aaa
Mode to modern phpunit
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 15:27:18 +01:00
Roeland Jago Douma c007ca624f
Make phpunit8 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-27 13:34:41 +01:00
Roeland Jago Douma 68748d4f85
Some php-cs fixes
* Order the imports
* No leading slash on imports
* Empty line before namespace
* One line per import
* Empty after imports
* Emmpty line at bottom of file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-22 20:52:10 +01:00
Christoph Wurst 543190f8b3
Do not create Application instances directly
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-10-11 08:33:09 +02:00
John Molakvoæ 62399c76e8
Allow group displaynames in the database backend (#17221)
Allow group displaynames in the database backend
2019-10-05 18:34:14 +02:00
Christoph Wurst de6940352a Move settings to an app
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-09-28 09:39:28 +00:00
Joas Schilling 653628c8fb
Allow to set the group display name in the database backend
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-09-27 14:29:56 +02:00
Roeland Jago Douma 04ef434af0
Development is 18 now!
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-09-05 11:26:35 +02:00
Joas Schilling f8592e5e79
Only prevent disabling encrytion via the API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-07-16 14:24:47 +02:00
Roeland Jago Douma 3cc3b0f0d8
Update tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-07-09 13:57:04 +02:00
Christoph Wurst d058ef2b6c
Make it possible to wipe all tokens/devices of a user
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-07-09 13:57:04 +02:00
John Molakvoæ (skjnldsv) 33409319be
Do not fail hard on new user mail error
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-07-02 08:42:47 +02:00
Joas Schilling 8c73c1ea5e
Don't allow to disable encryption via the API
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-06-27 14:54:28 +02:00
Roeland Jago Douma 98244b5d6d
Merge pull request #16024 from nextcloud/bugfix/15944/fix-return-code-user-provision
Forward OCSException to initiator
2019-06-25 13:32:10 +02:00
Arthur Schiwon 99075825e3
changes the returned key from UserID to id, in accordance with getUserData
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-06-21 16:38:25 +02:00
Arthur Schiwon 29449f85b6
uses "yes" and "no" for config switch over stringified numbers
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-06-21 10:22:12 +02:00
Daniel Kesselberg 4177653e99
Forward OCSException to initiator
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-06-20 18:04:52 +02:00
Arthur Schiwon bbe2f2535a
makes users management page aware of the introduced options
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-06-19 17:04:35 +02:00
Arthur Schiwon 5b754a6353
extends Provisioning API with optional userid and required email
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-06-19 17:02:28 +02:00
Arthur Schiwon 45110f4c5d
fixes misunderstanding of the error message
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-05-16 14:31:10 +02:00
Joas Schilling 4c19b3b2c6
Bump versions of server and the requirements of apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-04-11 14:02:23 +02:00
Julius Härtl add43bc19c
Check if password can be changed for the users backend in OCS api
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-05 13:44:25 +01:00
Roeland Jago Douma 95d1cf4817
Merge pull request #13412 from nextcloud/forward-password-policy
forward error message from password policy
2019-01-30 11:12:02 +01:00
Roeland Jago Douma 15abcff2a1
Expose subadmin to OCP
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-01-29 20:47:35 +01:00
Arthur Schiwon 4915d64de8
ignore non existing users when retrieving details of group members
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-01-17 11:59:15 +01:00
Joas Schilling 9262507881
Fix doc block
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-01-10 10:49:09 +01:00
Robin Appelman 3991aa0166
forward error message from password policy
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-01-07 16:28:06 +01:00
Joas Schilling 1751c28c28
Bump versions of server and the requirements of apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-23 10:28:40 +01:00
Morris Jobke d70b010432
Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again
Shorten index name of calendar changes table
2018-11-15 10:47:51 +01:00
Joas Schilling 1997346369
Fix interaction with groups that contain a slash
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-15 10:03:32 +01:00
Joas Schilling aa88254f64
Shorten index name of calendar changes table
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-14 10:14:23 +01:00
Arthur Schiwon 505722cc0d
do not offer to change display name or password, if not possible.
Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-11-07 22:37:41 +01:00
Roeland Jago Douma 2452a3ec73
Properly query the methodreflector
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 19:20:37 +01:00
zulan cf266ee004 Get l10n within NewUserMailHelper to ensure it always uses the new user's language.
Some related tests had to be changed because they relied on internals, see also from the PHPUnit documentation:
"Exercise caution when using [the at] matcher as it can lead to brittle tests which are too closely tied to specific implementation details."

Signed-off-by: Zulan <git@zulan.net>
2018-10-15 19:01:46 +02:00
Joas Schilling f0d48554d3
Fix user and group listing with users that have an integer user id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-12 09:47:25 +02:00
Joas Schilling 47cc5e5895
Update version requirements and versions of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-05 14:27:06 +02:00
Roeland Jago Douma 90a656305b
Bump autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-10 15:03:22 +02:00
Daniel Calviño Sánchez 36326e38a0 Add optional "displayName" parameter to add user endpoint
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-31 13:33:55 +02:00
Georg Ehrke 3ffeb4ae06
fix tests / mistakes made during rebase
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 21:52:04 +02:00
Thomas Citharel abab7eb7f0
handle config.php values
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-06-27 13:19:23 +02:00
Thomas Citharel 4a9f8623b5
Fix review & tests
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:19:21 +02:00
Thomas Citharel d8921ccd85
Allow user to choose locale
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2018-06-27 13:15:19 +02:00
Robin Appelman 290b5b5461
show error message when group exists
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-06-26 15:00:54 +02:00
John Molakvoæ (skjnldsv) a53dbb8c0b
New user support, provisionning api and design fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-19 23:20:33 +02:00
John Molakvoæ (skjnldsv) cc2d58a850
Keep userids as keys on group search
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-15 22:54:28 +02:00
John Molakvoæ (skjnldsv) f0ce44fedf
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-15 16:51:53 +02:00
John Molakvoæ (skjnldsv) d666723cb0
Return groups IDs and not Names
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-15 16:42:39 +02:00
Roeland Jago Douma 228d1cfbd7
Make the DELETION of groups match greedy on the groupID
fixes #6032

Now since the match is greedy it will also eat the /

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-09 19:55:09 +02:00
John Molakvoæ (skjnldsv) da583f05fc
Allow 0 quota by provisioning api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-07 11:30:37 +02:00
John Molakvoæ (skjnldsv) ddd1c8bc86
Disabled fix since new users list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-24 17:52:15 +02:00
John Molakvoæ (skjnldsv) 97af7566e4
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-24 17:52:15 +02:00
John Molakvoæ (skjnldsv) 10c135ca34
Added disabled count per groups
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-05-24 17:52:15 +02:00
Arthur Schiwon 38a90130ce
move log constants to ILogger
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-04-26 10:45:52 +02:00
Roeland Jago Douma 63dfbb2127
Merge pull request #9162 from nextcloud/allow-lang-ocs-api
Add language support for user creation
2018-04-17 11:01:46 +02:00
John Molakvoæ (skjnldsv) 5bd02a63a8
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-16 15:18:33 +02:00
John Molakvoæ (skjnldsv) 6028d60038
Add language support for user creation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-16 15:18:33 +02:00
John Molakvoæ (skjnldsv) 3e5ea9b0a9
Return proper boolean user enabled state api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-16 15:17:02 +02:00
Morris Jobke 10b37a074c
Revert "Add language support for user creation in api" 2018-04-12 11:00:54 +02:00
Morris Jobke e6c146121e
Merge pull request #9144 from nextcloud/allow-lang-ocs-api
Add language support for user creation in api
2018-04-11 16:21:32 +02:00
John Molakvoæ (skjnldsv) 89da1af889
Add language support for user creation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-11 10:59:56 +02:00
Roeland Jago Douma a8d4b0688e
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-11 00:30:14 +02:00
Roeland Jago Douma d363e2f0e3
The integrationtests expect a string
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-04-10 23:29:09 +02:00
Morris Jobke acbcc607ea
Merge pull request #9111 from nextcloud/use-proper-bool-user-disabled-state
Return proper boolean and do not save enabled state in db
2018-04-09 23:39:02 +02:00
John Molakvoæ (skjnldsv) 8b9bd37e4e
Fixed tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-09 15:13:11 +02:00
John Molakvoæ (skjnldsv) eae55761de
Properly return boolean on enable state
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-09 11:26:26 +02:00
John Molakvoæ (skjnldsv) 18ec4ddd2b
Allow user creation with subadmins and quota
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-04-06 15:30:41 +02:00
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