Skip to content

JWT Add Headers #171

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 2 commits into from
Apr 19, 2025
Merged

JWT Add Headers #171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b4be1
jwt auth header
ShaneMander Apr 13, 2025
dd6e9d0
Call setAuthHeaders from every API calling method
ShaneMander Apr 13, 2025
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
49 changes: 42 additions & 7 deletions Spawn-App-iOS-SwiftUI/Services/API/APIService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,11 @@ class APIService: IAPIService {
print(errorMessage ?? "no error message to log")
throw APIError.URLError
}
var request = URLRequest(url: finalURL)
request.httpMethod = "GET"
setAuthHeaders(request: &request)

let (data, response) = try await URLSession.shared.data(from: finalURL)
let (data, response) = try await URLSession.shared.data(from: request)

guard let httpResponse = response as? HTTPURLResponse else {
errorMessage = "HTTP request failed for \(finalURL)"
Expand Down Expand Up @@ -234,7 +237,7 @@ class APIService: IAPIService {
request.httpMethod = "POST"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.httpBody = encodedData

setAuthHeaders(request: &request)
let (data, response) = try await URLSession.shared.data(for: request)

guard let httpResponse = response as? HTTPURLResponse else {
Expand Down Expand Up @@ -304,7 +307,7 @@ class APIService: IAPIService {
request.httpMethod = "PUT"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.httpBody = encodedData

setAuthHeaders(request: &request)
let (data, response) = try await URLSession.shared.data(for: request)

guard let httpResponse = response as? HTTPURLResponse else {
Expand Down Expand Up @@ -332,7 +335,7 @@ class APIService: IAPIService {

var request = URLRequest(url: url)
request.httpMethod = "DELETE" // Set the HTTP method to DELETE

setAuthHeaders(request: &request) // Set auth headers if needed
let (_, response) = try await URLSession.shared.data(for: request)

guard let httpResponse = response as? HTTPURLResponse else {
Expand Down Expand Up @@ -512,6 +515,38 @@ class APIService: IAPIService {
}
}

fileprivate func setAuthHeaders(request: inout URLRequest) {
guard if let url = request.url else {
print("❌ ERROR: URL is nil")
return
}

// Check if auth headers are needed
let whitelistedEndpoints = [
"auth/sign-in",
"auth/make-user"
]
if whitelistedEndpoints.contains(where: { url.absoluteString.contains($0) }) {
// Don't set auth headers for these endpoints
return
}
// Get the access token from keychain
guard if
let accessToken = KeychainService.load("accessToken") as? String,
let refreshToken = KeychainService.load("refreshToken") as? String
else {
print("❌ ERROR: Missing access or refresh token in Keychain")
return
}

// Set the auth headers
request.addValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
request.addValue('Bearer \(refreshToken)', forHTTPHeaderField: "X-Refresh-Token")
print("🔑 Auth headers set")

return
}

internal func patchData<T: Encodable, U: Decodable>(
from url: URL,
with object: T
Expand All @@ -529,7 +564,7 @@ class APIService: IAPIService {
request.httpMethod = "PATCH"
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
request.httpBody = encodedData

setAuthHeaders(request: &request)
let (data, response) = try await URLSession.shared.data(for: request)

// Debug: Log the response details
Expand Down Expand Up @@ -613,7 +648,7 @@ class APIService: IAPIService {
request.httpMethod = "PATCH"
request.setValue("image/jpeg", forHTTPHeaderField: "Content-Type")
request.httpBody = imageData

sendAuthHeaders(request: &request) // Set auth headers if needed
// Log request headers
print("🔍 REQUEST HEADERS: \(request.allHTTPHeaderFields ?? [:])")

Expand Down Expand Up @@ -668,7 +703,7 @@ class APIService: IAPIService {
var request = URLRequest(url: url)
request.httpMethod = "POST"
request.setValue("multipart/form-data; boundary=\(boundary)", forHTTPHeaderField: "Content-Type")

setAuthHeaders(request: &request) // Set auth headers if needed
// Create the body
var body = Data()

Expand Down