From b246872f2318d04f0c2f9d25eeaa7163c7987626 Mon Sep 17 00:00:00 2001
From: Julien Calixte <julienc@bam.tech>
Date: Sun, 2 May 2021 00:01:41 +0200
Subject: [PATCH] :bug: (github) remove refetch not working

---
 src/hooks/useGitHubLogin.hook.ts  |  6 +++---
 src/modules/repo/services/repo.ts | 33 +++++++++++++++++++------------
 src/views/Home.vue                |  4 ++--
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/hooks/useGitHubLogin.hook.ts b/src/hooks/useGitHubLogin.hook.ts
index f378347..d64d96f 100644
--- a/src/hooks/useGitHubLogin.hook.ts
+++ b/src/hooks/useGitHubLogin.hook.ts
@@ -6,7 +6,7 @@ import { confirmMessage } from '@/utils/notif'
 import { GithubAccessToken } from '@/data/models/GithubAccessToken'
 import { Octokit } from '@octokit/rest'
 import { GithubToken } from '@/modules/user/interfaces/GithubToken'
-import { addMilliseconds } from 'date-fns'
+import { addSeconds } from 'date-fns'
 
 const personalTokenId = 'token'
 const username = ref<string | null>(null)
@@ -34,12 +34,12 @@ export const useGitHubLogin = () => {
   const saveCredentials = async (githubToken: GithubToken) => {
     const actualPAT = await getAccessToken()
 
-    const expirationDate = addMilliseconds(
+    const expirationDate = addSeconds(
       new Date(),
       githubToken.expires_in
     ).toISOString()
 
-    const refreshTokenExpirationDate = addMilliseconds(
+    const refreshTokenExpirationDate = addSeconds(
       new Date(),
       githubToken.refresh_token_expires_in
     ).toISOString()
diff --git a/src/modules/repo/services/repo.ts b/src/modules/repo/services/repo.ts
index f02e0d6..1beb579 100644
--- a/src/modules/repo/services/repo.ts
+++ b/src/modules/repo/services/repo.ts
@@ -15,7 +15,7 @@ const personalTokenId = 'token'
 
 const GITHUB_URL = 'https://github.com/login/oauth/access_token'
 
-const refreshToken = async () => {
+export const refreshToken = async () => {
   const accessToken = await data.get<
     DataType.GithubAccessToken,
     GithubAccessToken
@@ -24,8 +24,15 @@ const refreshToken = async () => {
     return
   }
 
+  console.log(
+    new Date(accessToken.expirationDate) >= new Date(),
+    accessToken.expirationDate,
+    new Date()
+  )
+
   if (new Date(accessToken.expirationDate) >= new Date()) {
     const response = await fetch(GITHUB_URL, {
+      method: 'POST',
       body: JSON.stringify({
         refresh_token: accessToken.refreshToken,
         grant_type: 'refresh_token'
@@ -39,20 +46,24 @@ const refreshToken = async () => {
       return
     }
 
+    const expirationDate = addMilliseconds(
+      new Date(),
+      githubToken.expires_in
+    ).toISOString()
+
+    const refreshTokenExpirationDate = addMilliseconds(
+      new Date(),
+      githubToken.refresh_token_expires_in
+    ).toISOString()
+
     const updatedAccessToken: GithubAccessToken = {
       ...accessToken,
       token: githubToken.access_token,
       expiresIn: githubToken.expires_in,
-      expirationDate: addMilliseconds(
-        new Date(),
-        githubToken.expires_in
-      ).toISOString(),
+      expirationDate,
       refreshToken: githubToken.refresh_token,
       refreshTokenExpiresIn: githubToken.refresh_token_expires_in,
-      refreshTokenExpirationDate: addMilliseconds(
-        new Date(),
-        githubToken.refresh_token_expires_in
-      ).toISOString()
+      refreshTokenExpirationDate
     }
 
     await data.add<DataType.GithubAccessToken>({
@@ -68,7 +79,6 @@ export const getFiles = async (
   if (!owner || !repo) {
     return []
   }
-  await refreshToken()
 
   const { accessToken } = useGitHubLogin()
 
@@ -104,7 +114,6 @@ export const getMainReadme = async (owner: string, repo: string) => {
   if (!owner || !repo) {
     return null
   }
-  await refreshToken()
 
   const { render } = useMarkdown()
   const { getCachedNote, saveCacheNote } = useNoteCache('README')
@@ -170,8 +179,6 @@ export const getFileContent = async (
     null
   }
 
-  await refreshToken()
-
   const file = await octokit.request(
     'GET /repos/{owner}/{repo}/git/blobs/{file_sha}',
     {
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 335936c..058c720 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -51,12 +51,12 @@ export default defineComponent({
 
   .new-version {
     position: absolute;
-    margin-top: 1rem;
+    top: 1rem;
+    right: 1rem;
   }
 }
 
 .authorize {
-  position: absolute;
   margin: auto;
 }
 </style>