strapi · alexandrebodin · Jul 20, 2020 · Jun 22, 2020 · Jun 22, 2020 · Jun 22, 2020
diff --git a/.eslintrc.front.js b/.eslintrc.front.js
@@ -43,6 +43,7 @@ module.exports = {
     },
   },
   rules: {
+    'import/no-unresolved': 0,
     'generator-star-spacing': 0,
     'no-console': 0,
     'require-atomic-updates': 0,

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,5 +1,6 @@
 const frontPaths = [
   'packages/**/admin/src/**/**/*.js',
+  'packages/**/ee/admin/**/**/*.js',
   'packages/strapi-helper-plugin/**/*.js',
   'packages/**/test/front/**/*.js',
   'test/config/front/**/*.js',

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2015-present Strapi Solutions SAS
+
+Portions of the Strapi software are licensed as follows:
+
+* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined in "ee/LICENSE".
+
+* All software outside of the above-mentioned directories or restrictions above is available under the "MIT Expat" license as set forth below.
+
+MIT Expat License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 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, 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.
diff --git a/LICENSE.md b/LICENSE.md
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -223,6 +223,7 @@ module.exports = {
             '/v3.x/admin-panel/customization',
             '/v3.x/admin-panel/custom-webpack-config',
             '/v3.x/admin-panel/deploy',
+            '/v3.x/admin-panel/forgot-password',
           ],
         },
         {

diff --git a/docs/v3.x/admin-panel/forgot-password.md b/docs/v3.x/admin-panel/forgot-password.md
@@ -0,0 +1,48 @@
+# Forgot Password Email
+
+## Customize forgot password email
+
+You may want to customize the forgot password email.
+You can do it by providing your own template (formatted as a [lodash template](https://lodash.com/docs/4.17.15#template)).
+
+The template will be compiled with the following variables: `url`, `user.email`, `user.username`, `user.firstname`, `user.lastname`.
+
+### Example
+
+**Path -** `./config/servers.js`
+
+```js
+const forgotPasswordTemplate = require('./email-templates/forgot-password');
+
+module.exports = ({ env }) => ({
+  // ...
+  admin: {
+    // ...
+    forgotPassword: {
+      from: 'support@mywebsite.fr',
+      replyTo: 'support@mywebsite.fr',
+      emailTemplate: forgotPasswordTemplate,
+    },
+    // ...
+  },
+  // ...
+});
+```
+
+**Path -** `./config/email-templates/forgot-password.js`
+
+```js
+const subject = `Reset password`;
+
+const html = `<p>Hi <%= user.firstname %></p>
+<p>Sorry you lost your password. You can click here to reset it: <%= url %></p>`;
+
+const text = `Hi <%= user.firstname %>
+Sorry you lost your password. You can click here to reset it: <%= url %>`;
+
+module.exports = {
+  subject,
+  text,
+  html,
+};
+```
diff --git a/docs/v3.x/concepts/configurations.md b/docs/v3.x/concepts/configurations.md
@@ -167,22 +167,25 @@ module.exports = ({ env }) => ({
 ```
 
 **Available options**
-
-| Property                 | Description                                                                                                                                                                                      | Type          | Default     |
-| ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------- | ----------- |
-| `host`                   | Host name                                                                                                                                                                                        | string        | `localhost` |
-| `port`                   | Port on which the server should be running.                                                                                                                                                      | integer       | `1337`      |
-| `emitErrors`             | Enable errors to be emitted to `koa` when they happen in order to attach custom logic or use error reporting services.                                                                           | boolean       | `false`     |
-| `url`                    | Url of the server. Enable proxy support such as Apache or Nginx, example: `https://mywebsite.com/api`. The url can be relative, if so, it is used with `http://${host}:${port}` as the base url. | string        | `''`        |
-| `cron`                   | Cron configuration (powered by [`node-schedule`](https://github.com/node-schedule/node-schedule))                                                                                                | Object        |             |
-| `cron.enabled`           | Enable or disable CRON tasks to schedule jobs at specific dates.                                                                                                                                 | boolean       | `false`     |
-| `admin`                  | Admin panel configuration                                                                                                                                                                        | Object        |             |
-| `admin.url`              | Url of your admin panel. Default value: `/admin`. Note: If the url is relative, it will be concatenated with `url`.                                                                              | string        | `/admin`    |
-| `admin.autoOpen`         | Enable or disabled administration opening on start.                                                                                                                                              | boolean       | `true`      |
-| `admin.watchIgnoreFiles` | Add custom files that should not be watched during development. See more [here](https://github.com/paulmillr/chokidar#path-filtering) (property `ignored`).                                      | Array(string) | `[]`        |
-| `admin.host`             | Use a different host for the admin panel. Only used along with `strapi develop --watch-admin`                                                                                                    | string        | `localhost` |
-| `admin.port`             | Use a different port for the admin panel. Only used along with `strapi develop --watch-admin`                                                                                                    | string        | `8000`      |
-| `admin.serveAdminPanel`  | If false, the admin panel won't be served. Note: the `index.html` will still be served, see [defaultIndex option](./middlewares#global-middlewares)                                              | boolean       | `true`      |
+| Property | Description | Type | Default |
+| ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| `host` | Host name | string | `localhost` |
+| `port` | Port on which the server should be running. | integer | `1337` |
+| `emitErrors` | Enable errors to be emitted to `koa` when they happen in order to attach custom logic or use error reporting services. | boolean | `false` |
+| `url` | Url of the server. Enable proxy support such as Apache or Nginx, example: `https://mywebsite.com/api`. The url can be relative, if so, it is used with `http://${host}:${port}` as the base url. | string | `''` |
+| `cron` | Cron configuration (powered by [`node-schedule`](https://github.com/node-schedule/node-schedule)) | Object | |
+| `cron.enabled` | Enable or disable CRON tasks to schedule jobs at specific dates. | boolean | `false` |
+| `admin` | Admin panel configuration | Object | |
+| `admin.url` | Url of your admin panel. Default value: `/admin`. Note: If the url is relative, it will be concatenated with `url`. | string | `/admin` |
+| `admin.autoOpen` | Enable or disabled administration opening on start. | boolean | `true` |
+| `admin.watchIgnoreFiles` | Add custom files that should not be watched during development. See more [here](https://github.com/paulmillr/chokidar#path-filtering) (property `ignored`). | Array(string) | `[]` |
+| `admin.host` | Use a different host for the admin panel. Only used along with `strapi develop --watch-admin` | string | `localhost` |
+| `admin.port` | Use a different port for the admin panel. Only used along with `strapi develop --watch-admin` | string | `8000` |
+| `admin.serveAdminPanel` | If false, the admin panel won't be served. Note: the `index.html` will still be served, see [defaultIndex option](./middlewares#global-middlewares) | boolean | `true` |
+| `admin.forgotPassword` | Settings to customize the forgot password email (see more here: [Forgot Password Email](../admin-panel/forgot-password)) | Object | {} |
+| `admin.forgotPassword.emailTemplate` | Email template as defined in [email plugin](../plugins/email#create-an-email-from-a-template-fillemailoptions) | Object | [Default template](https://github.com/strapi/strapi/tree/master/packages/strapi-admin/config/email-templates/forgot-password.js) |
+| `admin.forgotPassword.from` | Sender mail address | string | Default value defined in your [provider configuration](../plugins/email#configure-your-provider) |
+| `admin.forgotPassword.replyTo` | Default address or addresses the receiver is asked to reply to | string | Default value defined in your [provider configuration](../plugins/email#configure-your-provider) |
 
 ## Functions
 

diff --git a/docs/v3.x/guides/registering-a-field-in-admin.md b/docs/v3.x/guides/registering-a-field-in-admin.md
@@ -410,8 +410,6 @@ export default strapi => {
     injectedComponents: [],
     isReady: true,
     isRequired: pluginPkg.strapi.required || false,
-    leftMenuLinks: [],
-    leftMenuSections: [],
     mainComponent: null,
     name: pluginPkg.strapi.name,
     preventComponentRendering: false,

diff --git a/docs/v3.x/plugin-development/frontend-development.md b/docs/v3.x/plugin-development/frontend-development.md
@@ -69,15 +69,73 @@ Here are its properties:
 | initializer               | node    | Refer to the [Initializer documentation](#initializer)                                                                                                                                                                  |
 | injectedComponents        | array   | Refer to the [Injected Component documentation](#injected-components)                                                                                                                                                   |
 | isReady                   | boolean | The app will load until this proprety is true                                                                                                                                                                           |
-| leftMenuLinks             | array   | Array of links to inject in the menu                                                                                                                                                                                    |
-| mainComponent             | node    | The plugin's App container, setting it to null will prevent the plugin from being displayed in the menu                                                                                                                 |
+| mainComponent             | node    | The plugin's App container,                                                                                                                                                                                             |
+| menu                      | object  | Define where the link of your plugin will be set. Without this your plugin will not display a link in the left menu                                                                                                     |
 | name                      | string  | The plugin's name retrieved from the package.json                                                                                                                                                                       |
 | pluginLogo                | file    | The plugin's logo                                                                                                                                                                                                       |
 | preventComponentRendering | boolean | Whether or not display the plugin's blockerComponent instead of the main component                                                                                                                                      |
 | settings                  | object  | Refer to the [Plugins settings API](./frontend-settings-api.md)                                                                                                                                                         |
 | reducers                  | object  | The plugin's redux reducers                                                                                                                                                                                             |
 | trads                     | object  | The plugin's translation files                                                                                                                                                                                          |
 
+### Displaying the plugin's link in the main menu
+
+To display a plugin link into the main menu the plugin needs to export a menu object.
+
+**Path —** `plugins/my-plugin/admin/src/index.js`.
+
+```js
+import pluginPkg from '../../package.json';
+import pluginLogo from './assets/images/logo.svg';
+import App from './containers/App';
+import lifecycles from './lifecycles';
+import trads from './translations';
+import pluginId from './pluginId';
+
+export default strapi => {
+  const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+  const icon = pluginPkg.strapi.icon;
+  const name = pluginPkg.strapi.name;
+  const plugin = {
+    blockerComponent: null,
+    blockerComponentProps: {},
+    description: pluginDescription,
+    icon,
+    id: pluginId,
+    initializer: null,
+    isRequired: pluginPkg.strapi.required || false,
+    layout: null,
+    lifecycles,
+    mainComponent: App,
+    name,
+    pluginLogo,
+    preventComponentRendering: false,
+    trads,
+    menu: {
+      // Set a link into the PLUGINS section
+      pluginsSectionLinks: [
+        {
+          destination: `/plugins/${pluginId}`, // Endpoint of the link
+          icon,
+          label: {
+            id: `${pluginId}.plugin.name`, // Refers to a i18n
+            defaultMessage: 'My PLUGIN',
+          },
+          name,
+          // If the plugin has some permissions on whether or not it should be accessible
+          // depending on the logged in user's role you can set them here.
+          // Each permission object performs an OR comparison so if one matches the user's ones
+          // the link will be displayed
+          permissions: [{ action: 'plugins::content-type-builder.read', subject: null }],
+        },
+      ],
+    },
+  };
+
+  return strapi.registerPlugin(plugin);
+};
+```
+
 ### Initializer
 
 The component is generated by default when you create a new plugin. Use this component to execute some logic when the app is loading. When the logic has been executed this component should emit the `isReady` event so the user can interact with the application.

diff --git a/docs/v3.x/plugin-development/frontend-field-api.md b/docs/v3.x/plugin-development/frontend-field-api.md
@@ -56,8 +56,6 @@ export default strapi => {
     initializer: () => null,
     injectedComponents: [],
     isReady: true,
-    leftMenuLinks: [],
-    leftMenuSections: [],
     mainComponent: null,
     name: pluginPkg.strapi.name,
     preventComponentRendering: false,
@@ -141,8 +139,6 @@ export default strapi => {
     isRequired: pluginPkg.strapi.required || false,
     layout: null,
     lifecycles,
-    leftMenuLinks: [],
-    leftMenuSections: [],
     mainComponent: App,
     name: pluginPkg.strapi.name,
     pluginLogo,

diff --git a/docs/v3.x/plugin-development/frontend-settings-api.md b/docs/v3.x/plugin-development/frontend-settings-api.md
@@ -42,6 +42,7 @@ export default strapi => {
         title: 'Setting page 1',
         to: `${strapi.settingsBaseURL}/${pluginId}/setting1`,
         name: 'setting1',
+        permissions: [{ action: 'plugins::my-plugin.action-name', subject: null }], // This key is not mandatory it can be null, undefined or an empty array
       },
       {
         // Using i18n with a corresponding translation key
@@ -51,6 +52,8 @@ export default strapi => {
         },
         to: `${strapi.settingsBaseURL}/${pluginId}/setting2`,
         name: 'setting2',
+        // Define a specific component if needed:
+        Component: () => <div />,
       },
     ],
   };
@@ -64,8 +67,6 @@ export default strapi => {
     initializer: () => null,
     injectedComponents: [],
     isReady: true,
-    leftMenuLinks: [],
-    leftMenuSections: [],
     mainComponent: null,
     name: pluginPkg.strapi.name,
     preventComponentRendering: false,
@@ -147,6 +148,7 @@ export default strapi => {
         title: 'Setting page 1',
         to: `${strapi.settingsBaseURL}/${pluginId}/setting1`,
         name: 'setting1',
+        permissions: [{ action: 'plugins::my-plugin.action-name', subject: null }],
       },
       {
         title: {
@@ -168,8 +170,6 @@ export default strapi => {
     initializer: () => null,
     injectedComponents: [],
     isReady: true,
-    leftMenuLinks: [],
-    leftMenuSections: [],
     mainComponent: null,
     name: pluginPkg.strapi.name,
     preventComponentRendering: false,
@@ -233,23 +233,24 @@ export default strapi => {
     initializer: () => null,
     injectedComponents: [],
     isReady: true,
-    leftMenuLinks: [],
-    leftMenuSections: [],
     mainComponent: null,
     name: pluginPkg.strapi.name,
     preventComponentRendering: false,
     settings: {
       // Add a link into the global section of the settings view
-      global: [
-        {
-          title: 'Setting link 1',
-          to: `${strapi.settingsBaseURL}/setting-link-1`,
-          name: 'settingLink1',
-          Component: SettingLink,
-          // Bool : https://reacttraining.com/react-router/web/api/Route/exact-bool
-          exact: false,
-        },
-      ],
+      global: {
+        links: [
+          {
+            title: 'Setting link 1',
+            to: `${strapi.settingsBaseURL}/setting-link-1`,
+            name: 'settingLink1',
+            Component: SettingLink,
+            // Bool : https://reacttraining.com/react-router/web/api/Route/exact-bool
+            exact: false,
+            permissions: [{ action: 'plugins::my-plugin.action-name', subject: null }],
+          },
+        ],
+      },
       mainComponent: Settings,
       menuSection,
     },