yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,709 Commits 127 Branches 497 Tags
Commit Graph

62 Commits

Author SHA1 Message Date
Jean-Sébastien Herbaux
38126d9a32
Fix "has same role as author" condition not working properly (#8202) 
* Fix "has same role as author" condition not working properly

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Use creators constants

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add e2e test for default conditions, fix conditions on mongoose

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix tests in CE

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-10-08 19:50:39 +02:00
Alexandre Bodin
c98089ff65 Merge branch 'master' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 12:00:03 +02:00
Jean-Sébastien Herbaux
e55ea1d6b5
Hide creator fields from public api by default (#8052) 
* Add model option to hide/show creators fields in public API response

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add content-types util, rework sanitize-entity's private handling

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update search e2e tests, fix an issue on empty search for the core-api controller (find)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix GraphQL plugin (handle privates attributes on typeDefs + resolver builds)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix sanitizeEntity import

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Move doc update from beta to stable

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix e2e test

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix pr comments

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove creator's field from upload controller routes

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix typedef build for graphql association

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix pr (comments + several issues)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add tests for search behavior in content-manager

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Rename files variables to meaningful names (upload controllers)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix test with search id matching serialNumber

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add toHasBeenCalledWith check for config.get (utils/content-types.test.js)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 17:47:08 +02:00
Pierre Noël
36892fe2a8 add webhooks for draftAndPublish + sanitize all webhooks info (#7629) 
* add webhooks for draftAndPublish + sanitize all webhooks info

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:29 +02:00
Convly
a559047e77 Fix e2e and unit tests 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-09-22 17:39:17 +02:00
Alexandre BODIN
7394a35c51
Fix CE tests for travis (#7218) 
* Fix CE tests for travis

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Start app in CE too

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Cleanup

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-29 13:24:27 +02:00
Alexandre Bodin
8fd98b0c33 Fix test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-22 15:17:23 +02:00
Pierre Noël
9983d3b44e clean conditions at get and update 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-20 17:40:01 +02:00
Alexandre Bodin
9138034dbc Make admin role not editable at all 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-20 11:39:26 +02:00
Pierre Noël
c73aadbed5 add batch delete for users 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-16 12:57:54 +02:00
Alexandre Bodin
109e41ea1f Fix e2e tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 13:53:56 +02:00
Alexandre Bodin
5c6851e6ba Update naming of permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:45 +02:00
Pierre Noël
b1814214b1 clean permissions fields in DB at startup 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:47:22 +02:00
Pierre Noël
bfadebdf2c fix tests after upload.settings.read being removed from default permissions 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:38:20 +02:00
Pierre Noël
25bea051e0 prevent delete user route to delete last superAdmin 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:10:11 +02:00
Pierre Noël
6a1d65bc37 third refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Pierre Noël
243c4ccc4e add upload permissions to default roles + second refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Pierre Noël
dd88c00514 use new condition format 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:52 +02:00
Pierre Noël
6ab7669365 rename plugins::content-manager.create to plugins::content-manager.explorer.create and others 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:51 +02:00
Pierre Noël
b893501552 first refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:51 +02:00
Pierre Noël
8c1aa2999a fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:51 +02:00
Pierre Noël
3b8cab0621 add conditions logic for author/editor 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:50 +02:00
Pierre Noël
a6e090d991 prevent modification and delete of super admin role 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:09:49 +02:00
Alexandre Bodin
a83c34e72e Add default category 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:09:45 +02:00
Alexandre Bodin
24d4bad10c Add displayName 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:09:45 +02:00
Pierre Noël
2339c6b8f7 fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:09 +02:00
Pierre Noël
3aec039698 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:09 +02:00
Pierre Noël
42e3b64689 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:08 +02:00
Pierre Noël
0ff2048ea9 add action plugins::application.settings.read 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:08 +02:00
Pierre Noël
7e1a91dda6 add use strict 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:08 +02:00
Pierre Noël
bbb1353927 remove hidden contentTypes from permission actions list + fix tests 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:07 +02:00
Pierre Noël
e078c0b022 rename permissions to actions, inverted params of provider.get, separated formatter, add possibility to not specigy pluginName for ::application 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:07 +02:00
Pierre Noël
707746ef45 refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Pierre Noël
ae0dcb9745 add route GET /admin/permissions 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Convly
c398b969a4 Add unique email check on update user 2020-07-08 11:04:22 +02:00
Convly
d69101427f Fix PR: Refactor user e2e tests, fix domain logic, add user::deleteOne route 2020-07-08 11:04:22 +02:00
Convly
a6c2fab79c Add tests for user controller/service/api 
Fix e2e tests, add default role to match .min(1) condition
 2020-07-08 11:04:21 +02:00
Alexandre Bodin
d1e2350a2e Fix tests after merge 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:37 +02:00
Alexandre Bodin
7346b983c5 Add domain model for permission 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:59:37 +02:00
Pierre Noël
77eec454ff getUsersCountsFor -> getUserCount 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:59:37 +02:00
Pierre Noël
1746314930 fix tests for mongo 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:59:36 +02:00
Pierre Noël
970a470034 add tests + make role decription optional + refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:59:34 +02:00
Pierre Noël
86882a4aaa refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:08 +02:00
Pierre Noël
9d431ee8ff add single delete + refacto batch-delete 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:07 +02:00
Pierre Noël
308beddb24 add DELETE /admin/roles 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:58:07 +02:00
Alexandre Bodin
f7f3843916 Add tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:57:20 +02:00
Pierre Noël
e1209af1de refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:56:57 +02:00
Pierre Noël
182ec648d5 add loading of ee files + add create role 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:56:55 +02:00
Alexandre Bodin
7a056c2f45 Add admin registeration API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:53:19 +02:00
Pierre Noël
abcaa7f831 add PUT /admin/roles/:id 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 10:51:46 +02:00