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 }