yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-10 15:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,206 Commits 107 Branches 503 Tags
Commit Graph

1499 Commits

Author SHA1 Message Date
Drew Town
549803adfc
Sanitize user object in user plugin update method return value (#6003) 
* Sanitize user object in update method return value

Signed-off-by: Drew Town <drew.town+github@gmail.com>

* Sanitize returned user data on create and destroy
 2020-05-25 17:39:33 +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
Alexandre BODIN
9f5844949d
Merge pull request #6124 from frosato-dev/master 
Prevent user registration with confirmed status
 2020-05-19 13:21:58 +02:00
François Rosato
37e97d6219 Prevent user registration with confirmed status 
Pull request https://github.com/strapi/strapi/pull/6072 aimed to add security by preventing creation of user with email confirmation enabled. By limiting user params to 'username', 'email', 'password', the current code do not allow adding custom field to user entity during registration which may breaks existing applications that have added required custom fields into user model .

Signed-off-by: François Rosato <francois.rosato@ekino.com>
 2020-05-19 11:52:45 +02:00
ScottAgirs
13b379128d [bugfix] put back UsersPermissionsRegisterInput on register() 
Signed-off-by: ScottAgirs <scott@ijs.to>
 2020-05-18 15:49:00 -04:00
ramigs
24e015e3c0
in register, response has the jwt property only if email confirmation setting is true (#6192) 
Signed-off-by: ramigs <ramigs@gmail.com>
 2020-05-15 09:20:35 +02: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
Sulakin Vadim
30ba717525
fix vk providers (#5783) 2020-05-12 14:04:52 +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
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 2020-05-07 13:02:11 +02:00
Guilherme Pacheco
677b25007f
Fix user register test 
Signed-off-by: Guilherme Pacheco <guilherme.f.pacheco@gmail.com>
 2020-05-06 10:42:22 -03: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
4d5af2c95d Make password input optional while editing 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 19:05:43 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre Bodin
a927f7e19b Only allow registeration with specific fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Co-authored-by: diogotcorreia
 2020-05-05 14:46:44 +02:00
Alexandre Bodin
c364fcd0e2 Move lifecycles to sub field and added documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:08 +02:00
Ky
ec71ed2c92 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:45:30 +02:00
Ky
c11cc6ab97 apply design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 11:47:38 +02: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
d7327d4395 remove overwritting env var witohut passing by the config 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:39 +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
Ky
490d565c07 use theme for fontweight 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:31:43 +02:00
Ky
83f2022e20 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-28 15:22:20 +02:00
Ky
f828314acc apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:20:41 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
Ky
4cd1b6c124 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:55:03 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
Walter Cossu
f1745c0956 Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-24 10:47:29 +02:00
Walter Cossu
90e0d75230 added countSearch method to user service 2020-04-24 10:30:37 +02:00
trick0
371e3e0d28
Merge branch 'master' into master 2020-04-24 10:26:37 +02:00
soupette
221ad7975b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:51:42 +02:00
soupette
8dcaf1b065 Fix styled compo lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 15:49:51 +02:00
soupette
6d9bc79726 Upgrade react-intl dependency to latest 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:08 +02:00
soupette
b71647a7d7 Remove unneeded packages 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
13d4c58bbe Update reducer injector in all plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +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
Pierre Noël
134fba1229 rename DEFAULT_PERMISSIONS 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:19:12 +02:00
Pierre Noël
ddc5bb5ac3 fix missing permissions at startup 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-04-20 15:19:11 +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
soupette
bf1040f9b9 Upgrade reactstrap dependency. Fixes #5837 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 14:00:53 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00