From 9dfac11a1428240dd8a2005de948989421aab62e Mon Sep 17 00:00:00 2001
From: Julien Calixte <juliencalixte@gmail.com>
Date: Thu, 13 May 2021 16:26:03 +0200
Subject: [PATCH] --wip-- [skip ci]

---
 .eslintrc.js                       |  1 +
 src/modules/user/service/signIn.ts | 10 ++++++----
 src/views/Home.vue                 |  7 ++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 2a05d8e..e705ab2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -17,6 +17,7 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/camelcase': 'off',
+    'vue/no-multiple-template-root': 'off',
     'prettier-vue/prettier': [
       'error',
       {
diff --git a/src/modules/user/service/signIn.ts b/src/modules/user/service/signIn.ts
index c9c9cf2..c8a141d 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 { addSeconds } from 'date-fns'
+import { addMinutes, addSeconds } from 'date-fns'
 
 const AUTHENTICATION_SERVER = 'https://litenote.li212.fr'
 const personalTokenId = 'token'
@@ -31,7 +31,7 @@ export const needToRefreshToken = async () => {
     return false
   }
 
-  return new Date(accessToken.expirationDate) <= new Date()
+  return new Date(accessToken.expirationDate) <= addMinutes(new Date(), -15)
 }
 
 export const refreshToken = async () => {
@@ -44,9 +44,11 @@ export const refreshToken = async () => {
     return null
   }
 
-  console.log(accessToken.refreshToken)
+  const needRefresh = await needToRefreshToken()
 
-  if (await needToRefreshToken()) {
+  console.log(accessToken.refreshToken, needRefresh)
+
+  if (needRefresh) {
     const authenticationServerURL = new URL(AUTHENTICATION_SERVER)
     authenticationServerURL.searchParams.set('type', 'refresh')
     authenticationServerURL.searchParams.set('code', accessToken.refreshToken)
diff --git a/src/views/Home.vue b/src/views/Home.vue
index 3e60f80..ffa089b 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -8,10 +8,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, defineAsyncComponent, computed } from 'vue'
+import { defineComponent, defineAsyncComponent, computed, onMounted } 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,6 +35,10 @@ export default defineComponent({
   setup(props) {
     const { resetStackedNotes } = useQueryStackedNotes()
 
+    onMounted(() => {
+      refreshToken()
+    })
+
     return {
       resetStackedNotes,
       routeKey: computed(() => `${props.user}-${props.repo}`)