Added Header map to Rest request (#228)

Author: royjit

Amplify/Categories/API/Request/RESTOperationRequest.swift

@@ -18,6 +18,9 @@ public struct RESTOperationRequest: AmplifyOperationRequest {
     /// path of the resource
     public let path: String?
 
+    /// Request headers
+    public let headers: [String: String]?
+
     /// Query parameters
     public let queryParameters: [String: String]?
 
@@ -30,12 +33,14 @@ public struct RESTOperationRequest: AmplifyOperationRequest {
     public init(apiName: String?,
                 operationType: RESTOperationType,
                 path: String? = nil,
+                headers: [String: String]? = nil,
                 queryParameters: [String: String]? = nil,
                 body: Data? = nil,
                 options: Options) {
         self.apiName = apiName
         self.operationType = operationType
         self.path = path
+        self.headers = headers
         self.queryParameters = queryParameters
         self.body = body
         self.options = options

Amplify/Categories/API/Request/RESTRequest.swift

@@ -16,6 +16,9 @@ public class RESTRequest {
     /// Path of the resource
     public let path: String?
 
+    /// Headers
+    public let headers: [String: String]?
+
     /// Query parameters
     public let queryParameters: [String: String]?
 
@@ -24,10 +27,12 @@ public class RESTRequest {
 
     public init(apiName: String? = nil,
                 path: String? = nil,
+                headers: [String: String]? = nil,
                 queryParameters: [String: String]? = nil,
                 body: Data? = nil) {
         self.apiName = apiName
         self.path = path
+        self.headers = headers
         self.queryParameters = queryParameters
         self.body = body
     }

AmplifyPlugins/API/AWSAPICategoryPlugin/Operation/AWSRESTOperation.swift

@@ -93,6 +93,7 @@ RESTOperation {
         // Construct URL Request with url and request body
         let urlRequest = RESTOperationRequestUtils.constructURLRequest(with: url,
                                                                        operationType: request.operationType,
+                                                                       headers: request.headers,
                                                                        requestPayload: request.body)
 
         // Intercept request

AmplifyPlugins/API/AWSAPICategoryPlugin/Support/Utils/RESTOperationRequest+RESTRequest.swift

@@ -12,6 +12,7 @@ extension RESTOperationRequest {
         self = RESTOperationRequest(apiName: request.apiName,
                                     operationType: operationType,
                                     path: request.path,
+                                    headers: request.headers,
                                     queryParameters: request.queryParameters,
                                     body: request.body,
                                     options: RESTOperationRequest.Options())

AmplifyPlugins/API/AWSAPICategoryPlugin/Support/Utils/RESTOperationRequestUtils.swift

@@ -51,11 +51,17 @@ final class RESTOperationRequestUtils {
     // Construct a request specific to the `RESTOperationType`
     static func constructURLRequest(with url: URL,
                                     operationType: RESTOperationType,
+                                    headers: [String: String]?,
                                     requestPayload: Data?) -> URLRequest {
 
         var baseRequest = URLRequest(url: url)
-        let headers = ["content-type": "application/json"]
-        baseRequest.allHTTPHeaderFields = headers
+        var requestHeaders = ["content-type": "application/json"]
+        if let headers = headers {
+            for (key, value) in headers {
+                requestHeaders[key] = value
+            }
+        }
+        baseRequest.allHTTPHeaderFields = requestHeaders
         baseRequest.httpMethod = operationType.rawValue
         baseRequest.httpBody = requestPayload
         return baseRequest