Refresh session before calling into Postgrest (#33)

* Update postgres-swift and add support for `RequestAdapter`

* Implement `PostgrestClientDelegate` for refreshing and inserting access token before postgrest request

* Update dependencies

Author: grdsdev

Package.resolved

@@ -24,8 +24,8 @@
         "repositoryURL": "https://github.com/supabase-community/gotrue-swift",
         "state": {
           "branch": null,
-          "revision": "4528eee600e7f2b67a357d9c1a50d4f855b8123c",
-          "version": "0.0.6"
+          "revision": "023b7110c2c42ed1c03aa790d0a7272c48b2e957",
+          "version": "0.0.7"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/supabase-community/postgrest-swift",
         "state": {
           "branch": null,
-          "revision": "ebb07f8da5e8e4dee251c5bcb9c7f6ead537e1d6",
-          "version": "0.0.4"
+          "revision": "f7800664af17934fd80bed35f7d15736623e6cbb",
+          "version": "0.0.5"
         }
       },
       {
@@ -105,8 +105,8 @@
         "repositoryURL": "https://github.com/pointfreeco/xctest-dynamic-overlay",
         "state": {
           "branch": null,
-          "revision": "8816142e27f1127d87c61cee4a0a5db93e9df7c4",
-          "version": "0.3.1"
+          "revision": "046aba2944a7e197e5dc070836f8fe2d47d0e471",
+          "version": "0.3.2"
         }
       }
     ]

Package.swift

@@ -19,10 +19,10 @@ let package = Package(
     )
   ],
   dependencies: [
-    .package(url: "https://github.com/supabase-community/gotrue-swift", from: "0.0.5"),
+    .package(url: "https://github.com/supabase-community/gotrue-swift", from: "0.0.7"),
     .package(url: "https://github.com/supabase-community/storage-swift.git", from: "0.0.2"),
     .package(url: "https://github.com/supabase-community/realtime-swift.git", from: "0.0.1"),
-    .package(url: "https://github.com/supabase-community/postgrest-swift", from: "0.0.4"),
+    .package(url: "https://github.com/supabase-community/postgrest-swift", from: "0.0.5"),
   ],
   targets: [
     .target(

Sources/Supabase/SupabaseClient.swift

@@ -40,7 +40,11 @@ public class SupabaseClient {
     var headers: [String: String] = defaultHeaders
     headers["Authorization"] = "Bearer \(auth.session?.accessToken ?? supabaseKey)"
     return PostgrestClient(
-      url: restURL.absoluteString, headers: headers, fetch: nil, schema: schema)
+      url: restURL.absoluteString,
+      headers: headers,
+      schema: schema,
+      delegate: self
+    )
   }
 
   /// Realtime client for Supabase
@@ -77,3 +81,24 @@ public class SupabaseClient {
     realtime = RealtimeClient(endPoint: realtimeURL.absoluteString, params: defaultHeaders)
   }
 }
+
+extension SupabaseClient: PostgrestClientDelegate {
+  public func client(
+    _ client: PostgrestClient,
+    willSendRequest request: URLRequest,
+    completion: @escaping (URLRequest) -> Void
+  ) {
+    Task {
+      do {
+        try await auth.refreshCurrentSessionIfNeeded()
+        var request = request
+        if let accessToken = auth.session?.accessToken {
+          request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
+        }
+        completion(request)
+      } catch {
+        completion(request)
+      }
+    }
+  }
+}