@strapi/plugin-users-permissions 0.0.0-next.e41415e8ff5f565ff959667d5c5ba4f20bee013c → 0.0.0-next.e9b6852d1c05518ff6e37d599321f7aa7aa0683b
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.
- package/.eslintignore +1 -2
- package/.eslintrc +17 -0
- package/LICENSE +18 -3
- package/admin/src/components/BoundRoute/{index.js → index.jsx} +5 -3
- package/admin/src/components/FormModal/Input/{index.js → index.jsx} +3 -2
- package/admin/src/components/FormModal/{index.js → index.jsx} +13 -10
- package/admin/src/components/Permissions/PermissionRow/{SubCategory.js → SubCategory.jsx} +26 -5
- package/admin/src/components/Permissions/PermissionRow/{index.js → index.jsx} +4 -2
- package/admin/src/components/Permissions/{index.js → index.jsx} +6 -5
- package/admin/src/components/Policies/{index.js → index.jsx} +3 -2
- package/admin/src/components/UsersPermissions/{index.js → index.jsx} +8 -5
- package/admin/src/{permissions.js → constants.js} +1 -3
- package/admin/src/contexts/UsersPermissionsContext/{index.js → index.jsx} +1 -0
- package/admin/src/index.js +19 -28
- package/admin/src/pages/AdvancedSettings/{index.js → index.jsx} +68 -52
- package/admin/src/pages/AdvancedSettings/utils/schema.js +1 -1
- package/admin/src/pages/EmailTemplates/components/{EmailForm.js → EmailForm.jsx} +13 -12
- package/admin/src/pages/EmailTemplates/components/{EmailTable.js → EmailTable.jsx} +9 -7
- package/admin/src/pages/EmailTemplates/{index.js → index.jsx} +77 -63
- package/admin/src/pages/EmailTemplates/utils/schema.js +1 -1
- package/admin/src/pages/Providers/{index.js → index.jsx} +91 -86
- package/admin/src/pages/Providers/utils/forms.js +1 -1
- package/admin/src/pages/Roles/{CreatePage/utils/schema.js → constants.js} +2 -4
- package/admin/src/pages/Roles/hooks/usePlugins.js +78 -0
- package/admin/src/pages/Roles/index.jsx +33 -0
- package/admin/src/pages/Roles/pages/CreatePage.jsx +199 -0
- package/admin/src/pages/Roles/pages/EditPage.jsx +220 -0
- package/admin/src/pages/Roles/{ListPage/components/TableBody.js → pages/ListPage/components/TableBody.jsx} +46 -15
- package/admin/src/pages/Roles/{ListPage/index.js → pages/ListPage/index.jsx} +48 -47
- package/admin/src/pages/Roles/{ListPage → pages/ListPage}/utils/api.js +3 -4
- package/admin/src/translations/zh-Hans.json +80 -80
- package/admin/src/utils/index.js +1 -2
- package/dist/_chunks/ar-MvD8Ghac.mjs +44 -0
- package/dist/_chunks/ar-MvD8Ghac.mjs.map +1 -0
- package/dist/_chunks/ar-t5qTFaAD.js +44 -0
- package/dist/_chunks/ar-t5qTFaAD.js.map +1 -0
- package/dist/_chunks/cs-BMuXwxA1.mjs +50 -0
- package/dist/_chunks/cs-BMuXwxA1.mjs.map +1 -0
- package/dist/_chunks/cs-I8N4u-Sd.js +50 -0
- package/dist/_chunks/cs-I8N4u-Sd.js.map +1 -0
- package/dist/_chunks/de-YTjtq89K.js +62 -0
- package/dist/_chunks/de-YTjtq89K.js.map +1 -0
- package/dist/_chunks/de-zs2qqc0W.mjs +62 -0
- package/dist/_chunks/de-zs2qqc0W.mjs.map +1 -0
- package/dist/_chunks/dk-HctVBMsG.mjs +86 -0
- package/dist/_chunks/dk-HctVBMsG.mjs.map +1 -0
- package/dist/_chunks/dk-TF-dWjzl.js +86 -0
- package/dist/_chunks/dk-TF-dWjzl.js.map +1 -0
- package/dist/_chunks/en-CE3wEy_c.mjs +86 -0
- package/dist/_chunks/en-CE3wEy_c.mjs.map +1 -0
- package/dist/_chunks/en-m608rMZx.js +86 -0
- package/dist/_chunks/en-m608rMZx.js.map +1 -0
- package/dist/_chunks/es-9381tih_.mjs +86 -0
- package/dist/_chunks/es-9381tih_.mjs.map +1 -0
- package/dist/_chunks/es-XBQsB8_9.js +86 -0
- package/dist/_chunks/es-XBQsB8_9.js.map +1 -0
- package/dist/_chunks/fr-6cz3U-IF.js +50 -0
- package/dist/_chunks/fr-6cz3U-IF.js.map +1 -0
- package/dist/_chunks/fr-CMSc77If.mjs +50 -0
- package/dist/_chunks/fr-CMSc77If.mjs.map +1 -0
- package/dist/_chunks/id-RJ934rq-.js +62 -0
- package/dist/_chunks/id-RJ934rq-.js.map +1 -0
- package/dist/_chunks/id-SDuyIkZa.mjs +62 -0
- package/dist/_chunks/id-SDuyIkZa.mjs.map +1 -0
- package/dist/_chunks/index--NjZI15Z.mjs +301 -0
- package/dist/_chunks/index--NjZI15Z.mjs.map +1 -0
- package/dist/_chunks/index-EFtzpYTe.mjs +385 -0
- package/dist/_chunks/index-EFtzpYTe.mjs.map +1 -0
- package/dist/_chunks/index-M6VUX9Xe.mjs +250 -0
- package/dist/_chunks/index-M6VUX9Xe.mjs.map +1 -0
- package/dist/_chunks/index-PIkWT4fR.js +1191 -0
- package/dist/_chunks/index-PIkWT4fR.js.map +1 -0
- package/dist/_chunks/index-RINRWbs5.mjs +615 -0
- package/dist/_chunks/index-RINRWbs5.mjs.map +1 -0
- package/dist/_chunks/index-V3CiTkmR.mjs +1159 -0
- package/dist/_chunks/index-V3CiTkmR.mjs.map +1 -0
- package/dist/_chunks/index-d2k7RBd6.js +407 -0
- package/dist/_chunks/index-d2k7RBd6.js.map +1 -0
- package/dist/_chunks/index-f7pS9YU1.js +249 -0
- package/dist/_chunks/index-f7pS9YU1.js.map +1 -0
- package/dist/_chunks/index-j8_HHqx2.js +638 -0
- package/dist/_chunks/index-j8_HHqx2.js.map +1 -0
- package/dist/_chunks/index-zhL5rDjK.js +320 -0
- package/dist/_chunks/index-zhL5rDjK.js.map +1 -0
- package/dist/_chunks/it-YhZOlM2X.js +62 -0
- package/dist/_chunks/it-YhZOlM2X.js.map +1 -0
- package/dist/_chunks/it-bvH7DgQo.mjs +62 -0
- package/dist/_chunks/it-bvH7DgQo.mjs.map +1 -0
- package/dist/_chunks/ja-o_-JPvQv.mjs +48 -0
- package/dist/_chunks/ja-o_-JPvQv.mjs.map +1 -0
- package/dist/_chunks/ja-xssHUXFv.js +48 -0
- package/dist/_chunks/ja-xssHUXFv.js.map +1 -0
- package/dist/_chunks/ko-C3mHUSJa.js +86 -0
- package/dist/_chunks/ko-C3mHUSJa.js.map +1 -0
- package/dist/_chunks/ko-XJbPSez_.mjs +86 -0
- package/dist/_chunks/ko-XJbPSez_.mjs.map +1 -0
- package/dist/_chunks/ms-II5Ea73J.mjs +49 -0
- package/dist/_chunks/ms-II5Ea73J.mjs.map +1 -0
- package/dist/_chunks/ms-d0hfg65Z.js +49 -0
- package/dist/_chunks/ms-d0hfg65Z.js.map +1 -0
- package/dist/_chunks/nl-TA7TfK_5.js +48 -0
- package/dist/_chunks/nl-TA7TfK_5.js.map +1 -0
- package/dist/_chunks/nl-vEy6TN0K.mjs +48 -0
- package/dist/_chunks/nl-vEy6TN0K.mjs.map +1 -0
- package/dist/_chunks/pl-0pUL9hdA.js +86 -0
- package/dist/_chunks/pl-0pUL9hdA.js.map +1 -0
- package/dist/_chunks/pl-2VowaFGt.mjs +86 -0
- package/dist/_chunks/pl-2VowaFGt.mjs.map +1 -0
- package/dist/_chunks/pt-BR-WNOhafR4.js +44 -0
- package/dist/_chunks/pt-BR-WNOhafR4.js.map +1 -0
- package/dist/_chunks/pt-BR-sS1Xp3Jt.mjs +44 -0
- package/dist/_chunks/pt-BR-sS1Xp3Jt.mjs.map +1 -0
- package/dist/_chunks/pt-Rf9W51IO.mjs +48 -0
- package/dist/_chunks/pt-Rf9W51IO.mjs.map +1 -0
- package/dist/_chunks/pt-guNR9Gax.js +48 -0
- package/dist/_chunks/pt-guNR9Gax.js.map +1 -0
- package/dist/_chunks/ru-X3BMXDds.js +86 -0
- package/dist/_chunks/ru-X3BMXDds.js.map +1 -0
- package/dist/_chunks/ru-qKHnd5or.mjs +86 -0
- package/dist/_chunks/ru-qKHnd5or.mjs.map +1 -0
- package/dist/_chunks/sk-NWPw1oTN.js +50 -0
- package/dist/_chunks/sk-NWPw1oTN.js.map +1 -0
- package/dist/_chunks/sk-_Ryr-eTT.mjs +50 -0
- package/dist/_chunks/sk-_Ryr-eTT.mjs.map +1 -0
- package/dist/_chunks/sv-76NnbB__.js +86 -0
- package/dist/_chunks/sv-76NnbB__.js.map +1 -0
- package/dist/_chunks/sv-BqzScFXS.mjs +86 -0
- package/dist/_chunks/sv-BqzScFXS.mjs.map +1 -0
- package/dist/_chunks/th-WsknMEpq.mjs +60 -0
- package/dist/_chunks/th-WsknMEpq.mjs.map +1 -0
- package/dist/_chunks/th-cbppX21D.js +60 -0
- package/dist/_chunks/th-cbppX21D.js.map +1 -0
- package/dist/_chunks/tr-6mm_Fmz7.js +85 -0
- package/dist/_chunks/tr-6mm_Fmz7.js.map +1 -0
- package/dist/_chunks/tr-_DB1F1GW.mjs +85 -0
- package/dist/_chunks/tr-_DB1F1GW.mjs.map +1 -0
- package/dist/_chunks/uk-sI2I1ogF.js +49 -0
- package/dist/_chunks/uk-sI2I1ogF.js.map +1 -0
- package/dist/_chunks/uk-yxMSQAwI.mjs +49 -0
- package/dist/_chunks/uk-yxMSQAwI.mjs.map +1 -0
- package/dist/_chunks/vi-A3zJxaiI.js +50 -0
- package/dist/_chunks/vi-A3zJxaiI.js.map +1 -0
- package/dist/_chunks/vi-xY0zCW3d.mjs +50 -0
- package/dist/_chunks/vi-xY0zCW3d.mjs.map +1 -0
- package/dist/_chunks/zh-72SpmFXa.js +86 -0
- package/dist/_chunks/zh-72SpmFXa.js.map +1 -0
- package/dist/_chunks/zh-Hans-ArWWtyP4.js +86 -0
- package/dist/_chunks/zh-Hans-ArWWtyP4.js.map +1 -0
- package/dist/_chunks/zh-Hans-E84cu4kP.mjs +86 -0
- package/dist/_chunks/zh-Hans-E84cu4kP.mjs.map +1 -0
- package/dist/_chunks/zh-OFeldzbX.mjs +86 -0
- package/dist/_chunks/zh-OFeldzbX.mjs.map +1 -0
- package/dist/admin/index.js +5 -0
- package/dist/admin/index.js.map +1 -0
- package/dist/admin/index.mjs +6 -0
- package/dist/admin/index.mjs.map +1 -0
- package/documentation/content-api.yaml +1 -1
- package/jest.config.front.js +1 -0
- package/package.json +37 -18
- package/packup.config.ts +22 -0
- package/server/bootstrap/grant-config.js +9 -0
- package/server/bootstrap/index.js +36 -0
- package/server/bootstrap/users-permissions-actions.js +6 -0
- package/server/config.js +29 -0
- package/server/controllers/auth.js +73 -18
- package/server/controllers/user.js +12 -1
- package/server/middlewares/rateLimit.js +41 -21
- package/server/services/providers-registry.js +21 -2
- package/server/strategies/users-permissions.js +1 -8
- package/.eslintrc.js +0 -14
- package/admin/src/hooks/index.js +0 -5
- package/admin/src/hooks/useFetchRole/index.js +0 -64
- package/admin/src/hooks/useFetchRole/reducer.js +0 -31
- package/admin/src/hooks/useForm/index.js +0 -67
- package/admin/src/hooks/useForm/reducer.js +0 -40
- package/admin/src/hooks/usePlugins/index.js +0 -67
- package/admin/src/hooks/usePlugins/init.js +0 -5
- package/admin/src/hooks/usePlugins/reducer.js +0 -34
- package/admin/src/hooks/useRolesList/index.js +0 -62
- package/admin/src/hooks/useRolesList/init.js +0 -5
- package/admin/src/hooks/useRolesList/reducer.js +0 -31
- package/admin/src/pages/AdvancedSettings/utils/api.js +0 -17
- package/admin/src/pages/EmailTemplates/utils/api.js +0 -17
- package/admin/src/pages/Providers/reducer.js +0 -54
- package/admin/src/pages/Providers/utils/api.js +0 -25
- package/admin/src/pages/Providers/utils/createProvidersArray.js +0 -21
- package/admin/src/pages/Roles/CreatePage/index.js +0 -182
- package/admin/src/pages/Roles/EditPage/index.js +0 -194
- package/admin/src/pages/Roles/EditPage/utils/schema.js +0 -9
- package/admin/src/pages/Roles/ProtectedCreatePage/index.js +0 -12
- package/admin/src/pages/Roles/ProtectedEditPage/index.js +0 -12
- package/admin/src/pages/Roles/ProtectedListPage/index.js +0 -15
- package/admin/src/pages/Roles/index.js +0 -27
- package/admin/src/utils/getRequestURL.js +0 -5
- package/strapi-admin.js +0 -3
- package/admin/src/components/Permissions/PermissionRow/{CheckboxWrapper.js → CheckboxWrapper.jsx} +1 -1
package/.eslintignore
CHANGED
|
@@ -1,2 +1 @@
|
|
|
1
|
-
|
|
2
|
-
.eslintrc.js
|
|
1
|
+
dist
|
package/.eslintrc
ADDED
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
{
|
|
2
|
+
"root": true,
|
|
3
|
+
"overrides": [
|
|
4
|
+
{
|
|
5
|
+
"files": ["admin/**/*"],
|
|
6
|
+
"extends": ["custom/front"],
|
|
7
|
+
"rules": {
|
|
8
|
+
"import/extensions": "off"
|
|
9
|
+
}
|
|
10
|
+
},
|
|
11
|
+
{
|
|
12
|
+
"files": ["**/*"],
|
|
13
|
+
"excludedFiles": ["admin/**/*"],
|
|
14
|
+
"extends": ["custom/back"]
|
|
15
|
+
}
|
|
16
|
+
]
|
|
17
|
+
}
|
package/LICENSE
CHANGED
|
@@ -2,7 +2,21 @@ Copyright (c) 2015-present Strapi Solutions SAS
|
|
|
2
2
|
|
|
3
3
|
Portions of the Strapi software are licensed as follows:
|
|
4
4
|
|
|
5
|
-
* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined
|
|
5
|
+
* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined below.
|
|
6
|
+
|
|
7
|
+
Enterprise License
|
|
8
|
+
|
|
9
|
+
If you or the company you represent has entered into a written agreement referencing the Enterprise Edition of the Strapi source code available at
|
|
10
|
+
https://github.com/strapi/strapi, then such agreement applies to your use of the Enterprise Edition of the Strapi Software. If you or the company you
|
|
11
|
+
represent is using the Enterprise Edition of the Strapi Software in connection with a subscription to our cloud offering, then the agreement you have
|
|
12
|
+
agreed to with respect to our cloud offering and the licenses included in such agreement apply to your use of the Enterprise Edition of the Strapi Software.
|
|
13
|
+
Otherwise, the Strapi Enterprise Software License Agreement (found here https://strapi.io/enterprise-terms) applies to your use of the Enterprise Edition of the Strapi Software.
|
|
14
|
+
|
|
15
|
+
BY ACCESSING OR USING THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE RELEVANT REFERENCED AGREEMENT.
|
|
16
|
+
IF YOU ARE NOT AUTHORIZED TO ACCEPT THESE TERMS ON BEHALF OF THE COMPANY YOU REPRESENT OR IF YOU DO NOT AGREE TO ALL OF THE RELEVANT TERMS AND CONDITIONS REFERENCED AND YOU
|
|
17
|
+
HAVE NOT OTHERWISE EXECUTED A WRITTEN AGREEMENT WITH STRAPI, YOU ARE NOT AUTHORIZED TO ACCESS OR USE OR ALLOW ANY USER TO ACCESS OR USE ANY PART OF
|
|
18
|
+
THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE. YOUR ACCESS RIGHTS ARE CONDITIONAL ON YOUR CONSENT TO THE RELEVANT REFERENCED TERMS TO THE EXCLUSION OF ALL OTHER TERMS;
|
|
19
|
+
IF THE RELEVANT REFERENCED TERMS ARE CONSIDERED AN OFFER BY YOU, ACCEPTANCE IS EXPRESSLY LIMITED TO THE RELEVANT REFERENCED TERMS.
|
|
6
20
|
|
|
7
21
|
* All software outside of the above-mentioned directories or restrictions above is available under the "MIT Expat" license as set forth below.
|
|
8
22
|
|
|
@@ -18,5 +32,6 @@ furnished to do so, subject to the following conditions:
|
|
|
18
32
|
The above copyright notice and this permission notice shall be included in all
|
|
19
33
|
copies or substantial portions of the Software.
|
|
20
34
|
|
|
21
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
22
|
-
|
|
35
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
36
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
37
|
+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
3
|
-
import {
|
|
2
|
+
|
|
3
|
+
import { Box, Flex, Typography } from '@strapi/design-system';
|
|
4
4
|
import map from 'lodash/map';
|
|
5
5
|
import tail from 'lodash/tail';
|
|
6
|
-
import { useIntl } from 'react-intl';
|
|
7
6
|
import PropTypes from 'prop-types';
|
|
7
|
+
import { useIntl } from 'react-intl';
|
|
8
|
+
import styled from 'styled-components';
|
|
9
|
+
|
|
8
10
|
import getMethodColor from './getMethodColor';
|
|
9
11
|
|
|
10
12
|
const MethodBox = styled(Box)`
|
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import React from 'react';
|
|
8
|
-
|
|
9
|
-
import {
|
|
8
|
+
|
|
9
|
+
import { TextInput, ToggleInput } from '@strapi/design-system';
|
|
10
10
|
import PropTypes from 'prop-types';
|
|
11
|
+
import { useIntl } from 'react-intl';
|
|
11
12
|
|
|
12
13
|
const Input = ({
|
|
13
14
|
description,
|
|
@@ -5,22 +5,23 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import React from 'react';
|
|
8
|
-
|
|
8
|
+
|
|
9
9
|
import {
|
|
10
10
|
Button,
|
|
11
11
|
Flex,
|
|
12
|
-
Breadcrumbs,
|
|
13
|
-
Crumb,
|
|
14
12
|
Grid,
|
|
15
13
|
GridItem,
|
|
16
|
-
ModalLayout,
|
|
17
|
-
ModalHeader,
|
|
18
|
-
ModalFooter,
|
|
19
14
|
ModalBody,
|
|
15
|
+
ModalFooter,
|
|
16
|
+
ModalHeader,
|
|
17
|
+
ModalLayout,
|
|
20
18
|
} from '@strapi/design-system';
|
|
21
|
-
import
|
|
22
|
-
import { Formik } from 'formik';
|
|
19
|
+
import { Breadcrumbs, Crumb } from '@strapi/design-system/v2';
|
|
23
20
|
import { Form } from '@strapi/helper-plugin';
|
|
21
|
+
import { Formik } from 'formik';
|
|
22
|
+
import PropTypes from 'prop-types';
|
|
23
|
+
import { useIntl } from 'react-intl';
|
|
24
|
+
|
|
24
25
|
import Input from './Input';
|
|
25
26
|
|
|
26
27
|
const FormModal = ({
|
|
@@ -43,8 +44,10 @@ const FormModal = ({
|
|
|
43
44
|
<ModalLayout onClose={onToggle} labelledBy="title">
|
|
44
45
|
<ModalHeader>
|
|
45
46
|
<Breadcrumbs label={headerBreadcrumbs.join(', ')}>
|
|
46
|
-
{headerBreadcrumbs.map((crumb) => (
|
|
47
|
-
<Crumb
|
|
47
|
+
{headerBreadcrumbs.map((crumb, index, arr) => (
|
|
48
|
+
<Crumb isCurrent={index === arr.length - 1} key={crumb}>
|
|
49
|
+
{crumb}
|
|
50
|
+
</Crumb>
|
|
48
51
|
))}
|
|
49
52
|
</Breadcrumbs>
|
|
50
53
|
</ModalHeader>
|
|
@@ -1,13 +1,24 @@
|
|
|
1
1
|
import React, { useCallback, useMemo } from 'react';
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
Box,
|
|
5
|
+
Checkbox,
|
|
6
|
+
Flex,
|
|
7
|
+
Typography,
|
|
8
|
+
Grid,
|
|
9
|
+
GridItem,
|
|
10
|
+
VisuallyHidden,
|
|
11
|
+
} from '@strapi/design-system';
|
|
12
|
+
import { Cog as CogIcon } from '@strapi/icons';
|
|
2
13
|
import get from 'lodash/get';
|
|
3
|
-
import styled from 'styled-components';
|
|
4
14
|
import PropTypes from 'prop-types';
|
|
5
|
-
import { Box, Checkbox, Flex, Typography, Grid, GridItem } from '@strapi/design-system';
|
|
6
|
-
import { Cog as CogIcon } from '@strapi/icons';
|
|
7
15
|
import { useIntl } from 'react-intl';
|
|
8
|
-
import
|
|
16
|
+
import styled from 'styled-components';
|
|
17
|
+
|
|
9
18
|
import { useUsersPermissions } from '../../../contexts/UsersPermissionsContext';
|
|
10
19
|
|
|
20
|
+
import CheckboxWrapper from './CheckboxWrapper';
|
|
21
|
+
|
|
11
22
|
const Border = styled.div`
|
|
12
23
|
flex: 1;
|
|
13
24
|
align-self: center;
|
|
@@ -87,10 +98,20 @@ const SubCategory = ({ subCategory }) => {
|
|
|
87
98
|
</Checkbox>
|
|
88
99
|
<button
|
|
89
100
|
type="button"
|
|
90
|
-
data-testid="action-cog"
|
|
91
101
|
onClick={() => onSelectedAction(action.name)}
|
|
92
102
|
style={{ display: 'inline-flex', alignItems: 'center' }}
|
|
93
103
|
>
|
|
104
|
+
<VisuallyHidden as="span">
|
|
105
|
+
{formatMessage(
|
|
106
|
+
{
|
|
107
|
+
id: 'app.utils.show-bound-route',
|
|
108
|
+
defaultMessage: 'Show bound route for {route}',
|
|
109
|
+
},
|
|
110
|
+
{
|
|
111
|
+
route: action.name,
|
|
112
|
+
}
|
|
113
|
+
)}
|
|
114
|
+
</VisuallyHidden>
|
|
94
115
|
<CogIcon />
|
|
95
116
|
</button>
|
|
96
117
|
</CheckboxWrapper>
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import React, { useMemo } from 'react';
|
|
2
|
-
|
|
3
|
-
import sortBy from 'lodash/sortBy';
|
|
2
|
+
|
|
4
3
|
import { Box } from '@strapi/design-system';
|
|
4
|
+
import sortBy from 'lodash/sortBy';
|
|
5
|
+
import PropTypes from 'prop-types';
|
|
6
|
+
|
|
5
7
|
import SubCategory from './SubCategory';
|
|
6
8
|
|
|
7
9
|
const PermissionRow = ({ name, permissions }) => {
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import React, { useReducer } from 'react';
|
|
2
|
-
|
|
2
|
+
|
|
3
|
+
import { Accordion, AccordionContent, AccordionToggle, Flex } from '@strapi/design-system';
|
|
3
4
|
import { useIntl } from 'react-intl';
|
|
5
|
+
|
|
4
6
|
import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
|
|
5
7
|
import formatPluginName from '../../utils/formatPluginName';
|
|
6
|
-
|
|
8
|
+
|
|
7
9
|
import init from './init';
|
|
10
|
+
import PermissionRow from './PermissionRow';
|
|
8
11
|
import { initialState, reducer } from './reducer';
|
|
9
12
|
|
|
10
13
|
const Permissions = () => {
|
|
@@ -41,9 +44,7 @@ const Permissions = () => {
|
|
|
41
44
|
variant={index % 2 ? 'primary' : 'secondary'}
|
|
42
45
|
/>
|
|
43
46
|
<AccordionContent>
|
|
44
|
-
<
|
|
45
|
-
<PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
|
|
46
|
-
</Box>
|
|
47
|
+
<PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
|
|
47
48
|
</AccordionContent>
|
|
48
49
|
</Accordion>
|
|
49
50
|
))}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
3
|
-
import {
|
|
2
|
+
|
|
3
|
+
import { Flex, GridItem, Typography } from '@strapi/design-system';
|
|
4
4
|
import get from 'lodash/get';
|
|
5
5
|
import isEmpty from 'lodash/isEmpty';
|
|
6
6
|
import without from 'lodash/without';
|
|
7
|
+
import { useIntl } from 'react-intl';
|
|
7
8
|
|
|
8
9
|
import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
|
|
9
10
|
import BoundRoute from '../BoundRoute';
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
import React, {
|
|
1
|
+
import React, { forwardRef, memo, useImperativeHandle, useReducer } from 'react';
|
|
2
|
+
|
|
3
|
+
import { Flex, Grid, GridItem, Typography } from '@strapi/design-system';
|
|
2
4
|
import PropTypes from 'prop-types';
|
|
3
|
-
import { Typography, Flex, Grid, GridItem } from '@strapi/design-system';
|
|
4
5
|
import { useIntl } from 'react-intl';
|
|
6
|
+
|
|
7
|
+
import { UsersPermissionsProvider } from '../../contexts/UsersPermissionsContext';
|
|
5
8
|
import getTrad from '../../utils/getTrad';
|
|
6
|
-
import Policies from '../Policies';
|
|
7
9
|
import Permissions from '../Permissions';
|
|
8
|
-
import
|
|
9
|
-
|
|
10
|
+
import Policies from '../Policies';
|
|
11
|
+
|
|
10
12
|
import init from './init';
|
|
13
|
+
import reducer, { initialState } from './reducer';
|
|
11
14
|
|
|
12
15
|
const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
|
|
13
16
|
const { formatMessage } = useIntl();
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const
|
|
1
|
+
export const PERMISSIONS = {
|
|
2
2
|
// Roles
|
|
3
3
|
accessRoles: [
|
|
4
4
|
{ action: 'plugin::users-permissions.roles.create', subject: null },
|
|
@@ -27,5 +27,3 @@ const pluginPermissions = {
|
|
|
27
27
|
readProviders: [{ action: 'plugin::users-permissions.providers.read', subject: null }],
|
|
28
28
|
updateProviders: [{ action: 'plugin::users-permissions.providers.update', subject: null }],
|
|
29
29
|
};
|
|
30
|
-
|
|
31
|
-
export default pluginPermissions;
|
package/admin/src/index.js
CHANGED
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
// Also the strapi-generate-plugins/files/admin/src/index.js needs to be updated
|
|
6
6
|
// IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED
|
|
7
7
|
import { prefixPluginTranslations } from '@strapi/helper-plugin';
|
|
8
|
+
|
|
8
9
|
import pluginPkg from '../../package.json';
|
|
9
|
-
|
|
10
|
-
import
|
|
10
|
+
|
|
11
|
+
import { PERMISSIONS } from './constants';
|
|
11
12
|
import getTrad from './utils/getTrad';
|
|
12
13
|
|
|
13
14
|
const name = pluginPkg.strapi.name;
|
|
@@ -17,7 +18,7 @@ export default {
|
|
|
17
18
|
// Create the plugin's settings section
|
|
18
19
|
app.createSettingSection(
|
|
19
20
|
{
|
|
20
|
-
id:
|
|
21
|
+
id: 'users-permissions',
|
|
21
22
|
intlLabel: {
|
|
22
23
|
id: getTrad('Settings.section-label'),
|
|
23
24
|
defaultMessage: 'Users & Permissions plugin',
|
|
@@ -30,15 +31,13 @@ export default {
|
|
|
30
31
|
defaultMessage: 'Roles',
|
|
31
32
|
},
|
|
32
33
|
id: 'roles',
|
|
33
|
-
to: `/settings
|
|
34
|
+
to: `/settings/users-permissions/roles`,
|
|
34
35
|
async Component() {
|
|
35
|
-
const component = await import(
|
|
36
|
-
/* webpackChunkName: "users-roles-settings-page" */ './pages/Roles'
|
|
37
|
-
);
|
|
36
|
+
const component = await import('./pages/Roles');
|
|
38
37
|
|
|
39
38
|
return component;
|
|
40
39
|
},
|
|
41
|
-
permissions:
|
|
40
|
+
permissions: PERMISSIONS.accessRoles,
|
|
42
41
|
},
|
|
43
42
|
{
|
|
44
43
|
intlLabel: {
|
|
@@ -46,15 +45,13 @@ export default {
|
|
|
46
45
|
defaultMessage: 'Providers',
|
|
47
46
|
},
|
|
48
47
|
id: 'providers',
|
|
49
|
-
to: `/settings
|
|
48
|
+
to: `/settings/users-permissions/providers`,
|
|
50
49
|
async Component() {
|
|
51
|
-
const component = await import(
|
|
52
|
-
/* webpackChunkName: "users-providers-settings-page" */ './pages/Providers'
|
|
53
|
-
);
|
|
50
|
+
const component = await import('./pages/Providers');
|
|
54
51
|
|
|
55
52
|
return component;
|
|
56
53
|
},
|
|
57
|
-
permissions:
|
|
54
|
+
permissions: PERMISSIONS.readProviders,
|
|
58
55
|
},
|
|
59
56
|
{
|
|
60
57
|
intlLabel: {
|
|
@@ -62,15 +59,13 @@ export default {
|
|
|
62
59
|
defaultMessage: 'Email templates',
|
|
63
60
|
},
|
|
64
61
|
id: 'email-templates',
|
|
65
|
-
to: `/settings
|
|
62
|
+
to: `/settings/users-permissions/email-templates`,
|
|
66
63
|
async Component() {
|
|
67
|
-
const component = await import(
|
|
68
|
-
/* webpackChunkName: "users-email-settings-page" */ './pages/EmailTemplates'
|
|
69
|
-
);
|
|
64
|
+
const component = await import('./pages/EmailTemplates');
|
|
70
65
|
|
|
71
66
|
return component;
|
|
72
67
|
},
|
|
73
|
-
permissions:
|
|
68
|
+
permissions: PERMISSIONS.readEmailTemplates,
|
|
74
69
|
},
|
|
75
70
|
{
|
|
76
71
|
intlLabel: {
|
|
@@ -78,21 +73,19 @@ export default {
|
|
|
78
73
|
defaultMessage: 'Advanced Settings',
|
|
79
74
|
},
|
|
80
75
|
id: 'advanced-settings',
|
|
81
|
-
to: `/settings
|
|
76
|
+
to: `/settings/users-permissions/advanced-settings`,
|
|
82
77
|
async Component() {
|
|
83
|
-
const component = await import(
|
|
84
|
-
/* webpackChunkName: "users-advanced-settings-page" */ './pages/AdvancedSettings'
|
|
85
|
-
);
|
|
78
|
+
const component = await import('./pages/AdvancedSettings');
|
|
86
79
|
|
|
87
80
|
return component;
|
|
88
81
|
},
|
|
89
|
-
permissions:
|
|
82
|
+
permissions: PERMISSIONS.readAdvancedSettings,
|
|
90
83
|
},
|
|
91
84
|
]
|
|
92
85
|
);
|
|
93
86
|
|
|
94
87
|
app.registerPlugin({
|
|
95
|
-
id:
|
|
88
|
+
id: 'users-permissions',
|
|
96
89
|
name,
|
|
97
90
|
});
|
|
98
91
|
},
|
|
@@ -100,12 +93,10 @@ export default {
|
|
|
100
93
|
async registerTrads({ locales }) {
|
|
101
94
|
const importedTrads = await Promise.all(
|
|
102
95
|
locales.map((locale) => {
|
|
103
|
-
return import(
|
|
104
|
-
/* webpackChunkName: "users-permissions-translation-[request]" */ `./translations/${locale}.json`
|
|
105
|
-
)
|
|
96
|
+
return import(`./translations/${locale}.json`)
|
|
106
97
|
.then(({ default: data }) => {
|
|
107
98
|
return {
|
|
108
|
-
data: prefixPluginTranslations(data,
|
|
99
|
+
data: prefixPluginTranslations(data, 'users-permissions'),
|
|
109
100
|
locale,
|
|
110
101
|
};
|
|
111
102
|
})
|
|
@@ -1,41 +1,45 @@
|
|
|
1
|
-
import React
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
|
|
1
|
+
import React from 'react';
|
|
2
|
+
|
|
3
|
+
import {
|
|
4
|
+
Box,
|
|
5
|
+
Button,
|
|
6
|
+
ContentLayout,
|
|
7
|
+
Flex,
|
|
8
|
+
Grid,
|
|
9
|
+
GridItem,
|
|
10
|
+
HeaderLayout,
|
|
11
|
+
Main,
|
|
12
|
+
Option,
|
|
13
|
+
Select,
|
|
14
|
+
Typography,
|
|
15
|
+
useNotifyAT,
|
|
16
|
+
} from '@strapi/design-system';
|
|
5
17
|
import {
|
|
6
18
|
CheckPagePermissions,
|
|
7
19
|
Form,
|
|
8
20
|
GenericInput,
|
|
9
21
|
LoadingIndicatorPage,
|
|
10
22
|
SettingsPageTitle,
|
|
23
|
+
useAPIErrorHandler,
|
|
24
|
+
useFetchClient,
|
|
11
25
|
useFocusWhenNavigate,
|
|
12
26
|
useNotification,
|
|
13
27
|
useOverlayBlocker,
|
|
14
28
|
useRBAC,
|
|
15
29
|
} from '@strapi/helper-plugin';
|
|
16
|
-
import {
|
|
17
|
-
useNotifyAT,
|
|
18
|
-
Main,
|
|
19
|
-
HeaderLayout,
|
|
20
|
-
ContentLayout,
|
|
21
|
-
Button,
|
|
22
|
-
Box,
|
|
23
|
-
Flex,
|
|
24
|
-
Select,
|
|
25
|
-
Option,
|
|
26
|
-
Typography,
|
|
27
|
-
Grid,
|
|
28
|
-
GridItem,
|
|
29
|
-
} from '@strapi/design-system';
|
|
30
30
|
import { Check } from '@strapi/icons';
|
|
31
|
-
import
|
|
31
|
+
import { Formik } from 'formik';
|
|
32
|
+
import { useIntl } from 'react-intl';
|
|
33
|
+
import { useMutation, useQuery, useQueryClient } from 'react-query';
|
|
34
|
+
|
|
35
|
+
import { PERMISSIONS } from '../../constants';
|
|
32
36
|
import { getTrad } from '../../utils';
|
|
37
|
+
|
|
33
38
|
import layout from './utils/layout';
|
|
34
39
|
import schema from './utils/schema';
|
|
35
|
-
import { fetchData, putAdvancedSettings } from './utils/api';
|
|
36
40
|
|
|
37
41
|
const ProtectedAdvancedSettingsPage = () => (
|
|
38
|
-
<CheckPagePermissions permissions={
|
|
42
|
+
<CheckPagePermissions permissions={PERMISSIONS.readAdvancedSettings}>
|
|
39
43
|
<AdvancedSettingsPage />
|
|
40
44
|
</CheckPagePermissions>
|
|
41
45
|
);
|
|
@@ -46,39 +50,47 @@ const AdvancedSettingsPage = () => {
|
|
|
46
50
|
const { lockApp, unlockApp } = useOverlayBlocker();
|
|
47
51
|
const { notifyStatus } = useNotifyAT();
|
|
48
52
|
const queryClient = useQueryClient();
|
|
53
|
+
const { get, put } = useFetchClient();
|
|
54
|
+
const { formatAPIError } = useAPIErrorHandler();
|
|
55
|
+
|
|
49
56
|
useFocusWhenNavigate();
|
|
50
57
|
|
|
51
|
-
const updatePermissions = useMemo(
|
|
52
|
-
() => ({ update: pluginPermissions.updateAdvancedSettings }),
|
|
53
|
-
[]
|
|
54
|
-
);
|
|
55
58
|
const {
|
|
56
59
|
isLoading: isLoadingForPermissions,
|
|
57
60
|
allowedActions: { canUpdate },
|
|
58
|
-
} = useRBAC(
|
|
59
|
-
|
|
60
|
-
const {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
})
|
|
67
|
-
);
|
|
68
|
-
},
|
|
69
|
-
onError() {
|
|
70
|
-
toggleNotification({
|
|
71
|
-
type: 'warning',
|
|
72
|
-
message: { id: getTrad('notification.error'), defaultMessage: 'An error occured' },
|
|
73
|
-
});
|
|
61
|
+
} = useRBAC({ update: PERMISSIONS.updateAdvancedSettings });
|
|
62
|
+
|
|
63
|
+
const { isLoading: isLoadingData, data } = useQuery(
|
|
64
|
+
['users-permissions', 'advanced'],
|
|
65
|
+
async () => {
|
|
66
|
+
const { data } = await get('/users-permissions/advanced');
|
|
67
|
+
|
|
68
|
+
return data;
|
|
74
69
|
},
|
|
75
|
-
|
|
70
|
+
{
|
|
71
|
+
onSuccess() {
|
|
72
|
+
notifyStatus(
|
|
73
|
+
formatMessage({
|
|
74
|
+
id: getTrad('Form.advancedSettings.data.loaded'),
|
|
75
|
+
defaultMessage: 'Advanced settings data has been loaded',
|
|
76
|
+
})
|
|
77
|
+
);
|
|
78
|
+
},
|
|
79
|
+
onError() {
|
|
80
|
+
toggleNotification({
|
|
81
|
+
type: 'warning',
|
|
82
|
+
message: { id: getTrad('notification.error'), defaultMessage: 'An error occured' },
|
|
83
|
+
});
|
|
84
|
+
},
|
|
85
|
+
}
|
|
86
|
+
);
|
|
76
87
|
|
|
77
|
-
const isLoading = isLoadingForPermissions || isLoadingData
|
|
88
|
+
const isLoading = isLoadingForPermissions || isLoadingData;
|
|
78
89
|
|
|
79
|
-
const submitMutation = useMutation((body) =>
|
|
90
|
+
const submitMutation = useMutation((body) => put('/users-permissions/advanced', body), {
|
|
80
91
|
async onSuccess() {
|
|
81
|
-
await queryClient.invalidateQueries('advanced');
|
|
92
|
+
await queryClient.invalidateQueries(['users-permissions', 'advanced']);
|
|
93
|
+
|
|
82
94
|
toggleNotification({
|
|
83
95
|
type: 'success',
|
|
84
96
|
message: { id: getTrad('notification.success.saved'), defaultMessage: 'Saved' },
|
|
@@ -86,11 +98,12 @@ const AdvancedSettingsPage = () => {
|
|
|
86
98
|
|
|
87
99
|
unlockApp();
|
|
88
100
|
},
|
|
89
|
-
onError() {
|
|
101
|
+
onError(error) {
|
|
90
102
|
toggleNotification({
|
|
91
103
|
type: 'warning',
|
|
92
|
-
message:
|
|
104
|
+
message: formatAPIError(error),
|
|
93
105
|
});
|
|
106
|
+
|
|
94
107
|
unlockApp();
|
|
95
108
|
},
|
|
96
109
|
refetchActive: true,
|
|
@@ -101,9 +114,12 @@ const AdvancedSettingsPage = () => {
|
|
|
101
114
|
const handleSubmit = async (body) => {
|
|
102
115
|
lockApp();
|
|
103
116
|
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
117
|
+
submitMutation.mutate({
|
|
118
|
+
...body,
|
|
119
|
+
email_confirmation_redirection: body.email_confirmation
|
|
120
|
+
? body.email_confirmation_redirection
|
|
121
|
+
: '',
|
|
122
|
+
});
|
|
107
123
|
};
|
|
108
124
|
|
|
109
125
|
if (isLoading) {
|
|
@@ -143,7 +159,7 @@ const AdvancedSettingsPage = () => {
|
|
|
143
159
|
validationSchema={schema}
|
|
144
160
|
enableReinitialize
|
|
145
161
|
>
|
|
146
|
-
{({ errors, values, handleChange, isSubmitting }) => {
|
|
162
|
+
{({ errors, values, handleChange, isSubmitting, dirty }) => {
|
|
147
163
|
return (
|
|
148
164
|
<Form>
|
|
149
165
|
<HeaderLayout
|
|
@@ -155,7 +171,7 @@ const AdvancedSettingsPage = () => {
|
|
|
155
171
|
<Button
|
|
156
172
|
loading={isSubmitting}
|
|
157
173
|
type="submit"
|
|
158
|
-
disabled={!canUpdate}
|
|
174
|
+
disabled={canUpdate ? !dirty : !canUpdate}
|
|
159
175
|
startIcon={<Check />}
|
|
160
176
|
size="S"
|
|
161
177
|
>
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
3
|
-
import { useIntl } from 'react-intl';
|
|
4
|
-
import { Form, GenericInput } from '@strapi/helper-plugin';
|
|
5
|
-
import { Formik } from 'formik';
|
|
2
|
+
|
|
6
3
|
import {
|
|
7
|
-
|
|
8
|
-
ModalHeader,
|
|
9
|
-
ModalFooter,
|
|
10
|
-
ModalBody,
|
|
4
|
+
Button,
|
|
11
5
|
Grid,
|
|
12
6
|
GridItem,
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
7
|
+
ModalBody,
|
|
8
|
+
ModalFooter,
|
|
9
|
+
ModalHeader,
|
|
10
|
+
ModalLayout,
|
|
16
11
|
Textarea,
|
|
17
12
|
} from '@strapi/design-system';
|
|
13
|
+
import { Breadcrumbs, Crumb } from '@strapi/design-system/v2';
|
|
14
|
+
import { Form, GenericInput } from '@strapi/helper-plugin';
|
|
15
|
+
import { Formik } from 'formik';
|
|
16
|
+
import PropTypes from 'prop-types';
|
|
17
|
+
import { useIntl } from 'react-intl';
|
|
18
|
+
|
|
18
19
|
import { getTrad } from '../../../utils';
|
|
19
20
|
import schema from '../utils/schema';
|
|
20
21
|
|
|
@@ -45,7 +46,7 @@ const EmailForm = ({ template, onToggle, onSubmit }) => {
|
|
|
45
46
|
defaultMessage: 'Edit email template',
|
|
46
47
|
})}
|
|
47
48
|
</Crumb>
|
|
48
|
-
<Crumb>
|
|
49
|
+
<Crumb isCurrent>
|
|
49
50
|
{formatMessage({ id: getTrad(template.display), defaultMessage: template.display })}
|
|
50
51
|
</Crumb>
|
|
51
52
|
</Breadcrumbs>
|
|
@@ -1,20 +1,22 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
|
|
3
|
-
import { useIntl } from 'react-intl';
|
|
2
|
+
|
|
4
3
|
import {
|
|
4
|
+
Icon,
|
|
5
|
+
IconButton,
|
|
5
6
|
Table,
|
|
6
|
-
Thead,
|
|
7
7
|
Tbody,
|
|
8
|
-
Tr,
|
|
9
8
|
Td,
|
|
10
9
|
Th,
|
|
10
|
+
Thead,
|
|
11
|
+
Tr,
|
|
11
12
|
Typography,
|
|
12
|
-
IconButton,
|
|
13
|
-
Icon,
|
|
14
13
|
VisuallyHidden,
|
|
15
14
|
} from '@strapi/design-system';
|
|
16
|
-
import { Pencil, Refresh, Check } from '@strapi/icons';
|
|
17
15
|
import { onRowClick, stopPropagation } from '@strapi/helper-plugin';
|
|
16
|
+
import { Check, Pencil, Refresh } from '@strapi/icons';
|
|
17
|
+
import PropTypes from 'prop-types';
|
|
18
|
+
import { useIntl } from 'react-intl';
|
|
19
|
+
|
|
18
20
|
import { getTrad } from '../../../utils';
|
|
19
21
|
|
|
20
22
|
const EmailTable = ({ canUpdate, onEditClick }) => {
|