@strapi/plugin-users-permissions 4.0.0-beta.4 → 4.0.0-beta.8

package/admin/src/components/BoundRoute/index.js

@@ -1,7 +1,7 @@
 import React from 'react';
-import { Stack } from '@strapi/parts/Stack';
-import { Box } from '@strapi/parts/Box';
-import { H3, Text } from '@strapi/parts/Text';
+import { Stack } from '@strapi/design-system/Stack';
+import { Box } from '@strapi/design-system/Box';
+import { H3, Text } from '@strapi/design-system/Text';
 import map from 'lodash/map';
 import tail from 'lodash/tail';
 import { useIntl } from 'react-intl';

package/admin/src/components/FormModal/Input/index.js

@@ -6,8 +6,8 @@
 
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { ToggleInput } from '@strapi/parts/ToggleInput';
-import { TextInput } from '@strapi/parts/TextInput';
+import { ToggleInput } from '@strapi/design-system/ToggleInput';
+import { TextInput } from '@strapi/design-system/TextInput';
 import PropTypes from 'prop-types';
 
 const Input = ({

package/admin/src/components/FormModal/index.js

@@ -6,11 +6,16 @@
 
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { Button } from '@strapi/parts/Button';
-import { Stack } from '@strapi/parts/Stack';
-import { Breadcrumbs, Crumb } from '@strapi/parts/Breadcrumbs';
-import { Grid, GridItem } from '@strapi/parts/Grid';
-import { ModalLayout, ModalHeader, ModalFooter, ModalBody } from '@strapi/parts/ModalLayout';
+import { Button } from '@strapi/design-system/Button';
+import { Stack } from '@strapi/design-system/Stack';
+import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import {
+  ModalLayout,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+} from '@strapi/design-system/ModalLayout';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import { Form } from '@strapi/helper-plugin';

package/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js

@@ -1,5 +1,5 @@
 import styled, { css } from 'styled-components';
-import { Box } from '@strapi/parts/Box';
+import { Box } from '@strapi/design-system/Box';
 
 const activeCheckboxWrapperStyles = css`
   background: ${props => props.theme.colors.primary100};

package/admin/src/components/Permissions/PermissionRow/SubCategory.js

@@ -2,11 +2,11 @@ import React, { useCallback, useMemo } from 'react';
 import { get } from 'lodash';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
-import { Box } from '@strapi/parts/Box';
-import { Checkbox } from '@strapi/parts/Checkbox';
-import { Row } from '@strapi/parts/Row';
-import { TableLabel } from '@strapi/parts/Text';
-import { Grid, GridItem } from '@strapi/parts/Grid';
+import { Box } from '@strapi/design-system/Box';
+import { Checkbox } from '@strapi/design-system/Checkbox';
+import { Flex } from '@strapi/design-system/Flex';
+import { TableLabel } from '@strapi/design-system/Text';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
 import CogIcon from '@strapi/icons/Cog';
 import { useIntl } from 'react-intl';
 import CheckboxWrapper from './CheckboxWrapper';
@@ -59,7 +59,7 @@ const SubCategory = ({ subCategory }) => {
 
   return (
     <Box>
-      <Row justifyContent="space-between" alignItems="center">
+      <Flex justifyContent="space-between" alignItems="center">
         <Box paddingRight={4}>
           <TableLabel textColor="neutral600">{subCategory.label}</TableLabel>
         </Box>
@@ -75,8 +75,8 @@ const SubCategory = ({ subCategory }) => {
             {formatMessage({ id: 'app.utils.select-all', defaultMessage: 'Select all' })}
           </Checkbox>
         </Box>
-      </Row>
-      <Row paddingTop={6} paddingBottom={6}>
+      </Flex>
+      <Flex paddingTop={6} paddingBottom={6}>
         <Grid gap={2} style={{ flex: 1 }}>
           {subCategory.actions.map(action => {
             const name = `${action.name}.enabled`;
@@ -104,7 +104,7 @@ const SubCategory = ({ subCategory }) => {
             );
           })}
         </Grid>
-      </Row>
+      </Flex>
     </Box>
   );
 };

package/admin/src/components/Permissions/PermissionRow/index.js

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import sortBy from 'lodash/sortBy';
-import { Box } from '@strapi/parts/Box';
+import { Box } from '@strapi/design-system/Box';
 import SubCategory from './SubCategory';
 
 const PermissionRow = ({ name, permissions }) => {

package/admin/src/components/Permissions/index.js

@@ -1,6 +1,7 @@
 import React, { memo, useCallback, useReducer } from 'react';
-import { Accordion, AccordionToggle, AccordionContent } from '@strapi/parts/Accordion';
+import { Accordion, AccordionToggle, AccordionContent } from '@strapi/design-system/Accordion';
 import { useIntl } from 'react-intl';
+import { Box } from '@strapi/design-system/Box';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import formatPluginName from '../../utils/formatPluginName';
 import PermissionRow from './PermissionRow';
@@ -41,7 +42,9 @@ const Permissions = () => {
             variant={index % 2 ? 'primary' : 'secondary'}
           />
           <AccordionContent>
-            <PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
+            <Box background="neutral0">
+              <PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
+            </Box>
           </AccordionContent>
         </Accordion>
       ))}

package/admin/src/components/Policies/index.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { H3, Text } from '@strapi/parts/Text';
-import { Stack } from '@strapi/parts/Stack';
-import { GridItem } from '@strapi/parts/Grid';
+import { H3, Text } from '@strapi/design-system/Text';
+import { Stack } from '@strapi/design-system/Stack';
+import { GridItem } from '@strapi/design-system/Grid';
 import { get, isEmpty, takeRight, toLower, without } from 'lodash';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import BoundRoute from '../BoundRoute';

package/admin/src/components/UsersPermissions/index.js

@@ -1,8 +1,8 @@
 import React, { memo, useReducer, useCallback, forwardRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
-import { H3, Text } from '@strapi/parts/Text';
-import { Stack } from '@strapi/parts/Stack';
-import { Grid, GridItem } from '@strapi/parts/Grid';
+import { H3, Text } from '@strapi/design-system/Text';
+import { Stack } from '@strapi/design-system/Stack';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
 import { useIntl } from 'react-intl';
 import getTrad from '../../utils/getTrad';
 import Policies from '../Policies';

package/admin/src/index.js

@@ -6,13 +6,10 @@
 // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED
 import { prefixPluginTranslations } from '@strapi/helper-plugin';
 import pluginPkg from '../../package.json';
-import pluginLogo from './assets/images/logo.svg';
 import pluginPermissions from './permissions';
 import pluginId from './pluginId';
 import getTrad from './utils/getTrad';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
-const icon = pluginPkg.strapi.icon;
 const name = pluginPkg.strapi.name;
 
 export default {
@@ -95,13 +92,8 @@ export default {
     );
 
     app.registerPlugin({
-      description: pluginDescription,
-      icon,
       id: pluginId,
-      isReady: true,
-      isRequired: pluginPkg.strapi.required || false,
       name,
-      pluginLogo,
     });
   },
   bootstrap() {},

package/admin/src/pages/AdvancedSettings/index.js

@@ -13,16 +13,16 @@ import {
   useOverlayBlocker,
   useRBAC,
 } from '@strapi/helper-plugin';
-import { useNotifyAT } from '@strapi/parts/LiveRegions';
-import { Main } from '@strapi/parts/Main';
-import { HeaderLayout, ContentLayout } from '@strapi/parts/Layout';
-import { Button } from '@strapi/parts/Button';
-import { Box } from '@strapi/parts/Box';
-import { Stack } from '@strapi/parts/Stack';
-import { Select, Option } from '@strapi/parts/Select';
-import { H3 } from '@strapi/parts/Text';
-import { Grid, GridItem } from '@strapi/parts/Grid';
-import CheckIcon from '@strapi/icons/CheckIcon';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import { Main } from '@strapi/design-system/Main';
+import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
+import { Button } from '@strapi/design-system/Button';
+import { Box } from '@strapi/design-system/Box';
+import { Stack } from '@strapi/design-system/Stack';
+import { Select, Option } from '@strapi/design-system/Select';
+import { H3 } from '@strapi/design-system/Text';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import Check from '@strapi/icons/Check';
 import pluginPermissions from '../../permissions';
 import { getTrad } from '../../utils';
 import layout from './utils/layout';
@@ -151,7 +151,7 @@ const AdvancedSettingsPage = () => {
                     loading={isSubmitting}
                     type="submit"
                     disabled={!canUpdate}
-                    startIcon={<CheckIcon />}
+                    startIcon={<Check />}
                     size="L"
                   >
                     {formatMessage({ id: getTrad('Form.save'), defaultMessage: 'Save' })}

package/admin/src/pages/EmailTemplates/components/EmailForm.js

@@ -3,11 +3,16 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { Form, GenericInput } from '@strapi/helper-plugin';
 import { Formik } from 'formik';
-import { ModalLayout, ModalHeader, ModalFooter, ModalBody } from '@strapi/parts/ModalLayout';
-import { Grid, GridItem } from '@strapi/parts/Grid';
-import { Button } from '@strapi/parts/Button';
-import { Breadcrumbs, Crumb } from '@strapi/parts/Breadcrumbs';
-import { Textarea } from '@strapi/parts/Textarea';
+import {
+  ModalLayout,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+} from '@strapi/design-system/ModalLayout';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Button } from '@strapi/design-system/Button';
+import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs';
+import { Textarea } from '@strapi/design-system/Textarea';
 import { getTrad } from '../../../utils';
 import schema from '../utils/schema';
 

package/admin/src/pages/EmailTemplates/components/EmailTable.js

@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { Table, Thead, Tbody, Tr, Td, Th } from '@strapi/parts/Table';
-import { VisuallyHidden } from '@strapi/parts/VisuallyHidden';
-import { Text, TableLabel } from '@strapi/parts/Text';
-import { IconButton } from '@strapi/parts/IconButton';
-import EditIcon from '@strapi/icons/EditIcon';
-import Reload from '@strapi/icons/Reload';
+import { Table, Thead, Tbody, Tr, Td, Th } from '@strapi/design-system/Table';
+import { VisuallyHidden } from '@strapi/design-system/VisuallyHidden';
+import { Text, TableLabel } from '@strapi/design-system/Text';
+import { IconButton } from '@strapi/design-system/IconButton';
+import Pencil from '@strapi/icons/Pencil';
+import Reload from '@strapi/icons/Refresh';
 import { onRowClick, stopPropagation } from '@strapi/helper-plugin';
-import CheckIcon from '@strapi/icons/CheckIcon';
+import Check from '@strapi/icons/Check';
 import { getTrad } from '../../../utils';
 
 const EmailTable = ({ canUpdate, onEditClick }) => {
@@ -70,13 +70,13 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
                 defaultMessage: 'Edit a template',
               })}
               noBorder
-              icon={canUpdate && <EditIcon />}
+              icon={canUpdate && <Pencil />}
             />
           </Td>
         </Tr>
         <Tr {...onRowClick({ fn: () => onEditClick('email_confirmation') })}>
           <Td>
-            <CheckIcon
+            <Check
               aria-label={formatMessage({
                 id: getTrad('Email.template.email_confirmation'),
                 defaultMessage: 'Email address confirmation',
@@ -99,7 +99,7 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
                 defaultMessage: 'Edit a template',
               })}
               noBorder
-              icon={canUpdate && <EditIcon />}
+              icon={canUpdate && <Pencil />}
             />
           </Td>
         </Tr>

package/admin/src/pages/EmailTemplates/index.js

@@ -11,9 +11,9 @@ import {
   useFocusWhenNavigate,
   LoadingIndicatorPage,
 } from '@strapi/helper-plugin';
-import { useNotifyAT } from '@strapi/parts/LiveRegions';
-import { Main } from '@strapi/parts/Main';
-import { ContentLayout, HeaderLayout } from '@strapi/parts/Layout';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import { Main } from '@strapi/design-system/Main';
+import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
 import pluginPermissions from '../../permissions';
 import { getTrad } from '../../utils';
 import { fetchData, putEmailTemplate } from './utils/api';

package/admin/src/pages/Providers/index.js

@@ -15,14 +15,14 @@ import {
 import has from 'lodash/has';
 import upperFirst from 'lodash/upperFirst';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { HeaderLayout, Layout, ContentLayout } from '@strapi/parts/Layout';
-import { Main } from '@strapi/parts/Main';
-import { useNotifyAT } from '@strapi/parts/LiveRegions';
-import { Table, Thead, Tr, Th, Tbody, Td } from '@strapi/parts/Table';
-import { Text, TableLabel } from '@strapi/parts/Text';
-import { VisuallyHidden } from '@strapi/parts/VisuallyHidden';
-import { IconButton } from '@strapi/parts/IconButton';
-import EditIcon from '@strapi/icons/EditIcon';
+import { HeaderLayout, Layout, ContentLayout } from '@strapi/design-system/Layout';
+import { Main } from '@strapi/design-system/Main';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import { Table, Thead, Tr, Th, Tbody, Td } from '@strapi/design-system/Table';
+import { Text, TableLabel } from '@strapi/design-system/Text';
+import { VisuallyHidden } from '@strapi/design-system/VisuallyHidden';
+import { IconButton } from '@strapi/design-system/IconButton';
+import Pencil from '@strapi/icons/Pencil';
 import { useQuery, useMutation, useQueryClient } from 'react-query';
 import forms from './utils/forms';
 import { fetchData, putProvider } from './utils/api';
@@ -233,7 +233,7 @@ export const ProvidersPage = () => {
                         <IconButton
                           onClick={() => handleClickEdit(provider)}
                           noBorder
-                          icon={<EditIcon />}
+                          icon={<Pencil />}
                           label="Edit"
                         />
                       )}

package/admin/src/pages/Providers/utils/api.js

@@ -18,4 +18,4 @@ export const fetchData = async toggleNotification => {
 
 export const putProvider = body => {
   return axiosInstance.put(getRequestURL('providers'), body);
-}
+};

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

@@ -1,15 +1,15 @@
 import React, { useState, useRef } from 'react';
 import { useHistory } from 'react-router-dom';
-import { ContentLayout, HeaderLayout } from '@strapi/parts/Layout';
-import { Main } from '@strapi/parts/Main';
-import { Button } from '@strapi/parts/Button';
-import { Stack } from '@strapi/parts/Stack';
-import { Box } from '@strapi/parts/Box';
-import { TextInput } from '@strapi/parts/TextInput';
-import { Textarea } from '@strapi/parts/Textarea';
-import { H3 } from '@strapi/parts/Text';
-import CheckIcon from '@strapi/icons/CheckIcon';
-import { GridItem, Grid } from '@strapi/parts/Grid';
+import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
+import { Main } from '@strapi/design-system/Main';
+import { Button } from '@strapi/design-system/Button';
+import { Stack } from '@strapi/design-system/Stack';
+import { Box } from '@strapi/design-system/Box';
+import { TextInput } from '@strapi/design-system/TextInput';
+import { Textarea } from '@strapi/design-system/Textarea';
+import { H3 } from '@strapi/design-system/Text';
+import Check from '@strapi/icons/Check';
+import { GridItem, Grid } from '@strapi/design-system/Grid';
 import { Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import {
@@ -84,7 +84,7 @@ const EditPage = () => {
             <HeaderLayout
               primaryAction={
                 !isLoadingPlugins && (
-                  <Button type="submit" loading={isSubmitting} startIcon={<CheckIcon />}>
+                  <Button type="submit" loading={isSubmitting} startIcon={<Check />}>
                     {formatMessage({
                       id: 'app.components.Button.save',
                       defaultMessage: 'Save',

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

@@ -1,14 +1,16 @@
 import React, { useState, useRef } from 'react';
-import { ContentLayout, HeaderLayout } from '@strapi/parts/Layout';
-import { Main } from '@strapi/parts/Main';
-import { Button } from '@strapi/parts/Button';
-import { Stack } from '@strapi/parts/Stack';
-import { Box } from '@strapi/parts/Box';
-import { TextInput } from '@strapi/parts/TextInput';
-import { Textarea } from '@strapi/parts/Textarea';
-import { H3 } from '@strapi/parts/Text';
-import CheckIcon from '@strapi/icons/CheckIcon';
-import { GridItem, Grid } from '@strapi/parts/Grid';
+import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
+import { Main } from '@strapi/design-system/Main';
+import { Button } from '@strapi/design-system/Button';
+import { Stack } from '@strapi/design-system/Stack';
+import { Box } from '@strapi/design-system/Box';
+import { TextInput } from '@strapi/design-system/TextInput';
+import { Textarea } from '@strapi/design-system/Textarea';
+import { H3 } from '@strapi/design-system/Text';
+import ArrowLeft from '@strapi/icons/ArrowLeft';
+import Check from '@strapi/icons/Check';
+import { Link } from '@strapi/design-system/Link';
+import { GridItem, Grid } from '@strapi/design-system/Grid';
 import { Formik } from 'formik';
 import { useIntl } from 'react-intl';
 import { useRouteMatch } from 'react-router-dom';
@@ -92,7 +94,7 @@ const EditPage = () => {
                     disabled={role.code === 'strapi-super-admin'}
                     type="submit"
                     loading={isSubmitting}
-                    startIcon={<CheckIcon />}
+                    startIcon={<Check />}
                   >
                     {formatMessage({
                       id: 'app.components.Button.save',
@@ -103,6 +105,14 @@ const EditPage = () => {
               }
               title={role.name}
               subtitle={role.description}
+              navigationAction={
+                <Link startIcon={<ArrowLeft />} to="/settings/users-permissions/roles">
+                  {formatMessage({
+                    id: 'app.components.go-back',
+                    defaultMessage: 'Go back',
+                  })}
+                </Link>
+              }
             />
             <ContentLayout>
               <Stack size={7}>

package/admin/src/pages/Roles/ListPage/components/TableBody.js

@@ -1,7 +1,11 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { IconButton, Tbody, Text, Tr, Td, Row } from '@strapi/parts';
-import { EditIcon, DeleteIcon } from '@strapi/icons';
+import { IconButton } from '@strapi/design-system/IconButton';
+import { Text } from '@strapi/design-system/Text';
+import { Flex } from '@strapi/design-system/Flex';
+import { Tbody, Tr, Td } from '@strapi/design-system/Table';
+import Pencil from '@strapi/icons/Pencil';
+import Trash from '@strapi/icons/Trash';
 import { CheckPermissions, onRowClick, stopPropagation } from '@strapi/helper-plugin';
 import { useIntl } from 'react-intl';
 import { useHistory } from 'react-router-dom';
@@ -44,12 +48,12 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel
             </Text>
           </Td>
           <Td>
-            <Row justifyContent="end" {...stopPropagation}>
+            <Flex justifyContent="end" {...stopPropagation}>
               <CheckPermissions permissions={permissions.updateRole}>
                 <IconButton
                   onClick={() => handleClickEdit(role.id)}
                   noBorder
-                  icon={<EditIcon />}
+                  icon={<Pencil />}
                   label={formatMessage(
                     { id: 'app.component.table.edit', defaultMessage: 'Edit {target}' },
                     { target: `${role.name}` }
@@ -61,7 +65,7 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel
                   <IconButton
                     onClick={() => handleClickDelete(role.id)}
                     noBorder
-                    icon={<DeleteIcon />}
+                    icon={<Trash />}
                     label={formatMessage(
                       { id: 'app.component.table.delete', defaultMessage: 'Delete {target}' },
                       { target: `${role.name}` }
@@ -69,7 +73,7 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel
                   />
                 </CheckPermissions>
               )}
-            </Row>
+            </Flex>
           </Td>
         </Tr>
       ))}

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

@@ -13,8 +13,8 @@ import {
   ContentLayout,
   ActionLayout,
   VisuallyHidden,
-} from '@strapi/parts';
-import AddIcon from '@strapi/icons/AddIcon';
+} from '@strapi/design-system';
+import Plus from '@strapi/icons/Plus';
 import {
   useTracking,
   SettingsPageTitle,
@@ -137,7 +137,7 @@ const RoleListPage = () => {
           })}
           primaryAction={
             <CheckPermissions permissions={permissions.createRole}>
-              <Button onClick={handleNewRoleClick} startIcon={<AddIcon />}>
+              <Button onClick={handleNewRoleClick} startIcon={<Plus />}>
                 {formatMessage({
                   id: getTrad('List.button.roles'),
                   defaultMessage: 'Add new role',

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.8",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "displayName": "Roles & Permissions",
     "name": "users-permissions",
-    "icon": "users",
     "description": "users-permissions.plugin.description",
     "required": true,
     "kind": "plugin"
@@ -15,9 +14,9 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-beta.4",
-    "@strapi/utils": "4.0.0-beta.4",
-    "bcryptjs": "^2.4.3",
+    "@strapi/helper-plugin": "4.0.0-beta.8",
+    "@strapi/utils": "4.0.0-beta.8",
+    "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
     "koa2-ratelimit": "^0.9.0",
@@ -58,5 +57,5 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "b4a32bc84e2e23043dbc33b2bded0ea9ddcd13e7"
+  "gitHead": "61b7748dad3e3d3c88e4a0a318e2d526e372ead0"
 }

package/server/bootstrap/index.js

@@ -37,9 +37,12 @@ module.exports = async ({ strapi }) => {
 };
 
 const initGrant = async pluginStore => {
+  const apiPrefix = strapi.config.get('api.rest.prefix');
+  const baseURL = `${strapi.config.server.url}/${apiPrefix}/auth`;
+
   const grantConfig = {
     defaults: {
-      prefix: '/api/connect',
+      prefix: `${apiPrefix}/connect`,
     },
     email: {
       enabled: true,
@@ -50,7 +53,7 @@ const initGrant = async pluginStore => {
       icon: 'discord',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/discord/callback`,
+      callback: `${baseURL}/discord/callback`,
       scope: ['identify', 'email'],
     },
     facebook: {
@@ -58,7 +61,7 @@ const initGrant = async pluginStore => {
       icon: 'facebook-square',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/facebook/callback`,
+      callback: `${baseURL}/facebook/callback`,
       scope: ['email'],
     },
     google: {
@@ -66,7 +69,7 @@ const initGrant = async pluginStore => {
       icon: 'google',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/google/callback`,
+      callback: `${baseURL}/google/callback`,
       scope: ['email'],
     },
     github: {
@@ -74,7 +77,7 @@ const initGrant = async pluginStore => {
       icon: 'github',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/github/callback`,
+      callback: `${baseURL}/github/callback`,
       scope: ['user', 'user:email'],
     },
     microsoft: {
@@ -82,7 +85,7 @@ const initGrant = async pluginStore => {
       icon: 'windows',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/microsoft/callback`,
+      callback: `${baseURL}/microsoft/callback`,
       scope: ['user.read'],
     },
     twitter: {
@@ -90,14 +93,14 @@ const initGrant = async pluginStore => {
       icon: 'twitter',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/twitter/callback`,
+      callback: `${baseURL}/twitter/callback`,
     },
     instagram: {
       enabled: false,
       icon: 'instagram',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/instagram/callback`,
+      callback: `${baseURL}/instagram/callback`,
       scope: ['user_profile'],
     },
     vk: {
@@ -105,7 +108,7 @@ const initGrant = async pluginStore => {
       icon: 'vk',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/vk/callback`,
+      callback: `${baseURL}/vk/callback`,
       scope: ['email'],
     },
     twitch: {
@@ -113,7 +116,7 @@ const initGrant = async pluginStore => {
       icon: 'twitch',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/twitch/callback`,
+      callback: `${baseURL}/twitch/callback`,
       scope: ['user:read:email'],
     },
     linkedin: {
@@ -121,7 +124,7 @@ const initGrant = async pluginStore => {
       icon: 'linkedin',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/linkedin/callback`,
+      callback: `${baseURL}/linkedin/callback`,
       scope: ['r_liteprofile', 'r_emailaddress'],
     },
     cognito: {
@@ -130,7 +133,7 @@ const initGrant = async pluginStore => {
       key: '',
       secret: '',
       subdomain: 'my.subdomain.com',
-      callback: `${strapi.config.server.url}/api/auth/cognito/callback`,
+      callback: `${baseURL}/cognito/callback`,
       scope: ['email', 'openid', 'profile'],
     },
     reddit: {
@@ -139,7 +142,7 @@ const initGrant = async pluginStore => {
       key: '',
       secret: '',
       state: true,
-      callback: `${strapi.config.server.url}/api/auth/reddit/callback`,
+      callback: `${baseURL}/reddit/callback`,
       scope: ['identity'],
     },
     auth0: {
@@ -148,7 +151,7 @@ const initGrant = async pluginStore => {
       key: '',
       secret: '',
       subdomain: 'my-tenant.eu',
-      callback: `${strapi.config.server.url}/api/auth/auth0/callback`,
+      callback: `${baseURL}/auth0/callback`,
       scope: ['openid', 'email', 'profile'],
     },
     cas: {
@@ -156,7 +159,7 @@ const initGrant = async pluginStore => {
       icon: 'book',
       key: '',
       secret: '',
-      callback: `${strapi.config.server.url}/api/auth/cas/callback`,
+      callback: `${baseURL}/cas/callback`,
       scope: ['openid email'], // scopes should be space delimited
       subdomain: 'my.subdomain.com/cas',
     },

package/server/services/providers.js

@@ -586,8 +586,10 @@ module.exports = ({ strapi }) => {
     });
   };
 
-  const buildRedirectUri = (provider = '') =>
-    `${getAbsoluteServerUrl(strapi.config)}/api/connect/${provider}/callback`;
+  const buildRedirectUri = (provider = '') => {
+    const apiPrefix = strapi.config.get('api.rest.prefix');
+    return `${getAbsoluteServerUrl(strapi.config)}/${apiPrefix}/connect/${provider}/callback`;
+  };
 
   return {
     connect,

package/admin/src/assets/images/logo.svg

@@ -1 +0,0 @@
-<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg"><text transform="translate(-24 -6)" fill="#4B515A" fill-rule="evenodd" font-size="24" font-family="AppleColorEmoji, Apple Color Emoji"><tspan x="24" y="28">🔐</tspan></text></svg>