Merge pull request #67 from pvzig/0.0.6

0.0.6

SlackKit/Sources/Client+EventDispatching.swift

@@ -153,8 +153,10 @@ internal extension SlackClient {
             subteamAddedSelf(event)
         case .subteamSelfRemoved:
             subteamRemovedSelf(event)
+        case .error:
+            print("Error: \(anEvent)")
         case .unknown:
-            print("Unknown event of type: \(anEvent["type"] ?? "No Type Information")")
+            print("Unsupported event of type: \(anEvent["type"] ?? "No Type Information")")
         }
     }
 

SlackKit/Sources/Event.swift

@@ -22,7 +22,6 @@
 // THE SOFTWARE.
 
 internal enum EventType: String {
-
     case hello = "hello"
     case message = "message"
     case userTyping = "user_typing"
@@ -93,11 +92,11 @@ internal enum EventType: String {
     case subteamSelfAdded = "subteam_self_added"
     case subteamSelfRemoved = "subteam_self_removed"
     case ok = "ok"
+    case error = "error"
     case unknown = "unknown"
 }
 
 internal enum MessageSubtype: String {
-
     case botMessage = "bot_message"
     case meMessage = "me_message"
     case messageChanged = "message_changed"

SlackKit/Sources/Extensions.swift

@@ -39,18 +39,3 @@ internal extension String {
         return escapedString
     }
 }
-
-internal extension Dictionary where Key: ExpressibleByStringLiteral, Value: Any {
-
-    var requestStringFromParameters: String {
-        var requestString = ""
-        for key in self.keys {
-            if let value = self[key] as? String, let encodedValue = value.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed) {
-                requestString += "&\(key)=\(encodedValue)"
-            } else if let value = self[key] {
-                requestString += "&\(key)=\(value)"
-            }
-        }
-        return requestString
-    }
-}

SlackKit/Sources/NetworkInterface.swift

@@ -38,30 +38,20 @@ internal struct NetworkInterface {
         }
     }
 
-    internal func request(_ endpoint: Endpoint, token: String, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(endpoint.rawValue)?token=\(token)"
-        if let params = parameters {
-            requestString += params.requestStringFromParameters
+    internal func request(_ endpoint: Endpoint, parameters: [String: Any?], successClosure: @escaping ([String: Any])->Void, errorClosure: @escaping (SlackError)->Void) {
+        var components = URLComponents(string: "\(apiUrl)\(endpoint.rawValue)")
+        if parameters.count > 0 {
+            components?.queryItems = filterNilParameters(parameters).map { URLQueryItem(name: $0.0, value: "\($0.1)") }
+        }
+        guard let requestString = components?.string else {
+            errorClosure(SlackError.clientNetworkError)
+            return
         }
 
         do {
             let contentNegotiation = ContentNegotiationMiddleware(mediaTypes: [.json, .urlEncodedForm], mode: .client)
-            var response = try client?.get(requestString, middleware: [contentNegotiation])
-            if let buffer = try response?.body.becomeBuffer(deadline: 3.seconds.fromNow()) {
-                let data = Data(bytes: buffer.bytes)
-                let json = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
-                if let result = json as? [String: Any] {
-                    if (result["ok"] as? Bool == true) {
-                        successClosure(result)
-                    } else {
-                        if let errorString = result["error"] as? String {
-                            throw SlackError(rawValue: errorString) ?? SlackError.unknownError
-                        } else {
-                            throw SlackError.unknownError
-                        }
-                    }
-                }
-            }
+            let response = try client?.get(requestString, middleware: [contentNegotiation])
+            successClosure(try handleResponse(response))
         } catch let error {
             if let slackError = error as? SlackError {
                 errorClosure(slackError)
@@ -71,17 +61,21 @@ internal struct NetworkInterface {
         }
     }
 
-    internal func uploadRequest(token: String, data: Data, parameters: [String: Any]?, successClosure: ([String: Any])->Void, errorClosure: (SlackError)->Void) {
-        var requestString = "\(apiUrl)\(Endpoint.filesUpload.rawValue)?token=\(token)"
-        if let params = parameters {
-            requestString = requestString + params.requestStringFromParameters
+    internal func uploadRequest(data: Data, parameters: [String: Any?], successClosure: @escaping ([String: Any])->Void, errorClosure: @escaping (SlackError)->Void) {
+        var components = URLComponents(string: "\(apiUrl)\(Endpoint.filesUpload.rawValue)")
+        if parameters.count > 0 {
+            components?.queryItems = filterNilParameters(parameters).map { URLQueryItem(name: $0.0, value: "\($0.1)") }
+        }
+        guard let requestString = components?.string else {
+            errorClosure(SlackError.clientNetworkError)
+            return
         }
 
         let boundaryConstant = randomBoundary()
         let boundaryStart = "--\(boundaryConstant)\r\n"
         let boundaryEnd = "\r\n--\(boundaryConstant)--\r\n"
-        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters!["filename"])\"\r\n"
-        let contentTypeString = "Content-Type: \(parameters!["filetype"])\r\n\r\n"
+        let contentDispositionString = "Content-Disposition: form-data; name=\"file\"; filename=\"\(parameters["filename"])\"\r\n"
+        let contentTypeString = "Content-Type: \(parameters["filetype"])\r\n\r\n"
 
         guard let boundaryStartData = boundaryStart.data(using: .utf8), let dispositionData = contentDispositionString.data(using: .utf8), let contentTypeData = contentTypeString.data(using: .utf8), let boundaryEndData = boundaryEnd.data(using: .utf8) else {
             errorClosure(SlackError.clientNetworkError)
@@ -95,33 +89,62 @@ internal struct NetworkInterface {
         requestBodyData.append(contentsOf: boundaryEndData)
 
         let header: Headers = ["Content-Type":"multipart/form-data; boundary=\(boundaryConstant)"]
-
+        let body = Buffer([UInt8](requestBodyData))
+
         do {
-            let body = Buffer([UInt8](requestBodyData))
-            var response = try client?.post(requestString, headers: header, body: body)
-            if let buffer = try response?.body.becomeBuffer(deadline: 3.seconds.fromNow()) {
+            let response = try client?.post(requestString, headers: header, body: body)
+            successClosure(try handleResponse(response))
+        } catch let error {
+            if let slackError = error as? SlackError {
+                errorClosure(slackError)
+            } else {
+                errorClosure(SlackError.unknownError)
+            }
+        }
+    }
+
+    private func handleResponse(_ response: Response?) throws -> [String: Any] {
+        guard var response = response else {
+            throw SlackError.clientNetworkError
+        }
+        do {
+            let buffer = try response.body.becomeBuffer(deadline: 3.seconds.fromNow())
+            switch response.statusCode {
+            case 200:
                 let data = Data(bytes: buffer.bytes)
-                let json = try JSONSerialization.jsonObject(with: data, options: .allowFragments)
-                if let result = json as? [String: Any] {
-                    if (result["ok"] as? Bool == true) {
-                        successClosure(result)
+                if let json = try JSONSerialization.jsonObject(with: data, options: .allowFragments) as? [String: Any] {
+                    if json["ok"] as? Bool == true {
+                        return json
+                    } else if let errorString = json["error"] as? String {
+                        throw SlackError(rawValue: errorString) ?? .unknownError
                     } else {
-                        if let errorString = result["error"] as? String {
-                            throw SlackError(rawValue: errorString) ?? SlackError.unknownError
-                        } else {
-                            throw SlackError.unknownError
-                        }
+                        throw SlackError.clientJSONError
                     }
+                } else {
+                    throw SlackError.unknownError
                 }
+            case 429:
+                throw SlackError.tooManyRequests
+            default:
+                throw SlackError.clientNetworkError
             }
-
         } catch let error {
             if let slackError = error as? SlackError {
-                errorClosure(slackError)
+                throw slackError
             } else {
-                errorClosure(SlackError.unknownError)
+                throw SlackError.unknownError
+            }
+        }
+    }
+
+    private func filterNilParameters(_ parameters: [String: Any?]) -> [String: Any] {
+        var finalParameters = [String: Any]()
+        for (key, value) in parameters {
+            if let unwrapped = value {
+                finalParameters[key] = unwrapped
             }
         }
+        return finalParameters
     }
 
     private func randomBoundary() -> String {