@strapi/plugin-users-permissions 5.0.0-beta.1 → 5.0.0-beta.11

package/dist/_chunks/uk-LHOivnhP.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uk-LHOivnhP.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/_chunks/{vi-A3zJxaiI.js → vi-CdVRdKDw.js}

@@ -47,4 +47,4 @@ const vi = {
   "plugin.name": "Vai trò và Quyền"
 };
 exports.default = vi;
-//# sourceMappingURL=vi-A3zJxaiI.js.map
+//# sourceMappingURL=vi-CdVRdKDw.js.map

package/dist/_chunks/vi-CdVRdKDw.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vi-CdVRdKDw.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/_chunks/{vi-xY0zCW3d.mjs → vi-HW-EdMea.mjs}

@@ -47,4 +47,4 @@ const vi = {
 export {
   vi as default
 };
-//# sourceMappingURL=vi-xY0zCW3d.mjs.map
+//# sourceMappingURL=vi-HW-EdMea.mjs.map

package/dist/_chunks/vi-HW-EdMea.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"vi-HW-EdMea.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/_chunks/{zh-OFeldzbX.mjs → zh-5hKkVPA4.mjs}

@@ -83,4 +83,4 @@ const zh = {
 export {
   zh as default
 };
-//# sourceMappingURL=zh-OFeldzbX.mjs.map
+//# sourceMappingURL=zh-5hKkVPA4.mjs.map

package/dist/_chunks/zh-5hKkVPA4.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"zh-5hKkVPA4.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/_chunks/{zh-72SpmFXa.js → zh-Cuq8gMnF.js}

@@ -83,4 +83,4 @@ const zh = {
   "popUpWarning.warning.cancel": "您確定要取消變更嗎？"
 };
 exports.default = zh;
-//# sourceMappingURL=zh-72SpmFXa.js.map
+//# sourceMappingURL=zh-Cuq8gMnF.js.map

package/dist/_chunks/zh-Cuq8gMnF.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zh-Cuq8gMnF.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/_chunks/{zh-Hans-E84cu4kP.mjs → zh-Hans-BHilK-yc.mjs}

@@ -83,4 +83,4 @@ const zhHans = {
 export {
   zhHans as default
 };
-//# sourceMappingURL=zh-Hans-E84cu4kP.mjs.map
+//# sourceMappingURL=zh-Hans-BHilK-yc.mjs.map

package/dist/_chunks/zh-Hans-BHilK-yc.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"zh-Hans-BHilK-yc.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/_chunks/{zh-Hans-ArWWtyP4.js → zh-Hans-GQDMKtY4.js}

@@ -83,4 +83,4 @@ const zhHans = {
   "popUpWarning.warning.cancel": "你确定你要取消你的修改？"
 };
 exports.default = zhHans;
-//# sourceMappingURL=zh-Hans-ArWWtyP4.js.map
+//# sourceMappingURL=zh-Hans-GQDMKtY4.js.map

package/dist/_chunks/zh-Hans-GQDMKtY4.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zh-Hans-GQDMKtY4.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-JO4fO3Yj.js");
+const index = require("../_chunks/index-C5qelx5h.js");
 module.exports = index.index;
 //# sourceMappingURL=index.js.map

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-PTS42_em.mjs";
+import { i } from "../_chunks/index-CeYJys9a.mjs";
 export {
   i as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.11",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -46,17 +46,17 @@
     "watch": "pack-up watch"
   },
   "dependencies": {
-    "@strapi/design-system": "1.16.0",
-    "@strapi/icons": "1.16.0",
-    "@strapi/utils": "5.0.0-beta.1",
+    "@strapi/design-system": "2.0.0-beta.6",
+    "@strapi/icons": "2.0.0-beta.6",
+    "@strapi/utils": "5.0.0-beta.11",
     "bcryptjs": "2.4.3",
     "formik": "2.4.5",
     "grant-koa": "5.4.8",
     "immer": "9.0.21",
     "jsonwebtoken": "9.0.0",
     "jwk-to-pem": "2.0.5",
-    "koa": "2.13.4",
-    "koa2-ratelimit": "^1.1.2",
+    "koa": "2.15.2",
+    "koa2-ratelimit": "^1.1.3",
     "lodash": "4.17.21",
     "prop-types": "^15.8.1",
     "purest": "4.0.2",
@@ -67,23 +67,23 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
-    "@strapi/pack-up": "5.0.0-beta.1",
-    "@strapi/strapi": "5.0.0-beta.1",
-    "@testing-library/dom": "9.2.0",
-    "@testing-library/react": "14.0.0",
-    "@testing-library/user-event": "14.4.3",
+    "@strapi/pack-up": "5.0.0",
+    "@strapi/strapi": "5.0.0-beta.11",
+    "@testing-library/dom": "10.1.0",
+    "@testing-library/react": "15.0.7",
+    "@testing-library/user-event": "14.5.2",
     "msw": "1.3.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "react-router-dom": "6.22.3",
-    "styled-components": "5.3.11"
+    "styled-components": "6.1.8"
   },
   "peerDependencies": {
     "@strapi/strapi": "^5.0.0 || ^5.0.0-beta || ^5.0.0-alpha || ^5.0.0-rc",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
     "react-router-dom": "^6.0.0",
-    "styled-components": "^5.2.1"
+    "styled-components": "^6.0.0"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",
@@ -96,5 +96,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "ae773621dfcbc67c49dc6fa52ac41ea5de676ecb"
+  "gitHead": "0991f0ac0f739e43e6a5f9ac79acb8c774c359bf"
 }

package/server/bootstrap/index.js

@@ -103,9 +103,9 @@ module.exports = async ({ strapi }) => {
   await initEmails(pluginStore);
   await initAdvancedOptions(pluginStore);
 
-  await strapi.admin.services.permission.actionProvider.registerMany(
-    usersPermissionsActions.actions
-  );
+  await strapi
+    .service('admin::permission')
+    .actionProvider.registerMany(usersPermissionsActions.actions);
 
   await getService('users-permissions').initialize();
 

package/server/config.js

@@ -18,6 +18,35 @@ module.exports = {
         },
       },
     },
+    callback: {
+      validate(callback, provider) {
+        let uCallback;
+        let uProviderCallback;
+
+        try {
+          uCallback = new URL(callback);
+          uProviderCallback = new URL(provider.callback);
+        } catch {
+          throw new Error('The callback is not a valid URL');
+        }
+
+        // Make sure the different origin matches
+        if (uCallback.origin !== uProviderCallback.origin) {
+          throw new Error(
+            `Forbidden callback provided: origins don't match. Please verify your config.`
+          );
+        }
+
+        // Make sure the different pathname matches
+        if (uCallback.pathname !== uProviderCallback.pathname) {
+          throw new Error(
+            `Forbidden callback provided: pathname don't match. Please verify your config.`
+          );
+        }
+
+        // NOTE: We're not checking the search parameters on purpose to allow passing different states
+      },
+    },
   }),
   validator() {},
 };

package/server/controllers/auth.js

@@ -196,10 +196,28 @@ module.exports = {
     }
 
     // Ability to pass OAuth callback dynamically
-    grantConfig[provider].callback =
-      _.get(ctx, 'query.callback') ||
-      _.get(ctx, 'session.grant.dynamic.callback') ||
-      grantConfig[provider].callback;
+    const queryCustomCallback = _.get(ctx, 'query.callback');
+    const dynamicSessionCallback = _.get(ctx, 'session.grant.dynamic.callback');
+
+    const customCallback = queryCustomCallback ?? dynamicSessionCallback;
+
+    // The custom callback is validated to make sure it's not redirecting to an unwanted actor.
+    if (customCallback !== undefined) {
+      try {
+        // We're extracting the callback validator from the plugin config since it can be user-customized
+        const { validate: validateCallback } = strapi
+          .plugin('users-permissions')
+          .config('callback');
+
+        await validateCallback(customCallback, grantConfig[provider]);
+
+        grantConfig[provider].callback = customCallback;
+      } catch (e) {
+        throw new ValidationError('Invalid callback URL provided', { callback: customCallback });
+      }
+    }
+
+    // Build a valid redirect URI for the current provider
     grantConfig[provider].redirect_uri = getService('providers').buildRedirectUri(provider);
 
     return grant(grantConfig)(ctx, next);

package/server/controllers/content-manager-user.js

@@ -25,7 +25,9 @@ const findEntityAndCheckPermissions = async (ability, action, model, id) => {
     throw new NotFoundError();
   }
 
-  const pm = strapi.admin.services.permission.createPermissionsManager({ ability, action, model });
+  const pm = strapi
+    .service('admin::permission')
+    .createPermissionsManager({ ability, action, model });
 
   if (pm.ability.cannot(pm.action, pm.toSubject(doc))) {
     throw new ForbiddenError();
@@ -47,7 +49,7 @@ module.exports = {
 
     const { email, username } = body;
 
-    const pm = strapi.admin.services.permission.createPermissionsManager({
+    const pm = strapi.service('admin::permission').createPermissionsManager({
       ability: userAbility,
       action: ACTIONS.create,
       model: userModel,

package/server/services/user.js

@@ -11,6 +11,7 @@ const bcrypt = require('bcryptjs');
 const urlJoin = require('url-join');
 
 const { sanitize } = require('@strapi/utils');
+const { toNumber, getOr } = require('lodash/fp');
 const { getService } = require('../utils');
 
 const USER_MODEL_UID = 'plugin::users-permissions.user';
@@ -27,10 +28,26 @@ module.exports = ({ strapi }) => ({
   },
 
   /**
-   * Promise to search count users
+   * Hashes password fields in the provided values object if they are present.
+   * It checks each key in the values object against the model's attributes and
+   * hashes it if the attribute type is 'password',
    *
-   * @return {Promise}
+   * @param {object} values - The object containing the fields to be hashed.
+   * @return {object} The values object with hashed password fields if they were present.
    */
+  async ensureHashedPasswords(values) {
+    const attributes = strapi.getModel(USER_MODEL_UID).attributes;
+
+    for (const key in values) {
+      if (attributes[key] && attributes[key].type === 'password') {
+        // Check if a custom encryption.rounds has been set on the password attribute
+        const rounds = toNumber(getOr(10, 'encryption.rounds', attributes[key]));
+        values[key] = await bcrypt.hash(values[key], rounds);
+      }
+    }
+
+    return values;
+  },
 
   /**
    * Promise to add a/an user.
@@ -38,7 +55,7 @@ module.exports = ({ strapi }) => ({
    */
   async add(values) {
     return strapi.db.query(USER_MODEL_UID).create({
-      data: values,
+      data: await this.ensureHashedPasswords(values),
       populate: ['role'],
     });
   },
@@ -52,7 +69,7 @@ module.exports = ({ strapi }) => ({
   async edit(userId, params = {}) {
     return strapi.db.query(USER_MODEL_UID).update({
       where: { id: userId },
-      data: params,
+      data: await this.ensureHashedPasswords(params),
       populate: ['role'],
     });
   },

package/server/services/users-permissions.js

@@ -45,7 +45,7 @@ module.exports = ({ strapi }) => ({
       return action[Symbol.for('__type__')].includes('content-api');
     };
 
-    _.forEach(strapi.api, (api, apiName) => {
+    _.forEach(strapi.apis, (api, apiName) => {
       const controllers = _.reduce(
         api.controllers,
         (acc, controller, controllerName) => {
@@ -105,7 +105,7 @@ module.exports = ({ strapi }) => ({
   async getRoutes() {
     const routesMap = {};
 
-    _.forEach(strapi.api, (api, apiName) => {
+    _.forEach(strapi.apis, (api, apiName) => {
       const routes = _.flatMap(api.routes, (route) => {
         if (_.has(route, 'routes')) {
           return route.routes;
@@ -156,7 +156,7 @@ module.exports = ({ strapi }) => ({
 
     const permissionsFoundInDB = _.uniq(_.map(dbPermissions, 'action'));
 
-    const appActions = _.flatMap(strapi.api, (api, apiName) => {
+    const appActions = _.flatMap(strapi.apis, (api, apiName) => {
       return _.flatMap(api.controllers, (controller, controllerName) => {
         return _.keys(controller).map((actionName) => {
           return `api::${apiName}.${controllerName}.${actionName}`;

package/server/utils/sanitize/visitors/remove-user-relation-from-role-entities.js

@@ -2,8 +2,8 @@
 
 module.exports = ({ schema, key, attribute }, { remove }) => {
   if (
-    attribute.type === 'relation' &&
-    attribute.target === 'plugin::users-permissions.user' &&
+    attribute?.type === 'relation' &&
+    attribute?.target === 'plugin::users-permissions.user' &&
     schema.uid === 'plugin::users-permissions.role'
   ) {
     remove(key);