yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 23:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix provider auth

Browse Source
This commit is contained in:
cyril lopez 2018-01-23 17:25:58 +01:00
parent 06ab6ba8cd
commit 9e5d0e991b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-plugin-users-permissions/middlewares/provider/index.js
View File

@ -26,7 +26,7 @@ module.exports = strapi => {
strapi.app.use(async (ctx, next) => {
if (_.startsWith(ctx.request.url, '/connect') && ctx.request.method === 'GET') {
const provider = _.last(ctx.request.url.split('/'));
const provider = ctx.request.url.split('/')[2];
const config = strapi.plugins['users-permissions'].config.grant[provider];
if (_.get(config, 'enabled')) {

2
packages/strapi-plugin-users-permissions/services/Providers.js
View File

@ -69,7 +69,7 @@ exports.connect = (provider, query) => {
}
if (user && user.provider === provider) {
return resolve([null, [{ messages: [{ id: 'Auth.form.error.email.taken' }] }], 'Email is already taken.']);
return resolve([user, null]);
}
if (user && user.provider !== provider && strapi.plugins['users-permissions'].config.advanced.unique_email) {