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

Update branch

Browse Source 
Merge branch 'auth-provider/configs' of github.com:strapi/strapi into auth-provider/configs-front
This commit is contained in:
cyril lopez 2018-01-23 15:58:48 +01:00
commit db23c22ee4
20 changed files with 98 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/strapi-admin/admin/src/config/manifest.json Normal file
View File

File diff suppressed because one or more lines are too long

2
packages/strapi-bookshelf/package.json
View File

@ -55,4 +55,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-ejs/package.json
View File

@ -46,4 +46,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-api/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-controller/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-model/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-new/package.json
View File

@ -48,4 +48,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-plugin/package.json
View File

@ -44,4 +44,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-policy/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

2
packages/strapi-generate-service/package.json
View File

@ -43,4 +43,4 @@
"npm": ">= 5.3.0"
},
"license": "MIT"
}
}

44
packages/strapi-plugin-content-manager/package.json
View File

@ -2,27 +2,6 @@
"name": "strapi-plugin-content-manager",
"version": "3.0.0-alpha.8.3",
"description": "A powerful UI to easily manage your data.",
"engines": {
"node": ">= 8.0.0",
"npm": ">= 5.3.0"
},
"author": {
"email": "hi@strapi.io",
"name": "Strapi team",
"url": "http://strapi.io"
},
"maintainers": [
{
"name": "Strapi team",
"email": "hi@strapi.io",
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"license": "MIT",
"strapi": {
"name": "Content Manager",
"icon": "plug",
@ -46,5 +25,26 @@
"devDependencies": {
"react-select": "^1.0.0-rc.5",
"strapi-helper-plugin": "3.0.0-alpha.8.3"
}
},
"author": {
"name": "Strapi team",
"email": "hi@strapi.io",
"url": "http://strapi.io"
},
"maintainers": [
{
"name": "Strapi team",
"email": "hi@strapi.io",
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"engines": {
"node": ">= 8.0.0",
"npm": ">= 3.0.0"
},
"license": "MIT"
}

4
packages/strapi-plugin-content-type-builder/package.json
View File

@ -42,6 +42,10 @@
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"engines": {
"node": ">= 8.0.0",
"npm": ">= 3.0.0"

16
packages/strapi-plugin-email/package.json
View File

@ -29,17 +29,21 @@
"strapi-helper-plugin": "3.0.0-alpha.8.3"
},
"author": {
"name": "A Strapi developer",
"email": "",
"url": ""
"name": "Strapi team",
"email": "hi@strapi.io",
"url": "http://strapi.io"
},
"maintainers": [
{
"name": "A Strapi developer",
"email": "",
"url": ""
"name": "Strapi team",
"email": "hi@strapi.io",
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"engines": {
"node": ">= 7.0.0",
"npm": ">= 3.0.0"

4
packages/strapi-plugin-settings-manager/package.json
View File

@ -39,6 +39,10 @@
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"engines": {
"node": ">= 8.0.0",
"npm": ">= 3.0.0"

13
packages/strapi-plugin-users-permissions/config/functions/bootstrap.js vendored
View File

@ -55,17 +55,18 @@ module.exports = cb => {
icon: 'github',
key: '',
secret: '',
callback: '/auth/github/callback'
redirect_uri: '/auth/google/callback',
scope: [
'user',
'user:email'
]
},
linkedin2: {
twitter: {
enabled: false,
icon: 'linkedin',
key: '',
secret: '',
callback: '/auth/linkedin2/callback',
custom_params: {
'state': ''
}
callback: '/auth/twitter/callback'
}
};

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

@ -13,7 +13,6 @@ module.exports = {
callback: async (ctx) => {
const provider = ctx.params.provider || 'local';
const params = ctx.request.body;
const access_token = ctx.query.access_token;
if (provider === 'local') {
if (!_.get(strapi.plugins['users-permissions'].config.grant['email'], 'enabled') && !ctx.request.admin) {
@ -66,7 +65,7 @@ module.exports = {
}
} else {
// Connect the user thanks to the third-party provider.
const [user, error] = await strapi.plugins['users-permissions'].services.providers.connect(provider, access_token);
const [user, error] = await strapi.plugins['users-permissions'].services.providers.connect(provider, ctx.query);
if (error) {
return ctx.badRequest(null, (error === 'array') ? (ctx.request.admin ? error[0] : error[1]) : error);

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

@ -7,7 +7,6 @@
// Public node modules.
const _ = require('lodash');
const Grant = require('grant-koa');
const mount = require('koa-mount');
module.exports = strapi => {
return {
@ -40,7 +39,7 @@ module.exports = strapi => {
}
});
strapi.app.use(mount(grant));
strapi.app.use(strapi.koaMiddlewares.compose(grant.middleware));
cb();
}

7
packages/strapi-plugin-users-permissions/package.json
View File

@ -1,7 +1,7 @@
{
"name": "strapi-plugin-users-permissions",
"version": "3.0.0-alpha.8.3",
"description": "This is the description of the plugin.",
"description": "Protect your API with a full-authentication process based on JWT",
"strapi": {
"name": "Auth & Permissions",
"icon": "users",
@ -27,7 +27,6 @@
"grant-koa": "^3.8.1",
"jsonwebtoken": "^8.1.0",
"koa": "^2.1.0",
"koa-mount": "^3.0.0",
"purest": "^2.0.1",
"request": "^2.83.0",
"uuid": "^3.1.0"
@ -47,6 +46,10 @@
"url": "http://strapi.io"
}
],
"repository": {
"type": "git",
"url": "git://github.com/strapi/strapi.git"
},
"engines": {
"node": ">= 7.0.0",
"npm": ">= 3.0.0"

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

@ -6,6 +6,7 @@
// Public node modules.
const _ = require('lodash');
const request = require('request');
// Purest strategies.
const Purest = require('purest');
@ -27,8 +28,8 @@ const google = new Purest({
provider: 'google'
});
const linkedin = new Purest({
provider: 'linkedin'
const twitter = new Purest({
provider: 'twitter'
});
/**
@ -41,7 +42,9 @@ const linkedin = new Purest({
* @return {*}
*/
exports.connect = (provider, access_token) => {
exports.connect = (provider, query) => {
const access_token = query.access_token || query.code || query.oauth_token;
return new Promise((resolve, reject) => {
if (!access_token) {
reject(null, {
@ -49,7 +52,7 @@ exports.connect = (provider, access_token) => {
});
} else {
// Get the profile.
getProfile(provider, access_token, (err, profile) => {
getProfile(provider, query, (err, profile) => {
if (err) {
reject(err);
} else {
@ -107,8 +110,9 @@ exports.connect = (provider, access_token) => {
* @param {Function} callback
*/
const getProfile = (provider, access_token, callback) => {
let fields;
const getProfile = (provider, query, callback) => {
const access_token = query.access_token || query.code || query.oauth_token;
switch (provider) {
case 'facebook':
facebook.query().get('me?fields=name,email').auth(access_token).request((err, res, body) => {
@ -135,28 +139,34 @@ const getProfile = (provider, access_token, callback) => {
});
break;
case 'github':
github.query().get('user').auth(access_token).request((err, res, body) => {
if (err) {
callback(err);
} else {
callback(null, {
username: body.login,
email: body.email
});
request.post({
url: 'https://github.com/login/oauth/access_token',
form: {
client_id: strapi.plugins['users-permissions'].config.grant.github.key,
client_secret: strapi.plugins['users-permissions'].config.grant.github.secret,
code: access_token
}
}, (err, res, body) => {
github.query().get('user').auth(body.split('&')[0].split('=')[1]).request((err, res, body) => {
if (err) {
callback(err);
} else {
callback(null, {
username: body.login,
email: body.email
});
}
});
});
break;
case 'linkedin2':
fields = [
'public-profile-url', 'email-address'
];
linkedin.query().select('people/~:(' + fields.join() + ')?format=json').auth(access_token).request((err, res, body) => {
case 'twitter':
twitter.query().get('account/verify_credentials').auth(access_token, query.access_secret).qs({screen_name: query['raw[screen_name]']}).qs({include_email: 'true'}).request((err, res, body) => {
if (err) {
callback(err);
} else {
callback(null, {
username: substr(body.publicProfileUrl.lastIndexOf('/') + 1),
email: body.emailAddress
username: body.screen_name,
email: body.email
});
}
});

6
packages/strapi/lib/core/middlewares.js
View File

@ -110,7 +110,7 @@ module.exports = function() {
return reject(err);
}
mountMiddlewares.call(this, files, cwd)(resolve, reject);
mountMiddlewares.call(this, files, cwd, true)(resolve, reject);
}
);
})
@ -154,13 +154,13 @@ const requireMiddlewares = function (files, cwd) {
);
};
const mountMiddlewares = function (files, cwd) {
const mountMiddlewares = function (files, cwd, isPlugin) {
return (resolve, reject) =>
parallel(
files.map(p => cb => {
const folders = p.replace(/^.\/node_modules\/strapi-middleware-/, './')
.split('/');
const name = folders[folders.length - 2];
const name = isPlugin ? folders[folders.length - 2] : folders[1];
this.middleware[name] = this.middleware[name] || {
loaded: false