@strapi/plugin-users-permissions 4.0.0-next.1 → 4.0.0-next.13

package/server/routes/content-api/permissions.js

@@ -0,0 +1,9 @@
+'use strict';
+
+module.exports = [
+  {
+    method: 'GET',
+    path: '/permissions',
+    handler: 'permissions.getPermissions',
+  },
+];

package/server/routes/content-api/role.js

@@ -0,0 +1,29 @@
+'use strict';
+
+module.exports = [
+  {
+    method: 'GET',
+    path: '/roles/:id',
+    handler: 'role.getRole',
+  },
+  {
+    method: 'GET',
+    path: '/roles',
+    handler: 'role.getRoles',
+  },
+  {
+    method: 'POST',
+    path: '/roles',
+    handler: 'role.createRole',
+  },
+  {
+    method: 'PUT',
+    path: '/roles/:role',
+    handler: 'role.updateRole',
+  },
+  {
+    method: 'DELETE',
+    path: '/roles/:role',
+    handler: 'role.deleteRole',
+  },
+];

package/server/routes/content-api/user.js

@@ -0,0 +1,61 @@
+'use strict';
+
+module.exports = [
+  {
+    method: 'GET',
+    path: '/users/count',
+    handler: 'user.count',
+    config: {
+      prefix: '',
+    },
+  },
+  {
+    method: 'GET',
+    path: '/users',
+    handler: 'user.find',
+    config: {
+      auth: {},
+      prefix: '',
+    },
+  },
+  {
+    method: 'GET',
+    path: '/users/me',
+    handler: 'user.me',
+    config: {
+      prefix: '',
+    },
+  },
+  {
+    method: 'GET',
+    path: '/users/:id',
+    handler: 'user.findOne',
+    config: {
+      prefix: '',
+    },
+  },
+  {
+    method: 'POST',
+    path: '/users',
+    handler: 'user.create',
+    config: {
+      prefix: '',
+    },
+  },
+  {
+    method: 'PUT',
+    path: '/users/:id',
+    handler: 'user.update',
+    config: {
+      prefix: '',
+    },
+  },
+  {
+    method: 'DELETE',
+    path: '/users/:id',
+    handler: 'user.destroy',
+    config: {
+      prefix: '',
+    },
+  },
+];

package/server/routes/index.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+  admin: require('./admin'),
+  'content-api': require('./content-api'),
+};

package/{config → server}/schema.graphql.js

@@ -72,29 +72,31 @@ module.exports = {
   resolver: {
     Query: {
       me: {
-        resolver: 'plugins::users-permissions.user.me',
+        resolver: 'plugin::users-permissions.user.me',
       },
       role: {
-        resolverOf: 'plugins::users-permissions.users-permissions.getRole',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.users-permissions.getRole',
+        async resolver(obj, options, { context }) {
           context.params = { ...context.params, ...options.input };
 
-          await strapi.plugins['users-permissions'].controllers['users-permissions'].getRole(
-            context
-          );
+          await strapi
+            .plugin('users-permissions')
+            .controller('users-permissions')
+            .getRole(context);
 
           return context.body.role;
         },
       },
       roles: {
         description: `Retrieve all the existing roles. You can't apply filters on this query.`,
-        resolverOf: 'plugins::users-permissions.users-permissions.getRoles', // Apply the `getRoles` permissions on the resolver.
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.users-permissions.getRoles', // Apply the `getRoles` permissions on the resolver.
+        async resolver(obj, options, { context }) {
           context.params = { ...context.params, ...options.input };
 
-          await strapi.plugins['users-permissions'].controllers['users-permissions'].getRoles(
-            context
-          );
+          await strapi
+            .plugin('users-permissions')
+            .controller('users-permissions')
+            .getRoles(context);
 
           return context.body.roles;
         },
@@ -103,87 +105,102 @@ module.exports = {
     Mutation: {
       createRole: {
         description: 'Create a new role',
-        resolverOf: 'plugins::users-permissions.users-permissions.createRole',
-        resolver: async (obj, options, { context }) => {
-          await strapi.plugins['users-permissions'].controllers['users-permissions'].createRole(
-            context
-          );
+        resolverOf: 'plugin::users-permissions.users-permissions.createRole',
+        async resolver(obj, options, { context }) {
+          await strapi
+            .plugin('users-permissions')
+            .controller('users-permissions')
+            .createRole(context);
 
           return { ok: true };
         },
       },
       updateRole: {
         description: 'Update an existing role',
-        resolverOf: 'plugins::users-permissions.users-permissions.updateRole',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.users-permissions.updateRole',
+        async resolver(obj, options, { context }) {
           context.params = { ...context.params, ...options.input };
           context.params.role = context.params.id;
 
-          await strapi.plugins['users-permissions'].controllers['users-permissions'].updateRole(
-            context
-          );
+          await strapi
+            .plugin('users-permissions')
+            .controller('users-permissions')
+            .updateRole(context);
 
           return { ok: true };
         },
       },
       deleteRole: {
         description: 'Delete an existing role',
-        resolverOf: 'plugins::users-permissions.users-permissions.deleteRole',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.users-permissions.deleteRole',
+        async resolver(obj, options, { context }) {
           context.params = { ...context.params, ...options.input };
           context.params.role = context.params.id;
 
-          await strapi.plugins['users-permissions'].controllers['users-permissions'].deleteRole(
-            context
-          );
+          await strapi
+            .plugin('users-permissions')
+            .controller('users-permissions')
+            .deleteRole(context);
 
           return { ok: true };
         },
       },
       createUser: {
         description: 'Create a new user',
-        resolverOf: 'plugins::users-permissions.user.create',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.user.create',
+        async resolver(obj, options, { context }) {
           context.params = _.toPlainObject(options.input.where);
           context.request.body = _.toPlainObject(options.input.data);
 
-          await strapi.plugins['users-permissions'].controllers.user.create(context);
+          await strapi
+            .plugin('users-permissions')
+            .controller('user')
+            .create(context);
 
           return {
-            user: context.body.toJSON ? context.body.toJSON() : context.body,
+            user: context.body,
           };
         },
       },
       updateUser: {
         description: 'Update an existing user',
-        resolverOf: 'plugins::users-permissions.user.update',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.user.update',
+        async resolver(obj, options, { context }) {
           context.params = _.toPlainObject(options.input.where);
           context.request.body = _.toPlainObject(options.input.data);
 
-          await strapi.plugins['users-permissions'].controllers.user.update(context);
+          await strapi
+            .plugin('users-permissions')
+            .controller('user')
+            .update(context);
 
           return {
-            user: context.body.toJSON ? context.body.toJSON() : context.body,
+            user: context.body,
           };
         },
       },
       deleteUser: {
         description: 'Delete an existing user',
-        resolverOf: 'plugins::users-permissions.user.destroy',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.user.destroy',
+        async resolver(obj, options, { context }) {
           // Set parameters to context.
           context.params = _.toPlainObject(options.input.where);
           context.request.body = _.toPlainObject(options.input.data);
 
           // Retrieve user to be able to return it because
           // Bookshelf doesn't return the row once deleted.
-          await strapi.plugins['users-permissions'].controllers.user.findOne(context);
+          await strapi
+            .plugin('users-permissions')
+            .controller('user')
+            .findOne(context);
           // Assign result to user.
-          const user = context.body.toJSON ? context.body.toJSON() : context.body;
+          const user = context.body;
 
           // Run destroy query.
-          await strapi.plugins['users-permissions'].controllers.user.destroy(context);
+          await strapi
+            .plugin('users-permissions')
+            .controller('user')
+            .destroy(context);
 
           return {
             user,
@@ -192,12 +209,16 @@ module.exports = {
       },
       register: {
         description: 'Register a user',
-        resolverOf: 'plugins::users-permissions.auth.register',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.auth.register',
+        async resolver(obj, options, { context }) {
           context.request.body = _.toPlainObject(options.input);
 
-          await strapi.plugins['users-permissions'].controllers.auth.register(context);
-          let output = context.body.toJSON ? context.body.toJSON() : context.body;
+          await strapi
+            .plugin('users-permissions')
+            .controller('auth')
+            .register(context);
+
+          let output = context.body;
 
           checkBadRequest(output);
           return {
@@ -207,16 +228,20 @@ module.exports = {
         },
       },
       login: {
-        resolverOf: 'plugins::users-permissions.auth.callback',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.auth.callback',
+        async resolver(obj, options, { context }) {
           context.params = {
             ...context.params,
             provider: options.input.provider,
           };
           context.request.body = _.toPlainObject(options.input);
 
-          await strapi.plugins['users-permissions'].controllers.auth.callback(context);
-          let output = context.body.toJSON ? context.body.toJSON() : context.body;
+          await strapi
+            .plugin('users-permissions')
+            .controller('auth')
+            .callback(context);
+
+          let output = context.body;
 
           checkBadRequest(output);
           return {
@@ -227,12 +252,16 @@ module.exports = {
       },
       forgotPassword: {
         description: 'Request a reset password token',
-        resolverOf: 'plugins::users-permissions.auth.forgotPassword',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.auth.forgotPassword',
+        async resolver(obj, options, { context }) {
           context.request.body = _.toPlainObject(options);
 
-          await strapi.plugins['users-permissions'].controllers.auth.forgotPassword(context);
-          let output = context.body.toJSON ? context.body.toJSON() : context.body;
+          await strapi
+            .plugin('users-permissions')
+            .controller('auth')
+            .forgotPassword(context);
+
+          let output = context.body;
 
           checkBadRequest(output);
 
@@ -243,12 +272,16 @@ module.exports = {
       },
       resetPassword: {
         description: 'Reset user password. Confirm with a code (resetToken from forgotPassword)',
-        resolverOf: 'plugins::users-permissions.auth.resetPassword',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.auth.resetPassword',
+        async resolver(obj, options, { context }) {
           context.request.body = _.toPlainObject(options);
 
-          await strapi.plugins['users-permissions'].controllers.auth.resetPassword(context);
-          let output = context.body.toJSON ? context.body.toJSON() : context.body;
+          await strapi
+            .plugin('users-permissions')
+            .controller('auth')
+            .resetPassword(context);
+
+          let output = context.body;
 
           checkBadRequest(output);
 
@@ -260,16 +293,16 @@ module.exports = {
       },
       emailConfirmation: {
         description: 'Confirm an email users email address',
-        resolverOf: 'plugins::users-permissions.auth.emailConfirmation',
-        resolver: async (obj, options, { context }) => {
+        resolverOf: 'plugin::users-permissions.auth.emailConfirmation',
+        async resolver(obj, options, { context }) {
           context.query = _.toPlainObject(options);
 
-          await strapi.plugins['users-permissions'].controllers.auth.emailConfirmation(
-            context,
-            null,
-            true
-          );
-          let output = context.body.toJSON ? context.body.toJSON() : context.body;
+          await strapi
+            .plugin('users-permissions')
+            .controller('auth')
+            .emailConfirmation(context, null, true);
+
+          let output = context.body;
 
           checkBadRequest(output);
 

package/server/services/index.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const jwt = require('./jwt');
+const providers = require('./providers');
+const user = require('./user');
+const role = require('./role');
+const usersPermissions = require('./users-permissions');
+
+module.exports = {
+  jwt,
+  providers,
+  role,
+  user,
+  'users-permissions': usersPermissions,
+};

package/{services → server/services}/jwt.js

@@ -9,7 +9,7 @@
 const _ = require('lodash');
 const jwt = require('jsonwebtoken');
 
-module.exports = {
+module.exports = ({ strapi }) => ({
   getToken(ctx) {
     const params = _.assign({}, ctx.request.body, ctx.request.query);
 
@@ -39,27 +39,25 @@ module.exports = {
   },
 
   issue(payload, jwtOptions = {}) {
-    _.defaults(jwtOptions, strapi.plugins['users-permissions'].config.jwt);
+    _.defaults(jwtOptions, strapi.config.get('plugin.users-permissions.jwt'));
     return jwt.sign(
       _.clone(payload.toJSON ? payload.toJSON() : payload),
-      _.get(strapi.plugins, ['users-permissions', 'config', 'jwtSecret']),
+      strapi.config.get('plugin.users-permissions.jwtSecret'),
       jwtOptions
     );
   },
 
   verify(token) {
     return new Promise(function(resolve, reject) {
-      jwt.verify(
-        token,
-        _.get(strapi.plugins, ['users-permissions', 'config', 'jwtSecret']),
-        {},
-        function(err, tokenPayload = {}) {
-          if (err) {
-            return reject(new Error('Invalid token.'));
-          }
-          resolve(tokenPayload);
+      jwt.verify(token, strapi.config.get('plugin.users-permissions.jwtSecret'), {}, function(
+        err,
+        tokenPayload = {}
+      ) {
+        if (err) {
+          return reject(new Error('Invalid token.'));
         }
-      );
+        resolve(tokenPayload);
+      });
     });
   },
-};
+});