@strapi/plugin-users-permissions 0.0.0-next.dff425769af4d4d006725a10c395f59637403653 → 0.0.0-next.f45143c5e2a8a9d85691d0abf79a3f42024a0c71

package/admin/src/pages/Roles/ListPage/index.js

@@ -28,11 +28,12 @@ import {
   useQueryParams,
   EmptyStateLayout,
   ConfirmDialog,
+  useFilter,
+  useCollator,
 } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
-import matchSorter from 'match-sorter';
 
 import { fetchData, deleteData } from './utils/api';
 import { getTrad } from '../../../utils';
@@ -42,7 +43,7 @@ import TableBody from './components/TableBody';
 
 const RoleListPage = () => {
   const { trackUsage } = useTracking();
-  const { formatMessage } = useIntl();
+  const { formatMessage, locale } = useIntl();
   const { push } = useHistory();
   const toggleNotification = useNotification();
   const { notifyStatus } = useNotifyAT();
@@ -78,6 +79,17 @@ const RoleListPage = () => {
     enabled: canRead,
   });
 
+  const { includes } = useFilter(locale, {
+    sensitivity: 'base',
+  });
+
+  /**
+   * @type {Intl.Collator}
+   */
+  const formatter = useCollator(locale, {
+    sensitivity: 'base',
+  });
+
   const isLoading = isLoadingForData || isFetching;
 
   const handleNewRoleClick = () => {
@@ -118,7 +130,12 @@ const RoleListPage = () => {
     setIsConfirmButtonLoading(false);
   };
 
-  const sortedRoles = matchSorter(roles || [], _q, { keys: ['name', 'description'] });
+  const sortedRoles = (roles || [])
+    .filter((role) => includes(role.name, _q) || includes(role.description, _q))
+    .sort(
+      (a, b) => formatter.compare(a.name, b.name) || formatter.compare(a.description, b.description)
+    );
+
   const emptyContent = _q && !sortedRoles.length ? 'search' : 'roles';
 
   const colCount = 4;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "0.0.0-next.dff425769af4d4d006725a10c395f59637403653",
+  "version": "0.0.0-next.f45143c5e2a8a9d85691d0abf79a3f42024a0c71",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@strapi/design-system": "1.6.6",
-    "@strapi/helper-plugin": "0.0.0-next.dff425769af4d4d006725a10c395f59637403653",
+    "@strapi/helper-plugin": "0.0.0-next.f45143c5e2a8a9d85691d0abf79a3f42024a0c71",
     "@strapi/icons": "1.6.6",
-    "@strapi/utils": "0.0.0-next.dff425769af4d4d006725a10c395f59637403653",
+    "@strapi/utils": "0.0.0-next.f45143c5e2a8a9d85691d0abf79a3f42024a0c71",
     "bcryptjs": "2.4.3",
     "formik": "2.2.9",
     "grant-koa": "5.4.8",
@@ -42,7 +42,6 @@
     "koa": "^2.13.4",
     "koa2-ratelimit": "^1.1.2",
     "lodash": "4.17.21",
-    "match-sorter": "^4.0.2",
     "prop-types": "^15.7.2",
     "purest": "4.0.2",
     "react-intl": "6.3.2",
@@ -81,5 +80,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "dff425769af4d4d006725a10c395f59637403653"
+  "gitHead": "f45143c5e2a8a9d85691d0abf79a3f42024a0c71"
 }

package/server/controllers/auth.js

@@ -280,6 +280,12 @@ module.exports = {
         'confirmationToken',
         'resetPasswordToken',
         'provider',
+        'id',
+        'createdAt',
+        'updatedAt',
+        'createdBy',
+        'updatedBy',
+        'role',
       ]),
       provider: 'local',
     };

package/server/strategies/users-permissions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { castArray, map, every, pipe } = require('lodash/fp');
+const { castArray, map, every, pipe, isEmpty } = require('lodash/fp');
 const { ForbiddenError, UnauthorizedError } = require('@strapi/utils').errors;
 
 const { getService } = require('../utils');
@@ -80,6 +80,13 @@ const authenticate = async (ctx) => {
 const verify = async (auth, config) => {
   const { credentials: user, ability } = auth;
 
+  strapi.telemetry.send('didReceiveAPIRequest', {
+    eventProperties: {
+      authenticationMethod: auth?.strategy?.name,
+      isAuthenticated: !isEmpty(user),
+    },
+  });
+
   if (!config.scope) {
     if (!user) {
       // A non authenticated user cannot access routes that do not have a scope