@strapi/plugin-users-permissions 4.4.0-alpha.0 → 4.4.0-beta.3

package/admin/src/pages/AdvancedSettings/index.js

@@ -152,7 +152,7 @@ const AdvancedSettingsPage = () => {
                     type="submit"
                     disabled={!canUpdate}
                     startIcon={<Check />}
-                    size="L"
+                    size="S"
                   >
                     {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
                   </Button>

package/admin/src/pages/Roles/ListPage/index.js

@@ -131,7 +131,7 @@ const RoleListPage = () => {
           })}
           primaryAction={
             <CheckPermissions permissions={permissions.createRole}>
-              <Button onClick={handleNewRoleClick} startIcon={<Plus />} size="L">
+              <Button onClick={handleNewRoleClick} startIcon={<Plus />} size="S">
                 {formatMessage({
                   id: getTrad('List.button.roles'),
                   defaultMessage: 'Add new role',

package/documentation/content-api.yaml

@@ -102,6 +102,13 @@ paths:
       tags:
         - Users-Permissions - Auth
       summary: Default Callback from provider auth
+      parameters:
+        - name: provider
+          in: path
+          required: true
+          description: Provider name
+          schema:
+            type: string
       responses:
         200:
           description: Returns a jwt token and user info
@@ -196,15 +203,16 @@ paths:
           application/json:
             schema:
               type: object
+              required:
+                - password
+                - currentPassword
+                - passwordConfirmation
               properties:
                 password:
-                  required: true
                   type: string
                 currentPassword:
-                  required: true
                   type: string
                 passwordConfirmation:
-                  required: true
                   type: string
       responses:
         200:
@@ -219,7 +227,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-
   /auth/email-confirmation:
     get:
       tags:
@@ -228,7 +235,8 @@ paths:
       parameters:
         - in: query
           name: confirmation
-          type: string
+          schema:
+            type: string
           description: confirmation token received by email
       responses:
         301:
@@ -319,7 +327,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-
   /users-permissions/roles:
     get:
       tags:
@@ -364,7 +371,7 @@ paths:
         - Users-Permissions - Users & Roles
       summary: Create a role
       requestBody:
-        $ref: '#/components/schemas/Users-Permissions-RoleRequest'
+        $ref: '#/components/requestBodies/Users-Permissions-RoleRequest'
       responses:
         200:
           description: Returns ok if the role was create
@@ -391,10 +398,13 @@ paths:
       parameters:
         - in: path
           name: id
-          type: string
+          required: true
+          schema:
+            type: string
           description: role Id
       responses:
         200:
+          description: Returns the role
           content:
             application/json:
               schema:
@@ -431,10 +441,12 @@ paths:
       parameters:
         - in: path
           name: role
-          type: string
+          required: true
+          schema:
+            type: string
           description: role Id
       requestBody:
-        $ref: '#/components/schemas/Users-Permissions-RoleRequest'
+        $ref: '#/components/requestBodies/Users-Permissions-RoleRequest'
       responses:
         200:
           description: Returns ok if the role was udpated
@@ -460,7 +472,9 @@ paths:
       parameters:
         - in: path
           name: role
-          type: string
+          required: true
+          schema:
+            type: string
           description: role Id
       responses:
         200:
@@ -487,7 +501,7 @@ paths:
       summary: Get list of users
       responses:
         200:
-          summary: Returns an array of users
+          description: Returns an array of users
           content:
             application/json:
               schema:
@@ -520,17 +534,17 @@ paths:
           application/json:
             schema:
               type: object
+              required:
+                - username
+                - email
+                - password
               properties:
                 email:
                   type: string
-                  required: true
                 username:
                   type: string
-                  required: true
                 password:
                   type: string
-                  required: true
-
             example:
               username: foo
               email: foo@strapi.io
@@ -569,7 +583,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-
   /users/{id}:
     get:
       tags:
@@ -578,10 +591,13 @@ paths:
       parameters:
         - in: path
           name: id
-          type: string
+          required: true
+          schema:
+            type: string
           description: user Id
       responses:
         200:
+          description: Returns a user
           content:
             application/json:
               schema:
@@ -601,7 +617,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-
     put:
       tags:
         - Users-Permissions - Users & Roles
@@ -609,7 +624,9 @@ paths:
       parameters:
         - in: path
           name: id
-          type: string
+          required: true
+          schema:
+            type: string
           description: user Id
       requestBody:
         required: true
@@ -617,17 +634,17 @@ paths:
           application/json:
             schema:
               type: object
+              required:
+                - username
+                - email
+                - password
               properties:
                 email:
                   type: string
-                  required: true
                 username:
                   type: string
-                  required: true
                 password:
                   type: string
-                  required: true
-
             example:
               username: foo
               email: foo@strapi.io
@@ -666,13 +683,19 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Error'
-
     delete:
       tags:
         - Users-Permissions - Users & Roles
       summary: Delete a user
+      parameters:
+        - in: path
+          name: id
+          required: true
+          schema:
+            type: string
+          description: user Id
       responses:
-        200:
+        '200':
           description: Returns deleted user info
           content:
             application/json:
@@ -817,6 +840,10 @@ components:
                   policy:
                     type: string
 
+  parameters:
+  responses:
+  examples:
+  requestBodies:
     Users-Permissions-RoleRequest:
       required: true
       content:
@@ -841,8 +868,3 @@ components:
                   controllerA:
                     find:
                       enabled: true
-
-  parameters:
-  responses:
-  examples:
-  requestBodies:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.4.0-alpha.0",
+  "version": "4.4.0-beta.3",
   "description": "Protect your API with a full-authentication process based on JWT",
   "repository": {
     "type": "git",
@@ -27,8 +27,8 @@
     "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll"
   },
   "dependencies": {
-    "@strapi/helper-plugin": "4.4.0-alpha.0",
-    "@strapi/utils": "4.4.0-alpha.0",
+    "@strapi/helper-plugin": "4.4.0-beta.3",
+    "@strapi/utils": "4.4.0-beta.3",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -54,7 +54,7 @@
     "react-test-renderer": "^17.0.2"
   },
   "engines": {
-    "node": ">=14.19.1 <=16.x.x",
+    "node": ">=14.19.1 <=18.x.x",
     "npm": ">=6.0.0"
   },
   "strapi": {
@@ -64,5 +64,5 @@
     "required": true,
     "kind": "plugin"
   },
-  "gitHead": "fc78298ae4f9b247d636beda568734d5f8ed7b3e"
+  "gitHead": "baad89e67844d972ef53a6f1b0839a361bf968c0"
 }

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

@@ -147,7 +147,7 @@ module.exports = {
         .query('plugin::users-permissions.user')
         .findOne({ where: { username } });
 
-      if (userWithSameUsername && userWithSameUsername.id != id) {
+      if (userWithSameUsername && _.toString(userWithSameUsername.id) !== _.toString(id)) {
         throw new ApplicationError('Username already taken');
       }
     }
@@ -157,7 +157,7 @@ module.exports = {
         .query('plugin::users-permissions.user')
         .findOne({ where: { email: _.toLower(email) } });
 
-      if (userWithSameEmail && userWithSameEmail.id != id) {
+      if (userWithSameEmail && _.toString(userWithSameEmail.id) !== _.toString(id)) {
         throw new ApplicationError('Email already taken');
       }
       body.email = _.toLower(body.email);

package/server/controllers/user.js

@@ -105,7 +105,7 @@ module.exports = {
         .query('plugin::users-permissions.user')
         .findOne({ where: { username } });
 
-      if (userWithSameUsername && userWithSameUsername.id != id) {
+      if (userWithSameUsername && _.toString(userWithSameUsername.id) !== _.toString(id)) {
         throw new ApplicationError('Username already taken');
       }
     }
@@ -115,7 +115,7 @@ module.exports = {
         .query('plugin::users-permissions.user')
         .findOne({ where: { email: email.toLowerCase() } });
 
-      if (userWithSameEmail && userWithSameEmail.id != id) {
+      if (userWithSameEmail && _.toString(userWithSameEmail.id) !== _.toString(id)) {
         throw new ApplicationError('Email already taken');
       }
       ctx.request.body.email = ctx.request.body.email.toLowerCase();