From b142c04b95054358a89b2e798ec89cc3c836b481 Mon Sep 17 00:00:00 2001 From: archer <545436317@qq.com> Date: Mon, 7 Aug 2023 17:59:17 +0800 Subject: [PATCH] perf: git --- client/src/pages/api/user/account/gitLogin.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/pages/api/user/account/gitLogin.ts b/client/src/pages/api/user/account/gitLogin.ts index 755e647d1..406b83fbb 100644 --- a/client/src/pages/api/user/account/gitLogin.ts +++ b/client/src/pages/api/user/account/gitLogin.ts @@ -17,6 +17,7 @@ type GithubAccessTokenType = { scope: string; }; type GithubUserType = { + login: string; email: string; avatar_url: string; }; @@ -35,22 +36,22 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse< throw new Error('access_token is null'); } - const { - data: { email, avatar_url } - } = await axios.get('https://api.github.com/user', { + const { data } = await axios.get('https://api.github.com/user', { headers: { Authorization: `Bearer ${access_token}` } }); + const { login, email, avatar_url } = data; + const username = email || login; try { jsonRes(res, { - data: await loginByUsername({ username: email, res }) + data: await loginByUsername({ username, res }) }); } catch (err: any) { if (err?.code === 500) { jsonRes(res, { - data: await registerUser({ username: email, avatar: avatar_url, res }) + data: await registerUser({ username, avatar: avatar_url, res }) }); } throw new Error(err); @@ -71,7 +72,6 @@ export async function loginByUsername({ res: NextApiResponse; }) { const user = await User.findOne({ username }); - console.log(user, username); if (!user) { return Promise.reject({