@strapi/plugin-users-permissions 4.0.0-beta.2 → 4.0.0-beta.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/admin/src/components/BoundRoute/index.js +23 -27
  2. package/admin/src/components/FormModal/Input/index.js +2 -2
  3. package/admin/src/components/FormModal/index.js +10 -5
  4. package/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js +1 -1
  5. package/admin/src/components/Permissions/PermissionRow/SubCategory.js +12 -10
  6. package/admin/src/components/Permissions/PermissionRow/index.js +1 -1
  7. package/admin/src/components/Permissions/index.js +12 -8
  8. package/admin/src/components/Policies/index.js +12 -9
  9. package/admin/src/components/UsersPermissions/index.js +12 -15
  10. package/admin/src/index.js +0 -8
  11. package/admin/src/pages/AdvancedSettings/index.js +13 -13
  12. package/admin/src/pages/EmailTemplates/components/EmailForm.js +10 -5
  13. package/admin/src/pages/EmailTemplates/components/EmailTable.js +16 -16
  14. package/admin/src/pages/EmailTemplates/index.js +3 -3
  15. package/admin/src/pages/Providers/index.js +21 -21
  16. package/admin/src/pages/Providers/utils/api.js +1 -1
  17. package/admin/src/pages/Roles/CreatePage/index.js +13 -13
  18. package/admin/src/pages/Roles/EditPage/index.js +23 -13
  19. package/admin/src/pages/Roles/ListPage/components/TableBody.js +14 -10
  20. package/admin/src/pages/Roles/ListPage/index.js +19 -25
  21. package/documentation/1.0.0/overrides/users-permissions-User.json +7 -7
  22. package/package.json +29 -30
  23. package/server/bootstrap/index.js +17 -17
  24. package/server/config.js +2 -2
  25. package/server/content-types/permission/index.js +3 -0
  26. package/server/content-types/role/index.js +3 -0
  27. package/server/controllers/auth.js +73 -215
  28. package/server/controllers/{user/admin.js → content-manager-user.js} +44 -75
  29. package/server/controllers/index.js +2 -0
  30. package/server/controllers/role.js +7 -7
  31. package/server/controllers/settings.js +5 -4
  32. package/server/controllers/user.js +118 -28
  33. package/server/controllers/validation/auth.js +29 -0
  34. package/server/controllers/validation/user.js +38 -0
  35. package/server/middlewares/rateLimit.js +1 -1
  36. package/server/routes/admin/role.js +5 -5
  37. package/server/routes/admin/settings.js +6 -6
  38. package/server/routes/content-api/auth.js +5 -7
  39. package/server/services/jwt.js +9 -17
  40. package/server/services/providers.js +13 -10
  41. package/server/services/role.js +5 -10
  42. package/server/services/user.js +8 -6
  43. package/server/services/users-permissions.js +56 -45
  44. package/server/strategies/users-permissions.js +23 -22
  45. package/admin/src/assets/images/logo.svg +0 -1
  46. package/server/controllers/user/api.js +0 -158
package/server/bootstrap/index.js CHANGED
@@ -37,10 +37,10 @@ module.exports = async ({ strapi }) => {
37
37
  };
38
38
 
39
39
  const initGrant = async pluginStore => {
40
+ const apiPrefix = strapi.config.get('api.rest.prefix');
41
+ const baseURL = `${strapi.config.server.url}/${apiPrefix}/auth`;
42
+
40
43
  const grantConfig = {
41
- defaults: {
42
- prefix: '/api/connect',
43
- },
44
44
  email: {
45
45
  enabled: true,
46
46
  icon: 'envelope',
@@ -50,7 +50,7 @@ const initGrant = async pluginStore => {
50
50
  icon: 'discord',
51
51
  key: '',
52
52
  secret: '',
53
- callback: `${strapi.config.server.url}/api/auth/discord/callback`,
53
+ callback: `${baseURL}/discord/callback`,
54
54
  scope: ['identify', 'email'],
55
55
  },
56
56
  facebook: {
@@ -58,7 +58,7 @@ const initGrant = async pluginStore => {
58
58
  icon: 'facebook-square',
59
59
  key: '',
60
60
  secret: '',
61
- callback: `${strapi.config.server.url}/api/auth/facebook/callback`,
61
+ callback: `${baseURL}/facebook/callback`,
62
62
  scope: ['email'],
63
63
  },
64
64
  google: {
@@ -66,7 +66,7 @@ const initGrant = async pluginStore => {
66
66
  icon: 'google',
67
67
  key: '',
68
68
  secret: '',
69
- callback: `${strapi.config.server.url}/api/auth/google/callback`,
69
+ callback: `${baseURL}/google/callback`,
70
70
  scope: ['email'],
71
71
  },
72
72
  github: {
@@ -74,7 +74,7 @@ const initGrant = async pluginStore => {
74
74
  icon: 'github',
75
75
  key: '',
76
76
  secret: '',
77
- callback: `${strapi.config.server.url}/api/auth/github/callback`,
77
+ callback: `${baseURL}/github/callback`,
78
78
  scope: ['user', 'user:email'],
79
79
  },
80
80
  microsoft: {
@@ -82,7 +82,7 @@ const initGrant = async pluginStore => {
82
82
  icon: 'windows',
83
83
  key: '',
84
84
  secret: '',
85
- callback: `${strapi.config.server.url}/api/auth/microsoft/callback`,
85
+ callback: `${baseURL}/microsoft/callback`,
86
86
  scope: ['user.read'],
87
87
  },
88
88
  twitter: {
@@ -90,14 +90,14 @@ const initGrant = async pluginStore => {
90
90
  icon: 'twitter',
91
91
  key: '',
92
92
  secret: '',
93
- callback: `${strapi.config.server.url}/api/auth/twitter/callback`,
93
+ callback: `${baseURL}/twitter/callback`,
94
94
  },
95
95
  instagram: {
96
96
  enabled: false,
97
97
  icon: 'instagram',
98
98
  key: '',
99
99
  secret: '',
100
- callback: `${strapi.config.server.url}/api/auth/instagram/callback`,
100
+ callback: `${baseURL}/instagram/callback`,
101
101
  scope: ['user_profile'],
102
102
  },
103
103
  vk: {
@@ -105,7 +105,7 @@ const initGrant = async pluginStore => {
105
105
  icon: 'vk',
106
106
  key: '',
107
107
  secret: '',
108
- callback: `${strapi.config.server.url}/api/auth/vk/callback`,
108
+ callback: `${baseURL}/vk/callback`,
109
109
  scope: ['email'],
110
110
  },
111
111
  twitch: {
@@ -113,7 +113,7 @@ const initGrant = async pluginStore => {
113
113
  icon: 'twitch',
114
114
  key: '',
115
115
  secret: '',
116
- callback: `${strapi.config.server.url}/api/auth/twitch/callback`,
116
+ callback: `${baseURL}/twitch/callback`,
117
117
  scope: ['user:read:email'],
118
118
  },
119
119
  linkedin: {
@@ -121,7 +121,7 @@ const initGrant = async pluginStore => {
121
121
  icon: 'linkedin',
122
122
  key: '',
123
123
  secret: '',
124
- callback: `${strapi.config.server.url}/api/auth/linkedin/callback`,
124
+ callback: `${baseURL}/linkedin/callback`,
125
125
  scope: ['r_liteprofile', 'r_emailaddress'],
126
126
  },
127
127
  cognito: {
@@ -130,7 +130,7 @@ const initGrant = async pluginStore => {
130
130
  key: '',
131
131
  secret: '',
132
132
  subdomain: 'my.subdomain.com',
133
- callback: `${strapi.config.server.url}/api/auth/cognito/callback`,
133
+ callback: `${baseURL}/cognito/callback`,
134
134
  scope: ['email', 'openid', 'profile'],
135
135
  },
136
136
  reddit: {
@@ -139,7 +139,7 @@ const initGrant = async pluginStore => {
139
139
  key: '',
140
140
  secret: '',
141
141
  state: true,
142
- callback: `${strapi.config.server.url}/api/auth/reddit/callback`,
142
+ callback: `${baseURL}/reddit/callback`,
143
143
  scope: ['identity'],
144
144
  },
145
145
  auth0: {
@@ -148,7 +148,7 @@ const initGrant = async pluginStore => {
148
148
  key: '',
149
149
  secret: '',
150
150
  subdomain: 'my-tenant.eu',
151
- callback: `${strapi.config.server.url}/api/auth/auth0/callback`,
151
+ callback: `${baseURL}/auth0/callback`,
152
152
  scope: ['openid', 'email', 'profile'],
153
153
  },
154
154
  cas: {
@@ -156,7 +156,7 @@ const initGrant = async pluginStore => {
156
156
  icon: 'book',
157
157
  key: '',
158
158
  secret: '',
159
- callback: `${strapi.config.server.url}/api/auth/cas/callback`,
159
+ callback: `${baseURL}/cas/callback`,
160
160
  scope: ['openid email'], // scopes should be space delimited
161
161
  subdomain: 'my.subdomain.com/cas',
162
162
  },
package/server/config.js CHANGED
@@ -13,8 +13,8 @@ module.exports = {
13
13
  layout: {
14
14
  user: {
15
15
  actions: {
16
- create: 'User.create', // Use the User plugin's controller.
17
- update: 'User.update',
16
+ create: 'contentManagerUser.create', // Use the User plugin's controller.
17
+ update: 'contentManagerUser.update',
18
18
  },
19
19
  },
20
20
  },
package/server/content-types/permission/index.js CHANGED
@@ -13,6 +13,9 @@ module.exports = {
13
13
  'content-manager': {
14
14
  visible: false,
15
15
  },
16
+ 'content-type-builder': {
17
+ visible: false,
18
+ },
16
19
  },
17
20
  attributes: {
18
21
  action: {
package/server/content-types/role/index.js CHANGED
@@ -13,6 +13,9 @@ module.exports = {
13
13
  'content-manager': {
14
14
  visible: false,
15
15
  },
16
+ 'content-type-builder': {
17
+ visible: false,
18
+ },
16
19
  },
17
20
  attributes: {
18
21
  name: {