@strapi/plugin-users-permissions 4.1.3 → 4.1.4-alpha.2

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

@@ -23,7 +23,7 @@ function BoundRoute({ route }) {
   const colors = getMethodColor(route.method);
 
   return (
-    <Stack size={2}>
+    <Stack spacing={2}>
       <Typography variant="delta" as="h3">
         {formatMessage({
           id: 'users-permissions.BoundRoute.title',
@@ -35,7 +35,7 @@ function BoundRoute({ route }) {
           .{action}
         </Typography>
       </Typography>
-      <Stack horizontal hasRadius background="neutral0" borderColor="neutral200" size={0}>
+      <Stack horizontal hasRadius background="neutral0" borderColor="neutral200" spacing={0}>
         <MethodBox background={colors.background} borderColor={colors.border} padding={2}>
           <Typography fontWeight="bold" textColor={colors.text}>
             {method}

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

@@ -56,7 +56,7 @@ const FormModal = ({
           return (
             <Form>
               <ModalBody>
-                <Stack size={1}>
+                <Stack spacing={1}>
                   <Grid gap={5}>
                     {layout.form.map(row => {
                       return row.map(input => {

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

@@ -23,11 +23,11 @@ const Permissions = () => {
     });
 
   return (
-    <Stack size={1}>
+    <Stack spacing={1}>
       {collapses.map((collapse, index) => (
         <Accordion
           expanded={collapse.isOpen}
-          toggle={() => handleToggle(index)}
+          onToggle={() => handleToggle(index)}
           key={collapse.name}
           variant={index % 2 === 0 ? 'secondary' : undefined}
         >

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

@@ -30,14 +30,14 @@ const Policies = () => {
       style={{ minHeight: '100%' }}
     >
       {selectedAction ? (
-        <Stack size={2}>
+        <Stack spacing={2}>
           {displayedRoutes.map((route, key) => (
             // eslint-disable-next-line react/no-array-index-key
             <BoundRoute key={key} route={route} />
           ))}
         </Stack>
       ) : (
-        <Stack size={2}>
+        <Stack spacing={2}>
           <Typography variant="delta" as="h3">
             {formatMessage({
               id: 'users-permissions.Policies.header.title',

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

@@ -62,8 +62,8 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
     <UsersPermissionsProvider value={providerValue}>
       <Grid gap={0} shadow="filterShadow" hasRadius background="neutral0">
         <GridItem col={7} paddingTop={6} paddingBottom={6} paddingLeft={7} paddingRight={7}>
-          <Stack size={6}>
-            <Stack size={2}>
+          <Stack spacing={6}>
+            <Stack spacing={2}>
               <Typography variant="delta" as="h2">
                 {formatMessage({
                   id: getTrad('Plugins.header.title'),

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

@@ -168,7 +168,7 @@ const AdvancedSettingsPage = () => {
                   paddingLeft={7}
                   paddingRight={7}
                 >
-                  <Stack size={4}>
+                  <Stack spacing={4}>
                     <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: getTrad('Form.title.advancedSettings'),

package/admin/src/pages/AdvancedSettings/utils/schema.js

@@ -1,7 +1,7 @@
 import * as yup from 'yup';
 import { translatedErrors } from '@strapi/helper-plugin';
 
-const URL_REGEX = new RegExp('(^$)|((https?://.*)(d*)/?(.*))');
+const URL_REGEX = new RegExp('(^$)|((.+:\\/\\/.*)(d*)\\/?(.*))');
 
 const schema = yup.object().shape({
   email_confirmation_redirection: yup.mixed().when('email_confirmation', {

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

@@ -102,7 +102,7 @@ const EditPage = () => {
               })}
             />
             <ContentLayout>
-              <Stack size={7}>
+              <Stack spacing={7}>
                 <Box
                   background="neutral0"
                   hasRadius
@@ -112,7 +112,7 @@ const EditPage = () => {
                   paddingLeft={7}
                   paddingRight={7}
                 >
-                  <Stack size={4}>
+                  <Stack spacing={4}>
                     <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: getTrad('EditPage.form.roles'),

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

@@ -115,7 +115,7 @@ const EditPage = () => {
               }
             />
             <ContentLayout>
-              <Stack size={7}>
+              <Stack spacing={7}>
                 <Box
                   background="neutral0"
                   hasRadius
@@ -125,7 +125,7 @@ const EditPage = () => {
                   paddingLeft={7}
                   paddingRight={7}
                 >
-                  <Stack size={4}>
+                  <Stack spacing={4}>
                     <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: getTrad('EditPage.form.roles'),

package/admin/src/translations/en.json

@@ -12,7 +12,7 @@
   "EditForm.inputToggle.label.email-confirmation-redirection": "Redirection url",
   "EditForm.inputToggle.label.email-reset-password": "Reset password page",
   "EditForm.inputToggle.label.sign-up": "Enable sign-ups",
-  "EditForm.inputToggle.placeholder.email-confirmation-redirection": "ex: https://yourfrontend.com/reset-password",
+  "EditForm.inputToggle.placeholder.email-confirmation-redirection": "ex: https://yourfrontend.com/confirmation-redirection",
   "EditForm.inputToggle.placeholder.email-reset-password": "ex: https://yourfrontend.com/reset-password",
   "EditPage.form.roles": "Role details",
   "Email.template.data.loaded": "Email templates has been loaded",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.1.3",
+  "version": "4.1.4-alpha.2",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.1.3",
-    "@strapi/utils": "4.1.3",
+    "@strapi/helper-plugin": "4.1.4-alpha.2",
+    "@strapi/utils": "4.1.4-alpha.2",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -61,5 +61,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "8549f5aca34f2a72bb477a1b305260f39f271f4e"
+  "gitHead": "067d31a116cd5d31a0160073a09ade55ea4c95a9"
 }

package/server/bootstrap/grant-config.js

@@ -0,0 +1,123 @@
+'use strict';
+
+module.exports = baseURL => ({
+  email: {
+    enabled: true,
+    icon: 'envelope',
+  },
+  discord: {
+    enabled: false,
+    icon: 'discord',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/discord/callback`,
+    scope: ['identify', 'email'],
+  },
+  facebook: {
+    enabled: false,
+    icon: 'facebook-square',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/facebook/callback`,
+    scope: ['email'],
+  },
+  google: {
+    enabled: false,
+    icon: 'google',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/google/callback`,
+    scope: ['email'],
+  },
+  github: {
+    enabled: false,
+    icon: 'github',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/github/callback`,
+    scope: ['user', 'user:email'],
+  },
+  microsoft: {
+    enabled: false,
+    icon: 'windows',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/microsoft/callback`,
+    scope: ['user.read'],
+  },
+  twitter: {
+    enabled: false,
+    icon: 'twitter',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/twitter/callback`,
+  },
+  instagram: {
+    enabled: false,
+    icon: 'instagram',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/instagram/callback`,
+    scope: ['user_profile'],
+  },
+  vk: {
+    enabled: false,
+    icon: 'vk',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/vk/callback`,
+    scope: ['email'],
+  },
+  twitch: {
+    enabled: false,
+    icon: 'twitch',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/twitch/callback`,
+    scope: ['user:read:email'],
+  },
+  linkedin: {
+    enabled: false,
+    icon: 'linkedin',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/linkedin/callback`,
+    scope: ['r_liteprofile', 'r_emailaddress'],
+  },
+  cognito: {
+    enabled: false,
+    icon: 'aws',
+    key: '',
+    secret: '',
+    subdomain: 'my.subdomain.com',
+    callback: `${baseURL}/cognito/callback`,
+    scope: ['email', 'openid', 'profile'],
+  },
+  reddit: {
+    enabled: false,
+    icon: 'reddit',
+    key: '',
+    secret: '',
+    state: true,
+    callback: `${baseURL}/reddit/callback`,
+    scope: ['identity'],
+  },
+  auth0: {
+    enabled: false,
+    icon: '',
+    key: '',
+    secret: '',
+    subdomain: 'my-tenant.eu',
+    callback: `${baseURL}/auth0/callback`,
+    scope: ['openid', 'email', 'profile'],
+  },
+  cas: {
+    enabled: false,
+    icon: 'book',
+    key: '',
+    secret: '',
+    callback: `${baseURL}/cas/callback`,
+    scope: ['openid email'], // scopes should be space delimited
+    subdomain: 'my.subdomain.com/cas',
+  },
+});

package/server/bootstrap/index.js

@@ -11,6 +11,7 @@ const _ = require('lodash');
 const urljoin = require('url-join');
 const uuid = require('uuid/v4');
 const { getService } = require('../utils');
+const getGrantConfig = require('./grant-config');
 
 const usersPermissionsActions = require('./users-permissions-actions');
 
@@ -44,127 +45,7 @@ const initGrant = async pluginStore => {
   const apiPrefix = strapi.config.get('api.rest.prefix');
   const baseURL = urljoin(strapi.config.server.url, apiPrefix, 'auth');
 
-  const grantConfig = {
-    email: {
-      enabled: true,
-      icon: 'envelope',
-    },
-    discord: {
-      enabled: false,
-      icon: 'discord',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/discord/callback`,
-      scope: ['identify', 'email'],
-    },
-    facebook: {
-      enabled: false,
-      icon: 'facebook-square',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/facebook/callback`,
-      scope: ['email'],
-    },
-    google: {
-      enabled: false,
-      icon: 'google',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/google/callback`,
-      scope: ['email'],
-    },
-    github: {
-      enabled: false,
-      icon: 'github',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/github/callback`,
-      scope: ['user', 'user:email'],
-    },
-    microsoft: {
-      enabled: false,
-      icon: 'windows',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/microsoft/callback`,
-      scope: ['user.read'],
-    },
-    twitter: {
-      enabled: false,
-      icon: 'twitter',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/twitter/callback`,
-    },
-    instagram: {
-      enabled: false,
-      icon: 'instagram',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/instagram/callback`,
-      scope: ['user_profile'],
-    },
-    vk: {
-      enabled: false,
-      icon: 'vk',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/vk/callback`,
-      scope: ['email'],
-    },
-    twitch: {
-      enabled: false,
-      icon: 'twitch',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/twitch/callback`,
-      scope: ['user:read:email'],
-    },
-    linkedin: {
-      enabled: false,
-      icon: 'linkedin',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/linkedin/callback`,
-      scope: ['r_liteprofile', 'r_emailaddress'],
-    },
-    cognito: {
-      enabled: false,
-      icon: 'aws',
-      key: '',
-      secret: '',
-      subdomain: 'my.subdomain.com',
-      callback: `${baseURL}/cognito/callback`,
-      scope: ['email', 'openid', 'profile'],
-    },
-    reddit: {
-      enabled: false,
-      icon: 'reddit',
-      key: '',
-      secret: '',
-      state: true,
-      callback: `${baseURL}/reddit/callback`,
-      scope: ['identity'],
-    },
-    auth0: {
-      enabled: false,
-      icon: '',
-      key: '',
-      secret: '',
-      subdomain: 'my-tenant.eu',
-      callback: `${baseURL}/auth0/callback`,
-      scope: ['openid', 'email', 'profile'],
-    },
-    cas: {
-      enabled: false,
-      icon: 'book',
-      key: '',
-      secret: '',
-      callback: `${baseURL}/cas/callback`,
-      scope: ['openid email'], // scopes should be space delimited
-      subdomain: 'my.subdomain.com/cas',
-    },
-  };
+  const grantConfig = getGrantConfig(baseURL);
 
   const prevGrantConfig = (await pluginStore.get({ key: 'grant' })) || {};
   // store grant auth config to db

package/server/controllers/auth.js

@@ -137,7 +137,10 @@ module.exports = {
         throw new ValidationError('Incorrect code provided');
       }
 
-      await getService('user').edit(user.id, { resetPasswordToken: null, password: params.password });
+      await getService('user').edit(user.id, {
+        resetPasswordToken: null,
+        password: params.password,
+      });
       // Update the user.
       ctx.send({
         jwt: getService('jwt').issue({ id: user.id }),
@@ -338,7 +341,7 @@ module.exports = {
         params.confirmed = true;
       }
 
-    const user = await getService('user').add(params);
+      const user = await getService('user').add(params);
 
       const sanitizedUser = await sanitizeUser(user, ctx);
 
@@ -419,6 +422,13 @@ module.exports = {
       where: { email: params.email },
     });
 
+    if (!user) {
+      return ctx.send({
+        email: params.email,
+        sent: true,
+      });
+    }
+
     if (user.confirmed) {
       throw new ApplicationError('already.confirmed');
     }