Skip to content

Implement HTTP Client protocols for sub packages #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ let package = Package(
.library(
name: "Supabase",
targets: ["Supabase"]
)
),
],
dependencies: [
.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/storage-swift.git", branch: "master"),
.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.6"),
.package(
url: "https://github.com/supabase-community/postgrest-swift",
branch: "master"
),
],
targets: [
.target(
Expand All @@ -33,6 +36,6 @@ let package = Package(
.product(name: "Realtime", package: "realtime-swift"),
.product(name: "PostgREST", package: "postgrest-swift"),
]
)
),
]
)
103 changes: 60 additions & 43 deletions Sources/Supabase/SupabaseClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,25 @@ import PostgREST
import Realtime
import SupabaseStorage

/// The main class for accessing Supabase functionality
///
/// Initialize this class using `.init(supabaseURL: String, supabaseKey: String)`
///
/// There are four main classes contained by the `Supabase` class.
/// 1. `auth`
/// 2. `database`
/// 3. `realtime`
/// 4. `storage`
/// Each class listed is available under `Supabase.{name}`, eg: `Supabase.auth`
///
/// For more usage information read the README.md
/// Supabase Client.
public class SupabaseClient {
private var supabaseURL: URL
private var supabaseKey: String
private var schema: String
private var restURL: URL
private var realtimeURL: URL
private var authURL: URL
private var storageURL: URL

/// Auth client for Supabase.
private let supabaseURL: URL
private let supabaseKey: String
private let schema: String
private let restURL: URL
private let realtimeURL: URL
private let authURL: URL
private let storageURL: URL

/// Supabase Auth allows you to create and manage user sessions for access to data that is secured
/// by access policies.
public let auth: GoTrueClient

/// Storage client for Supabase.
/// Supabase Storage allows you to manage user-generated content, such as photos or videos.
public var storage: SupabaseStorageClient {
var headers: [String: String] = defaultHeaders
headers["Authorization"] = "Bearer \(auth.session?.accessToken ?? supabaseKey)"
return SupabaseStorageClient(url: storageURL.absoluteString, headers: headers)
return SupabaseStorageClient(url: storageURL.absoluteString, headers: headers, http: self)
}

/// Database client for Supabase.
Expand All @@ -43,7 +33,7 @@ public class SupabaseClient {
url: restURL.absoluteString,
headers: headers,
schema: schema,
delegate: self
http: self
)
}

Expand All @@ -57,16 +47,18 @@ public class SupabaseClient {
/// - supabaseURL: Unique Supabase project url
/// - supabaseKey: Supabase anonymous API Key
/// - schema: Database schema name, defaults to `public`
/// - autoRefreshToken: Toggles whether `Supabase.auth` automatically refreshes auth tokens. Defaults to `true`
/// - autoRefreshToken: Toggles whether `Supabase.auth` automatically refreshes auth tokens.
/// Defaults to `true`
public init(
supabaseURL: URL,
supabaseKey: String,
schema: String = "public",
autoRefreshToken: Bool = true
httpClient: HTTPClient = HTTPClient()
) {
self.supabaseURL = supabaseURL
self.supabaseKey = supabaseKey
self.schema = schema
self.httpClient = httpClient
restURL = supabaseURL.appendingPathComponent("/rest/v1")
realtimeURL = supabaseURL.appendingPathComponent("/realtime/v1")
authURL = supabaseURL.appendingPathComponent("/auth/v1")
Expand All @@ -83,25 +75,50 @@ public class SupabaseClient {
)
realtime = RealtimeClient(endPoint: realtimeURL.absoluteString, params: defaultHeaders)
}

public struct HTTPClient {
public let storage: StorageHTTPClient
public let postgrest: PostgrestHTTPClient

public init(storage: StorageHTTPClient? = nil, postgrest: PostgrestHTTPClient? = nil) {
self.storage = storage ?? DefaultStorageHTTPClient()
self.postgrest = postgrest ?? DefaultPostgrestHTTPClient()
}
}

private let httpClient: HTTPClient
}

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)
}
extension SupabaseClient {
func adapt(request: URLRequest) async throws -> URLRequest {
try await auth.refreshCurrentSessionIfNeeded()

var request = request
if let accessToken = auth.session?.accessToken {
request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
}
return request
}
}

extension SupabaseClient: PostgrestHTTPClient {
public func execute(_ request: URLRequest) async throws -> (Data, HTTPURLResponse) {
let request = try await adapt(request: request)
return try await httpClient.postgrest.execute(request)
}
}

extension SupabaseClient: StorageHTTPClient {
public func fetch(_ request: URLRequest) async throws -> (Data, HTTPURLResponse) {
let request = try await adapt(request: request)
return try await httpClient.storage.fetch(request)
}

public func upload(
_ request: URLRequest,
from data: Data
) async throws -> (Data, HTTPURLResponse) {
let request = try await adapt(request: request)
return try await httpClient.storage.upload(request, from: data)
}
}