@strapi/plugin-users-permissions 0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982 → 0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982",
+  "version": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -19,20 +19,37 @@
       "url": "https://strapi.io"
     }
   ],
+  "exports": {
+    "./strapi-admin": {
+      "source": "./admin/src/index.js",
+      "import": "./dist/admin/index.mjs",
+      "require": "./dist/admin/index.js",
+      "default": "./dist/admin/index.js"
+    },
+    "./strapi-server": {
+      "source": "./strapi-server.js",
+      "require": "./strapi-server.js",
+      "default": "./strapi-server.js"
+    },
+    "./package.json": "./package.json"
+  },
   "scripts": {
-    "test:unit": "run -T jest",
-    "test:unit:watch": "run -T jest --watch",
+    "build": "pack-up build",
+    "clean": "run -T rimraf dist",
+    "lint": "run -T eslint .",
     "test:front": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js",
-    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
     "test:front:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js",
+    "test:front:watch": "run -T cross-env IS_EE=true jest --config ./jest.config.front.js --watchAll",
     "test:front:watch:ce": "run -T cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll",
-    "lint": "run -T eslint ."
+    "test:unit": "run -T jest",
+    "test:unit:watch": "run -T jest --watch",
+    "watch": "pack-up watch"
   },
   "dependencies": {
-    "@strapi/design-system": "1.9.0",
-    "@strapi/helper-plugin": "0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982",
-    "@strapi/icons": "1.9.0",
-    "@strapi/utils": "0.0.0-next.e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982",
+    "@strapi/design-system": "1.14.1",
+    "@strapi/helper-plugin": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
+    "@strapi/icons": "1.14.1",
+    "@strapi/utils": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
     "bcryptjs": "2.4.3",
     "formik": "2.4.0",
     "grant-koa": "5.4.8",
@@ -51,23 +68,26 @@
     "yup": "0.32.9"
   },
   "devDependencies": {
+    "@strapi/pack-up": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
+    "@strapi/strapi": "0.0.0-next.e1ede8c55a0e1e22ce20137bf238fc374bd5dd51",
     "@testing-library/dom": "9.2.0",
     "@testing-library/react": "14.0.0",
     "@testing-library/user-event": "14.4.3",
-    "msw": "1.2.1",
+    "msw": "1.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "5.3.4",
     "styled-components": "5.3.3"
   },
   "peerDependencies": {
+    "@strapi/strapi": "^4.0.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
-    "react-router-dom": "5.3.4",
-    "styled-components": "5.3.3"
+    "react-router-dom": "^5.2.0",
+    "styled-components": "^5.2.1"
   },
   "engines": {
-    "node": ">=16.0.0 <=20.x.x",
+    "node": ">=18.0.0 <=20.x.x",
     "npm": ">=6.0.0"
   },
   "strapi": {
@@ -77,5 +97,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "e037a7b2d1f48b7bd8bcd0d9400ca0f9ded8a982"
+  "gitHead": "e1ede8c55a0e1e22ce20137bf238fc374bd5dd51"
 }

package/packup.config.ts

@@ -0,0 +1,22 @@
+import { Config, defineConfig } from '@strapi/pack-up';
+import { transformWithEsbuild } from 'vite';
+
+const config: Config = defineConfig({
+  bundles: [
+    {
+      source: './admin/src/index.js',
+      import: './dist/admin/index.mjs',
+      require: './dist/admin/index.js',
+      runtime: 'web',
+    },
+  ],
+  dist: './dist',
+  /**
+   * Because we're exporting a server & client package
+   * which have different runtimes we want to ignore
+   * what they look like in the package.json
+   */
+  exports: {},
+});
+
+export default config;

package/server/bootstrap/index.js

@@ -113,7 +113,8 @@ const userSchemaAdditions = () => {
     'updatedBy',
     'updatedAt',
     'publishedAt',
-    'strapi_reviewWorkflows_stage',
+    'strapi_stage',
+    'strapi_assignee',
   ];
 
   return currentSchema.filter((key) => !(ignoreDiffs.includes(key) || defaultSchema.includes(key)));

package/server/controllers/auth.js

@@ -26,7 +26,7 @@ const {
 } = require('./validation/auth');
 
 const { getAbsoluteAdminUrl, getAbsoluteServerUrl, sanitize } = utils;
-const { ApplicationError, ValidationError } = utils.errors;
+const { ApplicationError, ValidationError, ForbiddenError } = utils.errors;
 
 const sanitizeUser = (user, ctx) => {
   const { auth } = ctx.state;
@@ -100,6 +100,10 @@ module.exports = {
     try {
       const user = await getService('providers').connect(provider, ctx.query);
 
+      if (user.blocked) {
+        throw new ForbiddenError('Your account has been blocked by an administrator');
+      }
+
       return ctx.send({
         jwt: getService('jwt').issue({ id: user.id }),
         user: await sanitizeUser(user, ctx),

package/.eslintrc.js

@@ -1,14 +0,0 @@
-module.exports = {
-  root: true,
-  overrides: [
-    {
-      files: ['admin/**/*'],
-      extends: ['custom/front'],
-    },
-    {
-      files: ['**/*'],
-      excludedFiles: ['admin/**/*'],
-      extends: ['custom/back'],
-    },
-  ],
-};

package/strapi-admin.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./admin/src').default;