Skip to content

feat: edge functions support for custom domains and vanity domains #90

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.

Sign up for GitHub

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 1 commit into from
Jun 22, 2023
Merged

feat: edge functions support for custom domains and vanity domains #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop

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

11 changes: 1 addition & 10 deletions Sources/Supabase/SupabaseClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public class SupabaseClient {
storageURL = supabaseURL.appendingPathComponent("/storage/v1")
databaseURL = supabaseURL.appendingPathComponent("/rest/v1")
realtimeURL = supabaseURL.appendingPathComponent("/realtime/v1")
functionsURL = supabaseURL.appendingPathComponent("/functions/v1")

schema = options.db.schema
httpClient = options.global.httpClient
Expand All @@ -86,16 +87,6 @@ public class SupabaseClient {
headers: defaultHeaders,
localStorage: options.auth.storage
)

let isPlatform =
supabaseURL.absoluteString.contains("supabase.co")
|| supabaseURL.absoluteString.contains("supabase.in")
if isPlatform {
let urlParts = supabaseURL.absoluteString.split(separator: ".")
functionsURL = URL(string: "\(urlParts[0]).functions.\(urlParts[1]).\(urlParts[2])")!
} else {
functionsURL = supabaseURL.appendingPathComponent("functions/v1")
}
}

public struct HTTPClient {
Expand Down
22 changes: 2 additions & 20 deletions Tests/SupabaseTests/SupabaseClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ final class SupabaseClientTests: XCTestCase {
XCTAssertEqual(client.storageURL.absoluteString, "https://project-ref.supabase.co/storage/v1")
XCTAssertEqual(client.databaseURL.absoluteString, "https://project-ref.supabase.co/rest/v1")
XCTAssertEqual(client.realtimeURL.absoluteString, "https://project-ref.supabase.co/realtime/v1")
XCTAssertEqual(client.functionsURL.absoluteString, "https://project-ref.supabase.co/functions/v1")

XCTAssertEqual(
client.defaultHeaders,
[
Expand All @@ -47,24 +49,4 @@ final class SupabaseClientTests: XCTestCase {
]
)
}

func testFunctionsURL() {
var client = SupabaseClient(
supabaseURL: URL(string: "https://project-ref.supabase.co")!,
supabaseKey: "ANON_KEY"
)
XCTAssertEqual(client.functionsURL.absoluteString, "https://project-ref.functions.supabase.co")

client = SupabaseClient(
supabaseURL: URL(string: "https://project-ref.supabase.in")!,
supabaseKey: "ANON_KEY"
)
XCTAssertEqual(client.functionsURL.absoluteString, "https://project-ref.functions.supabase.in")

client = SupabaseClient(
supabaseURL: URL(string: "https://custom-domain.com")!,
supabaseKey: "ANON_KEY"
)
XCTAssertEqual(client.functionsURL.absoluteString, "https://custom-domain.com/functions/v1")
}
}