From 444ce89b19a2f58110494b09dd5f16020cefb0a6 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Fri, 4 Oct 2019 11:38:54 +0200
Subject: [PATCH] Fix sanitize bug with mongo objectid and use lower-case for
 getModel

---
 packages/strapi-utils/lib/sanitize-entity.js | 2 ++
 packages/strapi/lib/Strapi.js                | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/strapi-utils/lib/sanitize-entity.js b/packages/strapi-utils/lib/sanitize-entity.js
index 13deacabe7..5df70f1661 100644
--- a/packages/strapi-utils/lib/sanitize-entity.js
+++ b/packages/strapi-utils/lib/sanitize-entity.js
@@ -5,6 +5,8 @@ module.exports = function sanitizeEntity(data, { model, withPrivate = false }) {
 
   let plainData = typeof data.toJSON === 'function' ? data.toJSON() : data;
 
+  if (typeof plainData !== 'object') return plainData;
+
   const attributes = model.attributes;
   return Object.keys(plainData).reduce((acc, key) => {
     const attribute = attributes[key];
diff --git a/packages/strapi/lib/Strapi.js b/packages/strapi/lib/Strapi.js
index 84fba33500..81592ba5bc 100644
--- a/packages/strapi/lib/Strapi.js
+++ b/packages/strapi/lib/Strapi.js
@@ -413,11 +413,12 @@ class Strapi extends EventEmitter {
   }
 
   getModel(modelKey, plugin) {
+    let key = modelKey.toLowerCase();
     return plugin === 'admin'
-      ? _.get(strapi.admin, ['models', modelKey], undefined)
-      : _.get(strapi.plugins, [plugin, 'models', modelKey]) ||
-          _.get(strapi, ['models', modelKey]) ||
-          _.get(strapi, ['groups', modelKey]) ||
+      ? _.get(strapi.admin, ['models', key], undefined)
+      : _.get(strapi.plugins, [plugin, 'models', key]) ||
+          _.get(strapi, ['models', key]) ||
+          _.get(strapi, ['groups', key]) ||
           undefined;
   }