yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-03 11:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Alexandre Bodin 2020-04-16 14:05:23 +02:00
commit 94dbf10adc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-plugin-users-permissions/config/schema.graphql.js
View File

@ -249,6 +249,7 @@ module.exports = {
await strapi.plugins['users-permissions'].controllers.auth.emailConfirmation( await strapi.plugins['users-permissions'].controllers.auth.emailConfirmation(
context, context,
null,
true true
); );
let output = context.body.toJSON ? context.body.toJSON() : context.body; let output = context.body.toJSON ? context.body.toJSON() : context.body;

2
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -568,7 +568,7 @@ module.exports = {
} }
}, },
async emailConfirmation(ctx, returnUser) { async emailConfirmation(ctx, next, returnUser) {
const params = ctx.query; const params = ctx.query;
const decodedToken = await strapi.plugins['users-permissions'].services.jwt.verify( const decodedToken = await strapi.plugins['users-permissions'].services.jwt.verify(