diff --git a/Account/Sources/Account/URLRequest+Account.swift b/Account/Sources/Account/URLRequest+Account.swift index a430a6d58..810a2d17c 100755 --- a/Account/Sources/Account/URLRequest+Account.swift +++ b/Account/Sources/Account/URLRequest+Account.swift @@ -28,7 +28,7 @@ public extension URLRequest { let auth = "Basic \(base64 ?? "")" setValue(auth, forHTTPHeaderField: HTTPRequestHeader.authorization) case .newsBlurBasic: - setValue("application/x-www-form-urlencoded", forHTTPHeaderField: HTTPRequestHeader.contentType) + setValue(MimeType.formURLEncoded, forHTTPHeaderField: HTTPRequestHeader.contentType) httpMethod = "POST" var postData = URLComponents() postData.queryItems = [ @@ -40,7 +40,7 @@ public extension URLRequest { setValue("\(NewsBlurAPICaller.sessionIDCookieKey)=\(credentials.secret)", forHTTPHeaderField: "Cookie") httpShouldHandleCookies = true case .readerBasic: - setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") httpMethod = "POST" var postData = URLComponents() postData.queryItems = [ diff --git a/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift b/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift index 58f2e1420..a292c4966 100644 --- a/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift +++ b/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift @@ -24,7 +24,7 @@ public extension URLRequest { if credentialsType == .newsBlurBasic { - setValue("application/x-www-form-urlencoded", forHTTPHeaderField: HTTPRequestHeader.contentType) + setValue(MimeType.formURLEncoded, forHTTPHeaderField: HTTPRequestHeader.contentType) httpMethod = "POST" var postData = URLComponents() diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift b/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift index e82f51288..3a1adc01f 100644 --- a/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift +++ b/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift @@ -209,7 +209,7 @@ public enum CreateReaderAPISubscriptionResult: Sendable { var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.renameTag.rawValue), readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" guard let encodedOldName = self.encodeForURLPath(oldName), let encodedNewName = self.encodeForURLPath(newName) else { @@ -234,7 +234,7 @@ public enum CreateReaderAPISubscriptionResult: Sendable { var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.disableTag.rawValue), readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" let postData = "T=\(token)&s=\(folderExternalID)".data(using: String.Encoding.utf8) @@ -276,7 +276,7 @@ public enum CreateReaderAPISubscriptionResult: Sendable { var request = URLRequest(url: callURL, readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" guard let encodedFeedURL = self.encodeForURLPath(url) else { @@ -321,7 +321,7 @@ public enum CreateReaderAPISubscriptionResult: Sendable { var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionEdit.rawValue), readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" let postData = "T=\(token)&s=\(subscriptionID)&ac=unsubscribe".data(using: String.Encoding.utf8) @@ -357,7 +357,7 @@ public enum CreateReaderAPISubscriptionResult: Sendable { var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.subscriptionEdit.rawValue), readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" var postString = "T=\(token)&s=\(subscriptionID)&ac=edit" @@ -388,7 +388,7 @@ public enum CreateReaderAPISubscriptionResult: Sendable { var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.contents.rawValue), readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" // Get ids from above into hex representation of value @@ -559,7 +559,7 @@ private extension ReaderAPICaller { // Do POST asking for data about all the new articles var request = URLRequest(url: baseURL.appendingPathComponent(ReaderAPIEndpoints.editTag.rawValue), readerAPICredentials: self.credentials) self.addVariantHeaders(&request) - request.setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + request.setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") request.httpMethod = "POST" // Get ids from above into hex representation of value diff --git a/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift b/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift index ad674b80a..c50f971b6 100644 --- a/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift +++ b/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift @@ -24,7 +24,7 @@ extension URLRequest { if credentialsType == .readerBasic { - setValue("application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") + setValue(MimeType.formURLEncoded, forHTTPHeaderField: "Content-Type") httpMethod = "POST" var postData = URLComponents() postData.queryItems = [ diff --git a/Web/Sources/Web/MimeType.swift b/Web/Sources/Web/MimeType.swift index 36225b718..25ebcd192 100755 --- a/Web/Sources/Web/MimeType.swift +++ b/Web/Sources/Web/MimeType.swift @@ -17,6 +17,8 @@ public struct MimeType { public static let jpg = "image/jpg" public static let gif = "image/gif" public static let tiff = "image/tiff" + + public static let formURLEncoded = "application/x-www-form-urlencoded" } public extension String {