From 9ff73f09ac247013bf1c4d31e2a7d9b3d1929959 Mon Sep 17 00:00:00 2001 From: Julien Calixte Date: Thu, 27 May 2021 13:33:31 +0200 Subject: [PATCH] =?UTF-8?q?:bug:=20(authentication)=20simplify=20refres?= =?UTF-8?q?=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/repo/services/octo.ts | 37 +++++-------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/src/modules/repo/services/octo.ts b/src/modules/repo/services/octo.ts index f6283e4..80452a1 100644 --- a/src/modules/repo/services/octo.ts +++ b/src/modules/repo/services/octo.ts @@ -1,37 +1,10 @@ -import { useGitHubLogin } from '@/hooks/useGitHubLogin.hook' -import { needToRefreshToken, refreshToken } from '@/modules/user/service/signIn' +import { getAccessToken } from '@/modules/user/service/signIn' import { Octokit } from '@octokit/rest' -let refreshingToken = false -let octokit = new Octokit() - -const sleep = async (ms: number) => { - return new Promise((resolve) => setTimeout(resolve, ms)) -} - export const getOctokit = async (): Promise => { - const { accessToken } = useGitHubLogin() - octokit = new Octokit({ - auth: accessToken.value + const response = await getAccessToken() + + return new Octokit({ + auth: response?.token ?? '' }) - - if (refreshingToken) { - await sleep(100) - return getOctokit() - } - - if (!refreshingToken) { - refreshingToken = true - if (await needToRefreshToken()) { - const accessToken = await refreshToken() - if (accessToken) { - octokit = new Octokit({ - auth: accessToken.token - }) - } - } - refreshingToken = false - } - - return octokit }