Skip to content
Closed
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
31 changes: 30 additions & 1 deletion GTMAppAuth/Sources/AuthSession.swift
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,14 @@ public final class AuthSession: NSObject, GTMSessionFetcherAuthorizer, NSSecureC
serialAuthArgsQueue.sync {
authorizationArgs.append(args)
}
let additionalRefreshParameters = delegate?.additionalTokenRefreshParameters?(
// Get raw parameters from delegate
let rawParameters = delegate?.additionalTokenRefreshParameters?(
forAuthSession: self
)

// Safely convert any NSNumber values to String to prevent casting crashes
// This fixes issue #253 where refresh_token_expires_in comes as NSNumber
let additionalRefreshParameters = AuthSession.sanitizeRefreshParameters(rawParameters)
let authStateAction = {
(accessToken: String?, idToken: String?, error: Swift.Error?) in
self.serialAuthArgsQueue.sync { [weak self] in
Expand Down Expand Up @@ -497,4 +502,28 @@ public extension AuthSession {
}
}
}

/// Safely converts dictionary values to strings, handling NSNumber and other types
/// This fixes issue #253 where OAuth providers return numeric values that cause casting crashes
private static func sanitizeRefreshParameters(_ parameters: [String: Any]?) -> [String: String]? {
guard let parameters = parameters else { return nil }

var sanitized = [String: String]()
for (key, value) in parameters {
if let stringValue = value as? String {
sanitized[key] = stringValue
} else if let numberValue = value as? NSNumber {
// Convert NSNumber to String to prevent casting crashes
// This handles refresh_token_expires_in and similar numeric fields
sanitized[key] = numberValue.stringValue
} else if let boolValue = value as? Bool {
// Handle boolean values explicitly
sanitized[key] = boolValue ? "true" : "false"
} else {
// For any other type, try string interpolation as fallback
sanitized[key] = "\(value)"
}
}
return sanitized.isEmpty ? nil : sanitized
}
}