From c9fd4535bc5ed4d80f600780d48fc7c54b528dcf Mon Sep 17 00:00:00 2001
From: Chris Winch <cwinch@vidatec.com>
Date: Thu, 24 Oct 2019 09:44:52 +0100
Subject: [PATCH 01/17] update upload file size type to integer so that graphQl
 can sort as expected

---
 .../documentation/1.0.0/overrides/upload-File.json            | 4 ++--
 packages/strapi-plugin-upload/models/File.settings.json       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json b/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json
index 4621bb93ad..25f5cfd372 100644
--- a/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json
+++ b/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json
@@ -233,7 +233,7 @@
             "type": "string"
           },
           "size": {
-            "type": "string"
+            "type": "integer"
           },
           "mime": {
             "type": "string"
@@ -260,4 +260,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/strapi-plugin-upload/models/File.settings.json b/packages/strapi-plugin-upload/models/File.settings.json
index 06c270b8fe..4d6f45722a 100644
--- a/packages/strapi-plugin-upload/models/File.settings.json
+++ b/packages/strapi-plugin-upload/models/File.settings.json
@@ -32,7 +32,7 @@
       "required": true
     },
     "size": {
-      "type": "string",
+      "type": "integer",
       "configurable": false,
       "required": true
     },
@@ -56,4 +56,4 @@
       "configurable": false
     }
   }
-}
\ No newline at end of file
+}

From 6e5eb9d7245b18428d0accd825c7dbb954af2d9d Mon Sep 17 00:00:00 2001
From: Chris Winch <cwinch@vidatec.com>
Date: Thu, 24 Oct 2019 13:58:05 +0100
Subject: [PATCH 02/17] update upload size type to decimal

---
 .../documentation/1.0.0/overrides/upload-File.json            | 4 ++--
 packages/strapi-plugin-upload/models/File.settings.json       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json b/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json
index 25f5cfd372..52e508d305 100644
--- a/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json
+++ b/packages/strapi-plugin-upload/documentation/1.0.0/overrides/upload-File.json
@@ -30,7 +30,7 @@
                         "type": "string"
                       },
                       "size": {
-                        "type": "integer"
+                        "type": "decimal"
                       },
                       "url": {
                         "type": "string",
@@ -233,7 +233,7 @@
             "type": "string"
           },
           "size": {
-            "type": "integer"
+            "type": "decimal"
           },
           "mime": {
             "type": "string"
diff --git a/packages/strapi-plugin-upload/models/File.settings.json b/packages/strapi-plugin-upload/models/File.settings.json
index 4d6f45722a..de69fdfb21 100644
--- a/packages/strapi-plugin-upload/models/File.settings.json
+++ b/packages/strapi-plugin-upload/models/File.settings.json
@@ -32,7 +32,7 @@
       "required": true
     },
     "size": {
-      "type": "integer",
+      "type": "decimal",
       "configurable": false,
       "required": true
     },

From 1849a6c91597fade28b94b161d30e7e405b6ea6c Mon Sep 17 00:00:00 2001
From: Chris Winch <cwinch@vidatec.com>
Date: Thu, 24 Oct 2019 15:07:02 +0100
Subject: [PATCH 03/17] update upload e2e test to expect number value for size
 in response

---
 packages/strapi-plugin-upload/test/upload.test.e2e.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-upload/test/upload.test.e2e.js b/packages/strapi-plugin-upload/test/upload.test.e2e.js
index aedeaa1271..249eaffcb9 100644
--- a/packages/strapi-plugin-upload/test/upload.test.e2e.js
+++ b/packages/strapi-plugin-upload/test/upload.test.e2e.js
@@ -132,7 +132,7 @@ describe('Upload plugin end to end tests', () => {
           id: expect.anything(),
           sha256: expect.any(String),
           hash: expect.any(String),
-          size: expect.any(String),
+          size: expect.any(Number),
           url: expect.any(String),
           provider: 'local',
           name: 'rec.jpg',

From b698303b33a670d315ad3913d371db1e663cd21e Mon Sep 17 00:00:00 2001
From: Andrey Hohutkin <andrey.hohutkin@gmail.com>
Date: Mon, 4 Nov 2019 11:04:53 +0200
Subject: [PATCH 04/17] Fix empty date wrong display

Empty date values are shown incorrectly as a current date in the content manager (Admin UI)
The correct view should be '-'.
---
 .../admin/src/components/CustomTable/Row.js                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js
index d96a0ec91e..a5f60cfac6 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/CustomTable/Row.js
@@ -31,7 +31,7 @@ const getDisplayedValue = (type, value, name) => {
     case 'time':
     case 'datetime':
     case 'timestamp': {
-      if (value === null) {
+      if (value == null) {
         return '-';
       }
 

From cff8fd904149ab993df73ec144490e16d17a926b Mon Sep 17 00:00:00 2001
From: Victor LAMBERT <vic.lambert195@gmail.com>
Date: Sat, 16 Nov 2019 01:05:21 +0100
Subject: [PATCH 05/17] Populate only role relation to authorize user

---
 .../config/policies/permissions.js                            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/config/policies/permissions.js b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
index 55ae6bf4ad..e4fd13b294 100644
--- a/packages/strapi-plugin-users-permissions/config/policies/permissions.js
+++ b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
@@ -16,11 +16,11 @@ module.exports = async (ctx, next) => {
       if (isAdmin) {
         ctx.state.admin = await strapi
           .query('administrator', 'admin')
-          .findOne({ id });
+          .findOne({ id }, ['role']);
       } else {
         ctx.state.user = await strapi
           .query('user', 'users-permissions')
-          .findOne({ id });
+          .findOne({ id }, ['role']);
       }
     } catch (err) {
       return handleErrors(ctx, err, 'unauthorized');

From 54cd2082213c3acecfab380aff61ea5bba267646 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <jim@strapi.io>
Date: Thu, 28 Nov 2019 16:26:23 +0100
Subject: [PATCH 06/17] Remove search engine for index.html page

---
 .../strapi-generate-new/lib/resources/files/public/index.html    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/strapi-generate-new/lib/resources/files/public/index.html b/packages/strapi-generate-new/lib/resources/files/public/index.html
index 525729ca29..82b64f866b 100644
--- a/packages/strapi-generate-new/lib/resources/files/public/index.html
+++ b/packages/strapi-generate-new/lib/resources/files/public/index.html
@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <title>Welcome to your Strapi app</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="robots" content="noindex">
     <style>
       * {
         -webkit-box-sizing: border-box;

From 5fd96774063e37400cabb53042ad2b0f80a644e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgensen?= <kristian@froelund.net>
Date: Tue, 3 Dec 2019 12:59:33 +0100
Subject: [PATCH 07/17] Use the id of entry to update relations

Fixes #4644
---
 packages/strapi-hook-bookshelf/lib/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-hook-bookshelf/lib/queries.js b/packages/strapi-hook-bookshelf/lib/queries.js
index 1867648bdb..7048967927 100644
--- a/packages/strapi-hook-bookshelf/lib/queries.js
+++ b/packages/strapi-hook-bookshelf/lib/queries.js
@@ -134,7 +134,7 @@ module.exports = function createQueryBuilder({ model, modelKey, strapi }) {
 
       if (Object.keys(relations).length > 0) {
         return model.updateRelations(
-          Object.assign(params, { values: relations }),
+          { id: entry.id, values: relations },
           { transacting: trx }
         );
       }

From aa6955324627f6ed1fd5170f4970c630da3e8234 Mon Sep 17 00:00:00 2001
From: Anand Chowdhary <anandchowdhary@gmail.com>
Date: Wed, 4 Dec 2019 11:53:44 -0800
Subject: [PATCH 08/17] Change "Mac O/S" to "macOS"

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f91a0e382c..41c8629b0a 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ Complete installation requirements can be found in the documentation under <a hr
 
 - Ubuntu 18.04/Debian 9.x
 - CentOS/RHEL 8
-- Mac O/S Mojave
+- macOS Mojave
 - Windows 10
 - Docker - [Docker-Repo](https://github.com/strapi/strapi-docker)
 

From 87f8f91b524e7fce0e63011f0afbad388f527e45 Mon Sep 17 00:00:00 2001
From: Nevermoi <wlgq@hotmail.com>
Date: Thu, 5 Dec 2019 10:48:30 +0800
Subject: [PATCH 09/17] Update model.template

Wrong description of beforeSave and afterSave for model, since updating will not trigger these two hooks
---
 .../strapi-generate-model/templates/mongoose/model.template   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-generate-model/templates/mongoose/model.template b/packages/strapi-generate-model/templates/mongoose/model.template
index 300dc5a200..30172b433f 100644
--- a/packages/strapi-generate-model/templates/mongoose/model.template
+++ b/packages/strapi-generate-model/templates/mongoose/model.template
@@ -6,11 +6,11 @@
 
 module.exports = {
   // Before saving a value.
-  // Fired before an `insert` or `update` query.
+  // Fired before an `insert`.
   // beforeSave: async (model) => {},
 
   // After saving a value.
-  // Fired after an `insert` or `update` query.
+  // Fired after an `insert`.
   // afterSave: async (model, result) => {},
 
   // Before fetching all values.

From d1356a2a505ff63de471c90ab63e1421ade72e1c Mon Sep 17 00:00:00 2001
From: Pouya Miralayi <53266765+pouyamiralayi@users.noreply.github.com>
Date: Thu, 5 Dec 2019 16:47:15 +0330
Subject: [PATCH 10/17] Update upload.md

---
 docs/3.0.0-beta.x/plugins/upload.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/3.0.0-beta.x/plugins/upload.md b/docs/3.0.0-beta.x/plugins/upload.md
index 090eb04c64..2cd257ee06 100644
--- a/docs/3.0.0-beta.x/plugins/upload.md
+++ b/docs/3.0.0-beta.x/plugins/upload.md
@@ -76,7 +76,7 @@ You have to send FormData in your request body
 
 ## Upload files related to an entry
 
-To upload files that will be liked to an specific entry.
+To upload files that will be linked to an specific entry.
 
 ### Request parameters
 

From 95d707dc0e378f8c006cc6ed046328bb4eb03dd5 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <jim@strapi.io>
Date: Fri, 6 Dec 2019 14:40:25 +0100
Subject: [PATCH 11/17] Add strapi console comand

---
 docs/3.0.0-beta.x/cli/CLI.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/3.0.0-beta.x/cli/CLI.md b/docs/3.0.0-beta.x/cli/CLI.md
index e9c8aaad4f..06317fdf80 100644
--- a/docs/3.0.0-beta.x/cli/CLI.md
+++ b/docs/3.0.0-beta.x/cli/CLI.md
@@ -2,8 +2,6 @@
 
 Strapi comes with a full featured Command Line Interface (CLI) which lets you scaffold and manage your project in seconds.
 
----
-
 ## strapi new
 
 Create a new project.
@@ -245,8 +243,6 @@ strapi generate:plugin <name>
 
 Please refer to the [local plugins](../plugin-development/quick-start.md) section to know more.
 
----
-
 ## strapi install
 
 Install a plugin in the project.
@@ -264,8 +260,6 @@ strapi install <name>
 Some plugins have admin panel integrations, your admin panel might have to be rebuilt. This can take some time.
 :::
 
----
-
 ## strapi uninstall
 
 Uninstall a plugin from the project.
@@ -290,7 +284,13 @@ options [--delete-files]
 Some plugins have admin panel integrations, your admin panel might have to be rebuilt. This can take some time.
 :::
 
----
+## strapi console
+
+Start the server and let you eval commands into your application in real time.
+
+```bash
+strapi console
+```
 
 ## strapi version
 
@@ -300,8 +300,6 @@ Print the current globally installed Strapi version.
 strapi version
 ```
 
----
-
 ## strapi help
 
 List CLI commands.

From 23eb263e07d7409babd85a4b279c75c975a03908 Mon Sep 17 00:00:00 2001
From: Sergey Pravosud <pravosud93@gmail.com>
Date: Fri, 6 Dec 2019 21:15:12 +0500
Subject: [PATCH 12/17] added missed comma in ecosystem.config.js example
 (#4657)

---
 docs/3.0.0-beta.x/guides/deployment.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/3.0.0-beta.x/guides/deployment.md b/docs/3.0.0-beta.x/guides/deployment.md
index 84da298667..7fc5617988 100644
--- a/docs/3.0.0-beta.x/guides/deployment.md
+++ b/docs/3.0.0-beta.x/guides/deployment.md
@@ -493,7 +493,7 @@ sudo nano ecosystem.config.js
 module.exports = {
   apps : [{
     name: 'your-app-name',
-    cwd: '/home/ubuntu/my-strapi-project/my-project'
+    cwd: '/home/ubuntu/my-strapi-project/my-project',
     script: 'npm',
     args: 'start',
     env: {

From 959472231f8c0df68b44d46c1dd0040b08889623 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <jim@strapi.io>
Date: Fri, 6 Dec 2019 19:00:00 +0100
Subject: [PATCH 13/17] Add guide to create a draft system

---
 docs/.vuepress/config.js          |   1 +
 docs/3.0.0-beta.x/guides/draft.md | 119 ++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+)
 create mode 100644 docs/3.0.0-beta.x/guides/draft.md

diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
index bf94fa8d9a..733f58b3a1 100644
--- a/docs/.vuepress/config.js
+++ b/docs/.vuepress/config.js
@@ -200,6 +200,7 @@ module.exports = {
             '/3.0.0-beta.x/guides/external-data',
             '/3.0.0-beta.x/guides/custom-data-response',
             '/3.0.0-beta.x/guides/custom-admin',
+            '/3.0.0-beta.x/guides/draft',
             '/3.0.0-beta.x/guides/slug',
             '/3.0.0-beta.x/guides/webhooks',
           ],
diff --git a/docs/3.0.0-beta.x/guides/draft.md b/docs/3.0.0-beta.x/guides/draft.md
new file mode 100644
index 0000000000..1030671045
--- /dev/null
+++ b/docs/3.0.0-beta.x/guides/draft.md
@@ -0,0 +1,119 @@
+# Draft system
+
+This guide will explain how to create draft system. That will you manage draft, published, archive status.
+
+## Introduction
+
+What we want here is to fetch only data that have a `published` status.
+
+But we don't want to use [parameters](../content-api/parameters.md) (eg. /articles?status=published) because you can easily fake the params.
+
+To be able to do that, you have first to understand some concepts.
+
+When you create a content type, it generates an API with the following list of [endpoints](../content-api/endpoint.md).
+
+Each of these endpoint triggers a controller action. Here is the list of [controller actions](../concepts/controller.md) that exist by default when a content type is created.
+
+If you check the controller file of your generated API `./api/{content-type}/controller/{Content-Type}.js`, you will see an empty file. It is because all the default logic is managed by Strapi. But you can override these actions with your own code.
+
+And that is what we will do to filter to `published` status by default.
+
+## Example
+
+In our example we will use an Article content type. By default when you fetch articles, you will got all articles.
+Let's consider you don't want to expose articles that are in `draft` or `archive` status.
+
+To enforce this rule we will customize the action that fetchs all articles to just fetch `published` articles.
+
+To follow the example your will have to create a content type `articles` and add the following field definition:
+
+- `string` attribute named `title`
+- `text` attribute named `content`
+- `enumeration` attribute named `status` with `draft`, `published`, `archive`
+
+Then add some data with different `status`.
+
+## Override controller action
+
+To customize the function that fetch all our articles we will have to override the `find` function.
+
+First, to see the difference, let's request `GET /articles`. You will see all the data you created.
+Now let's start the customization.
+
+**Path —** `./api/article/controller/Article.js`
+
+```js
+module.exports = {
+  async find() {
+    return 'strapi';
+  },
+};
+```
+
+After saving the new function, let's restart the `GET /articles` request. We will see `strapi` as response.
+
+## Get the data back
+
+We now know the function we have to update, but we just want to customize the returned article values.
+
+In the [controller documentation](../concepts/controllers.html#extending-a-model-controller) you will find the default implementation of every actions. It will help you overwrite the fetch logic.
+
+**Path —** `./api/article/controller/Article.js`
+
+```js
+const { sanitizeEntity } = require('strapi-utils');
+
+module.exports = {
+  async find(ctx) {
+    let entities;
+    if (ctx.query._q) {
+      entities = await strapi.services.article.search(ctx.query);
+    } else {
+      entities = await strapi.services.article.find(ctx.query);
+    }
+
+    return entities.map(entity =>
+      sanitizeEntity(entity, { model: strapi.models.article })
+    );
+  },
+};
+```
+
+And now the data is back on `GET /articles`
+
+## Apply our changes
+
+We can see the `find` function returns the result of the `map`. And the map function just sanitizes all entries.
+
+So instead of just return the sanitized entry, we will also remove the chef email of each restaurant.
+
+**Path —** `./api/restaurant/controller/Restaurant.js`
+
+```js
+const { sanitizeEntity } = require('strapi-utils');
+
+module.exports = {
+  async find(ctx) {
+    let entities;
+
+    ctx.query.status = 'published';
+
+    if (ctx.query._q) {
+      entities = await strapi.services.article.search(ctx.query);
+    } else {
+      entities = await strapi.services.article.find(ctx.query);
+    }
+
+    return entities.map(entity =>
+      sanitizeEntity(entity, { model: strapi.models.article })
+    );
+  },
+};
+```
+
+And tada! Draft and archived articles disapeared.
+
+::: tip
+This guide can be applied to any other controller action.
+:::
+

From 344f825778c4095c34ee1487811135c88c6e96d2 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <jim@strapi.io>
Date: Fri, 6 Dec 2019 19:05:15 +0100
Subject: [PATCH 14/17] Fix typo

---
 docs/3.0.0-beta.x/guides/draft.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/3.0.0-beta.x/guides/draft.md b/docs/3.0.0-beta.x/guides/draft.md
index 1030671045..16d28802c2 100644
--- a/docs/3.0.0-beta.x/guides/draft.md
+++ b/docs/3.0.0-beta.x/guides/draft.md
@@ -83,9 +83,10 @@ And now the data is back on `GET /articles`
 
 ## Apply our changes
 
-We can see the `find` function returns the result of the `map`. And the map function just sanitizes all entries.
+Here we want force to fetch articles that have status equal to `published`.
 
-So instead of just return the sanitized entry, we will also remove the chef email of each restaurant.
+The way to do that is to set `ctx.query.status` to `published`.
+It will force the filter of the query.
 
 **Path —** `./api/restaurant/controller/Restaurant.js`
 
@@ -96,7 +97,10 @@ module.exports = {
   async find(ctx) {
     let entities;
 
-    ctx.query.status = 'published';
+    ctx.query = {
+      ...ctx.query,
+      status: 'published
+    };
 
     if (ctx.query._q) {
       entities = await strapi.services.article.search(ctx.query);

From fcdbc4fbe3e7ea9167f0ca306317aec6594df8af Mon Sep 17 00:00:00 2001
From: Mathijs Nelemans <mail@mnelemans.nl>
Date: Sat, 7 Dec 2019 12:40:05 +0100
Subject: [PATCH 15/17] Wrap tsvector attributes with coalesce before join

Fixed a bug where joining multiple tsvector attributes results in NULL
because one of the columns contains NULL. The expected behaviour is to
ignore that column instead, which is achieved by setting it to an empty
string
---
 packages/strapi-hook-bookshelf/lib/queries.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-hook-bookshelf/lib/queries.js b/packages/strapi-hook-bookshelf/lib/queries.js
index 1867648bdb..82e7dfefd6 100644
--- a/packages/strapi-hook-bookshelf/lib/queries.js
+++ b/packages/strapi-hook-bookshelf/lib/queries.js
@@ -546,8 +546,8 @@ const buildSearchQuery = (qb, model, params) => {
     case 'pg': {
       const searchQuery = searchText.map(attribute =>
         _.toLower(attribute) === attribute
-          ? `to_tsvector(${attribute})`
-          : `to_tsvector("${attribute}")`
+          ? `to_tsvector(coalesce(${attribute}, ''))`
+          : `to_tsvector(coalesce("${attribute}", ''))`
       );
 
       qb.orWhereRaw(`${searchQuery.join(' || ')} @@ plainto_tsquery(?)`, query);

From c8d455d4e2f0b3e221e7525c79ca22e62dc37ef0 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <jim@strapi.io>
Date: Mon, 9 Dec 2019 10:27:59 +0100
Subject: [PATCH 16/17] Add no index on production page

---
 .../lib/resources/files/public/production.html                   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/strapi-generate-new/lib/resources/files/public/production.html b/packages/strapi-generate-new/lib/resources/files/public/production.html
index 5875a7270b..3db9e22cde 100644
--- a/packages/strapi-generate-new/lib/resources/files/public/production.html
+++ b/packages/strapi-generate-new/lib/resources/files/public/production.html
@@ -5,6 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <title>Welcome to your Strapi app</title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="robots" content="noindex">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css" rel="stylesheet" />
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css" rel="stylesheet" />
     <link href="https://fonts.googleapis.com/css?family=Lato:400,700&display=swap" rel="stylesheet" />

From 2fa574b06127161ec2ed67aa17b07bf2d066605e Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Mon, 9 Dec 2019 14:01:11 +0100
Subject: [PATCH 17/17] Fix isComponent on null attributes

---
 .../strapi-connector-bookshelf/lib/utils/attributes.js    | 8 ++++++--
 .../config/policies/permissions.js                        | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-connector-bookshelf/lib/utils/attributes.js b/packages/strapi-connector-bookshelf/lib/utils/attributes.js
index 90f92de8a5..089b831d88 100644
--- a/packages/strapi-connector-bookshelf/lib/utils/attributes.js
+++ b/packages/strapi-connector-bookshelf/lib/utils/attributes.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { get } = require('lodash');
+
 /**
  * Returns the attribute keys of the component related attributes
  */
@@ -9,8 +11,10 @@ function getComponentAttributes(definition) {
   );
 }
 
-const isComponent = (def, key) =>
-  ['component', 'dynamiczone'].includes(def.attributes[key].type);
+const isComponent = (def, key) => {
+  const type = get(def, ['attributes', key, 'type']);
+  return ['component', 'dynamiczone'].includes(type);
+};
 
 module.exports = {
   getComponentAttributes,
diff --git a/packages/strapi-plugin-users-permissions/config/policies/permissions.js b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
index e4fd13b294..7a32c6bfc2 100644
--- a/packages/strapi-plugin-users-permissions/config/policies/permissions.js
+++ b/packages/strapi-plugin-users-permissions/config/policies/permissions.js
@@ -23,6 +23,7 @@ module.exports = async (ctx, next) => {
           .findOne({ id }, ['role']);
       }
     } catch (err) {
+      strapi.log.error(err);
       return handleErrors(ctx, err, 'unauthorized');
     }