From 84ba5fcd4612b4a676724b7a5cdfe6bc37bd9783 Mon Sep 17 00:00:00 2001
From: Julien Calixte <juliencalixte@gmail.com>
Date: Thu, 13 May 2021 16:34:30 +0200
Subject: [PATCH] :bug: (login) refresh token 15 minutes before expiration

---
 src/modules/repo/services/octo.ts  |  2 +-
 src/modules/user/service/signIn.ts |  9 +++++----
 src/views/Home.vue                 | 10 +---------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/modules/repo/services/octo.ts b/src/modules/repo/services/octo.ts
index c0df59f..f6283e4 100644
--- a/src/modules/repo/services/octo.ts
+++ b/src/modules/repo/services/octo.ts
@@ -26,7 +26,7 @@ export const getOctokit = async (): Promise<Octokit> => {
       const accessToken = await refreshToken()
       if (accessToken) {
         octokit = new Octokit({
-          auth: accessToken?.token
+          auth: accessToken.token
         })
       }
     }
diff --git a/src/modules/user/service/signIn.ts b/src/modules/user/service/signIn.ts
index bd2389c..8b3f612 100644
--- a/src/modules/user/service/signIn.ts
+++ b/src/modules/user/service/signIn.ts
@@ -4,7 +4,7 @@ import { GithubAccessToken } from '@/data/models/GithubAccessToken'
 import { GithubToken } from '@/modules/user/interfaces/GithubToken'
 import { GithubTokenError } from '@/modules/user/interfaces/GithubTokenError'
 import { Octokit } from '@octokit/rest'
-import { addMinutes, addSeconds } from 'date-fns'
+import { addMinutes, addSeconds, isBefore } from 'date-fns'
 
 const AUTHENTICATION_SERVER = 'https://litenote.li212.fr'
 const personalTokenId = 'token'
@@ -31,7 +31,10 @@ export const needToRefreshToken = async () => {
     return false
   }
 
-  return new Date(accessToken.expirationDate) <= addMinutes(new Date(), -15)
+  const expirationDate = new Date(accessToken.expirationDate)
+  const dateToCompare = addMinutes(new Date(), 15)
+
+  return isBefore(expirationDate, dateToCompare)
 }
 
 export const refreshToken = async () => {
@@ -46,8 +49,6 @@ export const refreshToken = async () => {
 
   const needRefresh = await needToRefreshToken()
 
-  console.log(accessToken.refreshToken, needRefresh)
-
   if (needRefresh) {
     const authenticationServerURL = new URL(AUTHENTICATION_SERVER)
     authenticationServerURL.searchParams.set('type', 'refresh')
diff --git a/src/views/Home.vue b/src/views/Home.vue
index fae44b1..3e60f80 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -8,11 +8,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent, computed, onMounted } from 'vue'
+import { defineComponent, defineAsyncComponent, computed } from 'vue'
 import { useQueryStackedNotes } from '@/hooks/useQueryStackedNotes.hook'
 import NewVersion from '@/components/NewVersion.vue'
 import Authorize from '@/components/Authorize.vue'
-import { refreshToken } from '@/modules/user/service/signIn'
 
 const FluxNote = defineAsyncComponent(() => import('@/components/FluxNote.vue'))
 
@@ -34,13 +33,6 @@ export default defineComponent({
   },
   setup(props) {
     const { resetStackedNotes } = useQueryStackedNotes()
-    onMounted(() => {
-      refreshToken()
-    })
-
-    onMounted(() => {
-      refreshToken()
-    })
 
     return {
       resetStackedNotes,