@strapi/plugin-users-permissions 0.0.0-next.d999ad0b00ff427885462051cdc96626b7946472 → 0.0.0-next.dad3c50630ca4fd9eccdcbe549ee632fc572e23d
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/.eslintrc +4 -1
- package/LICENSE +18 -3
- package/admin/src/components/BoundRoute/{index.js → index.jsx} +2 -2
- package/admin/src/components/FormModal/Input/{index.js → index.jsx} +32 -31
- package/admin/src/components/FormModal/index.jsx +115 -0
- package/admin/src/components/Permissions/PermissionRow/{CheckboxWrapper.js → CheckboxWrapper.jsx} +4 -3
- package/admin/src/components/Permissions/PermissionRow/{SubCategory.js → SubCategory.jsx} +13 -22
- package/admin/src/components/Permissions/index.jsx +47 -0
- package/admin/src/components/Permissions/reducer.js +1 -1
- package/admin/src/components/Policies/{index.js → index.jsx} +7 -5
- package/admin/src/components/UsersPermissions/{index.js → index.jsx} +15 -7
- package/admin/src/components/UsersPermissions/reducer.js +1 -1
- package/admin/src/index.js +15 -32
- package/admin/src/pages/AdvancedSettings/index.jsx +214 -0
- package/admin/src/pages/AdvancedSettings/utils/layout.js +20 -35
- package/admin/src/pages/AdvancedSettings/utils/schema.js +5 -2
- package/admin/src/pages/EmailTemplates/components/EmailForm.jsx +156 -0
- package/admin/src/pages/EmailTemplates/components/{EmailTable.js → EmailTable.jsx} +20 -17
- package/admin/src/pages/EmailTemplates/{index.js → index.jsx} +36 -62
- package/admin/src/pages/EmailTemplates/utils/schema.js +18 -6
- package/admin/src/pages/Providers/{index.js → index.jsx} +98 -113
- package/admin/src/pages/Providers/utils/forms.js +23 -11
- package/admin/src/pages/Roles/constants.js +3 -3
- package/admin/src/pages/Roles/hooks/usePlugins.js +4 -4
- package/admin/src/pages/Roles/index.jsx +24 -0
- package/admin/src/pages/Roles/pages/{CreatePage.js → CreatePage.jsx} +53 -58
- package/admin/src/pages/Roles/pages/{EditPage.js → EditPage.jsx} +63 -68
- package/admin/src/pages/Roles/pages/ListPage/components/{TableBody.js → TableBody.jsx} +27 -31
- package/admin/src/pages/Roles/pages/ListPage/{index.js → index.jsx} +79 -55
- package/admin/src/translations/en.json +1 -1
- package/admin/src/utils/prefixPluginTranslations.js +13 -0
- package/dist/_chunks/{ar-20af7bfe.js → ar-BguGUqwK.js} +1 -1
- package/dist/_chunks/ar-BguGUqwK.js.map +1 -0
- package/dist/_chunks/{ar-56e57465.mjs → ar-CK8BRRXB.mjs} +1 -1
- package/dist/_chunks/ar-CK8BRRXB.mjs.map +1 -0
- package/dist/_chunks/{cs-0521a3c8.mjs → cs-BVigMk0l.mjs} +1 -1
- package/dist/_chunks/cs-BVigMk0l.mjs.map +1 -0
- package/dist/_chunks/{cs-6d7de06a.js → cs-BW8-K_GY.js} +1 -1
- package/dist/_chunks/cs-BW8-K_GY.js.map +1 -0
- package/dist/_chunks/{de-84fed33d.mjs → de-BKUdRFI4.mjs} +1 -1
- package/dist/_chunks/de-BKUdRFI4.mjs.map +1 -0
- package/dist/_chunks/{de-4af0884b.js → de-owXpVluI.js} +1 -1
- package/dist/_chunks/de-owXpVluI.js.map +1 -0
- package/dist/_chunks/{dk-d8302360.mjs → dk-BQiTK50l.mjs} +1 -1
- package/dist/_chunks/dk-BQiTK50l.mjs.map +1 -0
- package/dist/_chunks/{dk-21e25c4b.js → dk-LXAnbuBk.js} +1 -1
- package/dist/_chunks/dk-LXAnbuBk.js.map +1 -0
- package/dist/_chunks/{en-a610d7d0.mjs → en-DOHtPf-2.mjs} +2 -2
- package/dist/_chunks/en-DOHtPf-2.mjs.map +1 -0
- package/dist/_chunks/{en-746a275e.js → en-MHo5mcsU.js} +2 -2
- package/dist/_chunks/en-MHo5mcsU.js.map +1 -0
- package/dist/_chunks/{es-b6ae0f5e.js → es-BwLCLXAQ.js} +1 -1
- package/dist/_chunks/es-BwLCLXAQ.js.map +1 -0
- package/dist/_chunks/{es-9d9ad31c.mjs → es-DNgOVMjD.mjs} +1 -1
- package/dist/_chunks/es-DNgOVMjD.mjs.map +1 -0
- package/dist/_chunks/{fr-0722d6cd.mjs → fr-DkgRugiU.mjs} +1 -1
- package/dist/_chunks/fr-DkgRugiU.mjs.map +1 -0
- package/dist/_chunks/{fr-dd77fc67.js → fr-DkhpSjjm.js} +1 -1
- package/dist/_chunks/fr-DkhpSjjm.js.map +1 -0
- package/dist/_chunks/{id-c19698f1.js → id-BTemOeTZ.js} +1 -1
- package/dist/_chunks/id-BTemOeTZ.js.map +1 -0
- package/dist/_chunks/{id-03eb1a4c.mjs → id-BdEsvnaF.mjs} +1 -1
- package/dist/_chunks/id-BdEsvnaF.mjs.map +1 -0
- package/dist/_chunks/index-B7pS1fj3.mjs +344 -0
- package/dist/_chunks/index-B7pS1fj3.mjs.map +1 -0
- package/dist/_chunks/{index-44d6a972.mjs → index-BL-l3_lc.mjs} +105 -103
- package/dist/_chunks/index-BL-l3_lc.mjs.map +1 -0
- package/dist/_chunks/index-BSTWMwNL-BWNRataA.mjs +11090 -0
- package/dist/_chunks/index-BSTWMwNL-BWNRataA.mjs.map +1 -0
- package/dist/_chunks/index-BSTWMwNL-HpyyuCo7.js +11113 -0
- package/dist/_chunks/index-BSTWMwNL-HpyyuCo7.js.map +1 -0
- package/dist/_chunks/{index-5860e7c7.js → index-CIkPiPXn.js} +257 -277
- package/dist/_chunks/index-CIkPiPXn.js.map +1 -0
- package/dist/_chunks/{index-7d44bd05.js → index-CQnJPBOY.js} +57 -57
- package/dist/_chunks/index-CQnJPBOY.js.map +1 -0
- package/dist/_chunks/index-DJMmEpFQ.js +365 -0
- package/dist/_chunks/index-DJMmEpFQ.js.map +1 -0
- package/dist/_chunks/{index-020975b0.mjs → index-DM_fRoLX.mjs} +239 -256
- package/dist/_chunks/index-DM_fRoLX.mjs.map +1 -0
- package/dist/_chunks/{index-c5c563a2.mjs → index-DcyZ40cm.mjs} +56 -56
- package/dist/_chunks/index-DcyZ40cm.mjs.map +1 -0
- package/dist/_chunks/index-DiPS5IT4.js +280 -0
- package/dist/_chunks/index-DiPS5IT4.js.map +1 -0
- package/dist/_chunks/index-KAVS9co4.mjs +262 -0
- package/dist/_chunks/index-KAVS9co4.mjs.map +1 -0
- package/dist/_chunks/{index-c1108fa6.js → index-UofNvex6.js} +109 -108
- package/dist/_chunks/index-UofNvex6.js.map +1 -0
- package/dist/_chunks/{it-95fb8dcc.mjs → it-B-rv0E24.mjs} +1 -1
- package/dist/_chunks/it-B-rv0E24.mjs.map +1 -0
- package/dist/_chunks/{it-06b8d8a3.js → it-D1rH6V6_.js} +1 -1
- package/dist/_chunks/it-D1rH6V6_.js.map +1 -0
- package/dist/_chunks/{ja-557e03ee.mjs → ja-C8K-VBPD.mjs} +1 -1
- package/dist/_chunks/ja-C8K-VBPD.mjs.map +1 -0
- package/dist/_chunks/{ja-e92e9903.js → ja-DqShgTMf.js} +1 -1
- package/dist/_chunks/ja-DqShgTMf.js.map +1 -0
- package/dist/_chunks/{ko-5148326d.js → ko-B9DGEPWH.js} +1 -1
- package/dist/_chunks/ko-B9DGEPWH.js.map +1 -0
- package/dist/_chunks/{ko-d3b19f18.mjs → ko-Busb0wIY.mjs} +1 -1
- package/dist/_chunks/ko-Busb0wIY.mjs.map +1 -0
- package/dist/_chunks/{ms-b8a16476.mjs → ms-ByvsQjRt.mjs} +1 -1
- package/dist/_chunks/ms-ByvsQjRt.mjs.map +1 -0
- package/dist/_chunks/{ms-1e62b726.js → ms-CPBU3LWf.js} +1 -1
- package/dist/_chunks/ms-CPBU3LWf.js.map +1 -0
- package/dist/_chunks/{nl-fb114313.mjs → nl-5qO8Rpcy.mjs} +1 -1
- package/dist/_chunks/nl-5qO8Rpcy.mjs.map +1 -0
- package/dist/_chunks/{nl-66ef33aa.js → nl-CwNB6YoO.js} +1 -1
- package/dist/_chunks/nl-CwNB6YoO.js.map +1 -0
- package/dist/_chunks/{pl-5d70d4e8.mjs → pl-BdIzifBE.mjs} +1 -1
- package/dist/_chunks/pl-BdIzifBE.mjs.map +1 -0
- package/dist/_chunks/{pl-7aa4933a.js → pl-Do9UD69f.js} +1 -1
- package/dist/_chunks/pl-Do9UD69f.js.map +1 -0
- package/dist/_chunks/{pt-95c2c76f.mjs → pt-BIO24ioG.mjs} +1 -1
- package/dist/_chunks/pt-BIO24ioG.mjs.map +1 -0
- package/dist/_chunks/{pt-BR-820fcd20.js → pt-BR-D7dZhxuP.js} +1 -1
- package/dist/_chunks/pt-BR-D7dZhxuP.js.map +1 -0
- package/dist/_chunks/{pt-BR-075f271a.mjs → pt-BR-f0p23AQZ.mjs} +1 -1
- package/dist/_chunks/pt-BR-f0p23AQZ.mjs.map +1 -0
- package/dist/_chunks/{pt-a470d4e6.js → pt-fdvyOnUp.js} +1 -1
- package/dist/_chunks/pt-fdvyOnUp.js.map +1 -0
- package/dist/_chunks/{ru-cd0d1ac9.js → ru-C94rjPGA.js} +1 -1
- package/dist/_chunks/ru-C94rjPGA.js.map +1 -0
- package/dist/_chunks/{ru-625a0fe5.mjs → ru-VWy-IB7K.mjs} +1 -1
- package/dist/_chunks/ru-VWy-IB7K.mjs.map +1 -0
- package/dist/_chunks/{sk-8334fbf7.js → sk-BABEhykl.js} +1 -1
- package/dist/_chunks/sk-BABEhykl.js.map +1 -0
- package/dist/_chunks/{sk-495ecbe4.mjs → sk-B_LIcepm.mjs} +1 -1
- package/dist/_chunks/sk-B_LIcepm.mjs.map +1 -0
- package/dist/_chunks/{sv-60a1fabf.mjs → sv-ABLKOokl.mjs} +1 -1
- package/dist/_chunks/sv-ABLKOokl.mjs.map +1 -0
- package/dist/_chunks/{sv-137a2f79.js → sv-Be43LhA9.js} +1 -1
- package/dist/_chunks/sv-Be43LhA9.js.map +1 -0
- package/dist/_chunks/{th-f633d0ed.mjs → th-DKyP7ueR.mjs} +1 -1
- package/dist/_chunks/th-DKyP7ueR.mjs.map +1 -0
- package/dist/_chunks/{th-7fe328ef.js → th-DgVhVLhL.js} +1 -1
- package/dist/_chunks/th-DgVhVLhL.js.map +1 -0
- package/dist/_chunks/{tr-eae92999.js → tr-B_idhkEs.js} +1 -1
- package/dist/_chunks/tr-B_idhkEs.js.map +1 -0
- package/dist/_chunks/{tr-16211986.mjs → tr-qa1Q5UjC.mjs} +1 -1
- package/dist/_chunks/tr-qa1Q5UjC.mjs.map +1 -0
- package/dist/_chunks/{uk-f1fae414.mjs → uk-BmRqbeQc.mjs} +1 -1
- package/dist/_chunks/uk-BmRqbeQc.mjs.map +1 -0
- package/dist/_chunks/{uk-0c33935a.js → uk-LHOivnhP.js} +1 -1
- package/dist/_chunks/uk-LHOivnhP.js.map +1 -0
- package/dist/_chunks/{vi-b5d581a1.js → vi-CdVRdKDw.js} +1 -1
- package/dist/_chunks/vi-CdVRdKDw.js.map +1 -0
- package/dist/_chunks/{vi-e8fd97e4.mjs → vi-HW-EdMea.mjs} +1 -1
- package/dist/_chunks/vi-HW-EdMea.mjs.map +1 -0
- package/dist/_chunks/{zh-284557f3.mjs → zh-5hKkVPA4.mjs} +1 -1
- package/dist/_chunks/zh-5hKkVPA4.mjs.map +1 -0
- package/dist/_chunks/{zh-9babf307.js → zh-Cuq8gMnF.js} +1 -1
- package/dist/_chunks/zh-Cuq8gMnF.js.map +1 -0
- package/dist/_chunks/{zh-Hans-68e4b43a.mjs → zh-Hans-BHilK-yc.mjs} +1 -1
- package/dist/_chunks/zh-Hans-BHilK-yc.mjs.map +1 -0
- package/dist/_chunks/{zh-Hans-baae8c78.js → zh-Hans-GQDMKtY4.js} +1 -1
- package/dist/_chunks/zh-Hans-GQDMKtY4.js.map +1 -0
- package/dist/admin/index.js +1 -2
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +1 -2
- package/dist/admin/index.mjs.map +1 -1
- package/package.json +27 -29
- package/packup.config.ts +0 -20
- package/server/bootstrap/index.js +18 -51
- package/server/bootstrap/users-permissions-actions.js +6 -0
- package/server/config.js +29 -0
- package/server/content-types/user/index.js +0 -1
- package/server/controllers/auth.js +62 -63
- package/server/controllers/content-manager-user.js +28 -30
- package/server/controllers/role.js +17 -4
- package/server/controllers/user.js +8 -9
- package/server/controllers/validation/auth.js +81 -25
- package/server/graphql/types/index.js +1 -0
- package/server/graphql/types/me.js +1 -0
- package/server/graphql/types/user-input.js +20 -0
- package/server/middlewares/rateLimit.js +1 -1
- package/server/register.js +1 -1
- package/server/services/jwt.js +3 -3
- package/server/services/permission.js +3 -7
- package/server/services/providers-registry.js +469 -261
- package/server/services/providers.js +10 -5
- package/server/services/role.js +15 -13
- package/server/services/user.js +56 -19
- package/server/services/users-permissions.js +15 -13
- package/server/utils/index.d.ts +2 -1
- package/server/utils/sanitize/sanitizers.js +7 -3
- package/server/utils/sanitize/visitors/remove-user-relation-from-role-entities.js +2 -2
- package/admin/src/components/FormModal/index.js +0 -126
- package/admin/src/components/Permissions/index.js +0 -55
- package/admin/src/pages/AdvancedSettings/index.js +0 -259
- package/admin/src/pages/EmailTemplates/components/EmailForm.js +0 -176
- package/admin/src/pages/Roles/index.js +0 -33
- package/admin/src/pages/Roles/pages/ListPage/utils/api.js +0 -30
- package/dist/_chunks/ar-20af7bfe.js.map +0 -1
- package/dist/_chunks/ar-56e57465.mjs.map +0 -1
- package/dist/_chunks/cs-0521a3c8.mjs.map +0 -1
- package/dist/_chunks/cs-6d7de06a.js.map +0 -1
- package/dist/_chunks/de-4af0884b.js.map +0 -1
- package/dist/_chunks/de-84fed33d.mjs.map +0 -1
- package/dist/_chunks/dk-21e25c4b.js.map +0 -1
- package/dist/_chunks/dk-d8302360.mjs.map +0 -1
- package/dist/_chunks/en-746a275e.js.map +0 -1
- package/dist/_chunks/en-a610d7d0.mjs.map +0 -1
- package/dist/_chunks/es-9d9ad31c.mjs.map +0 -1
- package/dist/_chunks/es-b6ae0f5e.js.map +0 -1
- package/dist/_chunks/fr-0722d6cd.mjs.map +0 -1
- package/dist/_chunks/fr-dd77fc67.js.map +0 -1
- package/dist/_chunks/id-03eb1a4c.mjs.map +0 -1
- package/dist/_chunks/id-c19698f1.js.map +0 -1
- package/dist/_chunks/index-016c7053.mjs +0 -385
- package/dist/_chunks/index-016c7053.mjs.map +0 -1
- package/dist/_chunks/index-020975b0.mjs.map +0 -1
- package/dist/_chunks/index-0a906e1d.mjs +0 -300
- package/dist/_chunks/index-0a906e1d.mjs.map +0 -1
- package/dist/_chunks/index-3943c2c0.js +0 -407
- package/dist/_chunks/index-3943c2c0.js.map +0 -1
- package/dist/_chunks/index-44d6a972.mjs.map +0 -1
- package/dist/_chunks/index-5860e7c7.js.map +0 -1
- package/dist/_chunks/index-7d44bd05.js.map +0 -1
- package/dist/_chunks/index-a3ce2893.js +0 -319
- package/dist/_chunks/index-a3ce2893.js.map +0 -1
- package/dist/_chunks/index-c1108fa6.js.map +0 -1
- package/dist/_chunks/index-c5c563a2.mjs.map +0 -1
- package/dist/_chunks/it-06b8d8a3.js.map +0 -1
- package/dist/_chunks/it-95fb8dcc.mjs.map +0 -1
- package/dist/_chunks/ja-557e03ee.mjs.map +0 -1
- package/dist/_chunks/ja-e92e9903.js.map +0 -1
- package/dist/_chunks/ko-5148326d.js.map +0 -1
- package/dist/_chunks/ko-d3b19f18.mjs.map +0 -1
- package/dist/_chunks/ms-1e62b726.js.map +0 -1
- package/dist/_chunks/ms-b8a16476.mjs.map +0 -1
- package/dist/_chunks/nl-66ef33aa.js.map +0 -1
- package/dist/_chunks/nl-fb114313.mjs.map +0 -1
- package/dist/_chunks/pl-5d70d4e8.mjs.map +0 -1
- package/dist/_chunks/pl-7aa4933a.js.map +0 -1
- package/dist/_chunks/pt-95c2c76f.mjs.map +0 -1
- package/dist/_chunks/pt-BR-075f271a.mjs.map +0 -1
- package/dist/_chunks/pt-BR-820fcd20.js.map +0 -1
- package/dist/_chunks/pt-a470d4e6.js.map +0 -1
- package/dist/_chunks/ru-625a0fe5.mjs.map +0 -1
- package/dist/_chunks/ru-cd0d1ac9.js.map +0 -1
- package/dist/_chunks/sk-495ecbe4.mjs.map +0 -1
- package/dist/_chunks/sk-8334fbf7.js.map +0 -1
- package/dist/_chunks/sv-137a2f79.js.map +0 -1
- package/dist/_chunks/sv-60a1fabf.mjs.map +0 -1
- package/dist/_chunks/th-7fe328ef.js.map +0 -1
- package/dist/_chunks/th-f633d0ed.mjs.map +0 -1
- package/dist/_chunks/tr-16211986.mjs.map +0 -1
- package/dist/_chunks/tr-eae92999.js.map +0 -1
- package/dist/_chunks/uk-0c33935a.js.map +0 -1
- package/dist/_chunks/uk-f1fae414.mjs.map +0 -1
- package/dist/_chunks/vi-b5d581a1.js.map +0 -1
- package/dist/_chunks/vi-e8fd97e4.mjs.map +0 -1
- package/dist/_chunks/zh-284557f3.mjs.map +0 -1
- package/dist/_chunks/zh-9babf307.js.map +0 -1
- package/dist/_chunks/zh-Hans-68e4b43a.mjs.map +0 -1
- package/dist/_chunks/zh-Hans-baae8c78.js.map +0 -1
- package/server/bootstrap/grant-config.js +0 -131
- package/strapi-server.js +0 -3
- /package/admin/src/components/Permissions/PermissionRow/{index.js → index.jsx} +0 -0
- /package/admin/src/contexts/UsersPermissionsContext/{index.js → index.jsx} +0 -0
|
@@ -9,7 +9,7 @@ const { RateLimitError } = utils.errors;
|
|
|
9
9
|
module.exports =
|
|
10
10
|
(config, { strapi }) =>
|
|
11
11
|
async (ctx, next) => {
|
|
12
|
-
let rateLimitConfig = strapi.config.get('plugin
|
|
12
|
+
let rateLimitConfig = strapi.config.get('plugin::users-permissions.ratelimit');
|
|
13
13
|
|
|
14
14
|
if (!rateLimitConfig) {
|
|
15
15
|
rateLimitConfig = {
|
package/server/register.js
CHANGED
|
@@ -7,7 +7,7 @@ const authStrategy = require('./strategies/users-permissions');
|
|
|
7
7
|
const sanitizers = require('./utils/sanitize/sanitizers');
|
|
8
8
|
|
|
9
9
|
module.exports = ({ strapi }) => {
|
|
10
|
-
strapi.
|
|
10
|
+
strapi.get('auth').register('content-api', authStrategy);
|
|
11
11
|
strapi.sanitizers.add('content-api.output', sanitizers.defaultSanitizeOutput);
|
|
12
12
|
|
|
13
13
|
if (strapi.plugin('graphql')) {
|
package/server/services/jwt.js
CHANGED
|
@@ -29,10 +29,10 @@ module.exports = ({ strapi }) => ({
|
|
|
29
29
|
},
|
|
30
30
|
|
|
31
31
|
issue(payload, jwtOptions = {}) {
|
|
32
|
-
_.defaults(jwtOptions, strapi.config.get('plugin
|
|
32
|
+
_.defaults(jwtOptions, strapi.config.get('plugin::users-permissions.jwt'));
|
|
33
33
|
return jwt.sign(
|
|
34
34
|
_.clone(payload.toJSON ? payload.toJSON() : payload),
|
|
35
|
-
strapi.config.get('plugin
|
|
35
|
+
strapi.config.get('plugin::users-permissions.jwtSecret'),
|
|
36
36
|
jwtOptions
|
|
37
37
|
);
|
|
38
38
|
},
|
|
@@ -41,7 +41,7 @@ module.exports = ({ strapi }) => ({
|
|
|
41
41
|
return new Promise((resolve, reject) => {
|
|
42
42
|
jwt.verify(
|
|
43
43
|
token,
|
|
44
|
-
strapi.config.get('plugin
|
|
44
|
+
strapi.config.get('plugin::users-permissions.jwtSecret'),
|
|
45
45
|
{},
|
|
46
46
|
(err, tokenPayload = {}) => {
|
|
47
47
|
if (err) {
|
|
@@ -11,11 +11,7 @@ module.exports = ({ strapi }) => ({
|
|
|
11
11
|
* @return {object[]}
|
|
12
12
|
*/
|
|
13
13
|
async findRolePermissions(roleID) {
|
|
14
|
-
return strapi.
|
|
15
|
-
'plugin::users-permissions.role',
|
|
16
|
-
{ id: roleID },
|
|
17
|
-
'permissions'
|
|
18
|
-
);
|
|
14
|
+
return strapi.db.query('plugin::users-permissions.role').load({ id: roleID }, 'permissions');
|
|
19
15
|
},
|
|
20
16
|
|
|
21
17
|
/**
|
|
@@ -24,8 +20,8 @@ module.exports = ({ strapi }) => ({
|
|
|
24
20
|
* @return {object[]}
|
|
25
21
|
*/
|
|
26
22
|
async findPublicPermissions() {
|
|
27
|
-
return strapi.
|
|
28
|
-
|
|
23
|
+
return strapi.db.query('plugin::users-permissions.permission').findMany({
|
|
24
|
+
where: PUBLIC_ROLE_FILTER,
|
|
29
25
|
});
|
|
30
26
|
},
|
|
31
27
|
|