WebAPI: Passes access token as Bearer Token (#200)

* Added passing access token as a Bearer token. * Removed superfluous code
pvzig · Oct 5, 2021 · e178c37 · e178c37
1 parent a19f6b3
commit e178c37
Show file tree

Hide file tree

Showing 3 changed files with 109 additions and 127 deletions.
diff --git a/SKWebAPI/Sources/Endpoint.swift b/SKWebAPI/Sources/Endpoint.swift
@@ -75,7 +75,7 @@ public enum Endpoint: String {
     case mpimList = "mpim.list"
     case mpimMark = "mpim.mark"
     case mpimOpen = "mpim.open"
-    case oauthAccess = "oauth.access"
+    case oauthAccess = "oauth.v2.access"
     case pinsList = "pins.list"
     case pinsAdd = "pins.add"
     case pinsRemove = "pins.remove"

diff --git a/SKWebAPI/Sources/NetworkInterface.swift b/SKWebAPI/Sources/NetworkInterface.swift
@@ -47,15 +47,23 @@ public struct NetworkInterface {
 
     internal func request(
         _ endpoint: Endpoint,
+        accessToken: String,
         parameters: [String: Any?],
         successClosure: @escaping ([String: Any]) -> Void,
         errorClosure: @escaping (SlackError) -> Void
     ) {
+        guard !accessToken.isEmpty else {
+            errorClosure(.invalidAuth)
+            return
+        }
+
         guard let url = requestURL(for: endpoint, parameters: parameters) else {
             errorClosure(SlackError.clientNetworkError)
             return
         }
-        let request = URLRequest(url: url)
+
+        var request = URLRequest(url: url)
+        request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
 
         session.dataTask(with: request) {(data, response, publicError) in
             do {
@@ -89,6 +97,7 @@ public struct NetworkInterface {
 
     internal func customRequest(
         _ url: String,
+        token: String,
         data: Data,
         success: @escaping (Bool) -> Void,
         errorClosure: @escaping (SlackError) -> Void
@@ -99,11 +108,12 @@ public struct NetworkInterface {
         }
         var request = URLRequest(url:url)
         request.httpMethod = "POST"
-        let contentType = "application/json"
+        let contentType = "application/json; charset: utf-8"
         request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+        request.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
         request.httpBody = data
 
-        session.dataTask(with: request) {(_, _, publicError) in
+        session.dataTask(with: request) {(data, response, publicError) in
             if publicError == nil {
                 success(true)
             } else {
@@ -114,6 +124,7 @@ public struct NetworkInterface {
 
     internal func uploadRequest(
         data: Data,
+        accessToken: String,
         parameters: [String: Any?],
         successClosure: @escaping ([String: Any]) -> Void, errorClosure: @escaping (SlackError) -> Void
     ) {
@@ -130,6 +141,7 @@ public struct NetworkInterface {
         let boundaryConstant = randomBoundary()
         let contentType = "multipart/form-data; boundary=" + boundaryConstant
         request.setValue(contentType, forHTTPHeaderField: "Content-Type")
+        request.setValue("Bearer \(accessToken)", forHTTPHeaderField: "Authorization")
         request.httpBody = requestBodyData(data: data, boundaryConstant: boundaryConstant, filename: filename, filetype: filetype)
 
         session.dataTask(with: request) {(data, response, publicError) in