Skip to content

Remove request URL from error strings #68

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

Closed
mosherBT wants to merge 2 commits into from
Closed

Remove request URL from error strings #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c04b85
Remove request URL from error strings
mosherBT Sep 22, 2026
fad53d8
comments
mosherBT Sep 22, 2026
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
21 changes: 13 additions & 8 deletions Source/OptableSDK.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,13 @@ extension OptableSDK {
api.dispatch(request: request, completionHandler: { data, response, error in
guard let response = response as? HTTPURLResponse, error == nil, data != nil else {
if let err = error {
completion(.failure(OptableError.identify("Session error: \(err)")))
completion(.failure(OptableError.identify("Session error: \(OptableSDK.generateSessionErrorDescription(with: err))")))
} else {
completion(.failure(OptableError.identify("Session error: Unknown")))
}
return
}
guard HTTPStatusCode(rawValue: response.statusCode)?.isSuccess == true else {
guard (200 ..< 300).contains(response.statusCode) else {
let errDesc = OptableSDK.generateEdgeAPIErrorDescription(with: data, response: response)
completion(.failure(OptableError.identify(errDesc, code: response.statusCode)))
return
Expand All @@ -343,13 +343,13 @@ extension OptableSDK {
api.dispatch(request: request, completionHandler: { data, response, error in
guard let response = response as? HTTPURLResponse, error == nil, data != nil else {
if let err = error {
completion(.failure(OptableError.targeting("Session error: \(err)")))
completion(.failure(OptableError.targeting("Session error: \(OptableSDK.generateSessionErrorDescription(with: err))")))
} else {
completion(.failure(OptableError.targeting("Session error: Unknown")))
}
return
}
guard HTTPStatusCode(rawValue: response.statusCode)?.isSuccess == true else {
guard (200 ..< 300).contains(response.statusCode) else {
let errDesc = OptableSDK.generateEdgeAPIErrorDescription(with: data, response: response)
completion(.failure(OptableError.targeting(errDesc, code: response.statusCode)))
return
Expand Down Expand Up @@ -377,13 +377,13 @@ extension OptableSDK {
api.dispatch(request: request, completionHandler: { data, response, error in
guard let response = response as? HTTPURLResponse, error == nil else {
if let err = error {
completion(.failure(OptableError.witness("Session error: \(err)")))
completion(.failure(OptableError.witness("Session error: \(OptableSDK.generateSessionErrorDescription(with: err))")))
} else {
completion(.failure(OptableError.witness("Session error: Unknown")))
}
return
}
guard HTTPStatusCode(rawValue: response.statusCode)?.isSuccess == true else {
guard (200 ..< 300).contains(response.statusCode) else {
let errDesc = OptableSDK.generateEdgeAPIErrorDescription(with: data, response: response)
completion(.failure(OptableError.witness(errDesc, code: response.statusCode)))
return
Expand All @@ -400,13 +400,13 @@ extension OptableSDK {
api.dispatch(request: request, completionHandler: { data, response, error in
guard let response = response as? HTTPURLResponse, error == nil else {
if let err = error {
completion(.failure(OptableError.profile("Session error: \(err)")))
completion(.failure(OptableError.profile("Session error: \(OptableSDK.generateSessionErrorDescription(with: err))")))
} else {
completion(.failure(OptableError.profile("Session error: Unknown")))
}
return
}
guard HTTPStatusCode(rawValue: response.statusCode)?.isSuccess == true else {
guard (200 ..< 300).contains(response.statusCode) else {
let errDesc = OptableSDK.generateEdgeAPIErrorDescription(with: data, response: response)
completion(.failure(OptableError.profile(errDesc, code: response.statusCode)))
return
Expand Down Expand Up @@ -459,6 +459,11 @@ extension OptableSDK {
return msg
}

static func generateSessionErrorDescription(with error: Error) -> String {
let error = error as NSError
return "\(error.domain) \(error.code): \(error.localizedDescription)"
}

static func generateGAMTargetingKeywords(from targetingData: NSDictionary?) -> NSDictionary? {
guard
let targetingData,
Expand Down
19 changes: 19 additions & 0 deletions Tests/Unit/OptableSDKHelpersTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,25 @@ class OptableSDKHelpersTests: XCTestCase {
XCTAssertFalse(message.contains("data:"))
}

// MARK: SessionErrorDescription
func test_generateSessionErrorDescription_excludesFailingURL() {
let error = NSError(
domain: NSURLErrorDomain,
code: NSURLErrorTimedOut,
userInfo: [
NSLocalizedDescriptionKey: "The request timed out.",
NSURLErrorFailingURLStringErrorKey: "https://example.com/v2/targeting?id=e%3Aabc123&osdk=ios",
]
)

let message = OptableSDK.generateSessionErrorDescription(with: error)
XCTAssertTrue(message.contains(NSURLErrorDomain))
XCTAssertTrue(message.contains("\(NSURLErrorTimedOut)"))
XCTAssertTrue(message.contains("The request timed out."))
XCTAssertFalse(message.contains("targeting"))
XCTAssertFalse(message.contains("abc123"))
}

// MARK: Version
func test_version_notUnknown() {
// Should resolve to something like ios-<marketing>-<build>
Expand Down
Loading