yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 00:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,700 Commits 113 Branches 488 Tags
Commit Graph

382 Commits

Author SHA1 Message Date
Convly
ef94229d81 Add Condition Provider & Permissions Engine 2020-07-08 11:05:49 +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
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
Alexandre Bodin
7a056c2f45 Add admin registeration API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:53:19 +02:00
Alexandre Bodin
a4f294f1c4 Use passport standard error handling 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-07-08 10:24:38 +02:00
Convly
364de7d2e8 Update admin::administrator queries to match its new name 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-07-08 10:21:18 +02:00
Juan David Landazabal
f4959d9560
Allow custom populate in ctx.state.user (#6770) 
* Allow custom populate in user model

Signed-off-by: Juan David <juand.business@gmail.com>

* use merge from lodash to join a custom populate

Signed-off-by: Juan David <juand.business@gmail.com>

* refactor fech
 2020-07-06 09:43:30 +02:00
Alexandre BODIN
48a818041e
Fix some user permission issue (#6629) 
* Fix some security issue

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

* compt node 10

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-06-15 10:34:59 +02:00
Scott Agirs
728e8c63b9
[typo] Persmissions > Permissions (#6390) 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-27 17:22:19 +02:00
Alexandre BODIN
f32bc7b30b
Merge pull request #5655 from ScottAgirs/patch---adjust-naming-to-password-mutations 
Fix #5653: improve UserPermissions - password mutations
 2020-05-25 15:44:48 +02:00
Jim LAURIE
fc4cef9926 fix: fix pr feedback 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-05-22 10:34:38 +02:00
Jim LAURIE
16c304d710 Merge branch 'master' of github.com:strapi/strapi into jwtconfig 2020-05-22 10:22:14 +02:00
ScottAgirs
ef861f19ff [bugfix] register() input, payload 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-19 12:03:31 -04:00
ScottAgirs
ebed726d7b [bugfix] register(input: UsersPermissionsRegisterInput) 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-19 11:58:36 -04:00
ScottAgirs
13b379128d [bugfix] put back UsersPermissionsRegisterInput on register() 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-18 15:49:00 -04:00
trick0
04337262cb Merge branch 'master' into master 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-05-13 18:33:44 +02:00
David Thomas
ba6c0b4ba2
Add Twitch auth provider (#6171) 
* Add Twitch auth provider

Signed-off-by: David Thomas <dev@synth3.tk>

* Remove unneeded label exclusion

Signed-off-by: David Thomas <dev@synth3.tk>
 2020-05-12 16:48:18 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833) 
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

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

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

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

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-08 13:50:00 +02:00
ScottAgirs
d41227b75d Merge branch 'master' into patch---adjust-naming-to-password-mutations 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-07 13:05:29 -04:00
Alexandre BODIN
2b3d94d747
Merge pull request #6047 from gfpacheco/bug/ignore-private-fields-on-register 
Ignore private fields input on user register
 2020-05-07 15:21:33 +02:00
Guilherme Pacheco
aa34dd256f
Update register mutation input 
Signed-off-by: Guilherme Pacheco <guilherme.f.pacheco@gmail.com>
 2020-05-06 10:42:17 -03:00
Alexandre Bodin
2e31afe6dd Upgrade doc to use env var and js config files 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:43 +02:00
Alexandre Bodin
5595f6ca94 Add policy loader 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:36 +02:00
trick0
371e3e0d28
Merge branch 'master' into master 2020-04-24 10:26:37 +02:00
Steven Raines
bec93f672f
updated arguments sent to role controller to (#5857) 
match the expected format

Signed-off-by: Steven Raines <stevenraines@gmail.com>
 2020-04-22 11:13:48 +02:00
Walter Cossu
c01bda9fff added user count 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-17 18:00:03 +02:00
Alexandre Bodin
94dbf10adc Merge branch 'master' into develop 2020-04-16 14:05:23 +02:00
Daniel
f56158b684 Fix email confirmation redirect which got broken in #5580 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-15 22:25:27 +02:00
Matt
ce8e97bce9 Signed-off-by: Matt <kapakapa197@gmail.com> 
Fixed a typo in the configuration
 2020-04-12 20:19:05 +02:00
Matt
2850c6ff0f Signed-off-by: Matt <kapakapa197@gmail.com> 
Fixed an erro on JWT default configuration file
 2020-04-12 14:46:19 +02:00
Matt
86321355c7 Added support for full jwt configuration with jwt.json config file 
Signed-off-by: Matt <kapakapa197@gmail.com>
 2020-04-12 14:23:43 +02:00
ScottAgirs
40fbe530c1 [minor] console log text tweak 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-04-11 13:46:45 -04:00
ScottAgirs
823acf4777 [deprecate] change-password in favour of reset-password 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-04-11 13:41:09 -04:00
ScottAgirs
7305a2e20c [add] changePassword 
[refactor] changePassword > resetPassword

Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
10667395e2 [rename] ForgotPassword > UserPersmissionsPasswordPayload 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
8e322285d6 [add] changePassword mutation 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
ScottAgirs
801224f2d9 [rename] changePassword > resetPassword for accuracy 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-03-31 00:55:35 -04:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Convly
f171029243 Change checkBadRequest's exception shape 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 14:33:55 +01:00
Convly
2d8e55838e Update path to contextBody attributes in schema.graphql.js@checkBadRequest() 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-27 12:19:44 +01:00
soupette
2e525a7f65 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-27 07:47:17 +01:00
Alexandre BODIN
9fdb650c6c
Fix rerouting of destroy route in user-perm (#5581) 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-26 13:55:52 +01:00
soupette
38b7823b34 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-26 08:01:22 +01:00
Roel Beerens
2570e27238 feat: Added missing forgotPassword, changePassword and emailConfirmation mutations/resolvers. Made a slight adjustment to the emailConfirmation controller function in Auth.js to return a UsersPermissionsLoginPayload when using GraphQL 
Signed-off-by: Roel Beerens <roel@gravity.nl>
 2020-03-23 18:02:26 +01:00
Alexandre Bodin
72440af84b Merge branch 'develop' into features/media-lib 2020-03-23 17:28:21 +01:00
Derrick Mehaffy
8f7af83049
Remove extra console.log in users-permissions 
Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
 2020-03-23 03:50:35 -07:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Alexandre Bodin
bff34ad023 Fix missing lib in users-permissions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 09:59:33 +01:00