yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,807 Commits 129 Branches 498 Tags
Commit Graph

259 Commits

Author SHA1 Message Date
Thomas
2f97ff1f93
better error handling for missing model error (#8328) 
* Ammending commit

Signed-off-by: Thomas Chezieres <tchezieres@MacBook-Pro.lan>

* ammending last commit

Signed-off-by: Thomas Chezieres <tchezieres@MacBook-Pro.lan>

Co-authored-by: Thomas Chezieres <tchezieres@MacBook-Pro.lan>
Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-15 16:39:46 +02:00
Alexandre BODIN
e53b54c218
Support query operators _or & _where in graphql with deep nesting (#8332) 
* SUpport query operators _or _where in graphql with deep nesting

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

* Add testing for complexe graphql queries

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-15 13:22:40 +02:00
jiv_e
6fb0a63751
Refactor log level configuration (#7695) 
* Refactor log level configuration

- Remove STRAPI_LOG_LEVEL environment variable related redundant code.
- Add helpful error message to the current log level configuration
  system.

Signed-off-by: Juho Viitasalo <juho.viitasalo@lildrop.com>

* Fix error message

Signed-off-by: Juho Viitasalo <juho.viitasalo@lildrop.com>

* Fix log level base value

* Fix breaking change

* Add debug message

* Change logger code to use Pino's log level values directly

* Update index.js

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
 2020-10-08 18:58:59 +02:00
Alexandre Bodin
29286c8fdb Use non visible attributes as a reference for rbac fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 16:30:48 +02:00
Alexandre Bodin
c60f826f4e Fix unit test 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 14:24:41 +02:00
Alexandre Bodin
0df69c30ce Allow setting the published_at field in the API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-05 14:07:17 +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
Alexandre Bodin
8589848ce4 Merge branch 'features/draft-publish' into releases/3.2 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-10-01 16:23:32 +02:00
Diego Albitres
0670c896e3
Add privateAttributes to global and per model response (#7331) 
* Added privateAttributes globally and per model

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added tests for sanitizeEntity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed broken test

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added privateAttributes to GraphQL responses

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Added docs for privateAttributes

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored and fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Merged tests and fixed broken tests from merge

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Updated documentation for new option

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Refactored GraphQL implementation

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed PR comments

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Fixed tests for sanitize-entity

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed code and tests for ignorePrivateFor

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Exported getPrivateAttributes for GraphQL plugin

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>

* Removed ignorePrivateFor from docs

Signed-off-by: Diego Albitres <diego.albitres@gmail.com>
 2020-09-24 09:40:10 +02:00
Pierre Noël
7221412d68 Draft publish/validators (#7853) 
* add validators for dz, components and relations

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:45:59 +02:00
Jean-Sébastien Herbaux
c4716d5668 [D&P] Return published content by default from get apis (#7657) 
* Add _publicationState request param / Returns live by default for CT that have D&P activated

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-09-22 17:39:46 +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
Pierre Noël
38216554d5 Draft publish/remove some validators for drafts (#7537) 
* remove required + minLength validator for drafts

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:24 +02:00
Pierre Noël
e29c1b7de9 add published_at (#7374) 
* add published_at

Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-09-22 17:39:18 +02:00
Convly
28beaaa932 Refactor validators and add better messages 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-09-22 17:39:16 +02:00
Jean-Sébastien Herbaux
1e67421668
Add utils::sanitize-entity tests (#7497) 
* Add utils::sanitize-entity tests

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-18 16:26:24 +02:00
Convly
10cc543cc7 Fix sanitizeEntity's includeFields usage for dynamic zones 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-08-06 15:13:45 +02:00
alaoui abdellah
bca8bb662a
style: 📝 Improve error message of file upload by adding an example (#7111) 
Signed-off-by: Abdellah Alaoui <als.abdellah@gmail.com>
 2020-07-25 08:45:06 +02:00
Alexandre Bodin
38d67fc873 Fix mongo issues 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 16:07:11 +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
1c90614f8b Fix sanitizeEntity 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:44 +02:00
Alexandre Bodin
cdc9bc2167 Allow multiple args in policies 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:43 +02:00
Alexandre Bodin
44a7e2321d Update findOne 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Alexandre Bodin
29fcf7c3cd Clean find relation list and tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:48:42 +02:00
Convly
36facdfd00 Add new sanitize-entity.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:41 +02:00
Convly
20f80b2361 Better permissions-manager.sanitize behavior 
Forbid empty arrays as fields for permissions (on ability creation)
Differentiate input from output sanitizing

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:38 +02:00
Convly
8b81395171 Fix filename typo 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:17 +02:00
Convly
b5fb5f8509 Add permissions to the content-manager routes 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:17 +02:00
Convly
11ba971302 Rework policy handling, add util to create policy factories, allow array declaration for hasPermissions 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:16 +02:00
Convly
b3f602d207 Rework policies resolving (allow policy generators) / Add hasPermissions policy 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:48:16 +02:00
Alexandre Bodin
966d9c554f Move hasDeepFilters to utils 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:36:26 +02:00
Alexandre Bodin
82316bbf3a Allow or operator and working with bookshelf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 11:32:44 +02:00
Pierre Noël
1ee5b7f189 fifth refacto 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:10:09 +02:00
Convly
765d7aaa52 Add check many permissions route/controller / Add userAbility to the context's state / Add isAuthenticatedAdmin.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 11:05:50 +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
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
ae0dcb9745 add route GET /admin/permissions 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Pierre Noël
5fffffa72d add permission registry provider 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-07-08 11:05:06 +02:00
Convly
248546581f Accept ids equal to 0 as StrapiID 2020-07-08 11:04:22 +02:00
Convly
65f0e7e3f3 Use custom type for strapiID & move it to strapi-utils 2020-07-08 11:04:21 +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
7f0bb01a07 refacto 
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
Convly
651d42dbea fix PR comments, move pagination logic to the database layer, handle searches 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:50:44 +02:00
Convly
08d121cd2d Remove useless parseInt from findPageQueryFactory.js 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:28 +02:00
Convly
60b24dd3c3 Add GET /admin/users route and new pagination system 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:49:22 +02:00
Alexandre Bodin
919aae2211 Fix unit tests 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:21:28 +02:00