make it more mutable

make it more mutable

Author: tomerd

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -60,14 +60,13 @@ extension HTTPClient {
     }
 
     public struct Request {
-        public let version: HTTPVersion
-        public let method: HTTPMethod
-        public let url: URL
+        public var version: HTTPVersion
+        public var method: HTTPMethod
         public var headers: HTTPHeaders
         public var body: Body?
-        
-        internal let scheme: String
-        internal let host: String
+        private var _url: URL!
+        private var _schema: String!
+        private var _host: String!
 
         public init(url: String, version: HTTPVersion = HTTPVersion(major: 1, minor: 1), method: HTTPMethod = .GET, headers: HTTPHeaders = HTTPHeaders(), body: Body? = nil) throws {
             guard let url = URL(string: url) else {
@@ -78,25 +77,41 @@ extension HTTPClient {
         }
 
         public init(url: URL, version: HTTPVersion = HTTPVersion(major: 1, minor: 1), method: HTTPMethod = .GET, headers: HTTPHeaders = HTTPHeaders(), body: Body? = nil) throws {
+            self.version = version
+            self.method = method
+            self.headers = headers
+            self.body = body
+            try self.setUrl(url)
+        }
+
+        public mutating func setUrl(_ url: URL) throws {
             guard let scheme = url.scheme?.lowercased() else {
                 throw HTTPClientError.emptyScheme
             }
 
-            guard Request.isSchemeSupported(scheme: scheme) else {
+            guard HTTPClient.Request.isSchemeSupported(scheme: scheme) else {
                 throw HTTPClientError.unsupportedScheme(scheme)
             }
 
             guard let host = url.host else {
                 throw HTTPClientError.emptyHost
             }
 
-            self.version = version
-            self.method = method
-            self.url = url
-            self.scheme = scheme
-            self.host = host
-            self.headers = headers
-            self.body = body
+            self._url = url
+            self._schema = scheme
+            self._host = host
+        }
+
+        public var url: URL {
+            return self._url
+        }
+
+        public var scheme: String {
+            return self._schema
+        }
+
+        public var host: String {
+            return self._host
         }
 
         public var useTLS: Bool {
@@ -527,38 +542,36 @@ internal struct RedirectHandler<T> {
     }
 
     func redirect(status: HTTPResponseStatus, to redirectURL: URL, promise: EventLoopPromise<T>) {
-        let originalRequest = self.request
+        let originalURL = self.request.url
+
+        var request = self.request
+        do {
+            try request.setUrl(redirectURL)
+        } catch {
+            return promise.fail(error)
+        }
 
         var convertToGet = false
         if status == .seeOther, request.method != .HEAD {
             convertToGet = true
         } else if status == .movedPermanently || status == .found, request.method == .POST {
             convertToGet = true
         }
-        
-        var method = originalRequest.method
-        var headers = originalRequest.headers
-        var body = originalRequest.body
-        
+
         if convertToGet {
-            method = .GET
-            body = nil
-            headers.remove(name: "Content-Length")
-            headers.remove(name: "Content-Type")
+            request.method = .GET
+            request.body = nil
+            request.headers.remove(name: "Content-Length")
+            request.headers.remove(name: "Content-Type")
         }
 
-        if !originalRequest.url.hasTheSameOrigin(as: redirectURL) {
-            headers.remove(name: "Origin")
-            headers.remove(name: "Cookie")
-            headers.remove(name: "Authorization")
-            headers.remove(name: "Proxy-Authorization")
-        }
-        
-        do {
-            let request = try HTTPClient.Request(url: redirectURL, version: originalRequest.version,  method: method, headers: headers, body: body)
-            return self.execute(request).futureResult.cascade(to: promise)
-        } catch {
-            return promise.fail(error)
+        if !originalURL.hasTheSameOrigin(as: redirectURL) {
+            request.headers.remove(name: "Origin")
+            request.headers.remove(name: "Cookie")
+            request.headers.remove(name: "Authorization")
+            request.headers.remove(name: "Proxy-Authorization")
         }
+
+        return self.execute(request).futureResult.cascade(to: promise)
     }
 }