now sending passwords in request body for login and added autorefresh

Author: awalias

src/Auth.js

@@ -1,12 +1,13 @@
 const superagent = require('superagent')
 
 class Auth {
-  constructor(authUrl, supabaseKey, options = {}) {
+  constructor(authUrl, supabaseKey, options = { autoRefreshToken: true }) {
     this.authUrl = authUrl
     this.accessToken = null
     this.refreshToken = null
     this.supabaseKey = supabaseKey
     this.currentUser = null
+    this.autoRefreshToken = options.autoRefreshToken
 
     this.signup = async (email, password) => {
       const { body } = await superagent
@@ -18,13 +19,32 @@ class Auth {
     }
 
     this.login = async (email, password) => {
+    
       const response = await superagent
-        .post(`${authUrl}/token?grant_type=password&username=${email}&password=${password}`)
+        .post(`${authUrl}/token?grant_type=password`, { email, password })
+        .set('accept', 'json')
+        .set('apikey', this.supabaseKey)
+
+      if (response.status === 200) {
+        this.accessToken = response.body['access_token']
+        this.refreshToken = response.body['refresh_token']
+        if (this.autoRefreshToken && tokenExirySeconds)
+          setTimeout(this.refreshToken, tokenExirySeconds - 60)
+      }
+      return response
+    }
+
+    this.refreshToken = async () => {
+      const response = await superagent
+        .post(`${authUrl}/token?grant_type=refresh_token`, { refresh_token: this.refreshToken })
         .set('apikey', this.supabaseKey)
 
       if (response.status === 200) {
         this.accessToken = response.body['access_token']
         this.refreshToken = response.body['refresh_token']
+        let tokenExirySeconds = response.body['expires_in']
+        if (this.autoRefreshToken && tokenExirySeconds)
+          setTimeout(this.refreshToken, tokenExirySeconds - 60)
       }
       return response
     }
@@ -39,6 +59,14 @@ class Auth {
       this.accessToken = null
     }
 
+    // this.setRefreshTokenExpiry = (refreshTokenExpirySeconds) => {
+    //   let bufferSeconds = 60
+    //   let t = new Date() // current time
+    //   this.refreshTokenExpiry = t.setSeconds(
+    //     t.getSeconds() + (refreshTokenExpirySeconds - bufferSeconds)
+    //   )
+    // }
+
     this.user = async () => {
       if (this.currentUser) return this.currentUser
 

src/index.js

@@ -4,7 +4,7 @@ import { Auth } from './Auth'
 import { PostgrestClient } from '@supabase/postgrest-js'
 
 class SupabaseClient {
-  constructor(supabaseUrl, supabaseKey, options = {}) {
+  constructor(supabaseUrl, supabaseKey, options = { autoRefreshToken: true }) {
     this.supabaseUrl = null
     this.supabaseKey = null
     this.restUrl = null
@@ -20,7 +20,7 @@ class SupabaseClient {
 
     this.authenticate(supabaseUrl, supabaseKey)
 
-    this.auth = new Auth(this.authUrl, supabaseKey)
+    this.auth = new Auth(this.authUrl, supabaseKey, { autoRefreshToken: options.autoRefreshToken })
   }
 
   /**

test/integration/testAuth.js

@@ -7,8 +7,8 @@ import { createClient } from '../../src'
 
 describe('test signing up and logging in as a new user', () => {
   const supabase = createClient(
-    'https://UxtUdvoEHGzXftFJhwwT.supabase.net',
-    'XbBJdEH2WdymQ0Hq9Huk1JqCCmggPX'
+    'https://HPPNcyqrPOIDwqzQHjRl.supabase.net',
+    'JBkDpEMQw9a9yIeVuFhTt5JEhGjQEY'
   )
   const randomEmail = `a${Math.random()}@google.com`