TerenceLiu
/
overleaf-sso
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issues of path join

This commit is contained in:
sparkcyf 2022-06-11 10:03:45 +08:00
parent 4841d4424d
commit a67856e7a6
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ldap-overleaf-sl/sharelatex/AuthenticationController.js
View File

@ -300,12 +300,7 @@ const AuthenticationController = {
querystring.stringify({ querystring.stringify({
client_id: process.env.OAUTH_CLIENT_ID, client_id: process.env.OAUTH_CLIENT_ID,
response_type: "code", response_type: "code",
redirect_uri: Path.join( redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"),
new URL(process.env.OAUTH_AUTH_URL).host ===
new URL(process.env.SHARELATEX_SITE_URL).host
? ""
: process.env.SHARELATEX_SITE_URL,
"", "/oauth/callback"),
})); }));
}, },
@ -318,12 +313,7 @@ const AuthenticationController = {
params.append('client_id', process.env.OAUTH_CLIENT_ID) params.append('client_id', process.env.OAUTH_CLIENT_ID)
params.append('client_secret', process.env.OAUTH_CLIENT_SECRET) params.append('client_secret', process.env.OAUTH_CLIENT_SECRET)
params.append("code", code) params.append("code", code)
params.append('redirect_uri', Path.join( params.append('redirect_uri', (process.env.SHARELATEX_SITE_URL + "/oauth/callback"))
new URL(process.env.OAUTH_AUTH_URL).host ===
new URL(process.env.SHARELATEX_SITE_URL).host
? ""
: process.env.SHARELATEX_SITE_URL,
"", "/oauth/callback"))
json_body = { json_body = {
@ -331,12 +321,7 @@ const AuthenticationController = {
client_id: process.env.OAUTH_CLIENT_ID, client_id: process.env.OAUTH_CLIENT_ID,
client_secret: process.env.OAUTH_CLIENT_SECRET, client_secret: process.env.OAUTH_CLIENT_SECRET,
"code": code, "code": code,
redirect_uri: Path.join( redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"),
new URL(process.env.OAUTH_AUTH_URL).host ===
new URL(process.env.SHARELATEX_SITE_URL).host
? ""
: process.env.SHARELATEX_SITE_URL,
"", "/oauth/callback"),
} }
axios.post(process.env.OAUTH_ACCESS_URL, params, { axios.post(process.env.OAUTH_ACCESS_URL, params, {
@ -346,9 +331,9 @@ const AuthenticationController = {
} }
}).then(access_res => { }).then(access_res => {
// console.log("respondis " + JSON.stringify(access_res.data)) // console.log("respond is " + JSON.stringify(access_res.data))
// console.log("authorization_bearer_is " + authorization_bearer) // console.log("authorization_bearer_is " + authorization_bearer)
authorization_bearer = "Bearer " + JSON.stringify(access_res.data.access_token).replace(/\"/g, "") authorization_bearer = "Bearer " + access_res.data.access_token
let axios_get_config = { let axios_get_config = {
headers: { headers: {
@ -359,7 +344,7 @@ const AuthenticationController = {
} }
axios.get(process.env.OAUTH_USER_URL, axios_get_config).then(info_res => { axios.get(process.env.OAUTH_USER_URL, axios_get_config).then(info_res => {
console.log("oauth_user: ", JSON.stringify(info_res.data)); // console.log("oauth_user: ", JSON.stringify(info_res.data));
if (info_res.data.err) { if (info_res.data.err) {
res.json({message: info_res.data.err}); res.json({message: info_res.data.err});
} else { } else {