Skip to content

Replace force-unwrapped URLs with URL.api(path:) helper #127

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
dprodger merged 1 commit into from
Apr 13, 2026
Merged

Replace force-unwrapped URLs with URL.api(path:) helper #127

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
8 changes: 2 additions & 6 deletions apps/Mac/Components/MacRecordingContributionEditView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,7 @@ struct MacRecordingContributionEditView: View {

let bodyData = try JSONSerialization.data(withJSONObject: body)

guard let url = URL(string: "\(NetworkManager.baseURL)/recordings/\(recordingId)/contribution") else {
throw URLError(.badURL)
}
let url = URL.api(path: "/recordings/\(recordingId)/contribution")

_ = try await authManager.makeAuthenticatedRequest(
url: url,
Expand Down Expand Up @@ -261,9 +259,7 @@ struct MacRecordingContributionEditView: View {

Task {
do {
guard let url = URL(string: "\(NetworkManager.baseURL)/recordings/\(recordingId)/contribution") else {
throw URLError(.badURL)
}
let url = URL.api(path: "/recordings/\(recordingId)/contribution")

_ = try await authManager.makeAuthenticatedRequest(
url: url,
Expand Down
4 changes: 1 addition & 3 deletions apps/Mac/Views/Import/MacArtistCreationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,7 @@ struct MacArtistCreationView: View {
}

private func saveArtistToAPI() async throws {
guard let url = URL(string: "\(NetworkManager.baseURL)/performers") else {
throw URLError(.badURL)
}
let url = URL.api(path: "/performers")

var request = URLRequest(url: url)
request.httpMethod = "POST"
Expand Down
4 changes: 1 addition & 3 deletions apps/Mac/Views/Import/MacSongCreationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,7 @@ struct MacSongCreationView: View {
}

private func saveSongToAPI() async throws {
guard let url = URL(string: "\(NetworkManager.baseURL)/songs") else {
throw URLError(.badURL)
}
let url = URL.api(path: "/songs")

var request = URLRequest(url: url)
request.httpMethod = "POST"
Expand Down
4 changes: 1 addition & 3 deletions apps/Mac/Views/SongBulkEditRecordingsView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,9 +468,7 @@ struct SongBulkEditRecordingsView: View {

let bodyData = try JSONSerialization.data(withJSONObject: body)

guard let url = URL(string: "\(NetworkManager.baseURL)/recordings/\(recordingId)/contribution") else {
throw URLError(.badURL)
}
let url = URL.api(path: "/recordings/\(recordingId)/contribution")

_ = try await authManager.makeAuthenticatedRequest(
url: url,
Expand Down
16 changes: 8 additions & 8 deletions apps/Shared/Auth/AuthenticationManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class AuthenticationManager: ObservableObject {
return false
}

let url = URL(string: "\(NetworkManager.baseURL)/auth/refresh-token")!
let url = URL.api(path: "/auth/refresh-token")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
Expand Down Expand Up @@ -157,7 +157,7 @@ class AuthenticationManager: ObservableObject {
isLoading = true
errorMessage = nil

let url = URL(string: "\(NetworkManager.baseURL)/auth/register")!
let url = URL.api(path: "/auth/register")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
Expand Down Expand Up @@ -213,7 +213,7 @@ class AuthenticationManager: ObservableObject {
isLoading = true
errorMessage = nil

let url = URL(string: "\(NetworkManager.baseURL)/auth/login")!
let url = URL.api(path: "/auth/login")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
Expand Down Expand Up @@ -285,7 +285,7 @@ class AuthenticationManager: ObservableObject {
private func fetchCurrentUser() async {
guard let token = accessToken else { return }

let url = URL(string: "\(NetworkManager.baseURL)/auth/me")!
let url = URL.api(path: "/auth/me")
var request = URLRequest(url: url)
request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")

Expand Down Expand Up @@ -327,7 +327,7 @@ class AuthenticationManager: ObservableObject {

/// Call logout endpoint on backend (best effort)
private func callLogoutEndpoint(accessToken: String, refreshToken: String) async {
let url = URL(string: "\(NetworkManager.baseURL)/auth/logout")!
let url = URL.api(path: "/auth/logout")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
Expand All @@ -352,7 +352,7 @@ class AuthenticationManager: ObservableObject {
isLoading = true
errorMessage = nil

let url = URL(string: "\(NetworkManager.baseURL)/auth/forgot-password")!
let url = URL.api(path: "/auth/forgot-password")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
Expand Down Expand Up @@ -494,7 +494,7 @@ class AuthenticationManager: ObservableObject {
isLoading = true
errorMessage = nil

let url = URL(string: "\(NetworkManager.baseURL)/auth/reset-password")!
let url = URL.api(path: "/auth/reset-password")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
Expand Down Expand Up @@ -627,7 +627,7 @@ class AuthenticationManager: ObservableObject {
#endif

private func authenticateWithGoogle(idToken: String) async -> Bool {
let url = URL(string: "\(NetworkManager.baseURL)/auth/google")!
let url = URL.api(path: "/auth/google")
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
Expand Down
Loading
Loading