From 138d73760c0e175dd626d7590d2bd674c80eca47 Mon Sep 17 00:00:00 2001 From: sparkcyf Date: Sun, 12 Jun 2022 01:36:59 +0800 Subject: [PATCH] fix the login error when user has different firstname and lastname between sharelatex and oauth2 provider --- .../sharelatex/AuthenticationController.js | 14 +++++++------- .../sharelatex/AuthenticationManager.js | 8 +++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ldap-overleaf-sl/sharelatex/AuthenticationController.js b/ldap-overleaf-sl/sharelatex/AuthenticationController.js index 85ba473..fb95299 100644 --- a/ldap-overleaf-sl/sharelatex/AuthenticationController.js +++ b/ldap-overleaf-sl/sharelatex/AuthenticationController.js @@ -316,13 +316,13 @@ const AuthenticationController = { params.append('redirect_uri', (process.env.SHARELATEX_SITE_URL + "/oauth/callback")) - json_body = { - "grant_type": "authorization_code", - client_id: process.env.OAUTH_CLIENT_ID, - client_secret: process.env.OAUTH_CLIENT_SECRET, - "code": code, - redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"), - } + // json_body = { + // "grant_type": "authorization_code", + // client_id: process.env.OAUTH_CLIENT_ID, + // client_secret: process.env.OAUTH_CLIENT_SECRET, + // "code": code, + // redirect_uri: (process.env.SHARELATEX_SITE_URL + "/oauth/callback"), + // } axios.post(process.env.OAUTH_ACCESS_URL, params, { headers: { diff --git a/ldap-overleaf-sl/sharelatex/AuthenticationManager.js b/ldap-overleaf-sl/sharelatex/AuthenticationManager.js index e062f81..8519be1 100644 --- a/ldap-overleaf-sl/sharelatex/AuthenticationManager.js +++ b/ldap-overleaf-sl/sharelatex/AuthenticationManager.js @@ -55,9 +55,7 @@ const AuthenticationManager = { createUserIfNotExist(oauth_user, callback) { const query = { //name: ZHANG San - email: oauth_user.email, - first_name: oauth_user.given_name, //San - last_name: oauth_user.family_name //Zhang + email: oauth_user.email }; User.findOne(query, (error, user) => { if ((!user || !user.hashedPassword)) { @@ -66,8 +64,8 @@ const AuthenticationManager = { const userRegHand = require('../User/UserRegistrationHandler.js') userRegHand.registerNewUser({ email: query.email, - first_name: query.first_name, - last_name: query.last_name, + first_name: oauth_user.given_name, + last_name: oauth_user.family_name, password: pass }, function (error, user) {