From a8c59f999a57b3823ecd2b7b6eb545d5f35a7d3a Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Fri, 2 Feb 2018 12:59:34 +0100
Subject: [PATCH 1/3] Fix user update via API and content-type-builder

---
 .../strapi-plugin-users-permissions/controllers/User.js     | 6 +++---
 packages/strapi-plugin-users-permissions/services/User.js   | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/controllers/User.js b/packages/strapi-plugin-users-permissions/controllers/User.js
index afd61eb3db..a7546f1e5d 100644
--- a/packages/strapi-plugin-users-permissions/controllers/User.js
+++ b/packages/strapi-plugin-users-permissions/controllers/User.js
@@ -97,9 +97,9 @@ module.exports = {
   update: async (ctx, next) => {
     try {
       if (strapi.plugins['users-permissions'].config.advanced.unique_email && ctx.request.body.email) {
-        const user = await strapi.query('user', 'users-permissions').findOne({ email: ctx.request.body.email });
+        const users = await strapi.plugins['users-permissions'].services.user.fetchAll({ email: ctx.request.body.email });
 
-        if (user) {
+        if (users && _.find(users, user => (user.id || user._id).toString() !== ctx.params.id)) {
           return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.email.taken' }] }] : 'Email is already taken.');
         }
       }
@@ -119,7 +119,7 @@ module.exports = {
           email: ctx.request.body.email
         });
 
-        if (user.id !== ctx.params.id) {
+        if ((user.id || user._id).toString() !== ctx.params.id) {
           return ctx.badRequest(null, ctx.request.admin ? [{ messages: [{ id: 'Auth.form.error.email.taken' }] }] : 'Email is already taken.');
         }
       }
diff --git a/packages/strapi-plugin-users-permissions/services/User.js b/packages/strapi-plugin-users-permissions/services/User.js
index 795b21d63f..8fecb8792e 100644
--- a/packages/strapi-plugin-users-permissions/services/User.js
+++ b/packages/strapi-plugin-users-permissions/services/User.js
@@ -48,6 +48,9 @@ module.exports = {
 
     // Use Content Manager business logic to handle relation.
     if (strapi.plugins['content-manager']) {
+      params.model = 'user';
+      params.id = params._id;
+
       return await strapi.plugins['content-manager'].services['contentmanager'].edit(params, values, 'users-permissions');
     }
 

From 5fece61ed971e6b7457351391657ba3ac23e4a85 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <j.laurie6993@gmail.com>
Date: Mon, 5 Feb 2018 12:41:10 +0100
Subject: [PATCH 2/3] Fix set params id

---
 packages/strapi-plugin-users-permissions/services/User.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/strapi-plugin-users-permissions/services/User.js b/packages/strapi-plugin-users-permissions/services/User.js
index 8fecb8792e..e079bba5fa 100644
--- a/packages/strapi-plugin-users-permissions/services/User.js
+++ b/packages/strapi-plugin-users-permissions/services/User.js
@@ -49,7 +49,7 @@ module.exports = {
     // Use Content Manager business logic to handle relation.
     if (strapi.plugins['content-manager']) {
       params.model = 'user';
-      params.id = params._id;
+      params.id = (params._id || params.id);
 
       return await strapi.plugins['content-manager'].services['contentmanager'].edit(params, values, 'users-permissions');
     }

From 1f3efc64169d507a381a1629e8cc65745d81069f Mon Sep 17 00:00:00 2001
From: Jim Laurie <j.laurie6993@gmail.com>
Date: Mon, 5 Feb 2018 16:36:33 +0100
Subject: [PATCH 3/3] 3.0.0-alpha.9.2

---
 package.json                                   |  2 +-
 packages/strapi-admin/package.json             |  6 +++---
 packages/strapi-bookshelf/package.json         |  6 +++---
 packages/strapi-ejs/package.json               |  2 +-
 packages/strapi-generate-admin/package.json    |  4 ++--
 packages/strapi-generate-api/package.json      |  2 +-
 .../strapi-generate-controller/package.json    |  2 +-
 packages/strapi-generate-model/package.json    |  2 +-
 packages/strapi-generate-new/package.json      |  4 ++--
 packages/strapi-generate-plugin/package.json   |  2 +-
 packages/strapi-generate-policy/package.json   |  2 +-
 packages/strapi-generate-service/package.json  |  2 +-
 packages/strapi-generate/package.json          |  4 ++--
 packages/strapi-helper-plugin/package.json     |  2 +-
 packages/strapi-knex/package.json              |  2 +-
 packages/strapi-middleware-views/package.json  |  2 +-
 packages/strapi-mongoose/package.json          |  4 ++--
 .../strapi-plugin-content-manager/package.json |  4 ++--
 .../package.json                               |  8 ++++----
 packages/strapi-plugin-email/package.json      |  4 ++--
 .../package.json                               |  4 ++--
 .../package.json                               |  4 ++--
 packages/strapi-redis/package.json             |  4 ++--
 packages/strapi-utils/package.json             |  2 +-
 packages/strapi/package.json                   | 18 +++++++++---------
 25 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index cee89da43d..5ae7acb0c9 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "devDependencies": {
     "assert": "~1.3.0",
     "babel-eslint": "^6.1.2",
diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json
index 8a908acb4b..63818d8bcf 100755
--- a/packages/strapi-admin/package.json
+++ b/packages/strapi-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-admin",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
   },
   "devDependencies": {
     "sanitize.css": "^4.1.0",
-    "strapi-helper-plugin": "3.0.0-alpha.9.1",
-    "strapi-utils": "3.0.0-alpha.9.1"
+    "strapi-helper-plugin": "3.0.0-alpha.9.2",
+    "strapi-utils": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi",
diff --git a/packages/strapi-bookshelf/package.json b/packages/strapi-bookshelf/package.json
index c6cc5475b1..a887187c0d 100755
--- a/packages/strapi-bookshelf/package.json
+++ b/packages/strapi-bookshelf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-bookshelf",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Bookshelf hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -19,8 +19,8 @@
     "bookshelf": "^0.10.3",
     "lodash": "^4.17.4",
     "pluralize": "^6.0.0",
-    "strapi-knex": "3.0.0-alpha.9.1",
-    "strapi-utils": "3.0.0-alpha.9.1"
+    "strapi-knex": "3.0.0-alpha.9.2",
+    "strapi-utils": "3.0.0-alpha.9.2"
   },
   "strapi": {
     "isHook": true,
diff --git a/packages/strapi-ejs/package.json b/packages/strapi-ejs/package.json
index 2ca76fb622..6b8843842d 100755
--- a/packages/strapi-ejs/package.json
+++ b/packages/strapi-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-ejs",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "EJS hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-admin/package.json b/packages/strapi-generate-admin/package.json
index f09fd580f1..11e6ea2001 100755
--- a/packages/strapi-generate-admin/package.json
+++ b/packages/strapi-generate-admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-admin",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate the default admin panel for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "fs-extra": "^4.0.1",
     "lodash": "^4.17.4",
-    "strapi-admin": "3.0.0-alpha.9.1"
+    "strapi-admin": "3.0.0-alpha.9.2"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-generate-api/package.json b/packages/strapi-generate-api/package.json
index af7d306043..2095310725 100755
--- a/packages/strapi-generate-api/package.json
+++ b/packages/strapi-generate-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-api",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate an API for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-controller/package.json b/packages/strapi-generate-controller/package.json
index 23a3c36c7a..21f716cdf8 100755
--- a/packages/strapi-generate-controller/package.json
+++ b/packages/strapi-generate-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-controller",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-model/package.json b/packages/strapi-generate-model/package.json
index f4a27a2b90..430cbfe0da 100755
--- a/packages/strapi-generate-model/package.json
+++ b/packages/strapi-generate-model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-model",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate a model for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-new/package.json b/packages/strapi-generate-new/package.json
index 0d975f63f6..80a33489ba 100755
--- a/packages/strapi-generate-new/package.json
+++ b/packages/strapi-generate-new/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-new",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate a new Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -18,7 +18,7 @@
     "get-installed-path": "^3.0.1",
     "inquirer": "^4.0.2",
     "lodash": "^4.17.4",
-    "strapi-utils": "3.0.0-alpha.9.1",
+    "strapi-utils": "3.0.0-alpha.9.2",
     "uuid": "^3.1.0"
   },
   "scripts": {
diff --git a/packages/strapi-generate-plugin/package.json b/packages/strapi-generate-plugin/package.json
index 4c2b83267c..85a7499f34 100755
--- a/packages/strapi-generate-plugin/package.json
+++ b/packages/strapi-generate-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-plugin",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-policy/package.json b/packages/strapi-generate-policy/package.json
index 4c02f04502..8acdc53ea6 100755
--- a/packages/strapi-generate-policy/package.json
+++ b/packages/strapi-generate-policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-policy",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate-service/package.json b/packages/strapi-generate-service/package.json
index 9d765d7fe3..320f1420a6 100755
--- a/packages/strapi-generate-service/package.json
+++ b/packages/strapi-generate-service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate-service",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Generate a service for a Strapi API.",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-generate/package.json b/packages/strapi-generate/package.json
index 62909337dc..aba2643bae 100755
--- a/packages/strapi-generate/package.json
+++ b/packages/strapi-generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-generate",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -17,7 +17,7 @@
     "fs-extra": "^4.0.0",
     "lodash": "^4.17.4",
     "reportback": "^2.0.1",
-    "strapi-utils": "3.0.0-alpha.9.1"
+    "strapi-utils": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json
index a649940d6a..45a722ba5c 100755
--- a/packages/strapi-helper-plugin/package.json
+++ b/packages/strapi-helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-helper-plugin",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Helper for Strapi plugins development",
   "engines": {
     "node": ">= 8.0.0",
diff --git a/packages/strapi-knex/package.json b/packages/strapi-knex/package.json
index 0e7a886995..c87dfb9186 100755
--- a/packages/strapi-knex/package.json
+++ b/packages/strapi-knex/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-knex",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Knex hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index b6383d5518..a5078aba36 100755
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Views hook to enable server-side rendering for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi-mongoose/package.json b/packages/strapi-mongoose/package.json
index dc58c3e419..179df53017 100755
--- a/packages/strapi-mongoose/package.json
+++ b/packages/strapi-mongoose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-mongoose",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Mongoose hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -19,7 +19,7 @@
     "mongoose": "^5.0.0-rc1",
     "mongoose-float": "^1.0.2",
     "pluralize": "^6.0.0",
-    "strapi-utils": "3.0.0-alpha.9.1"
+    "strapi-utils": "3.0.0-alpha.9.2"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-plugin-content-manager/package.json b/packages/strapi-plugin-content-manager/package.json
index 95655955d6..8fa68c07a6 100755
--- a/packages/strapi-plugin-content-manager/package.json
+++ b/packages/strapi-plugin-content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-manager",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "A powerful UI to easily manage your data.",
   "strapi": {
     "name": "Content Manager",
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "react-select": "^1.0.0-rc.5",
-    "strapi-helper-plugin": "3.0.0-alpha.9.1"
+    "strapi-helper-plugin": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json
index 2a50d29d0d..a052590eec 100755
--- a/packages/strapi-plugin-content-type-builder/package.json
+++ b/packages/strapi-plugin-content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-content-type-builder",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -24,11 +24,11 @@
   },
   "dependencies": {
     "pluralize": "^7.0.0",
-    "strapi-generate": "3.0.0-alpha.9.1",
-    "strapi-generate-api": "3.0.0-alpha.9.1"
+    "strapi-generate": "3.0.0-alpha.9.2",
+    "strapi-generate-api": "3.0.0-alpha.9.2"
   },
   "devDependencies": {
-    "strapi-helper-plugin": "3.0.0-alpha.9.1"
+    "strapi-helper-plugin": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-email/package.json b/packages/strapi-plugin-email/package.json
index 0078e4da10..8bfb32667e 100644
--- a/packages/strapi-plugin-email/package.json
+++ b/packages/strapi-plugin-email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-email",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "This is the description of the plugin.",
   "strapi": {
     "name": "Email",
@@ -26,7 +26,7 @@
     "sendmail": "^1.2.0"
   },
   "devDependencies": {
-    "strapi-helper-plugin": "3.0.0-alpha.9.1"
+    "strapi-helper-plugin": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json
index afaa88527c..f57bdc2795 100755
--- a/packages/strapi-plugin-settings-manager/package.json
+++ b/packages/strapi-plugin-settings-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-settings-manager",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Strapi plugin to manage settings.",
   "strapi": {
     "name": "Settings Manager",
@@ -25,7 +25,7 @@
   "devDependencies": {
     "flag-icon-css": "^2.8.0",
     "react-select": "^1.0.0-rc.5",
-    "strapi-helper-plugin": "3.0.0-alpha.9.1"
+    "strapi-helper-plugin": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json
index bfdb0c9341..50a6cb1dfc 100644
--- a/packages/strapi-plugin-users-permissions/package.json
+++ b/packages/strapi-plugin-users-permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-users-permissions",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "name": "Auth & Permissions",
@@ -32,7 +32,7 @@
     "uuid": "^3.1.0"
   },
   "devDependencies": {
-    "strapi-helper-plugin": "3.0.0-alpha.9.1"
+    "strapi-helper-plugin": "3.0.0-alpha.9.2"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/strapi-redis/package.json b/packages/strapi-redis/package.json
index 6fb22c9f7a..2168f7a549 100755
--- a/packages/strapi-redis/package.json
+++ b/packages/strapi-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-redis",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Redis hook for the Strapi framework",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -18,7 +18,7 @@
     "ioredis": "^3.1.2",
     "lodash": "^4.17.4",
     "stack-trace": "0.0.10",
-    "strapi-utils": "3.0.0-alpha.9.1"
+    "strapi-utils": "3.0.0-alpha.9.2"
   },
   "strapi": {
     "isHook": true
diff --git a/packages/strapi-utils/package.json b/packages/strapi-utils/package.json
index 834b90ec9e..e72a8442a0 100755
--- a/packages/strapi-utils/package.json
+++ b/packages/strapi-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-utils",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "http://strapi.io",
   "keywords": [
diff --git a/packages/strapi/package.json b/packages/strapi/package.json
index 9a3ec1e728..c1cda760bf 100755
--- a/packages/strapi/package.json
+++ b/packages/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi",
-  "version": "3.0.0-alpha.9.1",
+  "version": "3.0.0-alpha.9.2",
   "description": "An open source solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier.",
   "homepage": "http://strapi.io",
   "keywords": [
@@ -55,14 +55,14 @@
     "rimraf": "^2.6.2",
     "semver": "^5.4.1",
     "stack-trace": "0.0.10",
-    "strapi-generate": "3.0.0-alpha.9.1",
-    "strapi-generate-admin": "3.0.0-alpha.9.1",
-    "strapi-generate-api": "3.0.0-alpha.9.1",
-    "strapi-generate-new": "3.0.0-alpha.9.1",
-    "strapi-generate-plugin": "3.0.0-alpha.9.1",
-    "strapi-generate-policy": "3.0.0-alpha.9.1",
-    "strapi-generate-service": "3.0.0-alpha.9.1",
-    "strapi-utils": "3.0.0-alpha.9.1"
+    "strapi-generate": "3.0.0-alpha.9.2",
+    "strapi-generate-admin": "3.0.0-alpha.9.2",
+    "strapi-generate-api": "3.0.0-alpha.9.2",
+    "strapi-generate-new": "3.0.0-alpha.9.2",
+    "strapi-generate-plugin": "3.0.0-alpha.9.2",
+    "strapi-generate-policy": "3.0.0-alpha.9.2",
+    "strapi-generate-service": "3.0.0-alpha.9.2",
+    "strapi-utils": "3.0.0-alpha.9.2"
   },
   "author": {
     "email": "hi@strapi.io",