pull token from third party or fallback to auth

supabase · Dec 4, 2024 · 6264e7e · 6264e7e
1 parent 22d82e9
commit 6264e7e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/Sources/Supabase/SupabaseClient.swift b/Sources/Supabase/SupabaseClient.swift
@@ -348,12 +348,7 @@ public final class SupabaseClient: Sendable {
   }
 
   private func adapt(request: URLRequest) async -> URLRequest {
-    let token: String? =
-      if let accessToken = options.auth.accessToken {
-        try? await accessToken()
-      } else {
-        try? await auth.session.accessToken
-      }
+    let token = try? await _getAccessToken()
 
     var request = request
     if let token {
@@ -362,6 +357,14 @@ public final class SupabaseClient: Sendable {
     return request
   }
 
+  private func _getAccessToken() async throws -> String {
+    if let accessToken = options.auth.accessToken {
+      try await accessToken()
+    } else {
+      try await auth.session.accessToken
+    }
+  }
+
   private func listenForAuthEvents() {
     let task = Task {
       for await (event, session) in auth.authStateChanges {
@@ -404,8 +407,7 @@ public final class SupabaseClient: Sendable {
 
     if realtimeOptions.accessToken == nil {
       realtimeOptions.accessToken = { [weak self] in
-        guard let self else { return "" }
-        return try await self.auth.session.accessToken
+        try await self?._getAccessToken() ?? ""
       }
     } else {
       reportIssue(