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

Fix url join

Browse Source
This commit is contained in:
Alexandre Bodin 2021-11-29 10:41:26 +01:00
parent fb7ae11a0d
commit 1d6e3ef529
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/plugins/users-permissions/package.json
View File

@ -30,6 +30,7 @@
"react-router-dom": "5.2.0", "react-router-dom": "5.2.0",
"redux-saga": "^0.16.0", "redux-saga": "^0.16.0",
"request": "^2.83.0", "request": "^2.83.0",
"url-join": "4.0.1",
"uuid": "^3.1.0" "uuid": "^3.1.0"
}, },
"devDependencies": { "devDependencies": {

7
packages/plugins/users-permissions/server/services/providers.js
View File

@ -7,6 +7,7 @@
// Public node modules. // Public node modules.
const _ = require('lodash'); const _ = require('lodash');
const jwt = require('jsonwebtoken'); const jwt = require('jsonwebtoken');
const urlJoin = require('url-join');
const { getAbsoluteServerUrl } = require('@strapi/utils'); const { getAbsoluteServerUrl } = require('@strapi/utils');
@ -167,7 +168,7 @@ module.exports = ({ strapi }) => {
return callback(null, { return callback(null, {
username: userbody.login, username: userbody.login,
email: Array.isArray(emailsbody) email: Array.isArray(emailsbody)
? emailsbody.find(email => email.primary === true).email ? emailsbody.find((email) => email.primary === true).email
: null, : null,
}); });
}); });
@ -550,7 +551,7 @@ module.exports = ({ strapi }) => {
} }
if ( if (
!_.isEmpty(_.find(users, user => user.provider !== provider)) && !_.isEmpty(_.find(users, (user) => user.provider !== provider)) &&
advanced.unique_email advanced.unique_email
) { ) {
return resolve([ return resolve([
@ -588,7 +589,7 @@ module.exports = ({ strapi }) => {
const buildRedirectUri = (provider = '') => { const buildRedirectUri = (provider = '') => {
const apiPrefix = strapi.config.get('api.rest.prefix'); const apiPrefix = strapi.config.get('api.rest.prefix');
return `${getAbsoluteServerUrl(strapi.config)}/${apiPrefix}/connect/${provider}/callback`; return urlJoin(getAbsoluteServerUrl(strapi.config), apiPrefix, 'connect', provider, 'callback');
}; };
return { return {

2
yarn.lock
View File

@ -24485,7 +24485,7 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
url-join@^4.0.0: url-join@4.0.1, url-join@^4.0.0:
version "4.0.1" version "4.0.1"
resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7" resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.1.tgz#b642e21a2646808ffa178c4c5fda39844e12cde7"
integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA== integrity sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA==