@strapi/plugin-users-permissions 0.0.0-next.f7babb775ed9a7e18d8351cb7f74c63e016323c4 → 0.0.0-next.fb3a0b82484ce466b1efb1b28f16fc8ef73aba4a

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 (38) hide show
  1. package/admin/src/components/Permissions/index.js +2 -4
  2. package/admin/src/index.js +7 -8
  3. package/admin/src/pages/AdvancedSettings/index.js +41 -24
  4. package/admin/src/pages/EmailTemplates/index.js +62 -47
  5. package/admin/src/pages/Providers/index.js +64 -58
  6. package/admin/src/{hooks → pages/Roles/hooks}/usePlugins.js +15 -8
  7. package/admin/src/pages/Roles/index.js +10 -7
  8. package/admin/src/pages/Roles/pages/CreatePage.js +199 -0
  9. package/admin/src/pages/Roles/pages/EditPage.js +220 -0
  10. package/admin/src/pages/Roles/{ListPage → pages/ListPage}/components/TableBody.js +44 -14
  11. package/admin/src/pages/Roles/{ListPage → pages/ListPage}/index.js +19 -15
  12. package/admin/src/translations/zh-Hans.json +80 -80
  13. package/documentation/content-api.yaml +1 -1
  14. package/jest.config.front.js +1 -1
  15. package/package.json +7 -7
  16. package/server/bootstrap/index.js +36 -0
  17. package/server/controllers/auth.js +51 -14
  18. package/server/controllers/user.js +12 -1
  19. package/server/middlewares/rateLimit.js +1 -1
  20. package/admin/src/hooks/index.js +0 -5
  21. package/admin/src/hooks/useFetchRole/index.js +0 -67
  22. package/admin/src/hooks/useFetchRole/reducer.js +0 -31
  23. package/admin/src/hooks/useForm/index.js +0 -68
  24. package/admin/src/hooks/useForm/reducer.js +0 -40
  25. package/admin/src/hooks/useRolesList/index.js +0 -65
  26. package/admin/src/hooks/useRolesList/init.js +0 -5
  27. package/admin/src/hooks/useRolesList/reducer.js +0 -31
  28. package/admin/src/pages/AdvancedSettings/utils/api.js +0 -16
  29. package/admin/src/pages/EmailTemplates/utils/api.js +0 -16
  30. package/admin/src/pages/Providers/reducer.js +0 -54
  31. package/admin/src/pages/Providers/utils/api.js +0 -24
  32. package/admin/src/pages/Providers/utils/createProvidersArray.js +0 -21
  33. package/admin/src/pages/Roles/CreatePage.js +0 -185
  34. package/admin/src/pages/Roles/EditPage.js +0 -197
  35. package/admin/src/pages/Roles/ProtectedCreatePage.js +0 -15
  36. package/admin/src/pages/Roles/ProtectedEditPage.js +0 -15
  37. package/admin/src/pages/Roles/ProtectedListPage.js +0 -17
  38. /package/admin/src/pages/Roles/{ListPage → pages/ListPage}/utils/api.js +0 -0
@@ -1,82 +1,82 @@
1
1
  {
2
- "BoundRoute.title": "绑定路由到",
3
- "EditForm.inputSelect.description.role": "新验证身份的用户将被赋予所选角色。",
4
- "EditForm.inputSelect.label.role": "认证用户的默认角色",
5
- "EditForm.inputToggle.description.email": "不允许用户使用不同的认证提供者(绑定的相同的电子邮件地址)来创建多个帐户。",
6
- "EditForm.inputToggle.description.email-confirmation": "启用(ON)后,新注册的用户会收到一封确认电子邮件。",
7
- "EditForm.inputToggle.description.email-confirmation-redirection": "确认您的电子邮件后,选择将您重定向到的位置。",
8
- "EditForm.inputToggle.description.email-reset-password": "应用程序的重置密码页面的 URL",
9
- "EditForm.inputToggle.description.sign-up": "当禁用(OFF)时,注册过程将被禁止。任何人无论使用任何的供应商都不可以订阅。",
10
- "EditForm.inputToggle.label.email": "每个电子邮件地址一个帐户",
11
- "EditForm.inputToggle.label.email-confirmation": "启用电子邮件确认",
12
- "EditForm.inputToggle.label.email-confirmation-redirection": "重定向 URL",
13
- "EditForm.inputToggle.label.email-reset-password": "重置密码页面 URL",
14
- "EditForm.inputToggle.label.sign-up": "启用注册",
15
- "EditForm.inputToggle.placeholder.email-confirmation-redirection": "例如: https://yourfrontend.com/reset-password",
16
- "EditForm.inputToggle.placeholder.email-reset-password": "例如: https://yourfrontend.com/reset-password",
17
- "EditPage.form.roles": "角色详情",
18
- "Email.template.data.loaded": "电子邮件模板已加载",
19
- "Email.template.email_confirmation": "邮箱地址确认",
20
- "Email.template.form.edit.label": "编辑模板",
21
- "Email.template.table.action.label": "操作",
22
- "Email.template.table.icon.label": "图标",
23
- "Email.template.table.name.label": "名称",
24
- "Form.advancedSettings.data.loaded": "高级设置数据已加载",
25
- "HeaderNav.link.advancedSettings": "高级设置",
26
- "HeaderNav.link.emailTemplates": "电子邮件模板",
27
- "HeaderNav.link.providers": "提供者",
28
- "Plugin.permissions.plugins.description": "定义 {name} 插件所有允许的操作。",
29
- "Plugins.header.description": "下面只列出路由绑定的操作。",
30
- "Plugins.header.title": "权限",
31
- "Policies.header.hint": "选择应用程序或插件的操作,然后点击 COG 图标显示绑定的路由",
32
- "Policies.header.title": "高级设置",
33
- "PopUpForm.Email.email_templates.inputDescription": "如果你不确定如何使用变量, {link}",
34
- "PopUpForm.Email.link.documentation": "查看我们的文档",
35
- "PopUpForm.Email.options.from.email.label": "发件人地址",
36
- "PopUpForm.Email.options.from.email.placeholder": "kai@doe.com",
37
- "PopUpForm.Email.options.from.name.label": "发件人名称",
38
- "PopUpForm.Email.options.from.name.placeholder": "Kai Doe",
39
- "PopUpForm.Email.options.message.label": "消息",
40
- "PopUpForm.Email.options.object.label": "主题",
41
- "PopUpForm.Email.options.object.placeholder": "请为%APP_NAME%确认邮箱地址",
42
- "PopUpForm.Email.options.response_email.label": "回复邮件",
43
- "PopUpForm.Email.options.response_email.placeholder": "kai@doe.com",
44
- "PopUpForm.Providers.enabled.description": "如果禁用,用户将无法使用此供应商。",
45
- "PopUpForm.Providers.enabled.label": "启用",
46
- "PopUpForm.Providers.key.label": "客户端 ID",
47
- "PopUpForm.Providers.key.placeholder": "文本",
48
- "PopUpForm.Providers.redirectURL.front-end.label": "重定向 URL",
49
- "PopUpForm.Providers.redirectURL.label": "添加到{provider}应用配置的跳转URL",
50
- "PopUpForm.Providers.secret.label": "客户端秘钥",
51
- "PopUpForm.Providers.secret.placeholder": "文本",
52
- "PopUpForm.Providers.subdomain.label": "主机URI(子域名)",
53
- "PopUpForm.Providers.subdomain.placeholder": "my.subdomain.com",
54
- "PopUpForm.header.edit.email-templates": "编辑电子邮件模版",
55
- "PopUpForm.header.edit.providers": "编辑提供商",
56
- "Providers.data.loaded": "提供商已加载",
57
- "Providers.status": "状态",
58
- "Roles.empty": "您还没有任何角色。",
59
- "Roles.empty.search": "没有与搜索相匹配的角色。",
60
- "Settings.roles.deleted": "角色已被删除",
61
- "Settings.roles.edited": "角色编辑完成",
62
- "Settings.section-label": "用户及权限插件",
63
- "components.Input.error.validation.email": "这是一个无效的电子邮件",
64
- "components.Input.error.validation.json": "这不符合JSON格式",
65
- "components.Input.error.validation.max": "值过高。",
66
- "components.Input.error.validation.maxLength": "值过长。",
67
- "components.Input.error.validation.min": "值太低。",
68
- "components.Input.error.validation.minLength": "值太短。",
69
- "components.Input.error.validation.minSupMax": "不能超过上限",
70
- "components.Input.error.validation.regex": "该值不符合正则表达式。",
71
- "components.Input.error.validation.required": "该值为必填项。",
72
- "components.Input.error.validation.unique": "该值已被使用。",
73
- "notification.success.submit": "设置已被更新",
74
- "page.title": "设置 - 角色",
75
- "plugin.description.long": "使用基于 JWT 的完整身份验证过程来保护 API。这个插件还有一个 ACL 策略,允许你管理用户组之间的权限。",
76
- "plugin.description.short": "使用基于 JWT 的完整身份验证过程保护 API",
77
- "plugin.name": "角色及权限",
78
- "popUpWarning.button.cancel": "取消",
79
- "popUpWarning.button.confirm": "确认",
80
- "popUpWarning.title": "请确认",
81
- "popUpWarning.warning.cancel": "你确定你要取消你的修改?"
2
+ "BoundRoute.title": "绑定路由到",
3
+ "EditForm.inputSelect.description.role": "新验证身份的用户将被赋予所选角色。",
4
+ "EditForm.inputSelect.label.role": "认证用户的默认角色",
5
+ "EditForm.inputToggle.description.email": "不允许用户使用不同的认证提供商但相同的电子邮件地址来创建多个账户。",
6
+ "EditForm.inputToggle.description.email-confirmation": "启用(开)后,新注册的用户会收到一封确认电子邮件。",
7
+ "EditForm.inputToggle.description.email-confirmation-redirection": "确认您的电子邮件后,选择将您重定向到的位置。",
8
+ "EditForm.inputToggle.description.email-reset-password": "应用程序的重置密码页面的网址",
9
+ "EditForm.inputToggle.description.sign-up": "当禁用(关)时,注册过程将被禁止。任何人无论使用任何的供应商都不可以订阅。",
10
+ "EditForm.inputToggle.label.email": "每个电子邮件地址对应一个账户",
11
+ "EditForm.inputToggle.label.email-confirmation": "启用电子邮件确认",
12
+ "EditForm.inputToggle.label.email-confirmation-redirection": "重定向网址",
13
+ "EditForm.inputToggle.label.email-reset-password": "重置密码页面网址",
14
+ "EditForm.inputToggle.label.sign-up": "启用注册",
15
+ "EditForm.inputToggle.placeholder.email-confirmation-redirection": "例如: https://yourfrontend.com/email-confirmation-redirection",
16
+ "EditForm.inputToggle.placeholder.email-reset-password": "例如: https://yourfrontend.com/reset-password",
17
+ "EditPage.form.roles": "角色详情",
18
+ "Email.template.data.loaded": "电子邮件模板已加载",
19
+ "Email.template.email_confirmation": "邮箱地址确认",
20
+ "Email.template.form.edit.label": "编辑模板",
21
+ "Email.template.table.action.label": "操作",
22
+ "Email.template.table.icon.label": "图标",
23
+ "Email.template.table.name.label": "名称",
24
+ "Form.advancedSettings.data.loaded": "高级设置数据已加载",
25
+ "HeaderNav.link.advancedSettings": "高级设置",
26
+ "HeaderNav.link.emailTemplates": "电子邮件模板",
27
+ "HeaderNav.link.providers": "提供商",
28
+ "Plugin.permissions.plugins.description": "定义 {name} 插件所有允许的操作。",
29
+ "Plugins.header.description": "下面只列出路由绑定的操作。",
30
+ "Plugins.header.title": "权限",
31
+ "Policies.header.hint": "选择应用程序或插件对应的操作,然后点击齿轮图标显示绑定的路由",
32
+ "Policies.header.title": "高级设置",
33
+ "PopUpForm.Email.email_templates.inputDescription": "如果你不确定如何使用变量, {link}",
34
+ "PopUpForm.Email.link.documentation": "查看我们的文档",
35
+ "PopUpForm.Email.options.from.email.label": "发件人地址",
36
+ "PopUpForm.Email.options.from.email.placeholder": "kai@doe.com",
37
+ "PopUpForm.Email.options.from.name.label": "发件人名称",
38
+ "PopUpForm.Email.options.from.name.placeholder": "Kai Doe",
39
+ "PopUpForm.Email.options.message.label": "消息",
40
+ "PopUpForm.Email.options.object.label": "主题",
41
+ "PopUpForm.Email.options.object.placeholder": "请为%APP_NAME%确认邮箱地址",
42
+ "PopUpForm.Email.options.response_email.label": "回复邮件",
43
+ "PopUpForm.Email.options.response_email.placeholder": "kai@doe.com",
44
+ "PopUpForm.Providers.enabled.description": "如果禁用,用户将无法使用此供应商。",
45
+ "PopUpForm.Providers.enabled.label": "启用",
46
+ "PopUpForm.Providers.key.label": "客户端 ID",
47
+ "PopUpForm.Providers.key.placeholder": "文本",
48
+ "PopUpForm.Providers.redirectURL.front-end.label": "重定向网址",
49
+ "PopUpForm.Providers.redirectURL.label": "添加到{provider}应用配置的跳转网址",
50
+ "PopUpForm.Providers.secret.label": "客户端秘钥",
51
+ "PopUpForm.Providers.secret.placeholder": "文本",
52
+ "PopUpForm.Providers.subdomain.label": "主机URI(子域名)",
53
+ "PopUpForm.Providers.subdomain.placeholder": "my.subdomain.com",
54
+ "PopUpForm.header.edit.email-templates": "编辑电子邮件模版",
55
+ "PopUpForm.header.edit.providers": "编辑提供商",
56
+ "Providers.data.loaded": "提供商已加载",
57
+ "Providers.status": "状态",
58
+ "Roles.empty": "您还没有任何角色。",
59
+ "Roles.empty.search": "没有与搜索相匹配的角色。",
60
+ "Settings.roles.deleted": "角色已被删除",
61
+ "Settings.roles.edited": "角色编辑完成",
62
+ "Settings.section-label": "用户及权限插件",
63
+ "components.Input.error.validation.email": "这是一个无效的电子邮件",
64
+ "components.Input.error.validation.json": "这不符合JSON格式",
65
+ "components.Input.error.validation.max": "值过高。",
66
+ "components.Input.error.validation.maxLength": "值过长。",
67
+ "components.Input.error.validation.min": "值太低。",
68
+ "components.Input.error.validation.minLength": "值太短。",
69
+ "components.Input.error.validation.minSupMax": "不能超过上限",
70
+ "components.Input.error.validation.regex": "该值不符合正则表达式。",
71
+ "components.Input.error.validation.required": "该值为必填项。",
72
+ "components.Input.error.validation.unique": "该值已被使用。",
73
+ "notification.success.submit": "设置已被更新",
74
+ "page.title": "设置 - 角色",
75
+ "plugin.description.long": "使用基于 JWT 的完整身份验证过程来保护 API。这个插件还有一个 ACL 策略,允许你管理用户组之间的权限。",
76
+ "plugin.description.short": "使用基于 JWT 的完整身份验证过程保护 API",
77
+ "plugin.name": "用户及权限插件",
78
+ "popUpWarning.button.cancel": "取消",
79
+ "popUpWarning.button.confirm": "确认",
80
+ "popUpWarning.title": "请确认",
81
+ "popUpWarning.warning.cancel": "你确定你要取消你的修改?"
82
82
  }
@@ -93,7 +93,7 @@ paths:
93
93
  required: true
94
94
  responses:
95
95
  200:
96
- description: Successfull registration
96
+ description: Successful registration
97
97
  content:
98
98
  application/json:
99
99
  schema:
@@ -3,5 +3,5 @@
3
3
  module.exports = {
4
4
  preset: '../../../jest-preset.front.js',
5
5
  displayName: 'Users & Permissions plugin',
6
- setupFilesAfterEnv: ['./tests/setup.js'],
6
+ setupFilesAfterEnv: ['./admin/src/tests/setup.js'],
7
7
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@strapi/plugin-users-permissions",
3
- "version": "0.0.0-next.f7babb775ed9a7e18d8351cb7f74c63e016323c4",
3
+ "version": "0.0.0-next.fb3a0b82484ce466b1efb1b28f16fc8ef73aba4a",
4
4
  "description": "Protect your API with a full-authentication process based on JWT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -29,10 +29,10 @@
29
29
  "lint": "run -T eslint ."
30
30
  },
31
31
  "dependencies": {
32
- "@strapi/design-system": "1.8.2",
33
- "@strapi/helper-plugin": "0.0.0-next.f7babb775ed9a7e18d8351cb7f74c63e016323c4",
34
- "@strapi/icons": "1.8.2",
35
- "@strapi/utils": "0.0.0-next.f7babb775ed9a7e18d8351cb7f74c63e016323c4",
32
+ "@strapi/design-system": "1.12.0",
33
+ "@strapi/helper-plugin": "0.0.0-next.fb3a0b82484ce466b1efb1b28f16fc8ef73aba4a",
34
+ "@strapi/icons": "1.12.0",
35
+ "@strapi/utils": "0.0.0-next.fb3a0b82484ce466b1efb1b28f16fc8ef73aba4a",
36
36
  "bcryptjs": "2.4.3",
37
37
  "formik": "2.4.0",
38
38
  "grant-koa": "5.4.8",
@@ -54,7 +54,7 @@
54
54
  "@testing-library/dom": "9.2.0",
55
55
  "@testing-library/react": "14.0.0",
56
56
  "@testing-library/user-event": "14.4.3",
57
- "msw": "1.2.1",
57
+ "msw": "1.3.0",
58
58
  "react": "^18.2.0",
59
59
  "react-dom": "^18.2.0",
60
60
  "react-router-dom": "5.3.4",
@@ -77,5 +77,5 @@
77
77
  "required": true,
78
78
  "kind": "plugin"
79
79
  },
80
- "gitHead": "f7babb775ed9a7e18d8351cb7f74c63e016323c4"
80
+ "gitHead": "fb3a0b82484ce466b1efb1b28f16fc8ef73aba4a"
81
81
  }
@@ -10,10 +10,12 @@
10
10
  const crypto = require('crypto');
11
11
  const _ = require('lodash');
12
12
  const urljoin = require('url-join');
13
+ const { isArray } = require('lodash/fp');
13
14
  const { getService } = require('../utils');
14
15
  const getGrantConfig = require('./grant-config');
15
16
 
16
17
  const usersPermissionsActions = require('./users-permissions-actions');
18
+ const userSchema = require('../content-types/user');
17
19
 
18
20
  const initGrant = async (pluginStore) => {
19
21
  const apiPrefix = strapi.config.get('api.rest.prefix');
@@ -97,6 +99,27 @@ const initAdvancedOptions = async (pluginStore) => {
97
99
  }
98
100
  };
99
101
 
102
+ const userSchemaAdditions = () => {
103
+ const defaultSchema = Object.keys(userSchema.attributes);
104
+ const currentSchema = Object.keys(
105
+ strapi.contentTypes['plugin::users-permissions.user'].attributes
106
+ );
107
+
108
+ // Some dynamic fields may not have been initialized yet, so we need to ignore them
109
+ // TODO: we should have a global method for finding these
110
+ const ignoreDiffs = [
111
+ 'createdBy',
112
+ 'createdAt',
113
+ 'updatedBy',
114
+ 'updatedAt',
115
+ 'publishedAt',
116
+ 'strapi_stage',
117
+ 'strapi_assignee',
118
+ ];
119
+
120
+ return currentSchema.filter((key) => !(ignoreDiffs.includes(key) || defaultSchema.includes(key)));
121
+ };
122
+
100
123
  module.exports = async ({ strapi }) => {
101
124
  const pluginStore = strapi.store({ type: 'plugin', name: 'users-permissions' });
102
125
 
@@ -130,4 +153,17 @@ For security reasons, prefer storing the secret in an environment variable and r
130
153
  );
131
154
  }
132
155
  }
156
+
157
+ // TODO v5: Remove this block of code and default allowedFields to empty array
158
+ if (!isArray(strapi.config.get('plugin.users-permissions.register.allowedFields'))) {
159
+ const modifications = userSchemaAdditions();
160
+ if (modifications.length > 0) {
161
+ // if there is a potential vulnerability, show a warning
162
+ strapi.log.warn(
163
+ `Users-permissions registration has defaulted to accepting the following additional user fields during registration: ${modifications.join(
164
+ ','
165
+ )}`
166
+ );
167
+ }
168
+ }
133
169
  };
@@ -9,7 +9,11 @@
9
9
  /* eslint-disable no-useless-escape */
10
10
  const crypto = require('crypto');
11
11
  const _ = require('lodash');
12
+ const { concat, compact, isArray } = require('lodash/fp');
12
13
  const utils = require('@strapi/utils');
14
+ const {
15
+ contentTypes: { getNonWritableAttributes },
16
+ } = require('@strapi/utils');
13
17
  const { getService } = require('../utils');
14
18
  const {
15
19
  validateCallbackBody,
@@ -22,7 +26,7 @@ const {
22
26
  } = require('./validation/auth');
23
27
 
24
28
  const { getAbsoluteAdminUrl, getAbsoluteServerUrl, sanitize } = utils;
25
- const { ApplicationError, ValidationError } = utils.errors;
29
+ const { ApplicationError, ValidationError, ForbiddenError } = utils.errors;
26
30
 
27
31
  const sanitizeUser = (user, ctx) => {
28
32
  const { auth } = ctx.state;
@@ -96,6 +100,10 @@ module.exports = {
96
100
  try {
97
101
  const user = await getService('providers').connect(provider, ctx.query);
98
102
 
103
+ if (user.blocked) {
104
+ throw new ForbiddenError('Your account has been blocked by an administrator');
105
+ }
106
+
99
107
  return ctx.send({
100
108
  jwt: getService('jwt').issue({ id: user.id }),
101
109
  user: await sanitizeUser(user, ctx),
@@ -273,20 +281,49 @@ module.exports = {
273
281
  throw new ApplicationError('Register action is currently disabled');
274
282
  }
275
283
 
284
+ const { register } = strapi.config.get('plugin.users-permissions');
285
+ const alwaysAllowedKeys = ['username', 'password', 'email'];
286
+ const userModel = strapi.contentTypes['plugin::users-permissions.user'];
287
+ const { attributes } = userModel;
288
+
289
+ const nonWritable = getNonWritableAttributes(userModel);
290
+
291
+ const allowedKeys = compact(
292
+ concat(
293
+ alwaysAllowedKeys,
294
+ isArray(register?.allowedFields)
295
+ ? // Note that we do not filter allowedFields in case a user explicitly chooses to allow a private or otherwise omitted field on registration
296
+ register.allowedFields // if null or undefined, compact will remove it
297
+ : // to prevent breaking changes, if allowedFields is not set in config, we only remove private and known dangerous user schema fields
298
+ // TODO V5: allowedFields defaults to [] when undefined and remove this case
299
+ Object.keys(attributes).filter(
300
+ (key) =>
301
+ !nonWritable.includes(key) &&
302
+ !attributes[key].private &&
303
+ ![
304
+ // many of these are included in nonWritable, but we'll list them again to be safe and since we're removing this code in v5 anyway
305
+ // Strapi user schema fields
306
+ 'confirmed',
307
+ 'blocked',
308
+ 'confirmationToken',
309
+ 'resetPasswordToken',
310
+ 'provider',
311
+ 'id',
312
+ 'role',
313
+ // other Strapi fields that might be added
314
+ 'createdAt',
315
+ 'updatedAt',
316
+ 'createdBy',
317
+ 'updatedBy',
318
+ 'publishedAt', // d&p
319
+ 'strapi_reviewWorkflows_stage', // review workflows
320
+ ].includes(key)
321
+ )
322
+ )
323
+ );
324
+
276
325
  const params = {
277
- ..._.omit(ctx.request.body, [
278
- 'confirmed',
279
- 'blocked',
280
- 'confirmationToken',
281
- 'resetPasswordToken',
282
- 'provider',
283
- 'id',
284
- 'createdAt',
285
- 'updatedAt',
286
- 'createdBy',
287
- 'updatedBy',
288
- 'role',
289
- ]),
326
+ ..._.pick(ctx.request.body, allowedKeys),
290
327
  provider: 'local',
291
328
  };
292
329
 
@@ -11,7 +11,7 @@ const utils = require('@strapi/utils');
11
11
  const { getService } = require('../utils');
12
12
  const { validateCreateUserBody, validateUpdateUserBody } = require('./validation/user');
13
13
 
14
- const { sanitize } = utils;
14
+ const { sanitize, validate } = utils;
15
15
  const { ApplicationError, ValidationError, NotFoundError } = utils.errors;
16
16
 
17
17
  const sanitizeOutput = async (user, ctx) => {
@@ -21,6 +21,13 @@ const sanitizeOutput = async (user, ctx) => {
21
21
  return sanitize.contentAPI.output(user, schema, { auth });
22
22
  };
23
23
 
24
+ const validateQuery = async (query, ctx) => {
25
+ const schema = strapi.getModel('plugin::users-permissions.user');
26
+ const { auth } = ctx.state;
27
+
28
+ return validate.contentAPI.query(query, schema, { auth });
29
+ };
30
+
24
31
  const sanitizeQuery = async (query, ctx) => {
25
32
  const schema = strapi.getModel('plugin::users-permissions.user');
26
33
  const { auth } = ctx.state;
@@ -143,6 +150,7 @@ module.exports = {
143
150
  * @return {Object|Array}
144
151
  */
145
152
  async find(ctx) {
153
+ await validateQuery(ctx.query, ctx);
146
154
  const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);
147
155
  const users = await getService('user').fetchAll(sanitizedQuery);
148
156
 
@@ -155,6 +163,7 @@ module.exports = {
155
163
  */
156
164
  async findOne(ctx) {
157
165
  const { id } = ctx.params;
166
+ await validateQuery(ctx.query, ctx);
158
167
  const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);
159
168
 
160
169
  let data = await getService('user').fetch(id, sanitizedQuery);
@@ -171,6 +180,7 @@ module.exports = {
171
180
  * @return {Number}
172
181
  */
173
182
  async count(ctx) {
183
+ await validateQuery(ctx.query, ctx);
174
184
  const sanitizedQuery = await sanitizeQuery(ctx.query, ctx);
175
185
 
176
186
  ctx.body = await getService('user').count(sanitizedQuery);
@@ -201,6 +211,7 @@ module.exports = {
201
211
  return ctx.unauthorized();
202
212
  }
203
213
 
214
+ await validateQuery(query, ctx);
204
215
  const sanitizedQuery = await sanitizeQuery(query, ctx);
205
216
  const user = await getService('user').fetch(authUser.id, sanitizedQuery);
206
217
 
@@ -1,8 +1,8 @@
1
1
  'use strict';
2
2
 
3
+ const path = require('path');
3
4
  const utils = require('@strapi/utils');
4
5
  const { isString, has, toLower } = require('lodash/fp');
5
- const path = require('path');
6
6
 
7
7
  const { RateLimitError } = utils.errors;
8
8
 
@@ -1,5 +0,0 @@
1
- // eslint-disable-next-line import/prefer-default-export
2
- export { default as useForm } from './useForm';
3
- export { default as useRolesList } from './useRolesList';
4
- export * from './usePlugins';
5
- export { default as useFetchRole } from './useFetchRole';
@@ -1,67 +0,0 @@
1
- import { useCallback, useEffect, useReducer, useRef } from 'react';
2
-
3
- import { useFetchClient, useNotification } from '@strapi/helper-plugin';
4
-
5
- import pluginId from '../../pluginId';
6
-
7
- import reducer, { initialState } from './reducer';
8
-
9
- const useFetchRole = (id) => {
10
- const [state, dispatch] = useReducer(reducer, initialState);
11
- const toggleNotification = useNotification();
12
- const isMounted = useRef(null);
13
- const { get } = useFetchClient();
14
-
15
- useEffect(() => {
16
- isMounted.current = true;
17
-
18
- if (id) {
19
- fetchRole(id);
20
- } else {
21
- dispatch({
22
- type: 'GET_DATA_SUCCEEDED',
23
- role: {},
24
- });
25
- }
26
-
27
- return () => (isMounted.current = false);
28
- // eslint-disable-next-line react-hooks/exhaustive-deps
29
- }, [id]);
30
-
31
- const fetchRole = async (roleId) => {
32
- try {
33
- const {
34
- data: { role },
35
- } = await get(`/${pluginId}/roles/${roleId}`);
36
-
37
- // Prevent updating state on an unmounted component
38
- if (isMounted.current) {
39
- dispatch({
40
- type: 'GET_DATA_SUCCEEDED',
41
- role,
42
- });
43
- }
44
- } catch (err) {
45
- console.error(err);
46
-
47
- dispatch({
48
- type: 'GET_DATA_ERROR',
49
- });
50
- toggleNotification({
51
- type: 'warning',
52
- message: { id: 'notification.error' },
53
- });
54
- }
55
- };
56
-
57
- const handleSubmitSucceeded = useCallback((data) => {
58
- dispatch({
59
- type: 'ON_SUBMIT_SUCCEEDED',
60
- ...data,
61
- });
62
- }, []);
63
-
64
- return { ...state, onSubmitSucceeded: handleSubmitSucceeded };
65
- };
66
-
67
- export default useFetchRole;
@@ -1,31 +0,0 @@
1
- /* eslint-disable consistent-return */
2
- import produce from 'immer';
3
-
4
- export const initialState = {
5
- role: {},
6
- isLoading: true,
7
- };
8
-
9
- const reducer = (state, action) =>
10
- produce(state, (draftState) => {
11
- switch (action.type) {
12
- case 'GET_DATA_SUCCEEDED': {
13
- draftState.role = action.role;
14
- draftState.isLoading = false;
15
- break;
16
- }
17
- case 'GET_DATA_ERROR': {
18
- draftState.isLoading = false;
19
- break;
20
- }
21
- case 'ON_SUBMIT_SUCCEEDED': {
22
- draftState.role.name = action.name;
23
- draftState.role.description = action.description;
24
- break;
25
- }
26
- default:
27
- return draftState;
28
- }
29
- });
30
-
31
- export default reducer;
@@ -1,68 +0,0 @@
1
- import { useCallback, useEffect, useReducer, useRef } from 'react';
2
-
3
- import { useFetchClient, useNotification, useRBAC } from '@strapi/helper-plugin';
4
-
5
- import reducer, { initialState } from './reducer';
6
-
7
- const useUserForm = (endPoint, permissions) => {
8
- const { isLoading: isLoadingForPermissions, allowedActions } = useRBAC(permissions);
9
- const [{ isLoading, modifiedData }, dispatch] = useReducer(reducer, initialState);
10
- const toggleNotification = useNotification();
11
- const isMounted = useRef(true);
12
-
13
- const { get } = useFetchClient();
14
-
15
- useEffect(() => {
16
- const getData = async () => {
17
- try {
18
- dispatch({
19
- type: 'GET_DATA',
20
- });
21
-
22
- const { data } = await get(`/users-permissions/${endPoint}`);
23
-
24
- dispatch({
25
- type: 'GET_DATA_SUCCEEDED',
26
- data,
27
- });
28
- } catch (err) {
29
- // The user aborted the request
30
- if (isMounted.current) {
31
- dispatch({
32
- type: 'GET_DATA_ERROR',
33
- });
34
- console.error(err);
35
- toggleNotification({
36
- type: 'warning',
37
- message: { id: 'notification.error' },
38
- });
39
- }
40
- }
41
- };
42
-
43
- if (!isLoadingForPermissions) {
44
- getData();
45
- }
46
-
47
- return () => {
48
- isMounted.current = false;
49
- };
50
- }, [isLoadingForPermissions, endPoint, get, toggleNotification]);
51
-
52
- const dispatchSubmitSucceeded = useCallback((data) => {
53
- dispatch({
54
- type: 'ON_SUBMIT_SUCCEEDED',
55
- data,
56
- });
57
- }, []);
58
-
59
- return {
60
- allowedActions,
61
- dispatchSubmitSucceeded,
62
- isLoading,
63
- isLoadingForPermissions,
64
- modifiedData,
65
- };
66
- };
67
-
68
- export default useUserForm;
@@ -1,40 +0,0 @@
1
- import produce from 'immer';
2
-
3
- const initialState = {
4
- isLoading: true,
5
- modifiedData: {},
6
- };
7
-
8
- const reducer = (state, action) =>
9
- // eslint-disable-next-line consistent-return
10
- produce(state, (draftState) => {
11
- switch (action.type) {
12
- case 'GET_DATA': {
13
- draftState.isLoading = true;
14
- draftState.modifiedData = {};
15
-
16
- break;
17
- }
18
- case 'GET_DATA_SUCCEEDED': {
19
- draftState.isLoading = false;
20
- draftState.modifiedData = action.data;
21
-
22
- break;
23
- }
24
- case 'GET_DATA_ERROR': {
25
- draftState.isLoading = true;
26
- break;
27
- }
28
- case 'ON_SUBMIT_SUCCEEDED': {
29
- draftState.modifiedData = action.data;
30
-
31
- break;
32
- }
33
- default: {
34
- return draftState;
35
- }
36
- }
37
- });
38
-
39
- export default reducer;
40
- export { initialState };