@strapi/plugin-users-permissions 4.0.0-beta.18 → 4.0.0-beta.19

package/package.json

@@ -1,21 +1,31 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-beta.18",
+  "version": "4.0.0-beta.19",
   "description": "Protect your API with a full-authentication process based on JWT",
-  "strapi": {
-    "displayName": "Roles & Permissions",
-    "name": "users-permissions",
-    "description": "Protect your API with a full authentication process based on JWT. This plugin comes also with an ACL strategy that allows you to manage the permissions between the groups of users.",
-    "required": true,
-    "kind": "plugin"
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/strapi/strapi.git"
   },
+  "license": "SEE LICENSE IN LICENSE",
+  "author": {
+    "name": "Strapi Solutions SAS",
+    "email": "hi@strapi.io",
+    "url": "https://strapi.io"
+  },
+  "maintainers": [
+    {
+      "name": "Strapi Solutions SAS",
+      "email": "hi@strapi.io",
+      "url": "https://strapi.io"
+    }
+  ],
   "scripts": {
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-beta.18",
-    "@strapi/utils": "4.0.0-beta.18",
+    "@strapi/helper-plugin": "4.0.0-beta.19",
+    "@strapi/utils": "4.0.0-beta.19",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -36,26 +46,16 @@
   "devDependencies": {
     "koa": "^2.13.1"
   },
-  "author": {
-    "name": "Strapi team",
-    "email": "hi@strapi.io",
-    "url": "https://strapi.io"
-  },
-  "maintainers": [
-    {
-      "name": "Strapi team",
-      "email": "hi@strapi.io",
-      "url": "https://strapi.io"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/strapi/strapi.git"
-  },
   "engines": {
     "node": ">=12.x.x <=16.x.x",
     "npm": ">=6.0.0"
   },
-  "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "3e9e3f13cb85822e6d92b0e448ae0b94d440dac1"
+  "strapi": {
+    "displayName": "Roles & Permissions",
+    "name": "users-permissions",
+    "description": "Protect your API with a full authentication process based on JWT. This plugin comes also with an ACL strategy that allows you to manage the permissions between the groups of users.",
+    "required": true,
+    "kind": "plugin"
+  },
+  "gitHead": "6e0f2052136c7d337d72b944cd0564d4559896d0"
 }

package/server/bootstrap/index.js

@@ -41,9 +41,6 @@ const initGrant = async pluginStore => {
   const baseURL = `${strapi.config.server.url}/${apiPrefix}/auth`;
 
   const grantConfig = {
-    defaults: {
-      prefix: `${apiPrefix}/connect`,
-    },
     email: {
       enabled: true,
       icon: 'envelope',

package/server/controllers/auth.js

@@ -162,10 +162,18 @@ module.exports = {
   async connect(ctx, next) {
     const grant = require('grant-koa');
 
-    const grantConfig = await strapi
+    const providers = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'grant' })
       .get();
 
+    const apiPrefix = strapi.config.get('api.rest.prefix');
+    const grantConfig = {
+      defaults: {
+        prefix: `${apiPrefix}/connect`,
+      },
+      ...providers,
+    };
+
     const [requestPath] = ctx.request.url.split('?');
     const provider = requestPath.split('/connect/')[1].split('/')[0];
 

package/server/services/providers.js

@@ -28,7 +28,7 @@ module.exports = ({ strapi }) => {
   const getProfile = async (provider, query, callback) => {
     const access_token = query.access_token || query.code || query.oauth_token;
 
-    const grant = await strapi
+    const providers = await strapi
       .store({ type: 'plugin', name: 'users-permissions', key: 'grant' })
       .get();
 
@@ -168,7 +168,7 @@ module.exports = ({ strapi }) => {
                 return callback(null, {
                   username: userbody.login,
                   email: Array.isArray(emailsbody)
-                    ? emailsbody.find((email) => email.primary === true).email
+                    ? emailsbody.find(email => email.primary === true).email
                     : null,
                 });
               });
@@ -201,8 +201,8 @@ module.exports = ({ strapi }) => {
         const twitter = purest({
           provider: 'twitter',
           config: purestConfig,
-          key: grant.twitter.key,
-          secret: grant.twitter.secret,
+          key: providers.twitter.key,
+          secret: providers.twitter.secret,
         });
 
         twitter
@@ -225,8 +225,8 @@ module.exports = ({ strapi }) => {
       case 'instagram': {
         const instagram = purest({
           provider: 'instagram',
-          key: grant.instagram.key,
-          secret: grant.instagram.secret,
+          key: providers.instagram.key,
+          secret: providers.instagram.secret,
           config: purestConfig,
         });
 
@@ -298,7 +298,7 @@ module.exports = ({ strapi }) => {
 
         twitch
           .get('users')
-          .auth(access_token, grant.twitch.key)
+          .auth(access_token, providers.twitch.key)
           .request((err, res, body) => {
             if (err) {
               callback(err);
@@ -403,7 +403,7 @@ module.exports = ({ strapi }) => {
       }
       case 'auth0': {
         const purestAuth0Conf = {};
-        purestAuth0Conf[`https://${grant.auth0.subdomain}.auth0.com`] = {
+        purestAuth0Conf[`https://${providers.auth0.subdomain}.auth0.com`] = {
           __domain: {
             auth: {
               auth: { bearer: '[0]' },
@@ -442,7 +442,7 @@ module.exports = ({ strapi }) => {
         break;
       }
       case 'cas': {
-        const provider_url = 'https://' + _.get(grant['cas'], 'subdomain');
+        const provider_url = 'https://' + _.get(providers.cas, 'subdomain');
         const cas = purest({
           provider: 'cas',
           config: {
@@ -551,7 +551,7 @@ module.exports = ({ strapi }) => {
           }
 
           if (
-            !_.isEmpty(_.find(users, (user) => user.provider !== provider)) &&
+            !_.isEmpty(_.find(users, user => user.provider !== provider)) &&
             advanced.unique_email
           ) {
             return resolve([