From 44a382149f41f25250122415fa72863e00fc8f24 Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Thu, 27 Jun 2019 18:24:04 +0200
Subject: [PATCH] Fix grant-koa breaking with strapi on grant-koa v4.6.0

---
 .../controllers/Auth.js                        |  7 ++-----
 .../package.json                               |  3 +--
 yarn.lock                                      | 18 +++++++++---------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/strapi-plugin-users-permissions/controllers/Auth.js b/packages/strapi-plugin-users-permissions/controllers/Auth.js
index d40d19b5d4..0c757d755a 100644
--- a/packages/strapi-plugin-users-permissions/controllers/Auth.js
+++ b/packages/strapi-plugin-users-permissions/controllers/Auth.js
@@ -9,7 +9,7 @@
 /* eslint-disable no-useless-escape */
 const crypto = require('crypto');
 const _ = require('lodash');
-const compose = require('koa-compose');
+const grant = require('grant-koa');
 
 const emailRegExp = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 
@@ -263,10 +263,7 @@ module.exports = {
       return ctx.badRequest(null, 'This provider is disabled.');
     }
 
-    const Grant = require('grant-koa');
-    const grant = new Grant(grantConfig);
-
-    return compose(grant.middleware)(ctx, next);
+    return grant(grantConfig)(ctx, next);
   },
 
   forgotPassword: async ctx => {
diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json
index 8ceb64ee01..85b870c72f 100644
--- a/packages/strapi-plugin-users-permissions/package.json
+++ b/packages/strapi-plugin-users-permissions/package.json
@@ -14,11 +14,10 @@
   "dependencies": {
     "bcryptjs": "^2.4.3",
     "classnames": "^2.2.6",
-    "grant-koa": "^4.2.0",
+    "grant-koa": "^4.6.0",
     "immutable": "^3.8.2",
     "invariant": "^2.2.1",
     "jsonwebtoken": "^8.1.0",
-    "koa-compose": "^4.0.0",
     "koa2-ratelimit": "^0.6.1",
     "lodash": "^4.17.11",
     "purest": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock
index 44412e5046..aa0a3d4b5c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7934,17 +7934,17 @@ graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
-grant-koa@^4.2.0:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/grant-koa/-/grant-koa-4.5.2.tgz#a02e49c5ff3e593253023f3b3115441b1d0f54c7"
-  integrity sha512-lbBE2LjQhf14nRJAlVv5P5ld1V6wQhRn107Db1R0oQ/AtLtJA5cNe0YqYJS2ofl9pDJj+x1apShYVRWK6i4k/w==
+grant-koa@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/grant-koa/-/grant-koa-4.6.0.tgz#00ae29c66d1ad3b3b284bb9742cdbf934ba25fbf"
+  integrity sha512-zzSU+94m5kPN4Yb5gmRoJk34j50OBFCIczaUaB2n+o+NV84hTLXCRESZhp5BtvBDRY4ZTbsIKsgwCzsBHozQog==
   dependencies:
-    grant "4.5.2"
+    grant "4.6.0"
 
-grant@4.5.2:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/grant/-/grant-4.5.2.tgz#5401f119e6f119772386e5fb2e0eccf5d0d2c8b7"
-  integrity sha512-96hyS0ouJ5CaO30YWLb9zatc2r23aLKvaM+81qnZWCpmL3l4/KTdaRoNG4X/e93vlmryyJr5jus/jrqctT6iFw==
+grant@4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/grant/-/grant-4.6.0.tgz#2704bdeb27f6f3cae03b2fbf6eecf1415bc77bc5"
+  integrity sha512-jAhKZssj5EMtC2XQSfUq/+wU0mbYYsUFWHb9cdV4XPdS6IINmEMIwI68Wj9MpLJTrUQJ48CzqfGpo4Mve11RvQ==
   dependencies:
     qs "^6.7.0"
     request-compose "^1.2.0"