sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
71,567 Commits
620 Branches
1167 Tags
9.0 GiB
Commit Graph

190 Commits (8904bf645b30fbdfdcb00a2ea607d752ee69d865)

Author SHA1 Message Date
Christoph Wurst 833d1d2c3b
Fix php-cs formatting 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-04-14 17:53:44 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07:00
Christoph Wurst 5bf3d1bb38
Update license headers 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-05 15:38:45 +07:00
Roeland Jago Douma 3a7cf40aaa
Mode to modern phpunit 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 15:27:18 +07:00
Roeland Jago Douma c007ca624f
Make phpunit8 compatible 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-27 13:34:41 +07: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 +07: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 +07: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 +07:00
Roeland Jago Douma 3cc3b0f0d8
Update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-07-09 13:57:04 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07:00
Roeland Jago Douma 15abcff2a1
Expose subadmin to OCP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 20:47:35 +07: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 +07: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 +07: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 +07: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 +07:00
Georg Ehrke 3ffeb4ae06
fix tests / mistakes made during rebase 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2018-06-27 21:52:04 +07:00
Thomas Citharel 4a9f8623b5
Fix review & tests 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2018-06-27 13:19:21 +07: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 +07:00
John Molakvoæ (skjnldsv) f0ce44fedf
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-06-15 16:51:53 +07:00
John Molakvoæ (skjnldsv) 97af7566e4
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-24 17:52:15 +07:00
Arthur Schiwon 38a90130ce
move log constants to ILogger 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 10:45:52 +07: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 +07:00
Roeland Jago Douma a8d4b0688e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-11 00:30:14 +07:00
John Molakvoæ (skjnldsv) 8b9bd37e4e
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-09 15:13:11 +07:00
John Molakvoæ (skjnldsv) 762002ec2e
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-05 17:11:41 +07:00
John Molakvoæ (skjnldsv) b023bfe38f
Fixed tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-04-05 17:09:00 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07:00
Roeland Jago Douma fbeaacdf1b
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 22:03:40 +07: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 +07:00
Joas Schilling bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +07: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 +07:00
Morris Jobke 0eebff152a
Update license headers 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-11-06 16:56:19 +07:00
Morris Jobke c733cdaa65
Use ::class in test mocks of encryption app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-26 13:56:56 +07:00
Morris Jobke 43e498844e
Use ::class in test mocks 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 17:45:32 +07: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 +07:00
Roeland Jago Douma 2fae696d35
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +07: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 +07:00
Joas Schilling fa717d9706
Add unit tests for the new code 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-06-21 12:21:21 +07: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 +07: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 +07:00
Joas Schilling 7a87fedac3
Remove dead arguments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-04-24 10:18:14 +07: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 +07: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 +07: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 +07:00
Lukas Reschke 280a075c9c
Adjust class references 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-11 17:35:59 +07: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 +07:00
Morris Jobke 8838ed4c2e Merge pull request #4244 from nextcloud/welcome-email 
New layout for welcome email
 2017-04-07 14:52:28 +07: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 +07: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 +07: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 +07:00
Christoph Wurst 8e370bbf28
Refactor provision api app's UserControllerTest 
* Replace deprecated getMock with createMock
* Use createMock consistently
* Use php's ::class references

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-28 10:40:49 +07:00
Bjoern Schiessle 2ca8339d01
add groups to user info output 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-02-09 16:23:10 +07: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 +07: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 +07: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 +07: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 +07: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 +07: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 +07:00
Roeland Jago Douma e13affa29d
Adds provisioning middleware tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-12-30 14:12:10 +07: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 +07:00
Joas Schilling 0d878f94e6
Add unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-10-21 09:59:34 +07:00
Roeland Jago Douma 092b767ef9
Move Apps to OCSController 2016-08-14 18:34:07 +07:00
Roeland Jago Douma 8f4adebab7
Move Users to OCSController 2016-08-14 18:34:02 +07:00
Roeland Jago Douma 432e7c93c6
Move Groups over to OCSController 
* Take advantage of the AppFramework
* Fix tests
 2016-08-14 18:34:01 +07:00
Joas Schilling 813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +07: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 +07:00
Lukas Reschke aba539703c
Update license headers 2016-05-26 19:57:24 +07: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 +07:00
Thomas Müller 8486926a14
Add provisioning api to enable and disable users 2016-05-02 09:31:22 +07:00
Lukas Reschke c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +07: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 +07:00
Arthur Schiwon d19c47a381 More fixed tests :) 2016-02-09 18:11:30 +07:00
Thomas Müller aeb89947a2 Introduce IUser::setEMailAddress and add hook mechanism 2016-01-20 14:57:20 +07:00
Thomas Müller 682821c71e Happy new year! 2016-01-12 15:02:18 +07:00
Roeland Jago Douma 1af3bca720 Fix provisioning API unit test 2016-01-08 13:35:00 +07:00
Tom Needham 673a8a1e4a Remove unnecessary group name validation 2016-01-08 13:35:00 +07:00
Lukas Reschke 88c7face07 Inject OCSClient 
Fixes https://github.com/owncloud/core/issues/21451
 2016-01-06 11:40:22 +07:00
Joas Schilling 5453daab03 More fixes to the docs 2015-12-08 09:11:50 +07:00
Scrutinizer Auto-Fixer 0f1be1b601 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 20:08:20 +07:00
Thomas Müller eebe2b9c23 User IUser::getEMailAddress() all over the place 2015-12-02 21:25:05 +07:00
Thomas Müller 757aa45db7 Adding more DB groups to test suits 
Adding more DB groups to test suits
 2015-11-30 10:55:06 +07:00