Merge pull request #101 from thebengeu/expires

fix: supabase/supabase-js#178 handle JWT expiry <= 60s
supabase · Jun 14, 2021 · c2a1975 · c2a1975
2 parents 3be3eb0 + 7502d3a
commit c2a1975
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/GoTrueClient.ts b/src/GoTrueClient.ts
@@ -548,8 +548,12 @@ export default class GoTrueClient {
     this.currentUser = session.user
 
     const expiresAt = session.expires_at
-    const timeNow = Math.round(Date.now() / 1000)
-    if (expiresAt) this._startAutoRefreshToken((expiresAt - timeNow - 60) * 1000)
+    if (expiresAt) {
+      const timeNow = Math.round(Date.now() / 1000)
+      const expiresIn = expiresAt - timeNow
+      const refreshDurationBeforeExpires = expiresIn > 60 ? 60 : 0.5
+      this._startAutoRefreshToken((expiresIn - refreshDurationBeforeExpires) * 1000)
+    }
 
     // Do we need any extra check before persist session
     // access_token or user ?
@@ -576,7 +580,7 @@ export default class GoTrueClient {
    */
   private _startAutoRefreshToken(value: number) {
     if (this.refreshTokenTimer) clearTimeout(this.refreshTokenTimer)
-    if (!value || !this.autoRefreshToken) return
+    if (value <= 0 || !this.autoRefreshToken) return
 
     this.refreshTokenTimer = setTimeout(() => this._callRefreshToken(), value)
   }