yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14072 from strapi/fix/lost-code-merge

Browse Source 
Put missing code back
This commit is contained in:
Alexandre BODIN 2022-08-11 10:15:31 +02:00 committed by GitHub
commit b0da408fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/plugins/users-permissions/server/controllers/auth.js
View File

@ -91,6 +91,18 @@ module.exports = {
user: await sanitizeUser(user, ctx), user: await sanitizeUser(user, ctx),
}); });
} }
// Connect the user with the third-party provider.
try {
const user = await getService('providers').connect(provider, ctx.query);
return ctx.send({
jwt: getService('jwt').issue({ id: user.id }),
user: await sanitizeUser(user, ctx),
});
} catch (error) {
throw new ApplicationError(error.message);
}
}, },
async changePassword(ctx) { async changePassword(ctx) {