@strapi/plugin-users-permissions 4.0.5 → 4.0.6

package/admin/src/components/FormModal/Input/index.js

@@ -28,12 +28,12 @@ const Input = ({
 
   const label = formatMessage(
     { id: intlLabel.id, defaultMessage: intlLabel.defaultMessage },
-    { ...intlLabel.values }
+    { provider: providerToEditName, ...intlLabel.values }
   );
   const hint = description
     ? formatMessage(
         { id: description.id, defaultMessage: description.defaultMessage },
-        { ...description.values }
+        { provider: providerToEditName, ...description.values }
       )
     : '';
 

package/admin/src/pages/Providers/utils/forms.js

@@ -23,9 +23,6 @@ const keyLabel = { id: getTrad('PopUpForm.Providers.key.label'), defaultMessage:
 const hintLabel = {
   id: getTrad('PopUpForm.Providers.redirectURL.label'),
   defaultMessage: 'The redirect URL to add in your {provider} application configurations',
-  values: {
-    provider: 'VK',
-  },
 };
 const textPlaceholder = {
   id: getTrad('PopUpForm.Providers.key.placeholder'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.5",
+  "version": "4.0.6",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -28,8 +28,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.5",
-    "@strapi/utils": "4.0.5",
+    "@strapi/helper-plugin": "4.0.6",
+    "@strapi/utils": "4.0.6",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -61,5 +61,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "45020eee065af8917011cc43398f95c4c624d6ad"
+  "gitHead": "5b48053946aacfb564ff423342fe70d79cd6d66d"
 }

package/server/bootstrap/index.js

@@ -32,6 +32,9 @@ module.exports = async ({ strapi }) => {
 
     if (!process.env.JWT_SECRET) {
       strapi.fs.appendFile(process.env.ENV_PATH || '.env', `JWT_SECRET=${jwtSecret}\n`);
+      strapi.log.info(
+        'The Users & Permissions plugin automatically generated a jwt secret and stored it in your .env file under the name JWT_SECRET.'
+      );
     }
   }
 };

package/server/controllers/auth.js

@@ -188,7 +188,10 @@ module.exports = {
     }
 
     // Ability to pass OAuth callback dynamically
-    grantConfig[provider].callback = _.get(ctx, 'query.callback') || grantConfig[provider].callback;
+    grantConfig[provider].callback =
+      _.get(ctx, 'query.callback') ||
+      _.get(ctx, 'session.grant.dynamic.callback') ||
+      grantConfig[provider].callback;
     grantConfig[provider].redirect_uri = getService('providers').buildRedirectUri(provider);
 
     return grant(grantConfig)(ctx, next);

package/server/services/jwt.js

@@ -21,8 +21,6 @@ module.exports = ({ strapi }) => ({
       }
 
       token = parts[1];
-    } else if (ctx.query.access_token) {
-      token = ctx.query.access_token;
     } else {
       return null;
     }