Loading ldap-overleaf-sl/sharelatex/AuthenticationController.js +5 −20 Changes for ldap-overleaf-sl/sharelatex/AuthenticationController.js: 5 added lines, 20 removed lines. Original line number Diff line number Diff line Loading @@ -300,12 +300,7 @@ const AuthenticationController = { querystring.stringify({ client_id: process.env.OAUTH_CLIENT_ID, response_type: "code", redirect_uri: Path.join( new URL(process.env.OAUTH_AUTH_URL).host === new URL(process.env.SHARELATEX_SITE_URL).host ? "" : process.env.SHARELATEX_SITE_URL, "", "/oauth/callback"), redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"), })); }, Loading @@ -318,12 +313,7 @@ const AuthenticationController = { params.append('client_id', process.env.OAUTH_CLIENT_ID) params.append('client_secret', process.env.OAUTH_CLIENT_SECRET) params.append("code", code) params.append('redirect_uri', Path.join( new URL(process.env.OAUTH_AUTH_URL).host === new URL(process.env.SHARELATEX_SITE_URL).host ? "" : process.env.SHARELATEX_SITE_URL, "", "/oauth/callback")) params.append('redirect_uri', (process.env.SHARELATEX_SITE_URL + "/oauth/callback")) json_body = { Loading @@ -331,12 +321,7 @@ const AuthenticationController = { client_id: process.env.OAUTH_CLIENT_ID, client_secret: process.env.OAUTH_CLIENT_SECRET, "code": code, redirect_uri: Path.join( new URL(process.env.OAUTH_AUTH_URL).host === new URL(process.env.SHARELATEX_SITE_URL).host ? "" : process.env.SHARELATEX_SITE_URL, "", "/oauth/callback"), redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"), } axios.post(process.env.OAUTH_ACCESS_URL, params, { Loading @@ -348,7 +333,7 @@ const AuthenticationController = { // console.log("respond is " + JSON.stringify(access_res.data)) // 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 = { headers: { Loading @@ -359,7 +344,7 @@ const AuthenticationController = { } 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) { res.json({message: info_res.data.err}); } else { Loading Loading
ldap-overleaf-sl/sharelatex/AuthenticationController.js +5 −20 Changes for ldap-overleaf-sl/sharelatex/AuthenticationController.js: 5 added lines, 20 removed lines. Original line number Diff line number Diff line Loading @@ -300,12 +300,7 @@ const AuthenticationController = { querystring.stringify({ client_id: process.env.OAUTH_CLIENT_ID, response_type: "code", redirect_uri: Path.join( new URL(process.env.OAUTH_AUTH_URL).host === new URL(process.env.SHARELATEX_SITE_URL).host ? "" : process.env.SHARELATEX_SITE_URL, "", "/oauth/callback"), redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"), })); }, Loading @@ -318,12 +313,7 @@ const AuthenticationController = { params.append('client_id', process.env.OAUTH_CLIENT_ID) params.append('client_secret', process.env.OAUTH_CLIENT_SECRET) params.append("code", code) params.append('redirect_uri', Path.join( new URL(process.env.OAUTH_AUTH_URL).host === new URL(process.env.SHARELATEX_SITE_URL).host ? "" : process.env.SHARELATEX_SITE_URL, "", "/oauth/callback")) params.append('redirect_uri', (process.env.SHARELATEX_SITE_URL + "/oauth/callback")) json_body = { Loading @@ -331,12 +321,7 @@ const AuthenticationController = { client_id: process.env.OAUTH_CLIENT_ID, client_secret: process.env.OAUTH_CLIENT_SECRET, "code": code, redirect_uri: Path.join( new URL(process.env.OAUTH_AUTH_URL).host === new URL(process.env.SHARELATEX_SITE_URL).host ? "" : process.env.SHARELATEX_SITE_URL, "", "/oauth/callback"), redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"), } axios.post(process.env.OAUTH_ACCESS_URL, params, { Loading @@ -348,7 +333,7 @@ const AuthenticationController = { // console.log("respond is " + JSON.stringify(access_res.data)) // 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 = { headers: { Loading @@ -359,7 +344,7 @@ const AuthenticationController = { } 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) { res.json({message: info_res.data.err}); } else { Loading